diff --git a/.envrc b/.envrc
index 5def8fd66a..7fd05db3e5 100644
--- a/.envrc
+++ b/.envrc
@@ -1,4 +1,4 @@
-if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then
-    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
+if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
 fi
 use flake
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 09c9e76b19..7ff9017cb0 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,4 @@
 contact_links:
   - name: Report a Security Vulnerability
     url: https://github.com/space-wizards/space-station-14/blob/master/SECURITY.md
-    about: Please report security vulnerabilities privately so we can fix them before they are publicly disclosed.
-  - name: Request a Feature
-    url: https://discord.gg/rGvu9hKffJ
-    about: Submit feature requests on our Discord server (https://discord.gg/rGvu9hKffJ).
+    about: Please report security vulnerabilities to the Space Wizards privately so they can fix them before they are publicly disclosed.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..aba549332f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,27 @@
+---
+name: Request a Feature
+about: "Template for noting future planned features. Please ask for approval in the Discord if you aren't an organization Member before posting a feature request"
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+This is a loose format, write this however you need to
+Remove these comments before submitting
+-->
+
+# Description
+<!--
+Explain your request in as much detail as you can
+-->
+
+I want Goldfish crackers
+
+# Media
+<!--
+If applicable, add images or even a video to help explain your suggestion
+-->
+
+![Example Screenshot](https://example.com/thisimageisntreal.png)
diff --git a/.github/ISSUE_TEMPLATE/issue_report.md b/.github/ISSUE_TEMPLATE/issue_report.md
index f18221e055..ab82181197 100644
--- a/.github/ISSUE_TEMPLATE/issue_report.md
+++ b/.github/ISSUE_TEMPLATE/issue_report.md
@@ -1,32 +1,55 @@
 ---
 name: Report an Issue
-about: "..."
+about: "Any general issues you have during play or with the codebase"
 title: ''
 labels: ''
 assignees: ''
 
 ---
 
+<!--
+This is a loose format, write this however you need to
+Remove these comments before submitting
+-->
+
 # Description
 <!--
-Explain your issue in detail.
-Issues without proper explanation are liable to be closed by maintainers.
+Explain your issue in detail
+Issues without proper explanation are liable to be closed by maintainers
 -->
 
+Description
+
 # Reproduction
 <!--
-Include the steps to reproduce if applicable.
-Try to be as descriptive as possible.
+Include the steps to reproduce if applicable
+Try to be as descriptive as possible
 -->
 
-# Screenshots
+1. Open game
+2. Game doesn't open
+
+# Expected behavior
 <!--
-If applicable, add screenshots to help explain your problem.
-A video of the reproduction would also be useful.
+What should happen?
+Why might this not be happening? / Possible solutions  (if you know)
 -->
 
+1. Open game
+2. Game opens
+
+# Media
+<!--
+If applicable, add screenshots to help explain your problem
+A video of the reproduction would also be useful
+-->
+
+![Example Screenshot](https://example.com/thisimageisntreal.png)
+
 # Additional context
 <!--
-Add any other context about the problem here.
-Anything you think is related to the issue.
+Add any other context about the problem here
+Anything you think is related to the issue
 -->
+
+There's a ghost in my computer
diff --git a/.github/ISSUE_TEMPLATE/toolshed-feature-request.md b/.github/ISSUE_TEMPLATE/toolshed-feature-request.md
deleted file mode 100644
index dae84c3e25..0000000000
--- a/.github/ISSUE_TEMPLATE/toolshed-feature-request.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: Toolshed feature request
-about: Suggest a feature for Toolshed (for game admins/developers)
-title: "[TOOLSHED REQUEST]"
-labels: Toolshed
-assignees: moonheart08
-
----
-
-**Is your feature request related to a problem/bug? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the command you'd like**
-A clear and concise description of what you want and what it should do.
-If you're a technical user (i.e. programmer) including type signatures is helpful.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index bb0ae5066a..5d3ce070bc 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,20 +1,46 @@
+<!--
+This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same
+Remove these comments before submitting
+-->
+
 # Description
 
+<!--
+Explain this PR in as much detail as applicable
+
+Some example prompts to consider:
+How might this affect the game? The codebase?
+What might be some alternatives to this?
+How/Who does this benefit/hurt [the game/codebase]?
+-->
+
 Description.
 
 ---
 
 # TODO
 
+<!--
+A list of everything you have to do before this PR is "complete"
+You probably won't have to complete everything before merging but it's good to leave future references
+-->
+
 - [ ] Task
 - [x] Completed Task
 
 ---
 
+<!--
+This is default collapsed, readers click to expand it and see all your media
+The PR media section can get very large at times, so this is a good way to keep it clean
+The title is written using HTML tags
+The title must be within the <summary> tags or you won't see it
+-->
+
 <details><summary><h1>Media</h1></summary>
 <p>
 
-<!-- ![Example Media Embed](https://example.com/thisimageisntreal.png) -->
+![Example Media Embed](https://example.com/thisimageisntreal.png)
 
 </p>
 </details>
@@ -23,10 +49,14 @@ Description.
 
 # Changelog
 
-<!-- You can add an author after the `:cl:` to change the name that appears in the changelog, ex: `:cl: Death`, it will default to your GitHub display name -->
+<!--
+You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`)
+Leaving it blank will default to your GitHub display name
+This includes all available types for the changelog
+-->
 
 :cl:
-- add: Added fun!
-- tweak: Tweaked fun!
+- add: Added fun :D
+- tweak: Tweaked fun
 - fix: Fixed fun!
-- remove: Removed fun!
+- remove: Removed fun :(
diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml
index 01575f64b9..45c807b362 100644
--- a/.github/workflows/build-map-renderer.yml
+++ b/.github/workflows/build-map-renderer.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot'
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14'
     strategy:
       matrix:
         os: [ubuntu-latest]
diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml
index 519f5af6f4..c3b766f8de 100644
--- a/.github/workflows/build-test-debug.yml
+++ b/.github/workflows/build-test-debug.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot'
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14'
     strategy:
       matrix:
         os: [ubuntu-latest]
diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml
index a47965334c..152d3a9f3c 100644
--- a/.github/workflows/conflict-labeler.yml
+++ b/.github/workflows/conflict-labeler.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   Label:
-    if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot'
+    if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14'
     runs-on: ubuntu-latest
     steps:
       - name: Check for Merge Conflicts
diff --git a/.github/workflows/labeler-pr.yml b/.github/workflows/labeler-pr.yml
index e1755aa26e..efb051f4cc 100644
--- a/.github/workflows/labeler-pr.yml
+++ b/.github/workflows/labeler-pr.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   labeler:
-    if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot'
+    if: github.actor != 'PJBot' && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/labeler@v3
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 4ba70f3504..74a975be5c 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -67,7 +67,7 @@ jobs:
         username: ${{ secrets.PUBLISH_USER }}
         key: ${{ secrets.PUBLISH_KEY }}
         port: ${{ secrets.PUBLISH_PORT }}
-        script: /home/${{ secrets.PUBLISH_USER }}/publish/push.ps1 ${{ github.sha }}
+        script: /home/deltav/publish/push.ps1 ${{ github.sha }}
 
     - name: Publish changelog (Discord)
       run: Tools/actions_changelogs_since_last_run.py
diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml
index ccece69adb..b35a609220 100644
--- a/.github/workflows/test-packaging.yml
+++ b/.github/workflows/test-packaging.yml
@@ -29,7 +29,7 @@ on:
 jobs:
   build:
     name: Test Packaging
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot'
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14'
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/update-credits.yml b/.github/workflows/update-credits.yml
index fb3508385e..69a8bc1988 100644
--- a/.github/workflows/update-credits.yml
+++ b/.github/workflows/update-credits.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     # Hey there fork dev! If you like to include your own contributors in this then you can probably just change this to your own repo
     # Do this in dump_github_contributors.ps1 too into your own repo
-    if: github.repository == 'DeltaV-Station/Delta-v'
+    if: github.repository == 'Simple-Station/Einstein-Engines'
 
     steps:
       - uses: actions/checkout@v3.6.0
@@ -47,6 +47,6 @@ jobs:
         with:
           commit-message: Update Credits
           title: Update Credits
-          body: This is an automated Pull Request. This PR updates the github contributors in the credits section.
-          author: DeltaV-Bot <github@delta-v.org>
+          body: This is an automated Pull Request. This PR updates the GitHub contributors in the credits section.
+          author: ${{ vars.CHANGELOG_USER }} <${{ vars.CHANGELOG_EMAIL }}>
           branch: automated/credits-${{env.NOW}}
diff --git a/.github/workflows/validate-rgas.yml b/.github/workflows/validate-rgas.yml
index 0ed04021eb..72ce39ceff 100644
--- a/.github/workflows/validate-rgas.yml
+++ b/.github/workflows/validate-rgas.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   yaml-schema-validation:
     name: YAML RGA schema validator
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot'
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3.6.0
diff --git a/.github/workflows/validate_mapfiles.yml b/.github/workflows/validate_mapfiles.yml
index 43d77841a8..190ee97d8f 100644
--- a/.github/workflows/validate_mapfiles.yml
+++ b/.github/workflows/validate_mapfiles.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   yaml-schema-validation:
     name: YAML map schema validator
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot'
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3.6.0
diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml
index 796795b234..f60945ae7c 100644
--- a/.github/workflows/yaml-linter.yml
+++ b/.github/workflows/yaml-linter.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   build:
     name: YAML Linter
-    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot'
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'DeltaV-Bot' && github.actor != 'SimpleStation14'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3.6.0
diff --git a/Content.Benchmarks/ColorInterpolateBenchmark.cs b/Content.Benchmarks/ColorInterpolateBenchmark.cs
index 2243bb4819..eb182328d4 100644
--- a/Content.Benchmarks/ColorInterpolateBenchmark.cs
+++ b/Content.Benchmarks/ColorInterpolateBenchmark.cs
@@ -131,8 +131,8 @@ public static Color InterpolateSysVector4(Color a, Color b,
         public static Color InterpolateSysVector4In(in Color endPoint1, in Color endPoint2,
             float lambda)
         {
-            ref var sva = ref Unsafe.As<Color, SysVector4>(ref Unsafe.AsRef(endPoint1));
-            ref var svb = ref Unsafe.As<Color, SysVector4>(ref Unsafe.AsRef(endPoint2));
+            ref var sva = ref Unsafe.As<Color, SysVector4>(ref Unsafe.AsRef(in endPoint1));
+            ref var svb = ref Unsafe.As<Color, SysVector4>(ref Unsafe.AsRef(in endPoint2));
 
             var res = SysVector4.Lerp(svb, sva, lambda);
 
@@ -156,8 +156,8 @@ public static Color InterpolateSimd(Color a, Color b,
         public static Color InterpolateSimdIn(in Color a, in Color b,
             float lambda)
         {
-            var vecA = Unsafe.As<Color, Vector128<float>>(ref Unsafe.AsRef(a));
-            var vecB = Unsafe.As<Color, Vector128<float>>(ref Unsafe.AsRef(b));
+            var vecA = Unsafe.As<Color, Vector128<float>>(ref Unsafe.AsRef(in a));
+            var vecB = Unsafe.As<Color, Vector128<float>>(ref Unsafe.AsRef(in b));
 
             vecB = Fma.MultiplyAdd(Sse.Subtract(vecB, vecA), Vector128.Create(lambda), vecA);
 
diff --git a/Content.Benchmarks/DeviceNetworkingBenchmark.cs b/Content.Benchmarks/DeviceNetworkingBenchmark.cs
index 16805c2684..bb2a22312e 100644
--- a/Content.Benchmarks/DeviceNetworkingBenchmark.cs
+++ b/Content.Benchmarks/DeviceNetworkingBenchmark.cs
@@ -4,8 +4,8 @@
 using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
 using Content.IntegrationTests.Tests.DeviceNetwork;
-using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Systems;
+using Content.Shared.DeviceNetwork;
 using Robust.Shared;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
diff --git a/Content.Benchmarks/Program.cs b/Content.Benchmarks/Program.cs
index 0beb0a613d..42a436597d 100644
--- a/Content.Benchmarks/Program.cs
+++ b/Content.Benchmarks/Program.cs
@@ -18,11 +18,6 @@ internal static class Program
 
         public static void Main(string[] args)
         {
-            MainAsync(args).GetAwaiter().GetResult();
-        }
-
-        public static async Task MainAsync(string[] args)
-        {
 #if DEBUG
             Console.ForegroundColor = ConsoleColor.Red;
             Console.WriteLine("\nWARNING: YOU ARE RUNNING A DEBUG BUILD, USE A RELEASE BUILD FOR AN ACCURATE BENCHMARK");
diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs
index 508f3404ba..31d092b25d 100644
--- a/Content.Client/Actions/ActionsSystem.cs
+++ b/Content.Client/Actions/ActionsSystem.cs
@@ -1,6 +1,7 @@
 using System.IO;
 using System.Linq;
 using Content.Shared.Actions;
+using Content.Shared.Mapping;
 using JetBrains.Annotations;
 using Robust.Client.Player;
 using Robust.Shared.ContentPack;
@@ -78,10 +79,12 @@ private void OnWorldTargetHandleState(EntityUid uid, WorldTargetActionComponent
 
         private void BaseHandleState<T>(EntityUid uid, BaseActionComponent component, BaseActionComponentState state) where T : BaseActionComponent
         {
+            // TODO ACTIONS use auto comp states
             component.Icon = state.Icon;
             component.IconOn = state.IconOn;
             component.IconColor = state.IconColor;
-            component.Keywords = new HashSet<string>(state.Keywords);
+            component.Keywords.Clear();
+            component.Keywords.UnionWith(state.Keywords);
             component.Enabled = state.Enabled;
             component.Toggled = state.Toggled;
             component.Cooldown = state.Cooldown;
@@ -101,8 +104,7 @@ private void BaseHandleState<T>(EntityUid uid, BaseActionComponent component, Ba
             component.ItemIconStyle = state.ItemIconStyle;
             component.Sound = state.Sound;
 
-            if (_playerManager.LocalPlayer?.ControlledEntity == component.AttachedEntity)
-                ActionsUpdated?.Invoke();
+            UpdateAction(uid, component);
         }
 
         protected override void UpdateAction(EntityUid? actionId, BaseActionComponent? action = null)
@@ -111,7 +113,7 @@ protected override void UpdateAction(EntityUid? actionId, BaseActionComponent? a
                 return;
 
             base.UpdateAction(actionId, action);
-            if (_playerManager.LocalPlayer?.ControlledEntity != action.AttachedEntity)
+            if (_playerManager.LocalEntity != action.AttachedEntity)
                 return;
 
             ActionsUpdated?.Invoke();
@@ -144,7 +146,7 @@ private void HandleComponentState(EntityUid uid, ActionsComponent component, ref
                 _added.Add((actionId, action));
             }
 
-            if (_playerManager.LocalPlayer?.ControlledEntity != uid)
+            if (_playerManager.LocalEntity != uid)
                 return;
 
             foreach (var action in _removed)
@@ -177,7 +179,7 @@ public static int ActionComparer((EntityUid, BaseActionComponent?) a, (EntityUid
         protected override void ActionAdded(EntityUid performer, EntityUid actionId, ActionsComponent comp,
             BaseActionComponent action)
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity != performer)
+            if (_playerManager.LocalEntity != performer)
                 return;
 
             OnActionAdded?.Invoke(actionId);
@@ -185,7 +187,7 @@ protected override void ActionAdded(EntityUid performer, EntityUid actionId, Act
 
         protected override void ActionRemoved(EntityUid performer, EntityUid actionId, ActionsComponent comp, BaseActionComponent action)
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity != performer)
+            if (_playerManager.LocalEntity != performer)
                 return;
 
             OnActionRemoved?.Invoke(actionId);
@@ -193,7 +195,7 @@ protected override void ActionRemoved(EntityUid performer, EntityUid actionId, A
 
         public IEnumerable<(EntityUid Id, BaseActionComponent Comp)> GetClientActions()
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity is not { } user)
+            if (_playerManager.LocalEntity is not { } user)
                 return Enumerable.Empty<(EntityUid, BaseActionComponent)>();
 
             return GetActions(user);
@@ -216,7 +218,7 @@ public void UnlinkAllActions()
 
         public void LinkAllActions(ActionsComponent? actions = null)
         {
-             if (_playerManager.LocalPlayer?.ControlledEntity is not { } user ||
+             if (_playerManager.LocalEntity is not { } user ||
                  !Resolve(user, ref actions, false))
              {
                  return;
@@ -233,7 +235,7 @@ public override void Shutdown()
 
         public void TriggerAction(EntityUid actionId, BaseActionComponent action)
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity is not { } user ||
+            if (_playerManager.LocalEntity is not { } user ||
                 !TryComp(user, out ActionsComponent? actions))
             {
                 return;
@@ -261,7 +263,7 @@ public void TriggerAction(EntityUid actionId, BaseActionComponent action)
         /// </summary>
         public void LoadActionAssignments(string path, bool userData)
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity is not { } user)
+            if (_playerManager.LocalEntity is not { } user)
                 return;
 
             var file = new ResPath(path).ToRootedPath();
@@ -310,6 +312,70 @@ public void LoadActionAssignments(string path, bool userData)
             AssignSlot?.Invoke(assignments);
         }
 
+        /// <summary>
+        ///     Load actions and their toolbar assignments from a file.
+        ///     DeltaV - Load from an existing yaml stream instead
+        /// </summary>
+        public void LoadActionAssignments(YamlStream stream)
+        {
+            if (_playerManager.LocalEntity is not { } user)
+                return;
+
+            if (stream.Documents[0].RootNode.ToDataNode() is not SequenceDataNode sequence)
+                return;
+
+            ClearAssignments?.Invoke();
+
+            var assignments = new List<SlotAssignment>();
+            var existingActions = GetClientActions();
+            var existingActionsList = existingActions.ToList();
+
+            foreach (var entry in sequence.Sequence)
+            {
+                if (entry is not MappingDataNode map)
+                    continue;
+
+                if (!map.TryGet("action", out var actionNode))
+                    continue;
+
+                if (!map.TryGet<ValueDataNode>("name", out var nameNode))
+                    continue;
+
+                var action = _serialization.Read<BaseActionComponent>(actionNode, notNullableOverride: true);
+
+                // Prevent spawning actions multiple times
+                var existing = existingActionsList.FirstOrNull(a =>
+                    Name(a.Id) == nameNode.Value);
+
+                EntityUid actionId;
+                if (existing == null)
+                {
+                    actionId = Spawn(null);
+                    AddComp(actionId, action);
+                    _metaData.SetEntityName(actionId, nameNode.Value);
+                    DirtyEntity(actionId);
+                    AddActionDirect(user, actionId);
+                }
+                else
+                {
+                    actionId = existing.Value.Id;
+                }
+
+                if (!map.TryGet("assignments", out var assignmentNode))
+                    continue;
+
+                var nodeAssignments = _serialization.Read<List<(byte Hotbar, byte Slot)>>(assignmentNode, notNullableOverride: true);
+
+                foreach (var index in nodeAssignments)
+                {
+                    var assignment = new SlotAssignment(index.Hotbar, index.Slot, actionId);
+                    assignments.Add(assignment);
+                }
+            }
+
+            AssignSlot?.Invoke(assignments);
+        }
+
         public record struct SlotAssignment(byte Hotbar, byte Slot, EntityUid ActionId);
     }
 }
diff --git a/Content.Client/Administration/Managers/ClientAdminManager.cs b/Content.Client/Administration/Managers/ClientAdminManager.cs
index 1a1366c6f2..fdd62fb6a2 100644
--- a/Content.Client/Administration/Managers/ClientAdminManager.cs
+++ b/Content.Client/Administration/Managers/ClientAdminManager.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Administration.Managers;
 using Robust.Client.Console;
 using Robust.Client.Player;
+using Robust.Client.UserInterface;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
@@ -15,11 +16,14 @@ public sealed class ClientAdminManager : IClientAdminManager, IClientConGroupImp
         [Dependency] private readonly IClientNetManager _netMgr = default!;
         [Dependency] private readonly IClientConGroupController _conGroup = default!;
         [Dependency] private readonly IResourceManager _res = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
+        [Dependency] private readonly IUserInterfaceManager _userInterface = default!;
 
         private AdminData? _adminData;
         private readonly HashSet<string> _availableCommands = new();
 
         private readonly AdminCommandPermissions _localCommandPermissions = new();
+        private ISawmill _sawmill = default!;
 
         public event Action? AdminStatusUpdated;
 
@@ -92,17 +96,20 @@ private void UpdateMessageRx(MsgUpdateAdminStatus message)
             }
 
             _availableCommands.UnionWith(message.AvailableCommands);
-            Logger.DebugS("admin", $"Have {message.AvailableCommands.Length} commands available");
+            _sawmill.Debug($"Have {message.AvailableCommands.Length} commands available");
 
             _adminData = message.Admin;
             if (_adminData != null)
             {
                 var flagsText = string.Join("|", AdminFlagsHelper.FlagsToNames(_adminData.Flags));
-                Logger.InfoS("admin", $"Updated admin status: {_adminData.Active}/{_adminData.Title}/{flagsText}");
+                _sawmill.Info($"Updated admin status: {_adminData.Active}/{_adminData.Title}/{flagsText}");
+
+                if (_adminData.Active)
+                    _userInterface.DebugMonitors.SetMonitor(DebugMonitor.Coords, true);
             }
             else
             {
-                Logger.InfoS("admin", "Updated admin status: Not admin");
+                _sawmill.Info("Updated admin status: Not admin");
             }
 
             AdminStatusUpdated?.Invoke();
@@ -114,18 +121,17 @@ private void UpdateMessageRx(MsgUpdateAdminStatus message)
         void IPostInjectInit.PostInject()
         {
             _conGroup.Implementation = this;
+            _sawmill = _logManager.GetSawmill("admin");
         }
 
         public AdminData? GetAdminData(EntityUid uid, bool includeDeAdmin = false)
         {
-            return uid == _player.LocalPlayer?.ControlledEntity
-                ? _adminData
-                : null;
+            return uid == _player.LocalEntity ? _adminData : null;
         }
 
         public AdminData? GetAdminData(ICommonSession session, bool includeDeAdmin = false)
         {
-            if (_player.LocalPlayer?.UserId == session.UserId)
+            if (_player.LocalUser == session.UserId)
                 return _adminData;
 
             return null;
@@ -133,7 +139,7 @@ void IPostInjectInit.PostInject()
 
         public AdminData? GetAdminData(bool includeDeAdmin = false)
         {
-            if (_player.LocalPlayer is { Session: { } session })
+            if (_player.LocalSession is { } session)
                 return GetAdminData(session, includeDeAdmin);
 
             return null;
diff --git a/Content.Client/Administration/Systems/BwoinkSystem.cs b/Content.Client/Administration/Systems/BwoinkSystem.cs
index eafd40cc9c..5166dc8416 100644
--- a/Content.Client/Administration/Systems/BwoinkSystem.cs
+++ b/Content.Client/Administration/Systems/BwoinkSystem.cs
@@ -19,11 +19,11 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
             OnBwoinkTextMessageRecieved?.Invoke(this, message);
         }
 
-        public void Send(NetUserId channelId, string text)
+        public void Send(NetUserId channelId, string text, bool playSound)
         {
             // Reuse the channel ID as the 'true sender'.
             // Server will ignore this and if someone makes it not ignore this (which is bad, allows impersonation!!!), that will help.
-            RaiseNetworkEvent(new BwoinkTextMessage(channelId, channelId, text));
+            RaiseNetworkEvent(new BwoinkTextMessage(channelId, channelId, text, playSound: playSound));
             SendInputTextUpdated(channelId, false);
         }
 
diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
index e5269c027a..39ea50edbe 100644
--- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
+++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
@@ -7,6 +7,8 @@
             <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="2">
                 <BoxContainer Access="Public" Name="BwoinkArea" VerticalExpand="True" />
                 <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+                    <CheckBox Visible="True" Name="PlaySound" Access="Public" Text="{Loc 'admin-bwoink-play-sound'}" Pressed="True" />
+                    <Control HorizontalExpand="True" MinWidth="5" />
                     <Button Visible="True" Name="PopOut" Access="Public" Text="{Loc 'admin-logs-pop-out'}" StyleClasses="OpenBoth" HorizontalAlignment="Left" />
                     <Control HorizontalExpand="True" />
                     <Button Visible="False" Name="Bans" Text="{Loc 'admin-player-actions-bans'}" StyleClasses="OpenRight" />
diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
index 41c3ac76f9..fdf935d7c0 100644
--- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
+++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
@@ -29,6 +29,8 @@ public sealed partial class PlayerListControl : BoxContainer
         private IEntityManager _entManager;
         private IUserInterfaceManager _uiManager;
 
+        private PlayerInfo? _selectedPlayer;
+
         public PlayerListControl()
         {
             _entManager = IoCManager.Resolve<IEntityManager>();
@@ -50,10 +52,14 @@ private void PlayerListItemPressed(BaseButton.ButtonEventArgs? args, ListData? d
             if (args == null || data is not PlayerListData {Info: var selectedPlayer})
                 return;
 
+            if (selectedPlayer == _selectedPlayer)
+                return;
+
             if (args.Event.Function != EngineKeyFunctions.UIClick)
                 return;
 
             OnSelectionChanged?.Invoke(selectedPlayer);
+            _selectedPlayer = selectedPlayer;
 
             // update label text. Only required if there is some override (e.g. unread bwoink count).
             if (OverrideText != null && args.Button.Children.FirstOrDefault()?.Children?.FirstOrDefault() is Label label)
@@ -95,6 +101,8 @@ private void FilterList()
                 _sortedPlayerList.Sort((a, b) => Comparison(a, b));
 
             PlayerListContainer.PopulateList(_sortedPlayerList.Select(info => new PlayerListData(info)).ToList());
+            if (_selectedPlayer != null)
+                PlayerListContainer.Select(new PlayerListData(_selectedPlayer));
         }
 
         public void PopulateList(IReadOnlyList<PlayerInfo>? players = null)
@@ -102,6 +110,9 @@ public void PopulateList(IReadOnlyList<PlayerInfo>? players = null)
             players ??= _adminSystem.PlayerList;
 
             _playerList = players.ToList();
+            if (_selectedPlayer != null && !_playerList.Contains(_selectedPlayer))
+                _selectedPlayer = null;
+
             FilterList();
         }
 
diff --git a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml
index 9e0f9d182e..01259b60f7 100644
--- a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml
+++ b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml
@@ -12,7 +12,7 @@
         <BoxContainer Name="VolumeBox" Orientation="Vertical" HorizontalExpand="True" Margin="0 4"/>
 
         <!-- The temperature / heat capacity / thermal energy of the solution -->
-        <Collapsible Orientation="Vertical">
+        <Collapsible>
             <CollapsibleHeading Name="ThermalHeading" Title="{Loc 'admin-solutions-window-thermals'}" />
             <CollapsibleBody>
                 <BoxContainer Name="ThermalBox" Orientation="Vertical" HorizontalExpand="True" Margin="0 4"/>
@@ -23,7 +23,7 @@
         <ScrollContainer HorizontalExpand="True" VerticalExpand="True" Margin="0 4">
             <BoxContainer Name="ReagentList" Orientation="Vertical"/>
         </ScrollContainer>
-        
+
         <Button Name="AddButton" Text="{Loc 'admin-solutions-window-add-new-button'}" HorizontalExpand="True"  Margin="0 4"/>
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs b/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs
index e70248880b..ead1d8b00e 100644
--- a/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs
+++ b/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs
@@ -68,7 +68,7 @@ private void Refresh()
             SeverityRect.Texture = _sprites.Frame0(new SpriteSpecifier.Texture(new ResPath(iconPath)));
         }
 
-        TimeLabel.Text = Note.CreatedAt.ToString("yyyy-MM-dd HH:mm:ss");
+        TimeLabel.Text = Note.CreatedAt.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss");
         ServerLabel.Text = Note.ServerName ?? "Unknown";
         RoundLabel.Text = Note.Round == null ? "Unknown round" : "Round " + Note.Round;
         AdminLabel.Text = Note.CreatedByName;
@@ -91,7 +91,7 @@ private void Refresh()
             if (Note.ExpiryTime.Value > DateTime.UtcNow)
             {
                 ExpiresLabel.Text = Loc.GetString("admin-note-editor-expiry-label-params",
-                    ("date", Note.ExpiryTime.Value.ToString("yyyy-MM-dd HH:mm:ss")),
+                    ("date", Note.ExpiryTime.Value.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")),
                     ("expiresIn", (Note.ExpiryTime.Value - DateTime.UtcNow).ToString("d'd 'hh':'mm")));
                 ExpiresLabel.Modulate = Color.FromHex("#86DC3D");
             }
@@ -104,7 +104,7 @@ private void Refresh()
 
         if (Note.LastEditedAt > Note.CreatedAt)
         {
-            EditedLabel.Text = Loc.GetString("admin-notes-edited", ("author", Note.EditedByName), ("date", Note.LastEditedAt));
+            EditedLabel.Text = Loc.GetString("admin-notes-edited", ("author", Note.EditedByName), ("date", Note.LastEditedAt.Value.ToLocalTime()));
             EditedLabel.Visible = true;
         }
 
diff --git a/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs b/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs
index 5ef29513e2..18a5003158 100644
--- a/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs
+++ b/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs
@@ -36,12 +36,12 @@ public AdminNotesLinePopup(SharedAdminNote note, string playerName, bool showDel
             ? Loc.GetString("admin-notes-round-id-unknown")
             : Loc.GetString("admin-notes-round-id", ("id", note.Round));
         CreatedByLabel.Text = Loc.GetString("admin-notes-created-by", ("author", note.CreatedByName));
-        CreatedAtLabel.Text = Loc.GetString("admin-notes-created-at", ("date", note.CreatedAt.ToString("yyyy-MM-dd HH:mm:ss")));
+        CreatedAtLabel.Text = Loc.GetString("admin-notes-created-at", ("date", note.CreatedAt.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")));
         EditedByLabel.Text = Loc.GetString("admin-notes-last-edited-by", ("author", note.EditedByName));
-        EditedAtLabel.Text = Loc.GetString("admin-notes-last-edited-at", ("date", note.LastEditedAt?.ToString("yyyy-MM-dd HH:mm:ss") ?? Loc.GetString("admin-notes-edited-never")));
+        EditedAtLabel.Text = Loc.GetString("admin-notes-last-edited-at", ("date", note.LastEditedAt?.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss") ?? Loc.GetString("admin-notes-edited-never")));
         ExpiryTimeLabel.Text = note.ExpiryTime == null
             ? Loc.GetString("admin-notes-expires-never")
-            : Loc.GetString("admin-notes-expires", ("expires", note.ExpiryTime.Value.ToString("yyyy-MM-dd HH:mm:ss")));
+            : Loc.GetString("admin-notes-expires", ("expires", note.ExpiryTime.Value.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")));
         NoteTextEdit.InsertAtCursor(note.Message);
 
         if (note.NoteType is NoteType.ServerBan or NoteType.RoleBan)
diff --git a/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs b/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
index 77dde4688d..6f314f7954 100644
--- a/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
+++ b/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs
@@ -81,7 +81,7 @@ public NoteEdit(SharedAdminNote? note, string playerName, bool canCreate, bool c
             {
                 PermanentCheckBox.Pressed = false;
                 UpdatePermanentCheckboxFields();
-                ExpiryLineEdit.Text = ExpiryTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                ExpiryLineEdit.Text = ExpiryTime.Value.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss");
             }
         }
 
@@ -173,7 +173,7 @@ private void UpdatePermanentCheckboxFields()
         ExpiryLabel.Visible = !PermanentCheckBox.Pressed;
         ExpiryLineEdit.Visible = !PermanentCheckBox.Pressed;
 
-        ExpiryLineEdit.Text = !PermanentCheckBox.Pressed ? DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss") : string.Empty;
+        ExpiryLineEdit.Text = !PermanentCheckBox.Pressed ? DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") : string.Empty;
     }
 
     private void OnSecretPressed(BaseButton.ButtonEventArgs _)
@@ -269,7 +269,7 @@ private bool ParseExpiryTime()
             return false;
         }
 
-        ExpiryTime = result;
+        ExpiryTime = result.ToUniversalTime();
         ExpiryLineEdit.ModulateSelfOverride = null;
         return true;
     }
diff --git a/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs b/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs
index 04219fe39b..5f187cad79 100644
--- a/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs
+++ b/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs
@@ -99,7 +99,7 @@ private void SetLocation()
     {
         UpdateMapOptions();
 
-        if (!_entMan.TryGetComponent(_playerManager.LocalPlayer?.ControlledEntity, out TransformComponent? transform))
+        if (!_entMan.TryGetComponent(_playerManager.LocalEntity, out TransformComponent? transform))
             return;
 
         _pausePreview = true;
diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs
index 34611f51af..97c84e5d2f 100644
--- a/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs
@@ -42,7 +42,7 @@ private void Reset()
             var entManager = IoCManager.Resolve<IEntityManager>();
             var xformSystem = entManager.System<SharedTransformSystem>();
             var playerManager = IoCManager.Resolve<IPlayerManager>();
-            var player = playerManager.LocalPlayer?.ControlledEntity;
+            var player = playerManager.LocalEntity;
 
             var currentMap = MapId.Nullspace;
             var position = Vector2.Zero;
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
index 7e2fdda3e2..03fd52f446 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
@@ -28,7 +28,7 @@ protected override void EnteredTree()
         {
             _data.Clear();
 
-            var player = _players.LocalPlayer?.ControlledEntity;
+            var player = _players.LocalEntity;
             var playerGrid = _entities.GetComponentOrNull<TransformComponent>(player)?.GridUid;
             var query = IoCManager.Resolve<IEntityManager>().AllEntityQueryEnumerator<MapGridComponent>();
 
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
index d273ea3e55..c06d916133 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
@@ -31,7 +31,7 @@ protected override void EnteredTree()
             while (gridQuery.MoveNext(out var uid, out _))
             {
                 _gridData.Add(entManager.GetNetEntity(uid));
-                var player = playerManager.LocalPlayer?.ControlledEntity;
+                var player = playerManager.LocalEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
                 GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
             }
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
index 276ec3d67d..3353d0873e 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
@@ -34,7 +34,7 @@ protected override void EnteredTree()
 
             while (gridQuery.MoveNext(out var uid, out _))
             {
-                var player = playerManager.LocalPlayer?.ControlledEntity;
+                var player = playerManager.LocalEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
                 GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
                 _gridData.Add(entManager.GetNetEntity(uid));
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
index 850e43e418..1183efb9b5 100644
--- a/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
@@ -30,7 +30,7 @@ protected override void EnteredTree()
 
             while (gridQuery.MoveNext(out var uid, out _))
             {
-                var player = playerManager.LocalPlayer?.ControlledEntity;
+                var player = playerManager.LocalEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
                 GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
                 _data.Add(entManager.GetNetEntity(uid));
diff --git a/Content.Client/Alerts/ClientAlertsSystem.cs b/Content.Client/Alerts/ClientAlertsSystem.cs
index 83327ad77b..ab296a9619 100644
--- a/Content.Client/Alerts/ClientAlertsSystem.cs
+++ b/Content.Client/Alerts/ClientAlertsSystem.cs
@@ -40,7 +40,7 @@ public IReadOnlyDictionary<AlertKey, AlertState>? ActiveAlerts
     {
         get
         {
-            var ent = _playerManager.LocalPlayer?.ControlledEntity;
+            var ent = _playerManager.LocalEntity;
             return ent is not null
                 ? GetActiveAlerts(ent.Value)
                 : null;
@@ -49,7 +49,7 @@ public IReadOnlyDictionary<AlertKey, AlertState>? ActiveAlerts
 
     protected override void AfterShowAlert(Entity<AlertsComponent> alerts)
     {
-        if (_playerManager.LocalPlayer?.ControlledEntity != alerts.Owner)
+        if (_playerManager.LocalEntity != alerts.Owner)
             return;
 
         SyncAlerts?.Invoke(this, alerts.Comp.Alerts);
@@ -57,7 +57,7 @@ protected override void AfterShowAlert(Entity<AlertsComponent> alerts)
 
     protected override void AfterClearAlert(Entity<AlertsComponent> alertsComponent)
     {
-        if (_playerManager.LocalPlayer?.ControlledEntity != alertsComponent.Owner)
+        if (_playerManager.LocalEntity != alertsComponent.Owner)
             return;
 
         SyncAlerts?.Invoke(this, alertsComponent.Comp.Alerts);
@@ -65,13 +65,13 @@ protected override void AfterClearAlert(Entity<AlertsComponent> alertsComponent)
 
     private void ClientAlertsHandleState(EntityUid uid, AlertsComponent component, ref AfterAutoHandleStateEvent args)
     {
-        if (_playerManager.LocalPlayer?.ControlledEntity == uid)
+        if (_playerManager.LocalEntity == uid)
             SyncAlerts?.Invoke(this, component.Alerts);
     }
 
     private void OnPlayerAttached(EntityUid uid, AlertsComponent component, LocalPlayerAttachedEvent args)
     {
-        if (_playerManager.LocalPlayer?.ControlledEntity != uid)
+        if (_playerManager.LocalEntity != uid)
             return;
 
         SyncAlerts?.Invoke(this, component.Alerts);
@@ -81,7 +81,7 @@ protected override void HandleComponentShutdown(EntityUid uid, AlertsComponent c
     {
         base.HandleComponentShutdown(uid, component, args);
 
-        if (_playerManager.LocalPlayer?.ControlledEntity != uid)
+        if (_playerManager.LocalEntity != uid)
             return;
 
         ClearAlerts?.Invoke(this, EventArgs.Empty);
diff --git a/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs b/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs
index 3b4c9fa224..e84cf5d34d 100644
--- a/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs
+++ b/Content.Client/Ame/UI/AmeControllerBoundUserInterface.cs
@@ -1,6 +1,5 @@
-using Content.Shared.Ame;
+using Content.Shared.Ame.Components;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 
 namespace Content.Client.Ame.UI
 {
diff --git a/Content.Client/Ame/UI/AmeWindow.xaml.cs b/Content.Client/Ame/UI/AmeWindow.xaml.cs
index 8f5103e6cf..8b91ec5966 100644
--- a/Content.Client/Ame/UI/AmeWindow.xaml.cs
+++ b/Content.Client/Ame/UI/AmeWindow.xaml.cs
@@ -1,5 +1,5 @@
 using Content.Client.UserInterface;
-using Content.Shared.Ame;
+using Content.Shared.Ame.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Animations/EntityPickupAnimationSystem.cs b/Content.Client/Animations/EntityPickupAnimationSystem.cs
index 2ac51e6eba..abeac664c7 100644
--- a/Content.Client/Animations/EntityPickupAnimationSystem.cs
+++ b/Content.Client/Animations/EntityPickupAnimationSystem.cs
@@ -65,7 +65,7 @@ public void AnimateEntityPickup(EntityUid uid, EntityCoordinates initial, Vector
         despawn.Lifetime = 0.25f;
         _transform.SetLocalRotationNoLerp(animatableClone, initialAngle);
 
-        _animations.Play(animatableClone, animations, new Animation
+        _animations.Play(new Entity<AnimationPlayerComponent>(animatableClone, animations), new Animation
         {
             Length = TimeSpan.FromMilliseconds(125),
             AnimationTracks =
diff --git a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs
index ca8682e72d..08438e2a1b 100644
--- a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs
+++ b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs
@@ -11,7 +11,6 @@ namespace Content.Client.Anomaly.Ui;
 [GenerateTypedNameReferences]
 public sealed partial class AnomalyGeneratorWindow : FancyWindow
 {
-    [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
     private TimeSpan _cooldownEnd = TimeSpan.Zero;
diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
index de26eb5f19..43be67c9d6 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
@@ -22,7 +22,6 @@ public sealed partial class AirAlarmWindow : FancyWindow
     public event Action<string, AtmosMonitorThresholdType, AtmosAlarmThreshold, Gas?>? AtmosAlarmThresholdChanged;
     public event Action<AirAlarmMode>? AirAlarmModeChanged;
     public event Action<bool>? AutoModeChanged;
-    public event Action<string>? ResyncDeviceRequested;
     public event Action? ResyncAllRequested;
     public event Action<AirAlarmTab>? AirAlarmTabChange;
 
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml
index 632e44a458..5fb4e5f0c8 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/PumpControl.xaml
@@ -1,7 +1,7 @@
 <BoxContainer xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          Orientation="Vertical" Margin="2 0 2 4">
-    <Collapsible Orientation="Vertical">
+    <Collapsible>
         <CollapsibleHeading Name="CAddress" />
         <!-- Upper row: toggle, direction, checks -->
         <CollapsibleBody Margin="20 0 0 0">
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml
index 1cb9c9ed5b..34c1a9dd1a 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml
@@ -1,7 +1,7 @@
 <BoxContainer xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          Orientation="Vertical" Margin="2 0 2 4">
-    <Collapsible Orientation="Vertical">
+    <Collapsible>
         <CollapsibleHeading Name="CAddress" />
         <CollapsibleBody Margin="20 0 0 0">
             <BoxContainer Orientation="Vertical">
@@ -26,7 +26,7 @@
                     <Button Name="CCopySettings" Text="{Loc 'air-alarm-ui-widget-copy'}" ToolTip="{Loc 'air-alarm-ui-widget-copy-tooltip'}" />
                 </BoxContainer>
                 <!-- Lower row: every single gas -->
-                <Collapsible Orientation="Vertical" Margin="2 2 2 2">
+                <Collapsible Margin="2 2 2 2">
                     <CollapsibleHeading Title="Gas filters" />
                     <CollapsibleBody Margin="20 0 0 0">
                         <GridContainer HorizontalExpand="True" Name="CGasContainer" Columns="3" />
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml
index b90ca3f1f6..005e6807b3 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml
@@ -1,5 +1,5 @@
 <BoxContainer xmlns="https://spacestation14.io" HorizontalExpand="True">
-    <Collapsible Orientation="Vertical">
+    <Collapsible>
         <CollapsibleHeading Name="SensorAddress" />
         <CollapsibleBody Margin="20 2 2 2">
             <BoxContainer Orientation="Vertical" HorizontalExpand="True">
@@ -10,7 +10,7 @@
                     <RichTextLabel Name="TemperatureLabel" />
                     <Control Name="TemperatureThresholdContainer" Margin="20 0 2 0" />
                 </BoxContainer>
-                <Collapsible Orientation="Vertical" Margin="2">
+                <Collapsible Margin="2">
                     <CollapsibleHeading Title="{Loc 'air-alarm-ui-sensor-gases'}" />
                     <CollapsibleBody Margin="20 0 0 0">
                         <BoxContainer Name="GasContainer" Orientation="Vertical" Margin="2" />
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml
index 3885127384..0d5e741d0f 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'}"/>
+    <CheckBox Name="CBoundEnabled" HorizontalAlignment="Center" Text="{Loc 'Enable'}" Pressed="True" />
     <FloatSpinBox Name="CSpinner" />
 </BoxContainer>
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs
index da63db77d3..3612d84de4 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdBoundControl.xaml.cs
@@ -72,7 +72,6 @@ public ThresholdBoundControl(string controlLabel, float value, float uiValueScal
         CBoundLabel.Text = controlLabel;
 
         CSpinner.Value = ScaledValue;
-        CBoundEnabled.Pressed = _value != null;
 
         CSpinner.OnValueChanged += SpinnerValueChanged;
         CBoundEnabled.OnToggled += CheckboxToggled;
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml
index 0f53673da1..635a70f532 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/ThresholdControl.xaml
@@ -1,7 +1,7 @@
 <BoxContainer xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          Orientation="Vertical" Margin="0 0 0 4">
-    <Collapsible Orientation="Vertical">
+    <Collapsible>
         <CollapsibleHeading Name="CName" />
         <CollapsibleBody Margin="20 0 0 0">
             <BoxContainer Orientation="Vertical">
diff --git a/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs b/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs
new file mode 100644
index 0000000000..4d8d1191e9
--- /dev/null
+++ b/Content.Client/Atmos/UI/SpaceHeaterBoundUserInterface.cs
@@ -0,0 +1,90 @@
+using Content.Shared.Atmos.Piping.Portable.Components;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface.Controls;
+
+namespace Content.Client.Atmos.UI;
+
+/// <summary>
+///     Initializes a <see cref="SpaceHeaterWindow"/> and updates it when new server messages are received.
+/// </summary>
+[UsedImplicitly]
+public sealed class SpaceHeaterBoundUserInterface : BoundUserInterface
+{
+    [ViewVariables]
+    private SpaceHeaterWindow? _window;
+
+    public SpaceHeaterBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _window = new SpaceHeaterWindow();
+
+        if (State != null)
+            UpdateState(State);
+
+        _window.OpenCentered();
+
+        _window.OnClose += Close;
+
+        _window.ToggleStatusButton.OnPressed += _ => OnToggleStatusButtonPressed();
+        _window.IncreaseTempRange.OnPressed += _ => OnTemperatureRangeChanged(_window.TemperatureChangeDelta);
+        _window.DecreaseTempRange.OnPressed += _ => OnTemperatureRangeChanged(-_window.TemperatureChangeDelta);
+        _window.ModeSelector.OnItemSelected += OnModeChanged;
+
+        _window.PowerLevelSelector.OnItemSelected += OnPowerLevelChange;
+    }
+
+    private void OnToggleStatusButtonPressed()
+    {
+        _window?.SetActive(!_window.Active);
+        SendMessage(new SpaceHeaterToggleMessage());
+    }
+
+    private void OnTemperatureRangeChanged(float changeAmount)
+    {
+        SendMessage(new SpaceHeaterChangeTemperatureMessage(changeAmount));
+    }
+
+    private void OnModeChanged(OptionButton.ItemSelectedEventArgs args)
+    {
+        _window?.ModeSelector.SelectId(args.Id);
+        SendMessage(new SpaceHeaterChangeModeMessage((SpaceHeaterMode)args.Id));
+    }
+
+    private void OnPowerLevelChange(RadioOptionItemSelectedEventArgs<int> args)
+    {
+        _window?.PowerLevelSelector.Select(args.Id);
+        SendMessage(new SpaceHeaterChangePowerLevelMessage((SpaceHeaterPowerLevel)args.Id));
+    }
+
+    /// <summary>
+    ///     Update the UI state based on server-sent info
+    /// </summary>
+    /// <param name="state"></param>
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+        if (_window == null || state is not SpaceHeaterBoundUserInterfaceState cast)
+            return;
+
+        _window.SetActive(cast.Enabled);
+        _window.ModeSelector.SelectId((int)cast.Mode);
+        _window.PowerLevelSelector.Select((int)cast.PowerLevel);
+
+        _window.MinTemp = cast.MinTemperature;
+        _window.MaxTemp = cast.MaxTemperature;
+        _window.SetTemperature(cast.TargetTemperature);
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (!disposing)
+            return;
+        _window?.Dispose();
+    }
+}
diff --git a/Content.Client/Atmos/UI/SpaceHeaterWindow.xaml b/Content.Client/Atmos/UI/SpaceHeaterWindow.xaml
new file mode 100644
index 0000000000..1b7bd490b8
--- /dev/null
+++ b/Content.Client/Atmos/UI/SpaceHeaterWindow.xaml
@@ -0,0 +1,34 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+               MinSize="280 160" Title="Temperature Control Unit">
+
+    <BoxContainer Name="VboxContainer" Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
+
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+            <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+                <Button Text="{Loc comp-space-heater-ui-status-disabled}" Access="Public" Name="ToggleStatusButton"/>
+            </BoxContainer>
+            <BoxContainer Orientation="Horizontal" SeparationOverride="5">
+                <Label Text="{Loc comp-space-heater-ui-mode}"/>
+                <OptionButton Access="Public" Name="ModeSelector"/>
+            </BoxContainer>
+        </BoxContainer>
+
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True" SeparationOverride="5">
+            <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+                <Label Text="{Loc comp-space-heater-ui-thermostat}"/>
+            </BoxContainer>
+            <BoxContainer Orientation="Horizontal" HorizontalExpand="True" HorizontalAlignment="Right">
+                <Button Text="{Loc comp-space-heater-ui-decrease-temperature-range}" Access="Public" Name="DecreaseTempRange" StyleClasses="OpenRight"/>
+                <LineEdit Name ="Thermostat" MinSize="55 0"></LineEdit>
+                <Button Text="{Loc comp-space-heater-ui-increase-temperature-range}" Access="Public" Name="IncreaseTempRange" StyleClasses="OpenLeft"/>
+            </BoxContainer>
+        </BoxContainer>
+
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True" SeparationOverride="5">
+            <Label Text="{Loc comp-space-heater-ui-power-consumption}"/>
+            <BoxContainer Name="PowerLevelSelectorHBox" Access="Public" SeparationOverride="2"/>
+        </BoxContainer>
+
+    </BoxContainer>
+</DefaultWindow>
diff --git a/Content.Client/Atmos/UI/SpaceHeaterWindow.xaml.cs b/Content.Client/Atmos/UI/SpaceHeaterWindow.xaml.cs
new file mode 100644
index 0000000000..097601a011
--- /dev/null
+++ b/Content.Client/Atmos/UI/SpaceHeaterWindow.xaml.cs
@@ -0,0 +1,73 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Piping.Portable.Components;
+
+namespace Content.Client.Atmos.UI;
+
+/// <summary>
+///     Client-side UI used to control a space heater.
+/// </summary>
+[GenerateTypedNameReferences]
+public sealed partial class SpaceHeaterWindow : DefaultWindow
+{
+    // To account for a minimum delta temperature for atmos equalization to trigger we use a fixed step for target temperature increment/decrement
+    public int TemperatureChangeDelta = 5;
+    public bool Active;
+
+    // Temperatures range bounds in Kelvin (K)
+    public float MinTemp;
+    public float MaxTemp;
+
+    public RadioOptions<int> PowerLevelSelector;
+
+    public SpaceHeaterWindow()
+    {
+        RobustXamlLoader.Load(this);
+
+        // Add the Mode selector list
+        foreach (var value in Enum.GetValues<SpaceHeaterMode>())
+        {
+            ModeSelector.AddItem(Loc.GetString($"comp-space-heater-mode-{value}"), (int)value);
+        }
+
+        // Add the Power level radio buttons
+        PowerLevelSelectorHBox.AddChild(PowerLevelSelector = new RadioOptions<int>(RadioOptionsLayout.Horizontal));
+        PowerLevelSelector.FirstButtonStyle = "OpenRight";
+        PowerLevelSelector.LastButtonStyle = "OpenLeft";
+        PowerLevelSelector.ButtonStyle = "OpenBoth";
+        foreach (var value in Enum.GetValues<SpaceHeaterPowerLevel>())
+        {
+            PowerLevelSelector.AddItem(Loc.GetString($"comp-space-heater-ui-{value}-power-consumption"), (int)value);
+        }
+
+        // Only allow temperature increment/decrement of TemperatureChangeDelta
+        Thermostat.Editable = false;
+    }
+
+    public void SetActive(bool active)
+    {
+        Active = active;
+        ToggleStatusButton.Pressed = active;
+
+        if (active)
+        {
+            ToggleStatusButton.Text = Loc.GetString("comp-space-heater-ui-status-enabled");
+        }
+        else
+        {
+            ToggleStatusButton.Text = Loc.GetString("comp-space-heater-ui-status-disabled");
+        }
+    }
+
+    public void SetTemperature(float targetTemperature)
+    {
+        Thermostat.SetText($"{targetTemperature - Atmospherics.T0C} °C");
+
+        IncreaseTempRange.Disabled = targetTemperature + TemperatureChangeDelta > MaxTemp;
+        DecreaseTempRange.Disabled = targetTemperature - TemperatureChangeDelta < MinTemp;
+    }
+}
+
diff --git a/Content.Client/Audio/AmbientSoundSystem.cs b/Content.Client/Audio/AmbientSoundSystem.cs
index d39073fa33..9d30cabb1e 100644
--- a/Content.Client/Audio/AmbientSoundSystem.cs
+++ b/Content.Client/Audio/AmbientSoundSystem.cs
@@ -99,10 +99,10 @@ public override void Initialize()
         UpdatesOutsidePrediction = true;
         UpdatesAfter.Add(typeof(AmbientSoundTreeSystem));
 
-        _cfg.OnValueChanged(CCVars.AmbientCooldown, SetCooldown, true);
-        _cfg.OnValueChanged(CCVars.MaxAmbientSources, SetAmbientCount, true);
-        _cfg.OnValueChanged(CCVars.AmbientRange, SetAmbientRange, true);
-        _cfg.OnValueChanged(CCVars.AmbienceVolume, SetAmbienceGain, true);
+        Subs.CVar(_cfg, CCVars.AmbientCooldown, SetCooldown, true);
+        Subs.CVar(_cfg, CCVars.MaxAmbientSources, SetAmbientCount, true);
+        Subs.CVar(_cfg, CCVars.AmbientRange, SetAmbientRange, true);
+        Subs.CVar(_cfg, CCVars.AmbienceVolume, SetAmbienceGain, true);
         SubscribeLocalEvent<AmbientSoundComponent, ComponentShutdown>(OnShutdown);
     }
 
@@ -138,11 +138,6 @@ public override void Shutdown()
     {
         base.Shutdown();
         ClearSounds();
-
-        _cfg.UnsubValueChanged(CCVars.AmbientCooldown, SetCooldown);
-        _cfg.UnsubValueChanged(CCVars.MaxAmbientSources, SetAmbientCount);
-        _cfg.UnsubValueChanged(CCVars.AmbientRange, SetAmbientRange);
-        _cfg.UnsubValueChanged(CCVars.AmbienceVolume, SetAmbienceGain);
     }
 
     private int PlayingCount(string countSound)
diff --git a/Content.Client/Audio/BackgroundAudioSystem.cs b/Content.Client/Audio/BackgroundAudioSystem.cs
deleted file mode 100644
index 2927983062..0000000000
--- a/Content.Client/Audio/BackgroundAudioSystem.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-using Content.Client.GameTicking.Managers;
-using Content.Client.Lobby;
-using Content.Shared.CCVar;
-using Content.Shared.GameTicking;
-using JetBrains.Annotations;
-using Robust.Client;
-using Robust.Client.State;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Configuration;
-using Robust.Shared.Player;
-
-namespace Content.Client.Audio;
-
-[UsedImplicitly]
-public sealed class BackgroundAudioSystem : EntitySystem
-{
-    /*
-     * TODO: Nuke this system and merge into contentaudiosystem
-     */
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly IBaseClient _client = default!;
-    [Dependency] private readonly IConfigurationManager _configManager = default!;
-    [Dependency] private readonly ClientGameTicker _gameTicker = default!;
-    [Dependency] private readonly IStateManager _stateManager = default!;
-
-    private readonly AudioParams _lobbyParams = new(-5f, 1, "Master", 0, 0, 0, true, 0f);
-    private readonly AudioParams _roundEndParams = new(-5f, 1, "Master", 0, 0, 0, false, 0f);
-
-    public EntityUid? LobbyMusicStream;
-    public EntityUid? LobbyRoundRestartAudioStream;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        _configManager.OnValueChanged(CCVars.LobbyMusicEnabled, LobbyMusicCVarChanged);
-        _configManager.OnValueChanged(CCVars.LobbyMusicVolume, LobbyMusicVolumeCVarChanged);
-
-        _stateManager.OnStateChanged += StateManagerOnStateChanged;
-
-        _client.PlayerLeaveServer += OnLeave;
-
-        _gameTicker.LobbySongUpdated += LobbySongUpdated;
-
-        SubscribeNetworkEvent<RoundRestartCleanupEvent>(PlayRestartSound);
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-
-        _configManager.UnsubValueChanged(CCVars.LobbyMusicEnabled, LobbyMusicCVarChanged);
-        _configManager.UnsubValueChanged(CCVars.LobbyMusicVolume, LobbyMusicVolumeCVarChanged);
-
-        _stateManager.OnStateChanged -= StateManagerOnStateChanged;
-
-        _client.PlayerLeaveServer -= OnLeave;
-
-        _gameTicker.LobbySongUpdated -= LobbySongUpdated;
-
-        EndLobbyMusic();
-    }
-
-    private void StateManagerOnStateChanged(StateChangedEventArgs args)
-    {
-        switch (args.NewState)
-        {
-            case LobbyState:
-                StartLobbyMusic();
-                break;
-            default:
-                EndLobbyMusic();
-                break;
-        }
-    }
-
-    private void OnLeave(object? sender, PlayerEventArgs args)
-    {
-        EndLobbyMusic();
-    }
-
-    private void LobbyMusicVolumeCVarChanged(float volume)
-    {
-        if (_stateManager.CurrentState is LobbyState)
-        {
-            RestartLobbyMusic();
-        }
-    }
-
-    private void LobbyMusicCVarChanged(bool musicEnabled)
-    {
-        if (!musicEnabled)
-        {
-            EndLobbyMusic();
-        }
-        else if (_stateManager.CurrentState is LobbyState)
-        {
-            StartLobbyMusic();
-        }
-        else
-        {
-            EndLobbyMusic();
-        }
-    }
-
-    private void LobbySongUpdated()
-    {
-        RestartLobbyMusic();
-    }
-
-    public void RestartLobbyMusic()
-    {
-        EndLobbyMusic();
-        StartLobbyMusic();
-    }
-
-    public void StartLobbyMusic()
-    {
-        if (LobbyMusicStream != null || !_configManager.GetCVar(CCVars.LobbyMusicEnabled))
-            return;
-
-        var file = _gameTicker.LobbySong;
-        if (file == null) // We have not received the lobby song yet.
-        {
-            return;
-        }
-
-        LobbyMusicStream = _audio.PlayGlobal(
-            file,
-            Filter.Local(),
-            false,
-            _lobbyParams.WithVolume(_lobbyParams.Volume + SharedAudioSystem.GainToVolume(_configManager.GetCVar(CCVars.LobbyMusicVolume))))?.Entity;
-    }
-
-    private void EndLobbyMusic()
-    {
-        LobbyMusicStream = _audio.Stop(LobbyMusicStream);
-    }
-
-    private void PlayRestartSound(RoundRestartCleanupEvent ev)
-    {
-        if (!_configManager.GetCVar(CCVars.RestartSoundsEnabled))
-            return;
-
-        var file = _gameTicker.RestartSound;
-        if (string.IsNullOrEmpty(file))
-        {
-            return;
-        }
-
-        LobbyRoundRestartAudioStream = _audio.PlayGlobal(
-            file,
-            Filter.Local(),
-            false,
-            _roundEndParams.WithVolume(_roundEndParams.Volume + SharedAudioSystem.GainToVolume(_configManager.GetCVar(CCVars.LobbyMusicVolume)))
-        )?.Entity;
-    }
-}
diff --git a/Content.Client/Audio/ClientGlobalSoundSystem.cs b/Content.Client/Audio/ClientGlobalSoundSystem.cs
index 1d98564090..7c77865f74 100644
--- a/Content.Client/Audio/ClientGlobalSoundSystem.cs
+++ b/Content.Client/Audio/ClientGlobalSoundSystem.cs
@@ -26,11 +26,11 @@ public override void Initialize()
         base.Initialize();
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
         SubscribeNetworkEvent<AdminSoundEvent>(PlayAdminSound);
-        _cfg.OnValueChanged(CCVars.AdminSoundsEnabled, ToggleAdminSound, true);
+        Subs.CVar(_cfg, CCVars.AdminSoundsEnabled, ToggleAdminSound, true);
 
         SubscribeNetworkEvent<StationEventMusicEvent>(PlayStationEventMusic);
         SubscribeNetworkEvent<StopStationEventMusic>(StopStationEventMusic);
-        _cfg.OnValueChanged(CCVars.EventMusicEnabled, ToggleStationEventMusic, true);
+        Subs.CVar(_cfg, CCVars.EventMusicEnabled, ToggleStationEventMusic, true);
 
         SubscribeNetworkEvent<GameGlobalSoundEvent>(PlayGameSound);
     }
diff --git a/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs b/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs
index 89324f2225..84b787a4ec 100644
--- a/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs
+++ b/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs
@@ -59,7 +59,7 @@ public sealed partial class ContentAudioSystem
 
     private void InitializeAmbientMusic()
     {
-        _configManager.OnValueChanged(CCVars.AmbientMusicVolume, AmbienceCVarChanged, true);
+        Subs.CVar(_configManager, CCVars.AmbientMusicVolume, AmbienceCVarChanged, true);
         _sawmill = IoCManager.Resolve<ILogManager>().GetSawmill("audio.ambience");
 
         // Reset audio
@@ -84,7 +84,6 @@ private void AmbienceCVarChanged(float obj)
 
     private void ShutdownAmbientMusic()
     {
-        _configManager.UnsubValueChanged(CCVars.AmbientMusicVolume, AmbienceCVarChanged);
         _state.OnStateChanged -= OnStateChange;
         _ambientMusicStream = _audio.Stop(_ambientMusicStream);
     }
@@ -229,7 +228,7 @@ private void UpdateAmbientMusic()
 
     private AmbientMusicPrototype? GetAmbience()
     {
-        var player = _player.LocalPlayer?.ControlledEntity;
+        var player = _player.LocalEntity;
 
         if (player == null)
             return null;
diff --git a/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs b/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs
new file mode 100644
index 0000000000..0fdcc7a86d
--- /dev/null
+++ b/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs
@@ -0,0 +1,283 @@
+using System.Linq;
+using Content.Client.GameTicking.Managers;
+using Content.Client.Lobby;
+using Content.Shared.Audio.Events;
+using Content.Shared.CCVar;
+using Content.Shared.GameTicking;
+using Robust.Client;
+using Robust.Client.ResourceManagement;
+using Robust.Client.State;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Player;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Audio;
+
+// Part of ContentAudioSystem that is responsible for lobby music playing/stopping and round-end sound-effect.
+public sealed partial class ContentAudioSystem
+{
+    [Dependency] private readonly IBaseClient _client = default!;
+    [Dependency] private readonly ClientGameTicker _gameTicker = default!;
+    [Dependency] private readonly IStateManager _stateManager = default!;
+    [Dependency] private readonly IResourceCache _resourceCache = default!;
+
+    private readonly AudioParams _lobbySoundtrackParams = new(-5f, 1, "Master", 0, 0, 0, false, 0f);
+    private readonly AudioParams _roundEndSoundEffectParams = new(-5f, 1, "Master", 0, 0, 0, false, 0f);
+
+    /// <summary>
+    /// EntityUid of lobby restart sound component.
+    /// </summary>
+    private EntityUid? _lobbyRoundRestartAudioStream;
+
+    /// <summary>
+    /// Shuffled list of soundtrack file-names.
+    /// </summary>
+    private string[]? _lobbyPlaylist;
+
+    /// <summary>
+    /// Short info about lobby soundtrack currently playing. Is null if soundtrack is not playing.
+    /// </summary>
+    private LobbySoundtrackInfo? _lobbySoundtrackInfo;
+
+    private Action<LobbySoundtrackChangedEvent>? _lobbySoundtrackChanged;
+
+    /// <summary>
+    /// Event for subscription on lobby soundtrack changes.
+    /// </summary>
+    public event Action<LobbySoundtrackChangedEvent>? LobbySoundtrackChanged
+    {
+        add
+        {
+            if (value != null)
+            {
+                if (_lobbySoundtrackInfo != null)
+                {
+                    value(new LobbySoundtrackChangedEvent(_lobbySoundtrackInfo.Filename));
+                }
+
+                _lobbySoundtrackChanged += value;
+            }
+        }
+        remove => _lobbySoundtrackChanged -= value;
+    }
+
+    /// <summary>
+    /// Initializes subscriptions that are related to lobby music.
+    /// </summary>
+    private void InitializeLobbyMusic()
+    {
+        Subs.CVar(_configManager, CCVars.LobbyMusicEnabled, LobbyMusicCVarChanged);
+        Subs.CVar(_configManager, CCVars.LobbyMusicVolume, LobbyMusicVolumeCVarChanged);
+
+        _stateManager.OnStateChanged += StateManagerOnStateChanged;
+
+        _client.PlayerLeaveServer += OnLeave;
+
+        SubscribeNetworkEvent<LobbyMusicStopEvent>(OnLobbySongStopped);
+        SubscribeNetworkEvent<LobbyPlaylistChangedEvent>(OnLobbySongChanged);
+    }
+
+    private void OnLobbySongStopped(LobbyMusicStopEvent ev)
+    {
+        EndLobbyMusic();
+    }
+
+    private void StateManagerOnStateChanged(StateChangedEventArgs args)
+    {
+        switch (args.NewState)
+        {
+            case LobbyState:
+                StartLobbyMusic();
+                break;
+            default:
+                EndLobbyMusic();
+                break;
+        }
+    }
+
+    private void OnLeave(object? sender, PlayerEventArgs args)
+    {
+        EndLobbyMusic();
+    }
+
+    private void LobbyMusicVolumeCVarChanged(float volume)
+    {
+        if (_lobbySoundtrackInfo != null)
+        {
+            _audio.SetVolume(
+                _lobbySoundtrackInfo.MusicStreamEntityUid,
+                _lobbySoundtrackParams.Volume + SharedAudioSystem.GainToVolume(_configManager.GetCVar(CCVars.LobbyMusicVolume))
+            );
+        }
+    }
+
+    private void LobbyMusicCVarChanged(bool musicEnabled)
+    {
+        if (musicEnabled && _stateManager.CurrentState is LobbyState)
+        {
+            StartLobbyMusic();
+        }
+        else
+        {
+            EndLobbyMusic();
+        }
+    }
+
+    private void OnLobbySongChanged(LobbyPlaylistChangedEvent playlistChangedEvent)
+    {
+        var playlist = playlistChangedEvent.Playlist;
+        //playlist is already playing, no need to restart it
+        if (_lobbySoundtrackInfo != null
+            && _lobbyPlaylist != null
+            && _lobbyPlaylist.SequenceEqual(playlist)
+           )
+        {
+            return;
+        }
+
+        EndLobbyMusic();
+        StartLobbyMusic(playlistChangedEvent.Playlist);
+    }
+
+    /// <summary>
+    /// Re-starts playing lobby music from playlist, last sent from server. if there is currently none - does nothing.
+    /// </summary>
+    private void StartLobbyMusic()
+    {
+        if (_lobbyPlaylist == null || _lobbyPlaylist.Length == 0)
+        {
+            return;
+        }
+
+        StartLobbyMusic(_lobbyPlaylist);
+    }
+
+    /// <summary>
+    /// Starts playing lobby music from playlist. If playlist is empty, or lobby music setting is turned off - does nothing.
+    /// </summary>
+    /// <param name="playlist">Array of soundtrack filenames for lobby playlist.</param>
+    private void StartLobbyMusic(string[] playlist)
+    {
+        if (_lobbySoundtrackInfo != null || !_configManager.GetCVar(CCVars.LobbyMusicEnabled))
+            return;
+
+        _lobbyPlaylist = playlist;
+        if (_lobbyPlaylist.Length == 0)
+        {
+            return;
+        }
+
+        PlaySoundtrack(playlist[0]);
+    }
+
+    private void PlaySoundtrack(string soundtrackFilename)
+    {
+        if (!_resourceCache.TryGetResource(new ResPath(soundtrackFilename), out AudioResource? audio))
+        {
+            return;
+        }
+
+        var playResult = _audio.PlayGlobal(
+            soundtrackFilename,
+            Filter.Local(),
+            false,
+            _lobbySoundtrackParams.WithVolume(_lobbySoundtrackParams.Volume + SharedAudioSystem.GainToVolume(_configManager.GetCVar(CCVars.LobbyMusicVolume)))
+        );
+        if (playResult.Value.Entity == default)
+        {
+            _sawmill.Warning(
+                $"Tried to play lobby soundtrack '{{Filename}}' using {nameof(SharedAudioSystem)}.{nameof(SharedAudioSystem.PlayGlobal)} but it returned default value of EntityUid!",
+                soundtrackFilename);
+            return;
+        }
+
+        var nextTrackOn = _timing.CurTime + audio.AudioStream.Length;
+        _lobbySoundtrackInfo = new LobbySoundtrackInfo(soundtrackFilename, nextTrackOn, playResult.Value.Entity);
+
+        var lobbySongChangedEvent = new LobbySoundtrackChangedEvent(soundtrackFilename);
+        _lobbySoundtrackChanged?.Invoke(lobbySongChangedEvent);
+    }
+
+    private void EndLobbyMusic()
+    {
+        if (_lobbySoundtrackInfo == null)
+        {
+            return;
+        }
+
+        _audio.Stop(_lobbySoundtrackInfo.MusicStreamEntityUid);
+        _lobbySoundtrackInfo = null;
+        var lobbySongChangedEvent = new LobbySoundtrackChangedEvent();
+        _lobbySoundtrackChanged?.Invoke(lobbySongChangedEvent);
+    }
+
+    private void PlayRestartSound(RoundRestartCleanupEvent ev)
+    {
+        if (!_configManager.GetCVar(CCVars.RestartSoundsEnabled))
+            return;
+
+        var file = _gameTicker.RestartSound;
+        if (string.IsNullOrEmpty(file))
+        {
+            return;
+        }
+
+        _lobbyRoundRestartAudioStream = _audio.PlayGlobal(
+            file,
+            Filter.Local(),
+            false,
+            _roundEndSoundEffectParams.WithVolume(_roundEndSoundEffectParams.Volume + SharedAudioSystem.GainToVolume(_configManager.GetCVar(CCVars.LobbyMusicVolume)))
+        )?.Entity;
+    }
+
+    private void ShutdownLobbyMusic()
+    {
+        _stateManager.OnStateChanged -= StateManagerOnStateChanged;
+
+        _client.PlayerLeaveServer -= OnLeave;
+
+        EndLobbyMusic();
+    }
+
+    private void UpdateLobbyMusic()
+    {
+        if (
+            _lobbySoundtrackInfo != null
+            && _timing.CurTime >= _lobbySoundtrackInfo.NextTrackOn
+            && _lobbyPlaylist?.Length > 0
+            )
+        {
+            var nextSoundtrackFilename = GetNextSoundtrackFromPlaylist(_lobbySoundtrackInfo.Filename, _lobbyPlaylist);
+            PlaySoundtrack(nextSoundtrackFilename);
+        }
+    }
+
+    private static string GetNextSoundtrackFromPlaylist(string currentSoundtrackFilename, string[] playlist)
+    {
+        var indexOfCurrent = Array.IndexOf(playlist, currentSoundtrackFilename);
+        var nextTrackIndex = indexOfCurrent + 1;
+        if (nextTrackIndex > playlist.Length - 1)
+        {
+            nextTrackIndex = 0;
+        }
+
+        return playlist[nextTrackIndex];
+    }
+
+    /// <summary> Container for lobby soundtrack information. </summary>
+    /// <param name="Filename">Soundtrack filename.</param>
+    /// <param name="NextTrackOn">Time (based on <see cref="IGameTiming.CurTime"/>) when this track is going to finish playing and next track have to be started.</param>
+    /// <param name="MusicStreamEntityUid">
+    /// EntityUid of launched soundtrack (from <see cref="SharedAudioSystem.PlayGlobal(string,Robust.Shared.Player.Filter,bool,System.Nullable{Robust.Shared.Audio.AudioParams})"/>).
+    /// </param>
+    private sealed record LobbySoundtrackInfo(string Filename, TimeSpan NextTrackOn, EntityUid MusicStreamEntityUid);
+}
+
+/// <summary>
+/// Event of changing lobby soundtrack (or stopping lobby music - will pass null for <paramref name="SoundtrackFilename"/> in that case).
+/// Is used by <see cref="ContentAudioSystem.LobbySoundtrackChanged"/> and <see cref="LobbyState.UpdateLobbySoundtrackInfo"/>.
+/// </summary>
+/// <param name="SoundtrackFilename">Filename of newly set soundtrack, or null if soundtrack playback is stopped.</param>
+public sealed record LobbySoundtrackChangedEvent(string? SoundtrackFilename = null);
diff --git a/Content.Client/Audio/ContentAudioSystem.cs b/Content.Client/Audio/ContentAudioSystem.cs
index c81e0a44f1..c7fc7bcf73 100644
--- a/Content.Client/Audio/ContentAudioSystem.cs
+++ b/Content.Client/Audio/ContentAudioSystem.cs
@@ -1,18 +1,11 @@
 using Content.Shared.Audio;
 using Content.Shared.GameTicking;
-using Robust.Client.Audio;
-using Robust.Client.ResourceManagement;
-using Robust.Client.UserInterface;
 using AudioComponent = Robust.Shared.Audio.Components.AudioComponent;
 
 namespace Content.Client.Audio;
 
 public sealed partial class ContentAudioSystem : SharedContentAudioSystem
 {
-    [Dependency] private readonly IAudioManager _audioManager = default!;
-    [Dependency] private readonly IResourceCache _cache = default!;
-    [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
-
     // Need how much volume to change per tick and just remove it when it drops below "0"
     private readonly Dictionary<EntityUid, float> _fadingOut = new();
 
@@ -36,12 +29,14 @@ public sealed partial class ContentAudioSystem : SharedContentAudioSystem
     public const float AmbientMusicMultiplier = 3f;
     public const float LobbyMultiplier = 3f;
     public const float InterfaceMultiplier = 2f;
-
+    
     public override void Initialize()
     {
         base.Initialize();
+
         UpdatesOutsidePrediction = true;
         InitializeAmbientMusic();
+        InitializeLobbyMusic();
         SubscribeNetworkEvent<RoundRestartCleanupEvent>(OnRoundCleanup);
     }
 
@@ -50,11 +45,11 @@ private void OnRoundCleanup(RoundRestartCleanupEvent ev)
         _fadingOut.Clear();
 
         // Preserve lobby music but everything else should get dumped.
-        var lobbyMusic = EntityManager.System<BackgroundAudioSystem>().LobbyMusicStream;
+        var lobbyMusic = _lobbySoundtrackInfo?.MusicStreamEntityUid;
         TryComp(lobbyMusic, out AudioComponent? lobbyMusicComp);
         var oldMusicGain = lobbyMusicComp?.Gain;
 
-        var restartAudio = EntityManager.System<BackgroundAudioSystem>().LobbyRoundRestartAudioStream;
+        var restartAudio = _lobbyRoundRestartAudioStream;
         TryComp(restartAudio, out AudioComponent? restartComp);
         var oldAudioGain = restartComp?.Gain;
 
@@ -69,12 +64,14 @@ private void OnRoundCleanup(RoundRestartCleanupEvent ev)
         {
             Audio.SetGain(restartAudio, oldAudioGain.Value, restartComp);
         }
+        PlayRestartSound(ev);
     }
 
     public override void Shutdown()
     {
         base.Shutdown();
         ShutdownAmbientMusic();
+        ShutdownLobbyMusic();
     }
 
     public override void Update(float frameTime)
@@ -85,6 +82,7 @@ public override void Update(float frameTime)
             return;
 
         UpdateAmbientMusic();
+        UpdateLobbyMusic();
         UpdateFades(frameTime);
     }
 
diff --git a/Content.Client/Bed/Cryostorage/CryostorageEntryControl.xaml b/Content.Client/Bed/Cryostorage/CryostorageEntryControl.xaml
index 176acbf29b..5acb142a60 100644
--- a/Content.Client/Bed/Cryostorage/CryostorageEntryControl.xaml
+++ b/Content.Client/Bed/Cryostorage/CryostorageEntryControl.xaml
@@ -11,7 +11,7 @@
         <PanelContainer.PanelOverride>
             <graphics:StyleBoxFlat BackgroundColor="{xNamespace:Static style:StyleNano.ButtonColorDisabled}" />
         </PanelContainer.PanelOverride>
-        <Collapsible Orientation="Vertical" Name="Collapsible">
+        <Collapsible Name="Collapsible">
             <CollapsibleHeading Name="Heading" MinHeight="35"/>
             <CollapsibleBody Name="Body">
                 <BoxContainer Name="ItemsContainer" Orientation="Vertical" HorizontalExpand="True"/>
diff --git a/Content.Client/Camera/CameraRecoilSystem.cs b/Content.Client/Camera/CameraRecoilSystem.cs
index bb419b465d..3e04cd5bf1 100644
--- a/Content.Client/Camera/CameraRecoilSystem.cs
+++ b/Content.Client/Camera/CameraRecoilSystem.cs
@@ -9,26 +9,19 @@ public sealed class CameraRecoilSystem : SharedCameraRecoilSystem
 {
     [Dependency] private readonly IConfigurationManager _configManager = default!;
 
-    protected float Intensity;
+    private float _intensity;
 
     public override void Initialize()
     {
         base.Initialize();
         SubscribeNetworkEvent<CameraKickEvent>(OnCameraKick);
 
-        _configManager.OnValueChanged(CCVars.ScreenShakeIntensity, OnCvarChanged, true);
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-
-        _configManager.UnsubValueChanged(CCVars.ScreenShakeIntensity, OnCvarChanged);
+        Subs.CVar(_configManager, CCVars.ScreenShakeIntensity, OnCvarChanged, true);
     }
 
     private void OnCvarChanged(float value)
     {
-        Intensity = value;
+        _intensity = value;
     }
 
     private void OnCameraKick(CameraKickEvent ev)
@@ -38,13 +31,13 @@ private void OnCameraKick(CameraKickEvent ev)
 
     public override void KickCamera(EntityUid uid, Vector2 recoil, CameraRecoilComponent? component = null)
     {
-        if (Intensity == 0)
+        if (_intensity == 0)
             return;
 
         if (!Resolve(uid, ref component, false))
             return;
 
-        recoil *= Intensity;
+        recoil *= _intensity;
 
         // Use really bad math to "dampen" kicks when we're already kicked.
         var existing = component.CurrentKick.Length();
diff --git a/Content.Client/CardboardBox/CardboardBoxSystem.cs b/Content.Client/CardboardBox/CardboardBoxSystem.cs
index 5e479409cf..50f9de239d 100644
--- a/Content.Client/CardboardBox/CardboardBoxSystem.cs
+++ b/Content.Client/CardboardBox/CardboardBoxSystem.cs
@@ -10,6 +10,7 @@ namespace Content.Client.CardboardBox;
 public sealed class CardboardBoxSystem : SharedCardboardBoxSystem
 {
     [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
+    [Dependency] private readonly TransformSystem _transform = default!;
 
     public override void Initialize()
     {
@@ -29,7 +30,7 @@ private void OnBoxEffect(PlayBoxEffectMessage msg)
         if (!xformQuery.TryGetComponent(source, out var xform))
             return;
 
-        var sourcePos = xform.MapPosition;
+        var sourcePos = _transform.GetMapCoordinates(source, xform);
 
         //Any mob that can move should be surprised?
         //God mind rework needs to come faster so it can just check for mind
@@ -53,16 +54,17 @@ private void OnBoxEffect(PlayBoxEffectMessage msg)
         //Play the effect for the mobs as long as they can see the box and are in range.
         foreach (var mob in mobMoverEntities)
         {
-            if (!xformQuery.TryGetComponent(mob, out var moverTransform) || !ExamineSystemShared.InRangeUnOccluded(sourcePos, moverTransform.MapPosition, box.Distance, null))
+            var mapPos = _transform.GetMapCoordinates(mob);
+            if (!ExamineSystemShared.InRangeUnOccluded(sourcePos, mapPos, box.Distance, null))
                 continue;
 
-            var ent = Spawn(box.Effect, moverTransform.MapPosition);
+            var ent = Spawn(box.Effect, mapPos);
 
             if (!xformQuery.TryGetComponent(ent, out var entTransform) || !TryComp<SpriteComponent>(ent, out var sprite))
                 continue;
 
             sprite.Offset = new Vector2(0, 1);
-            entTransform.AttachParent(mob);
+            _transform.SetParent(ent, entTransform, mob);
         }
 
     }
diff --git a/Content.Client/Cargo/UI/BountyEntry.xaml.cs b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
index 05c5673ddd..1fc8a4986a 100644
--- a/Content.Client/Cargo/UI/BountyEntry.xaml.cs
+++ b/Content.Client/Cargo/UI/BountyEntry.xaml.cs
@@ -12,7 +12,6 @@ namespace Content.Client.Cargo.UI;
 [GenerateTypedNameReferences]
 public sealed partial class BountyEntry : BoxContainer
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
 
     public Action? OnButtonPressed;
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
index 5402a24667..baf0d31f1f 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
@@ -92,6 +92,7 @@ public void PopulateProducts()
                 // else if category and not search
                 if (search.Length == 0 && _category == null ||
                     search.Length != 0 && prototype.Name.ToLowerInvariant().Contains(search) ||
+                    search.Length != 0 && prototype.Description.ToLowerInvariant().Contains(search) ||
                     search.Length == 0 && _category != null && prototype.Category.Equals(_category))
                 {
                     var button = new CargoProductRow
diff --git a/Content.Client/Cargo/UI/CargoPalletMenu.xaml b/Content.Client/Cargo/UI/CargoPalletMenu.xaml
index 489c6cb8f6..d791c9ce3a 100644
--- a/Content.Client/Cargo/UI/CargoPalletMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoPalletMenu.xaml
@@ -1,9 +1,9 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
-            xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-            xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
             SetSize="300 150"
-            MinSize="300 150">
-    <BoxContainer Orientation="Vertical">
+            MinSize="300 150"
+                      Title="{Loc 'cargo-pallet-console-menu-title'}">
+    <BoxContainer Orientation="Vertical" Margin="5">
         <BoxContainer Orientation="Horizontal">
             <Label Text="{Loc 'cargo-pallet-menu-appraisal-label'}"
                    StyleClasses="LabelKeyText" />
diff --git a/Content.Client/Cargo/UI/CargoPalletMenu.xaml.cs b/Content.Client/Cargo/UI/CargoPalletMenu.xaml.cs
index c46ecf562d..3ac0117dc7 100644
--- a/Content.Client/Cargo/UI/CargoPalletMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoPalletMenu.xaml.cs
@@ -17,7 +17,6 @@ public CargoPalletMenu()
         RobustXamlLoader.Load(this);
         SellButton.OnPressed += OnSellPressed;
         AppraiseButton.OnPressed += OnAppraisePressed;
-        Title = Loc.GetString("cargo-pallet-console-menu-title");
     }
 
     public void SetAppraisal(int amount)
diff --git a/Content.Client/CartridgeLoader/Cartridges/NewsReadUi.cs b/Content.Client/CartridgeLoader/Cartridges/NewsReadUi.cs
deleted file mode 100644
index 6874e9644d..0000000000
--- a/Content.Client/CartridgeLoader/Cartridges/NewsReadUi.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using Content.Client.UserInterface.Fragments;
-using Content.Shared.CartridgeLoader.Cartridges;
-using Content.Shared.CartridgeLoader;
-using Robust.Client.GameObjects;
-using Robust.Client.UserInterface;
-
-namespace Content.Client.CartridgeLoader.Cartridges;
-
-public sealed partial class NewsReadUi : UIFragment
-{
-    private NewsReadUiFragment? _fragment;
-
-    public override Control GetUIFragmentRoot()
-    {
-        return _fragment!;
-    }
-
-    public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner)
-    {
-        _fragment = new NewsReadUiFragment();
-
-        _fragment.OnNextButtonPressed += () =>
-        {
-            SendNewsReadMessage(NewsReadUiAction.Next, userInterface);
-        };
-        _fragment.OnPrevButtonPressed += () =>
-        {
-            SendNewsReadMessage(NewsReadUiAction.Prev, userInterface);
-        };
-        _fragment.OnNotificationSwithPressed += () =>
-        {
-            SendNewsReadMessage(NewsReadUiAction.NotificationSwith, userInterface);
-        };
-    }
-
-    public override void UpdateState(BoundUserInterfaceState state)
-    {
-        if (state is NewsReadBoundUserInterfaceState cast)
-            _fragment?.UpdateState(cast.Article, cast.TargetNum, cast.TotalNum, cast.NotificationOn);
-        else if (state is NewsReadEmptyBoundUserInterfaceState empty)
-            _fragment?.UpdateEmptyState(empty.NotificationOn);
-    }
-
-    private void SendNewsReadMessage(NewsReadUiAction action, BoundUserInterface userInterface)
-    {
-        var newsMessage = new NewsReadUiMessageEvent(action);
-        var message = new CartridgeUiMessage(newsMessage);
-        userInterface.SendMessage(message);
-    }
-}
diff --git a/Content.Client/CartridgeLoader/Cartridges/NewsReadUiFragment.xaml b/Content.Client/CartridgeLoader/Cartridges/NewsReadUiFragment.xaml
deleted file mode 100644
index 7431713ea8..0000000000
--- a/Content.Client/CartridgeLoader/Cartridges/NewsReadUiFragment.xaml
+++ /dev/null
@@ -1,54 +0,0 @@
-<cartridges:NewsReadUiFragment xmlns:cartridges="clr-namespace:Content.Client.CartridgeLoader.Cartridges"
-                               xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-                               xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                               xmlns="https://spacestation14.io" Margin="1 0 2 0">
-    <PanelContainer StyleClasses="BackgroundDark"></PanelContainer>
-    <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="5,5,5,5">
-        <Button
-            Name="Prev"
-            MinWidth="64"
-            HorizontalAlignment="Left"
-            Text="{Loc 'news-read-ui-past-text'}"
-            Access="Public"
-            HorizontalExpand="True"/>
-        <Button
-            Name="Next"
-            MinWidth="64"
-            HorizontalAlignment="Right"
-            Text="{Loc 'news-read-ui-next-text'}" />
-    </BoxContainer>
-    <controls:StripeBack Name="АrticleNameContainer">
-        <PanelContainer>
-            <Label Name="PageNum" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="4,0,0,0"/>
-            <Label Name="PageName" Align="Center"/>
-        </PanelContainer>
-    </controls:StripeBack>
-    <PanelContainer VerticalExpand="True">
-        <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BackgroundColor="#80808005" />
-        </PanelContainer.PanelOverride>
-        <ScrollContainer
-                Name="PageTextScroll"
-                HScrollEnabled="False"
-                HorizontalExpand="True"
-                MinSize="0 0"
-                SizeFlagsStretchRatio="2"
-                VerticalExpand="True">
-            <BoxContainer
-                Name="PageTextContainer"
-                MinSize="0 0"
-                Orientation="Vertical"
-                SizeFlagsStretchRatio="2"
-                VerticalExpand="True">
-            </BoxContainer>
-            <RichTextLabel Margin="8,8,8,8" Name="PageText" VerticalAlignment="Top"/>
-        </ScrollContainer>
-    </PanelContainer>
-    <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="5,5,5,5">
-        <Button
-            Name="NotificationSwith"
-            MinWidth="20"/>
-        <RichTextLabel Margin="5,2,2,2" Name="ShareTime" VerticalAlignment="Top"/>
-        <RichTextLabel Margin="5,2,2,2" Name="Author" VerticalAlignment="Top" HorizontalAlignment="Right"/>
-    </BoxContainer>
-</cartridges:NewsReadUiFragment>
diff --git a/Content.Client/CartridgeLoader/Cartridges/NewsReadUiFragment.xaml.cs b/Content.Client/CartridgeLoader/Cartridges/NewsReadUiFragment.xaml.cs
deleted file mode 100644
index df558429c9..0000000000
--- a/Content.Client/CartridgeLoader/Cartridges/NewsReadUiFragment.xaml.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using Content.Client.Message;
-using Content.Shared.MassMedia.Systems;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client.CartridgeLoader.Cartridges;
-
-[GenerateTypedNameReferences]
-public sealed partial class NewsReadUiFragment : BoxContainer
-{
-    public event Action? OnNextButtonPressed;
-    public event Action? OnPrevButtonPressed;
-
-    public event Action? OnNotificationSwithPressed;
-
-    public NewsReadUiFragment()
-    {
-        RobustXamlLoader.Load(this);
-        Orientation = LayoutOrientation.Vertical;
-        HorizontalExpand = true;
-        VerticalExpand = true;
-
-        Next.OnPressed += _ => OnNextButtonPressed?.Invoke();
-        Prev.OnPressed += _ => OnPrevButtonPressed?.Invoke();
-        NotificationSwith.OnPressed += _ => OnNotificationSwithPressed?.Invoke();
-    }
-
-    public void UpdateState(NewsArticle article, int targetNum, int totalNum, bool notificationOn)
-    {
-        PageNum.Visible = true;
-        PageText.Visible = true;
-        ShareTime.Visible = true;
-        Author.Visible = true;
-
-        PageName.Text = article.Name;
-        PageText.SetMarkup(article.Content);
-
-        PageNum.Text = $"{targetNum}/{totalNum}";
-
-        NotificationSwith.Text = Loc.GetString(notificationOn ? "news-read-ui-notification-on" : "news-read-ui-notification-off");
-
-        string shareTime = article.ShareTime.ToString("hh\\:mm\\:ss");
-        ShareTime.SetMarkup(Loc.GetString("news-read-ui-time-prefix-text") + " " + shareTime);
-
-        Author.SetMarkup(Loc.GetString("news-read-ui-author-prefix") + " " + (article.Author != null ? article.Author : Loc.GetString("news-read-ui-no-author")));
-    }
-
-    public void UpdateEmptyState(bool notificationOn)
-    {
-        PageNum.Visible = false;
-        PageText.Visible = false;
-        ShareTime.Visible = false;
-        Author.Visible = false;
-
-        PageName.Text = Loc.GetString("news-read-ui-not-found-text");
-
-        NotificationSwith.Text = Loc.GetString(notificationOn ? "news-read-ui-notification-on" : "news-read-ui-notification-off");
-    }
-}
diff --git a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUi.cs b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUi.cs
new file mode 100644
index 0000000000..8ad665d361
--- /dev/null
+++ b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUi.cs
@@ -0,0 +1,54 @@
+using Content.Client.UserInterface.Fragments;
+using Content.Shared.CartridgeLoader.Cartridges;
+using Content.Shared.CartridgeLoader;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.CartridgeLoader.Cartridges;
+
+public sealed partial class NewsReaderUi : UIFragment
+{
+    private NewsReaderUiFragment? _fragment;
+
+    public override Control GetUIFragmentRoot()
+    {
+        return _fragment!;
+    }
+
+    public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner)
+    {
+        _fragment = new NewsReaderUiFragment();
+
+        _fragment.OnNextButtonPressed += () =>
+        {
+            SendNewsReaderMessage(NewsReaderUiAction.Next, userInterface);
+        };
+        _fragment.OnPrevButtonPressed += () =>
+        {
+            SendNewsReaderMessage(NewsReaderUiAction.Prev, userInterface);
+        };
+        _fragment.OnNotificationSwithPressed += () =>
+        {
+            SendNewsReaderMessage(NewsReaderUiAction.NotificationSwitch, userInterface);
+        };
+    }
+
+    public override void UpdateState(BoundUserInterfaceState state)
+    {
+        switch (state)
+        {
+            case NewsReaderBoundUserInterfaceState cast:
+                _fragment?.UpdateState(cast.Article, cast.TargetNum, cast.TotalNum, cast.NotificationOn);
+                break;
+            case NewsReaderEmptyBoundUserInterfaceState empty:
+                _fragment?.UpdateEmptyState(empty.NotificationOn);
+                break;
+        }
+    }
+
+    private void SendNewsReaderMessage(NewsReaderUiAction action, BoundUserInterface userInterface)
+    {
+        var newsMessage = new NewsReaderUiMessageEvent(action);
+        var message = new CartridgeUiMessage(newsMessage);
+        userInterface.SendMessage(message);
+    }
+}
diff --git a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml
new file mode 100644
index 0000000000..bd5879408e
--- /dev/null
+++ b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml
@@ -0,0 +1,65 @@
+<cartridges:NewsReaderUiFragment xmlns:cartridges="clr-namespace:Content.Client.CartridgeLoader.Cartridges"
+                               xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+                               xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                               xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+                               xmlns="https://spacestation14.io"
+                               Margin="1 0 2 0"
+                               Orientation="Vertical"
+                               HorizontalExpand="True"
+                               VerticalExpand="True">
+    <PanelContainer StyleClasses="BackgroundDark"></PanelContainer>
+    <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="5,5,5,5">
+        <Button
+            Name="Prev"
+            MinWidth="64"
+            Disabled="True"
+            HorizontalAlignment="Left"
+            Text="{Loc 'news-read-ui-prev-text'}"
+            ToolTip="{Loc 'news-read-ui-prev-tooltip'}"
+            Access="Public"
+            HorizontalExpand="True"/>
+        <Button
+            Name="Next"
+            MinWidth="64"
+            Disabled="True"
+            HorizontalAlignment="Right"
+            Text="{Loc 'news-read-ui-next-text'}"
+            ToolTip="{Loc 'news-read-ui-next-tooltip'}"/>
+    </BoxContainer>
+    <controls:StripeBack Name="АrticleNameContainer">
+        <PanelContainer>
+            <Label Name="PageNum" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="4,0,0,0"/>
+            <Label Name="PageName" Align="Center"/>
+        </PanelContainer>
+    </controls:StripeBack>
+    <PanelContainer VerticalExpand="True">
+        <PanelContainer.PanelOverride>
+            <gfx:StyleBoxFlat BackgroundColor="#80808005" />
+        </PanelContainer.PanelOverride>
+        <ScrollContainer
+                Name="PageTextScroll"
+                HScrollEnabled="False"
+                HorizontalExpand="True"
+                MinSize="0 0"
+                SizeFlagsStretchRatio="2"
+                VerticalExpand="True">
+            <BoxContainer
+                Name="PageTextContainer"
+                MinSize="0 0"
+                Orientation="Vertical"
+                SizeFlagsStretchRatio="2"
+                VerticalExpand="True">
+            </BoxContainer>
+            <RichTextLabel Margin="8,8,8,8" Name="PageText" VerticalAlignment="Top"/>
+        </ScrollContainer>
+    </PanelContainer>
+    <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="5,5,5,5">
+        <Button
+            Name="NotificationSwitch"
+            ToolTip="{Loc news-reader-ui-mute-tooltip}"
+            MinWidth="20"/>
+        <RichTextLabel Margin="5,2,2,2" Name="ShareTime" VerticalAlignment="Top"/>
+        <customControls:VSeparator Margin="2 0"/>
+        <RichTextLabel Margin="5,2,2,2" Name="Author" VerticalAlignment="Top" HorizontalAlignment="Right"/>
+    </BoxContainer>
+</cartridges:NewsReaderUiFragment>
diff --git a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs
new file mode 100644
index 0000000000..f3b2d373d7
--- /dev/null
+++ b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs
@@ -0,0 +1,60 @@
+using Content.Client.Message;
+using Content.Shared.MassMedia.Systems;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class NewsReaderUiFragment : BoxContainer
+{
+    public event Action? OnNextButtonPressed;
+    public event Action? OnPrevButtonPressed;
+
+    public event Action? OnNotificationSwithPressed;
+
+    public NewsReaderUiFragment()
+    {
+        RobustXamlLoader.Load(this);
+
+        Next.OnPressed += _ => OnNextButtonPressed?.Invoke();
+        Prev.OnPressed += _ => OnPrevButtonPressed?.Invoke();
+        NotificationSwitch.OnPressed += _ => OnNotificationSwithPressed?.Invoke();
+    }
+
+    public void UpdateState(NewsArticle article, int targetNum, int totalNum, bool notificationOn)
+    {
+        PageNum.Visible = true;
+        PageText.Visible = true;
+        ShareTime.Visible = true;
+        Author.Visible = true;
+
+        PageName.Text = article.Title;
+        PageText.SetMarkup(article.Content);
+
+        PageNum.Text = $"{targetNum}/{totalNum}";
+
+        NotificationSwitch.Text = Loc.GetString(notificationOn ? "news-read-ui-notification-on" : "news-read-ui-notification-off");
+
+        string shareTime = article.ShareTime.ToString(@"hh\:mm\:ss");
+        ShareTime.SetMarkup(Loc.GetString("news-read-ui-time-prefix-text") + " " + shareTime);
+
+        Author.SetMarkup(Loc.GetString("news-read-ui-author-prefix") + " " + (article.Author != null ? article.Author : Loc.GetString("news-read-ui-no-author")));
+
+        Prev.Disabled = targetNum <= 1;
+        Next.Disabled = targetNum >= totalNum;
+    }
+
+    public void UpdateEmptyState(bool notificationOn)
+    {
+        PageNum.Visible = false;
+        PageText.Visible = false;
+        ShareTime.Visible = false;
+        Author.Visible = false;
+
+        PageName.Text = Loc.GetString("news-read-ui-not-found-text");
+
+        NotificationSwitch.Text = Loc.GetString(notificationOn ? "news-read-ui-notification-on" : "news-read-ui-notification-off");
+    }
+}
diff --git a/Content.Client/Changelog/ChangelogManager.cs b/Content.Client/Changelog/ChangelogManager.cs
index d62ce17f0e..2b056e885b 100644
--- a/Content.Client/Changelog/ChangelogManager.cs
+++ b/Content.Client/Changelog/ChangelogManager.cs
@@ -5,7 +5,6 @@
 using Content.Shared.CCVar;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Markdown;
 using Robust.Shared.Serialization.Markdown.Mapping;
@@ -169,7 +168,7 @@ public sealed partial class Changelog
         }
 
         [DataDefinition]
-        public sealed partial class ChangelogEntry : ISerializationHooks
+        public sealed partial class ChangelogEntry
         {
             [DataField("id")]
             public int Id { get; private set; }
@@ -177,17 +176,11 @@ public sealed partial class ChangelogEntry : ISerializationHooks
             [DataField("author")]
             public string Author { get; private set; } = "";
 
-            [DataField("time")] private string _time = default!;
-
+            [DataField]
             public DateTime Time { get; private set; }
 
             [DataField("changes")]
             public List<ChangelogChange> Changes { get; private set; } = default!;
-
-            void ISerializationHooks.AfterDeserialization()
-            {
-                Time = DateTime.Parse(_time, null, DateTimeStyles.RoundtripKind);
-            }
         }
 
         [DataDefinition]
diff --git a/Content.Client/CharacterInfo/CharacterInfoSystem.cs b/Content.Client/CharacterInfo/CharacterInfoSystem.cs
index 844a352a18..aeaa48c6f2 100644
--- a/Content.Client/CharacterInfo/CharacterInfoSystem.cs
+++ b/Content.Client/CharacterInfo/CharacterInfoSystem.cs
@@ -20,7 +20,7 @@ public override void Initialize()
 
     public void RequestCharacterInfo()
     {
-        var entity = _players.LocalPlayer?.ControlledEntity;
+        var entity = _players.LocalEntity;
         if (entity == null)
         {
             return;
diff --git a/Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs b/Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs
index 0eea36aa57..844f793fc4 100644
--- a/Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs
+++ b/Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs
@@ -20,7 +20,8 @@ public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem
     public override void Initialize()
     {
         base.Initialize();
-        _cfg.OnValueChanged(CCVars.ChatShowTypingIndicator, OnShowTypingChanged);
+
+        Subs.CVar(_cfg, CCVars.ChatShowTypingIndicator, OnShowTypingChanged);
     }
 
     public void ClientChangedChatText()
@@ -67,7 +68,7 @@ private void ClientUpdateTyping(bool isClientTyping)
         _isClientTyping = isClientTyping;
 
         // check if player controls any pawn
-        if (_playerManager.LocalPlayer?.ControlledEntity == null)
+        if (_playerManager.LocalEntity == null)
             return;
 
         // send a networked event to server
diff --git a/Content.Client/Chat/UI/SpeechBubble.cs b/Content.Client/Chat/UI/SpeechBubble.cs
index 91e8e5a90f..82eccbcec8 100644
--- a/Content.Client/Chat/UI/SpeechBubble.cs
+++ b/Content.Client/Chat/UI/SpeechBubble.cs
@@ -182,20 +182,9 @@ protected FormattedMessage FormatSpeech(string message, Color? fontColor = null)
             return msg;
         }
 
-        protected string ExtractSpeechSubstring(ChatMessage message, string tag)
-        {
-            var rawmsg = message.WrappedMessage;
-            var tagStart = rawmsg.IndexOf($"[{tag}]");
-            var tagEnd = rawmsg.IndexOf($"[/{tag}]");
-            if (tagStart < 0 || tagEnd < 0) //the above return -1 if the tag's not found, which in turn will cause the below to throw an exception. a blank speech bubble is far more noticeably broken than the bubble not appearing at all -bhijn
-                return "";
-            tagStart += tag.Length + 2;
-            return rawmsg.Substring(tagStart, tagEnd - tagStart);
-        }
-
         protected FormattedMessage ExtractAndFormatSpeechSubstring(ChatMessage message, string tag, Color? fontColor = null)
         {
-            return FormatSpeech(ExtractSpeechSubstring(message, tag), fontColor);
+            return FormatSpeech(SharedChatSystem.GetStringInsideTag(message, tag), fontColor);
         }
 
     }
diff --git a/Content.Client/Chemistry/Components/InjectorComponent.cs b/Content.Client/Chemistry/Components/InjectorComponent.cs
deleted file mode 100644
index 4d10517a11..0000000000
--- a/Content.Client/Chemistry/Components/InjectorComponent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.FixedPoint;
-
-namespace Content.Client.Chemistry.Components
-{
-    /// <summary>
-    /// Client behavior for injectors & syringes. Used for item status on injectors
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class InjectorComponent : SharedInjectorComponent
-    {
-        [ViewVariables]
-        public FixedPoint2 CurrentVolume;
-        [ViewVariables]
-        public FixedPoint2 TotalVolume;
-        [ViewVariables]
-        public InjectorToggleMode CurrentMode;
-        [ViewVariables(VVAccess.ReadWrite)]
-        public bool UiUpdateNeeded;
-    }
-}
diff --git a/Content.Client/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Client/Chemistry/EntitySystems/InjectorSystem.cs
index 896349a161..12eb7f3d14 100644
--- a/Content.Client/Chemistry/EntitySystems/InjectorSystem.cs
+++ b/Content.Client/Chemistry/EntitySystems/InjectorSystem.cs
@@ -2,34 +2,21 @@
 using Content.Client.Chemistry.UI;
 using Content.Client.Items;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Robust.Shared.GameStates;
 
 namespace Content.Client.Chemistry.EntitySystems;
 
-public sealed class InjectorSystem : EntitySystem
+public sealed class InjectorSystem : SharedInjectorSystem
 {
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<InjectorComponent, ComponentHandleState>(OnHandleInjectorState);
-        Subs.ItemStatus<InjectorComponent>(ent => new InjectorStatusControl(ent));
+        Subs.ItemStatus<InjectorComponent>(ent => new InjectorStatusControl(ent, SolutionContainers));
         SubscribeLocalEvent<HyposprayComponent, ComponentHandleState>(OnHandleHyposprayState);
         Subs.ItemStatus<HyposprayComponent>(ent => new HyposprayStatusControl(ent));
     }
 
-    private void OnHandleInjectorState(EntityUid uid, InjectorComponent component, ref ComponentHandleState args)
-    {
-        if (args.Current is not SharedInjectorComponent.InjectorComponentState state)
-        {
-            return;
-        }
-
-        component.CurrentVolume = state.CurrentVolume;
-        component.TotalVolume = state.TotalVolume;
-        component.CurrentMode = state.CurrentMode;
-        component.UiUpdateNeeded = true;
-    }
-
     private void OnHandleHyposprayState(EntityUid uid, HyposprayComponent component, ref ComponentHandleState args)
     {
         if (args.Current is not HyposprayComponentState cState)
diff --git a/Content.Client/Chemistry/UI/InjectorStatusControl.cs b/Content.Client/Chemistry/UI/InjectorStatusControl.cs
index f772320168..9cb699330c 100644
--- a/Content.Client/Chemistry/UI/InjectorStatusControl.cs
+++ b/Content.Client/Chemistry/UI/InjectorStatusControl.cs
@@ -1,7 +1,8 @@
-using Content.Client.Chemistry.Components;
 using Content.Client.Message;
 using Content.Client.Stylesheets;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.FixedPoint;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
@@ -10,40 +11,51 @@ namespace Content.Client.Chemistry.UI;
 
 public sealed class InjectorStatusControl : Control
 {
-    private readonly InjectorComponent _parent;
+    private readonly Entity<InjectorComponent> _parent;
+    private readonly SharedSolutionContainerSystem _solutionContainers;
     private readonly RichTextLabel _label;
 
-    public InjectorStatusControl(InjectorComponent parent)
+    private FixedPoint2 PrevVolume;
+    private FixedPoint2 PrevMaxVolume;
+    private InjectorToggleMode PrevToggleState;
+
+    public InjectorStatusControl(Entity<InjectorComponent> parent, SharedSolutionContainerSystem solutionContainers)
     {
         _parent = parent;
+        _solutionContainers = solutionContainers;
         _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
         AddChild(_label);
-
-        Update();
     }
 
     protected override void FrameUpdate(FrameEventArgs args)
     {
         base.FrameUpdate(args);
-        if (!_parent.UiUpdateNeeded)
+
+        if (!_solutionContainers.TryGetSolution(_parent.Owner, InjectorComponent.SolutionName, out _, out var solution))
             return;
-        Update();
-    }
 
-    public void Update()
-    {
-        _parent.UiUpdateNeeded = false;
+        // only updates the UI if any of the details are different than they previously were
+        if (PrevVolume == solution.Volume
+            && PrevMaxVolume == solution.MaxVolume
+            && PrevToggleState == _parent.Comp.ToggleState)
+            return;
 
-        //Update current volume and injector state
-        var modeStringLocalized = _parent.CurrentMode switch
+        PrevVolume = solution.Volume;
+        PrevMaxVolume = solution.MaxVolume;
+        PrevToggleState = _parent.Comp.ToggleState;
+
+        // Update current volume and injector state
+        var modeStringLocalized = Loc.GetString(_parent.Comp.ToggleState switch
         {
-            SharedInjectorComponent.InjectorToggleMode.Draw => Loc.GetString("injector-draw-text"),
-            SharedInjectorComponent.InjectorToggleMode.Inject => Loc.GetString("injector-inject-text"),
-            _ => Loc.GetString("injector-invalid-injector-toggle-mode")
-        };
+            InjectorToggleMode.Draw => "injector-draw-text",
+            InjectorToggleMode.Inject => "injector-inject-text",
+            _ => "injector-invalid-injector-toggle-mode"
+        });
+
         _label.SetMarkup(Loc.GetString("injector-volume-label",
-            ("currentVolume", _parent.CurrentVolume),
-            ("totalVolume", _parent.TotalVolume),
-            ("modeString", modeStringLocalized)));
+            ("currentVolume", solution.Volume),
+            ("totalVolume", solution.MaxVolume),
+            ("modeString", modeStringLocalized),
+            ("transferVolume", _parent.Comp.TransferAmount)));
     }
 }
diff --git a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml
index d9e480f132..3b812ba56b 100644
--- a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml
+++ b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml
@@ -32,19 +32,22 @@
                     StyleClasses="OpenLeft"/>
         </BoxContainer>
         <Control MinSize="0 10"/>
-        <ScrollContainer HScrollEnabled="False" HorizontalExpand="True" VerticalExpand="True" MinSize="0 160">
-            <PanelContainer VerticalExpand="True"
-                            SizeFlagsStretchRatio="6"
-                            MinSize="0 150">
-                <PanelContainer.PanelOverride>
-                    <gfx:StyleBoxFlat BackgroundColor="#1b1b1e" />
-                </PanelContainer.PanelOverride>
-                <BoxContainer Name="ContainerInfo"
-                              Orientation="Vertical"
-                              HorizontalExpand="True">
-                    <Label Text="{Loc 'reagent-dispenser-window-no-container-loaded-text'}"/>
-                </BoxContainer>
-            </PanelContainer>
-        </ScrollContainer>
+        <BoxContainer Orientation="Horizontal">
+            <SpriteView Name="View" Scale="4 4" MinSize="150 150"/>
+            <ScrollContainer HScrollEnabled="False" HorizontalExpand="True" VerticalExpand="True" MinSize="0 160">
+                <PanelContainer VerticalExpand="True"
+                                SizeFlagsStretchRatio="6"
+                                MinSize="0 150">
+                    <PanelContainer.PanelOverride>
+                        <gfx:StyleBoxFlat BackgroundColor="#1b1b1e" />
+                    </PanelContainer.PanelOverride>
+                    <BoxContainer Name="ContainerInfo"
+                                Orientation="Vertical"
+                                HorizontalExpand="True">
+                        <Label Text="{Loc 'reagent-dispenser-window-no-container-loaded-text'}"/>
+                    </BoxContainer>
+                </PanelContainer>
+            </ScrollContainer>
+        </BoxContainer>
     </BoxContainer>
 </DefaultWindow>
diff --git a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs
index a36cc2fe54..7fcf0191f2 100644
--- a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs
+++ b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Client.Stylesheets;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Reagent;
@@ -19,6 +18,7 @@ namespace Content.Client.Chemistry.UI
     public sealed partial class ReagentDispenserWindow : DefaultWindow
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
         public event Action<BaseButton.ButtonEventArgs, DispenseReagentButton>? OnDispenseReagentButtonPressed;
         public event Action<GUIMouseHoverEventArgs, DispenseReagentButton>? OnDispenseReagentButtonMouseEntered;
         public event Action<GUIMouseHoverEventArgs, DispenseReagentButton>? OnDispenseReagentButtonMouseExited;
@@ -52,7 +52,7 @@ public ReagentDispenserWindow()
         /// Update the button grid of reagents which can be dispensed.
         /// </summary>
         /// <param name="inventory">Reagents which can be dispensed by this dispenser</param>
-        public void UpdateReagentsList(List<KeyValuePair<string, KeyValuePair<string,string>>> inventory)
+        public void UpdateReagentsList(List<KeyValuePair<string, KeyValuePair<string, string>>> inventory)
         {
             if (ChemicalList == null)
                 return;
@@ -86,6 +86,9 @@ public void UpdateState(BoundUserInterfaceState state)
             UpdateContainerInfo(castState);
             UpdateReagentsList(castState.Inventory);
 
+            _entityManager.TryGetEntity(castState.OutputContainerEntity, out var outputContainerEnt);
+            View.SetEntity(outputContainerEnt);
+
             // Disable the Clear & Eject button if no beaker
             ClearButton.Disabled = castState.OutputContainer is null;
             EjectButton.Disabled = castState.OutputContainer is null;
@@ -134,7 +137,7 @@ public void UpdateContainerInfo(ReagentDispenserBoundUserInterfaceState state)
 
             if (state.OutputContainer is null)
             {
-                ContainerInfo.Children.Add(new Label {Text = Loc.GetString("reagent-dispenser-window-no-container-loaded-text") });
+                ContainerInfo.Children.Add(new Label { Text = Loc.GetString("reagent-dispenser-window-no-container-loaded-text") });
                 return;
             }
 
@@ -159,11 +162,11 @@ public void UpdateContainerInfo(ReagentDispenserBoundUserInterfaceState state)
                     ? p.LocalizedName
                     : Loc.GetString("reagent-dispenser-window-reagent-name-not-found-text");
 
-                var nameLabel = new Label {Text = $"{localizedName}: "};
+                var nameLabel = new Label { Text = $"{localizedName}: " };
                 var quantityLabel = new Label
                 {
                     Text = Loc.GetString("reagent-dispenser-window-quantity-label-text", ("quantity", quantity)),
-                    StyleClasses = {StyleNano.StyleClassLabelSecondaryColor},
+                    StyleClasses = { StyleNano.StyleClassLabelSecondaryColor },
                 };
 
                 ContainerInfo.Children.Add(new BoxContainer
diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
index b4486b8c0e..f1e8e8d7aa 100644
--- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
+++ b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
@@ -49,12 +49,17 @@ protected override void OnAppearanceChange(EntityUid uid, SolutionContainerVisua
         if (!args.Sprite.LayerMapTryGet(component.Layer, out var fillLayer))
             return;
 
+        var maxFillLevels = component.MaxFillLevels;
+        var fillBaseName = component.FillBaseName;
+        var changeColor = component.ChangeColor;
+        var fillSprite = component.MetamorphicDefaultSprite;
+
         // Currently some solution methods such as overflowing will try to update appearance with a
         // volume greater than the max volume. We'll clamp it so players don't see
         // a giant error sign and error for debug.
         if (fraction > 1f)
         {
-            Logger.Error("Attempted to set solution container visuals volume ratio on " + ToPrettyString(uid) + " to a value greater than 1. Volume should never be greater than max volume!");
+            Log.Error("Attempted to set solution container visuals volume ratio on " + ToPrettyString(uid) + " to a value greater than 1. Volume should never be greater than max volume!");
             fraction = 1f;
         }
         if (component.Metamorphic)
@@ -72,13 +77,23 @@ protected override void OnAppearanceChange(EntityUid uid, SolutionContainerVisua
                     if (reagentProto?.MetamorphicSprite is { } sprite)
                     {
                         args.Sprite.LayerSetSprite(baseLayer, sprite);
-                        args.Sprite.LayerSetVisible(fillLayer, false);
+                        if (reagentProto.MetamorphicMaxFillLevels > 0)
+                        {
+                            args.Sprite.LayerSetVisible(fillLayer, true);
+                            maxFillLevels = reagentProto.MetamorphicMaxFillLevels;
+                            fillBaseName = reagentProto.MetamorphicFillBaseName;
+                            changeColor = reagentProto.MetamorphicChangeColor;
+                            fillSprite = sprite;
+                        }
+                        else
+                            args.Sprite.LayerSetVisible(fillLayer, false);
+
                         if (hasOverlay)
                             args.Sprite.LayerSetVisible(overlayLayer, false);
-                        return;
                     }
                     else
                     {
+                        args.Sprite.LayerSetVisible(fillLayer, true);
                         if (hasOverlay)
                             args.Sprite.LayerSetVisible(overlayLayer, true);
                         if (component.MetamorphicDefaultSprite != null)
@@ -87,21 +102,27 @@ protected override void OnAppearanceChange(EntityUid uid, SolutionContainerVisua
                 }
             }
         }
+        else
+        {
+            args.Sprite.LayerSetVisible(fillLayer, true);
+        }
 
-        int closestFillSprite = ContentHelpers.RoundToLevels(fraction, 1, component.MaxFillLevels + 1);
+        var closestFillSprite = ContentHelpers.RoundToLevels(fraction, 1, maxFillLevels + 1);
 
         if (closestFillSprite > 0)
         {
-            if (component.FillBaseName == null)
+            if (fillBaseName == null)
                 return;
 
-            args.Sprite.LayerSetVisible(fillLayer, true);
-
-            var stateName = component.FillBaseName + closestFillSprite;
+            var stateName = fillBaseName + closestFillSprite;
+            if (fillSprite != null)
+                args.Sprite.LayerSetSprite(fillLayer, fillSprite);
             args.Sprite.LayerSetState(fillLayer, stateName);
 
-            if (component.ChangeColor && AppearanceSystem.TryGetData<Color>(uid, SolutionContainerVisuals.Color, out var color, args.Component))
+            if (changeColor && AppearanceSystem.TryGetData<Color>(uid, SolutionContainerVisuals.Color, out var color, args.Component))
                 args.Sprite.LayerSetColor(fillLayer, color);
+            else
+                args.Sprite.LayerSetColor(fillLayer, Color.White);
         }
         else
         {
@@ -110,8 +131,10 @@ protected override void OnAppearanceChange(EntityUid uid, SolutionContainerVisua
             else
             {
                 args.Sprite.LayerSetState(fillLayer, component.EmptySpriteName);
-                if (component.ChangeColor)
+                if (changeColor)
                     args.Sprite.LayerSetColor(fillLayer, component.EmptySpriteColor);
+                else
+                    args.Sprite.LayerSetColor(fillLayer, Color.White);
             }
         }
 
@@ -130,7 +153,7 @@ private void OnGetHeldVisuals(EntityUid uid, SolutionContainerVisualsComponent c
         if (!AppearanceSystem.TryGetData<float>(uid, SolutionContainerVisuals.FillFraction, out var fraction, appearance))
             return;
 
-        int closestFillSprite = ContentHelpers.RoundToLevels(fraction, 1, component.InHandsMaxFillLevels + 1);
+        var closestFillSprite = ContentHelpers.RoundToLevels(fraction, 1, component.InHandsMaxFillLevels + 1);
 
         if (closestFillSprite > 0)
         {
diff --git a/Content.Client/CloningConsole/UI/CloningConsoleWindow.xaml.cs b/Content.Client/CloningConsole/UI/CloningConsoleWindow.xaml.cs
index b71f1a282f..a14ce13874 100644
--- a/Content.Client/CloningConsole/UI/CloningConsoleWindow.xaml.cs
+++ b/Content.Client/CloningConsole/UI/CloningConsoleWindow.xaml.cs
@@ -7,7 +7,7 @@
 namespace Content.Client.CloningConsole.UI
 {
     [GenerateTypedNameReferences]
-    public partial class CloningConsoleWindow : DefaultWindow
+    public sealed partial class CloningConsoleWindow : DefaultWindow
     {
         public CloningConsoleWindow()
         {
diff --git a/Content.Client/CombatMode/CombatModeSystem.cs b/Content.Client/CombatMode/CombatModeSystem.cs
index 34ae0b1338..2c938b1b93 100644
--- a/Content.Client/CombatMode/CombatModeSystem.cs
+++ b/Content.Client/CombatMode/CombatModeSystem.cs
@@ -28,7 +28,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<CombatModeComponent, AfterAutoHandleStateEvent>(OnHandleState);
 
-        _cfg.OnValueChanged(CCVars.CombatModeIndicatorsPointShow, OnShowCombatIndicatorsChanged, true);
+        Subs.CVar(_cfg, CCVars.CombatModeIndicatorsPointShow, OnShowCombatIndicatorsChanged, true);
     }
 
     private void OnHandleState(EntityUid uid, CombatModeComponent component, ref AfterAutoHandleStateEvent args)
@@ -38,7 +38,6 @@ private void OnHandleState(EntityUid uid, CombatModeComponent component, ref Aft
 
     public override void Shutdown()
     {
-        _cfg.UnsubValueChanged(CCVars.CombatModeIndicatorsPointShow, OnShowCombatIndicatorsChanged);
         _overlayManager.RemoveOverlay<CombatModeIndicatorsOverlay>();
 
         base.Shutdown();
@@ -46,7 +45,7 @@ public override void Shutdown()
 
     public bool IsInCombatMode()
     {
-        var entity = _playerManager.LocalPlayer?.ControlledEntity;
+        var entity = _playerManager.LocalEntity;
 
         if (entity == null)
             return false;
@@ -67,7 +66,7 @@ protected override bool IsNpc(EntityUid uid)
 
     private void UpdateHud(EntityUid entity)
     {
-        if (entity != _playerManager.LocalPlayer?.ControlledEntity || !Timing.IsFirstTimePredicted)
+        if (entity != _playerManager.LocalEntity || !Timing.IsFirstTimePredicted)
         {
             return;
         }
diff --git a/Content.Client/Commands/ActionsCommands.cs b/Content.Client/Commands/ActionsCommands.cs
index 3d8e906e09..dd489fd4d6 100644
--- a/Content.Client/Commands/ActionsCommands.cs
+++ b/Content.Client/Commands/ActionsCommands.cs
@@ -1,7 +1,10 @@
+using System.IO;
 using Content.Client.Actions;
 using Content.Client.Mapping;
 using Content.Shared.Administration;
+using Robust.Client.UserInterface;
 using Robust.Shared.Console;
+using YamlDotNet.RepresentationModel;
 
 namespace Content.Client.Commands;
 
@@ -47,7 +50,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
     {
         if (args.Length != 1)
         {
-            shell.WriteLine(Help);
+            LoadActs(); // DeltaV - Load from a file dialogue instead
             return;
         }
 
@@ -60,6 +63,26 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             shell.WriteError(LocalizationManager.GetString($"cmd-{Command}-error"));
         }
     }
+
+    /// <summary>
+    /// DeltaV - Load actions from a file stream instead
+    /// </summary>
+    private static async void LoadActs()
+    {
+        var fileMan = IoCManager.Resolve<IFileDialogManager>();
+        var actMan = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ActionsSystem>();
+
+        var stream = await fileMan.OpenFile(new FileDialogFilters(new FileDialogFilters.Group("yml")));
+        if (stream is null)
+            return;
+
+        var reader = new StreamReader(stream);
+        var yamlStream = new YamlStream();
+        yamlStream.Load(reader);
+
+        actMan.LoadActionAssignments(yamlStream);
+        reader.Close();
+    }
 }
 
 [AnyCommand]
diff --git a/Content.Client/Commands/DebugPathfindingCommand.cs b/Content.Client/Commands/DebugPathfindingCommand.cs
index e02b6dcbbd..b920ccc5ed 100644
--- a/Content.Client/Commands/DebugPathfindingCommand.cs
+++ b/Content.Client/Commands/DebugPathfindingCommand.cs
@@ -38,7 +38,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
         }
     }
 
-    public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+    public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
     {
         if (args.Length > 1)
         {
diff --git a/Content.Client/Construction/ConstructionSystem.cs b/Content.Client/Construction/ConstructionSystem.cs
index 940538670c..ae1724c3bf 100644
--- a/Content.Client/Construction/ConstructionSystem.cs
+++ b/Content.Client/Construction/ConstructionSystem.cs
@@ -185,7 +185,7 @@ public bool TrySpawnGhost(
             [NotNullWhen(true)] out EntityUid? ghost)
         {
             ghost = null;
-            if (_playerManager.LocalPlayer?.ControlledEntity is not { } user ||
+            if (_playerManager.LocalEntity is not { } user ||
                 !user.IsValid())
             {
                 return false;
diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
index 0e15fadfae..956f2fd035 100644
--- a/Content.Client/Content.Client.csproj
+++ b/Content.Client/Content.Client.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>11</LangVersion>
+    <LangVersion>12</LangVersion>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Client\</OutputPath>
diff --git a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs
index 039c03601a..ae1b3ec3bf 100644
--- a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs
+++ b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs
@@ -148,7 +148,7 @@ public void OnKeyBindDown(ContextMenuElement element, GUIBoundKeyEventArgs args)
                     Uid = entity.Value,
                 };
 
-                var session = _playerManager.LocalPlayer?.Session;
+                var session = _playerManager.LocalSession;
                 if (session != null)
                 {
                     inputSys.HandleInputCommand(session, func, message);
@@ -189,7 +189,7 @@ public override void FrameUpdate(FrameEventArgs args)
             if (!_context.RootMenu.Visible)
                 return;
 
-            if (_playerManager.LocalPlayer?.ControlledEntity is not { } player ||
+            if (_playerManager.LocalEntity is not { } player ||
                 !player.IsValid())
                 return;
 
diff --git a/Content.Client/CrewManifest/UI/CrewManifestListing.cs b/Content.Client/CrewManifest/UI/CrewManifestListing.cs
index 614add536e..03d8b7168f 100644
--- a/Content.Client/CrewManifest/UI/CrewManifestListing.cs
+++ b/Content.Client/CrewManifest/UI/CrewManifestListing.cs
@@ -1,18 +1,14 @@
-using Content.Shared.CCVar;
-using Content.Shared.CrewManifest;
+using Content.Shared.CrewManifest;
 using Content.Shared.Roles;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
-using System.Linq;
 
 namespace Content.Client.CrewManifest.UI;
 
 public sealed class CrewManifestListing : BoxContainer
 {
-    [Dependency] private readonly IConfigurationManager _configManager = default!;
     [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     private readonly SpriteSystem _spriteSystem;
@@ -25,7 +21,7 @@ public CrewManifestListing()
 
     public void AddCrewManifestEntries(CrewManifestEntries entries)
     {
-        var entryDict = new Dictionary<string, List<CrewManifestEntry>>();
+        var entryDict = new Dictionary<DepartmentPrototype, List<CrewManifestEntry>>();
 
         foreach (var entry in entries.Entries)
         {
@@ -34,37 +30,19 @@ public void AddCrewManifestEntries(CrewManifestEntries entries)
                 // this is a little expensive, and could be better
                 if (department.Roles.Contains(entry.JobPrototype))
                 {
-                    entryDict.GetOrNew(department.ID).Add(entry);
+                    entryDict.GetOrNew(department).Add(entry);
                 }
             }
         }
 
-        var entryList = new List<(string section, List<CrewManifestEntry> entries)>();
+        var entryList = new List<(DepartmentPrototype section, List<CrewManifestEntry> entries)>();
 
         foreach (var (section, listing) in entryDict)
         {
             entryList.Add((section, listing));
         }
 
-        var sortOrder = _configManager.GetCVar(CCVars.CrewManifestOrdering).Split(",").ToList();
-
-        entryList.Sort((a, b) =>
-        {
-            var ai = sortOrder.IndexOf(a.section);
-            var bi = sortOrder.IndexOf(b.section);
-
-            // this is up here so -1 == -1 occurs first
-            if (ai == bi)
-                return 0;
-
-            if (ai == -1)
-                return -1;
-
-            if (bi == -1)
-                return 1;
-
-            return ai.CompareTo(bi);
-        });
+        entryList.Sort((a, b) => DepartmentUIComparer.Instance.Compare(a.section, b.section));
 
         foreach (var item in entryList)
         {
diff --git a/Content.Client/CrewManifest/UI/CrewManifestSection.cs b/Content.Client/CrewManifest/UI/CrewManifestSection.cs
index 9b51b5d424..4b1b02cb75 100644
--- a/Content.Client/CrewManifest/UI/CrewManifestSection.cs
+++ b/Content.Client/CrewManifest/UI/CrewManifestSection.cs
@@ -4,24 +4,25 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Prototypes;
 using System.Numerics;
+using Content.Shared.Roles;
 
 namespace Content.Client.CrewManifest.UI;
 
 public sealed class CrewManifestSection : BoxContainer
 {
-    public CrewManifestSection(IPrototypeManager prototypeManager, SpriteSystem spriteSystem, string sectionTitle,
+    public CrewManifestSection(
+        IPrototypeManager prototypeManager,
+        SpriteSystem spriteSystem,
+        DepartmentPrototype section,
         List<CrewManifestEntry> entries)
     {
         Orientation = LayoutOrientation.Vertical;
         HorizontalExpand = true;
 
-        if (Loc.TryGetString($"department-{sectionTitle}", out var localizedDepart))
-            sectionTitle = localizedDepart;
-
         AddChild(new Label()
         {
             StyleClasses = { "LabelBig" },
-            Text = Loc.GetString(sectionTitle)
+            Text = Loc.GetString($"department-{section.ID}")
         });
 
         var gridContainer = new GridContainer()
@@ -55,8 +56,9 @@ public CrewManifestSection(IPrototypeManager prototypeManager, SpriteSystem spri
                 var icon = new TextureRect()
                 {
                     TextureScale = new Vector2(2, 2),
-                    Stretch = TextureRect.StretchMode.KeepCentered,
+                    VerticalAlignment = VAlignment.Center,
                     Texture = spriteSystem.Frame0(jobIcon.Icon),
+                    Margin = new Thickness(0, 0, 4, 0)
                 };
 
                 titleContainer.AddChild(icon);
diff --git a/Content.Client/Damage/DamageVisualsSystem.cs b/Content.Client/Damage/DamageVisualsSystem.cs
index 718d473182..e275f13f93 100644
--- a/Content.Client/Damage/DamageVisualsSystem.cs
+++ b/Content.Client/Damage/DamageVisualsSystem.cs
@@ -28,8 +28,6 @@ public sealed class DamageVisualsSystem : VisualizerSystem<DamageVisualsComponen
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
-    private const string SawmillName = "DamageVisuals";
-
     public override void Initialize()
     {
         base.Initialize();
@@ -54,14 +52,14 @@ private void VerifyVisualizerSetup(EntityUid entity, DamageVisualsComponent dama
     {
         if (damageVisComp.Thresholds.Count < 1)
         {
-            Logger.ErrorS(SawmillName, $"ThresholdsLookup were invalid for entity {entity}. ThresholdsLookup: {damageVisComp.Thresholds}");
+            Log.Error($"ThresholdsLookup were invalid for entity {entity}. ThresholdsLookup: {damageVisComp.Thresholds}");
             damageVisComp.Valid = false;
             return;
         }
 
         if (damageVisComp.Divisor == 0)
         {
-            Logger.ErrorS(SawmillName, $"Divisor for {entity} is set to zero.");
+            Log.Error($"Divisor for {entity} is set to zero.");
             damageVisComp.Valid = false;
             return;
         }
@@ -70,21 +68,21 @@ private void VerifyVisualizerSetup(EntityUid entity, DamageVisualsComponent dama
         {
             if (damageVisComp.DamageOverlayGroups == null && damageVisComp.DamageOverlay == null)
             {
-                Logger.ErrorS(SawmillName, $"Enabled overlay without defined damage overlay sprites on {entity}.");
+                Log.Error($"Enabled overlay without defined damage overlay sprites on {entity}.");
                 damageVisComp.Valid = false;
                 return;
             }
 
             if (damageVisComp.TrackAllDamage && damageVisComp.DamageOverlay == null)
             {
-                Logger.ErrorS(SawmillName, $"Enabled all damage tracking without a damage overlay sprite on {entity}.");
+                Log.Error($"Enabled all damage tracking without a damage overlay sprite on {entity}.");
                 damageVisComp.Valid = false;
                 return;
             }
 
             if (!damageVisComp.TrackAllDamage && damageVisComp.DamageOverlay != null)
             {
-                Logger.WarningS(SawmillName, $"Disabled all damage tracking with a damage overlay sprite on {entity}.");
+                Log.Warning($"Disabled all damage tracking with a damage overlay sprite on {entity}.");
                 damageVisComp.Valid = false;
                 return;
             }
@@ -92,7 +90,7 @@ private void VerifyVisualizerSetup(EntityUid entity, DamageVisualsComponent dama
 
             if (damageVisComp.TrackAllDamage && damageVisComp.DamageOverlayGroups != null)
             {
-                Logger.WarningS(SawmillName, $"Enabled all damage tracking with damage overlay groups on {entity}.");
+                Log.Warning($"Enabled all damage tracking with damage overlay groups on {entity}.");
                 damageVisComp.Valid = false;
                 return;
             }
@@ -101,21 +99,21 @@ private void VerifyVisualizerSetup(EntityUid entity, DamageVisualsComponent dama
         {
             if (damageVisComp.TargetLayers == null)
             {
-                Logger.ErrorS(SawmillName, $"Disabled overlay without target layers on {entity}.");
+                Log.Error($"Disabled overlay without target layers on {entity}.");
                 damageVisComp.Valid = false;
                 return;
             }
 
             if (damageVisComp.DamageOverlayGroups != null || damageVisComp.DamageOverlay != null)
             {
-                Logger.ErrorS(SawmillName, $"Disabled overlay with defined damage overlay sprites on {entity}.");
+                Log.Error($"Disabled overlay with defined damage overlay sprites on {entity}.");
                 damageVisComp.Valid = false;
                 return;
             }
 
             if (damageVisComp.DamageGroup == null)
             {
-                Logger.ErrorS(SawmillName, $"Disabled overlay without defined damage group on {entity}.");
+                Log.Error($"Disabled overlay without defined damage group on {entity}.");
                 damageVisComp.Valid = false;
                 return;
             }
@@ -123,12 +121,12 @@ private void VerifyVisualizerSetup(EntityUid entity, DamageVisualsComponent dama
 
         if (damageVisComp.DamageOverlayGroups != null && damageVisComp.DamageGroup != null)
         {
-            Logger.WarningS(SawmillName, $"Damage overlay sprites and damage group are both defined on {entity}.");
+            Log.Warning($"Damage overlay sprites and damage group are both defined on {entity}.");
         }
 
         if (damageVisComp.DamageOverlay != null && damageVisComp.DamageGroup != null)
         {
-            Logger.WarningS(SawmillName, $"Damage overlay sprites and damage group are both defined on {entity}.");
+            Log.Warning($"Damage overlay sprites and damage group are both defined on {entity}.");
         }
     }
 
@@ -144,7 +142,7 @@ private void InitializeVisualizer(EntityUid entity, DamageVisualsComponent damag
 
         if (damageVisComp.Thresholds[0] != 0)
         {
-            Logger.ErrorS(SawmillName, $"ThresholdsLookup were invalid for entity {entity}. ThresholdsLookup: {damageVisComp.Thresholds}");
+            Log.Error($"ThresholdsLookup were invalid for entity {entity}. ThresholdsLookup: {damageVisComp.Thresholds}");
             damageVisComp.Valid = false;
             return;
         }
@@ -163,7 +161,7 @@ private void InitializeVisualizer(EntityUid entity, DamageVisualsComponent damag
                 {
                     if (!damageContainer.SupportedGroups.Contains(damageType))
                     {
-                        Logger.ErrorS(SawmillName, $"Damage key {damageType} was invalid for entity {entity}.");
+                        Log.Error($"Damage key {damageType} was invalid for entity {entity}.");
                         damageVisComp.Valid = false;
                         return;
                     }
@@ -177,7 +175,7 @@ private void InitializeVisualizer(EntityUid entity, DamageVisualsComponent damag
             {
                 if (!damageContainer.SupportedGroups.Contains(damageVisComp.DamageGroup))
                 {
-                    Logger.ErrorS(SawmillName, $"Damage keys were invalid for entity {entity}.");
+                    Log.Error($"Damage keys were invalid for entity {entity}.");
                     damageVisComp.Valid = false;
                     return;
                 }
@@ -197,7 +195,7 @@ private void InitializeVisualizer(EntityUid entity, DamageVisualsComponent damag
                 {
                     if (!damagePrototypeIdList.Contains(damageType))
                     {
-                        Logger.ErrorS(SawmillName, $"Damage keys were invalid for entity {entity}.");
+                        Log.Error($"Damage keys were invalid for entity {entity}.");
                         damageVisComp.Valid = false;
                         return;
                     }
@@ -208,7 +206,7 @@ private void InitializeVisualizer(EntityUid entity, DamageVisualsComponent damag
             {
                 if (!damagePrototypeIdList.Contains(damageVisComp.DamageGroup))
                 {
-                    Logger.ErrorS(SawmillName, $"Damage keys were invalid for entity {entity}.");
+                    Log.Error($"Damage keys were invalid for entity {entity}.");
                     damageVisComp.Valid = false;
                     return;
                 }
@@ -232,7 +230,7 @@ private void InitializeVisualizer(EntityUid entity, DamageVisualsComponent damag
             {
                 if (!spriteComponent.LayerMapTryGet(key, out var index))
                 {
-                    Logger.WarningS(SawmillName, $"Layer at key {key} was invalid for entity {entity}.");
+                    Log.Warning($"Layer at key {key} was invalid for entity {entity}.");
                     continue;
                 }
 
@@ -244,7 +242,7 @@ private void InitializeVisualizer(EntityUid entity, DamageVisualsComponent damag
             // invalidate the visualizer without crashing.
             if (damageVisComp.TargetLayerMapKeys.Count == 0)
             {
-                Logger.ErrorS(SawmillName, $"Target layers were invalid for entity {entity}.");
+                Log.Error($"Target layers were invalid for entity {entity}.");
                 damageVisComp.Valid = false;
                 return;
             }
diff --git a/Content.Client/Decals/DecalSystem.cs b/Content.Client/Decals/DecalSystem.cs
index be442ab8a0..901ab270fb 100644
--- a/Content.Client/Decals/DecalSystem.cs
+++ b/Content.Client/Decals/DecalSystem.cs
@@ -50,16 +50,8 @@ public override void Shutdown()
         protected override void OnDecalRemoved(EntityUid gridId, uint decalId, DecalGridComponent component, Vector2i indices, DecalChunk chunk)
         {
             base.OnDecalRemoved(gridId, decalId, component, indices, chunk);
-
-            if (!component.DecalZIndexIndex.Remove(decalId, out var zIndex))
-                return;
-
-            if (!component.DecalRenderIndex.TryGetValue(zIndex, out var renderIndex))
-                return;
-
-            renderIndex.Remove(decalId);
-            if (renderIndex.Count == 0)
-                component.DecalRenderIndex.Remove(zIndex);
+            DebugTools.Assert(chunk.Decals.ContainsKey(decalId));
+            chunk.Decals.Remove(decalId);
         }
 
         private void OnHandleState(EntityUid gridUid, DecalGridComponent gridComp, ref ComponentHandleState args)
@@ -133,8 +125,6 @@ private void OnChunkUpdate(DecalChunkUpdateEvent ev)
         private void UpdateChunks(EntityUid gridId, DecalGridComponent gridComp, Dictionary<Vector2i, DecalChunk> updatedGridChunks)
         {
             var chunkCollection = gridComp.ChunkCollection.ChunkCollection;
-            var renderIndex = gridComp.DecalRenderIndex;
-            var zIndexIndex = gridComp.DecalZIndexIndex;
 
             // Update any existing data / remove decals we didn't receive data for.
             foreach (var (indices, newChunkData) in updatedGridChunks)
@@ -155,11 +145,6 @@ private void UpdateChunks(EntityUid gridId, DecalGridComponent gridComp, Diction
 
                 foreach (var (uid, decal) in newChunkData.Decals)
                 {
-                    if (zIndexIndex.TryGetValue(uid, out var zIndex))
-                        renderIndex[zIndex].Remove(uid);
-
-                    renderIndex.GetOrNew(decal.ZIndex)[uid] = decal;
-                    zIndexIndex[uid] = decal.ZIndex;
                     gridComp.DecalIndex[uid] = indices;
                 }
             }
diff --git a/Content.Client/Decals/Overlays/DecalOverlay.cs b/Content.Client/Decals/Overlays/DecalOverlay.cs
index 60b24c154b..d9904ae80b 100644
--- a/Content.Client/Decals/Overlays/DecalOverlay.cs
+++ b/Content.Client/Decals/Overlays/DecalOverlay.cs
@@ -3,6 +3,7 @@
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Enumerators;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Decals.Overlays
@@ -15,6 +16,8 @@ public sealed class DecalOverlay : GridOverlay
 
         private readonly Dictionary<string, (Texture Texture, bool SnapCardinals)> _cachedTextures = new(64);
 
+        private readonly List<(uint Id, Decal Decal)> _decals = new();
+
         public DecalOverlay(
             SpriteSystem sprites,
             IEntityManager entManager,
@@ -30,10 +33,10 @@ protected override void Draw(in OverlayDrawArgs args)
             if (args.MapId == MapId.Nullspace)
                 return;
 
-            var grid = Grid;
+            var owner = Grid.Owner;
 
-            if (!_entManager.TryGetComponent(grid, out DecalGridComponent? decalGrid) ||
-                !_entManager.TryGetComponent(grid, out TransformComponent? xform))
+            if (!_entManager.TryGetComponent(owner, out DecalGridComponent? decalGrid) ||
+                !_entManager.TryGetComponent(owner, out TransformComponent? xform))
             {
                 return;
             }
@@ -46,40 +49,68 @@ protected override void Draw(in OverlayDrawArgs args)
             var xformSystem = _entManager.System<TransformSystem>();
             var eyeAngle = args.Viewport.Eye?.Rotation ?? Angle.Zero;
 
-            var zIndexDictionary = decalGrid.DecalRenderIndex;
+            var gridAABB = xformSystem.GetInvWorldMatrix(xform).TransformBox(args.WorldBounds.Enlarged(1f));
+            var chunkEnumerator = new ChunkIndicesEnumerator(gridAABB, SharedDecalSystem.ChunkSize);
+            _decals.Clear();
+
+            while (chunkEnumerator.MoveNext(out var index))
+            {
+                if (!decalGrid.ChunkCollection.ChunkCollection.TryGetValue(index.Value, out var chunk))
+                    continue;
+
+                foreach (var (id, decal) in chunk.Decals)
+                {
+                    if (!gridAABB.Contains(decal.Coordinates))
+                        continue;
+
+                    _decals.Add((id, decal));
+                }
+            }
 
-            if (zIndexDictionary.Count == 0)
+            if (_decals.Count == 0)
                 return;
 
-            var (_, worldRot, worldMatrix) = xformSystem.GetWorldPositionRotationMatrix(xform);
+            _decals.Sort((x, y) =>
+            {
+                var zComp = x.Decal.ZIndex.CompareTo(y.Decal.ZIndex);
 
+                if (zComp != 0)
+                    return zComp;
+
+                return x.Id.CompareTo(y.Id);
+            });
+
+            var (_, worldRot, worldMatrix) = xformSystem.GetWorldPositionRotationMatrix(xform);
             handle.SetTransform(worldMatrix);
 
-            foreach (var decals in zIndexDictionary.Values)
+            foreach (var (_, decal) in _decals)
             {
-                foreach (var decal in decals.Values)
+                if (!_cachedTextures.TryGetValue(decal.Id, out var cache))
                 {
-                    if (!_cachedTextures.TryGetValue(decal.Id, out var cache) && _prototypeManager.TryIndex<DecalPrototype>(decal.Id, out var decalProto))
+                    // Nothing to cache someone messed up
+                    if (!_prototypeManager.TryIndex<DecalPrototype>(decal.Id, out var decalProto))
                     {
-                        cache = (_sprites.Frame0(decalProto.Sprite), decalProto.SnapCardinals);
-                        _cachedTextures[decal.Id] = cache;
+                        continue;
                     }
 
-                    var cardinal = Angle.Zero;
-
-                    if (cache.SnapCardinals)
-                    {
-                        var worldAngle = eyeAngle + worldRot;
-                        cardinal = worldAngle.GetCardinalDir().ToAngle();
-                    }
+                    cache = (_sprites.Frame0(decalProto.Sprite), decalProto.SnapCardinals);
+                    _cachedTextures[decal.Id] = cache;
+                }
 
-                    var angle = decal.Angle - cardinal;
+                var cardinal = Angle.Zero;
 
-                    if (angle.Equals(Angle.Zero))
-                        handle.DrawTexture(cache.Texture, decal.Coordinates, decal.Color);
-                    else
-                        handle.DrawTexture(cache.Texture, decal.Coordinates, angle, decal.Color);
+                if (cache.SnapCardinals)
+                {
+                    var worldAngle = eyeAngle + worldRot;
+                    cardinal = worldAngle.GetCardinalDir().ToAngle();
                 }
+
+                var angle = decal.Angle - cardinal;
+
+                if (angle.Equals(Angle.Zero))
+                    handle.DrawTexture(cache.Texture, decal.Coordinates, decal.Color);
+                else
+                    handle.DrawTexture(cache.Texture, decal.Coordinates, angle, decal.Color);
             }
 
             handle.SetTransform(Matrix3.Identity);
diff --git a/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml b/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml
new file mode 100644
index 0000000000..f1dae68077
--- /dev/null
+++ b/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml
@@ -0,0 +1,23 @@
+<tabs:DeltaTab xmlns="https://spacestation14.io"
+                  xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                  xmlns:tabs="clr-namespace:Content.Client.DeltaV.Options.UI.Tabs"
+                  xmlns:xNamespace="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:s="clr-namespace:Content.Client.Stylesheets">
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Vertical" Margin="8 8 8 8" VerticalExpand="True">
+            <Label Text="{Loc 'ui-options-general-forknotice'}"
+                   FontColorOverride="{xNamespace:Static s:StyleNano.ConcerningOrangeFore}"
+                   StyleClasses="LabelKeyText"/>
+            <Label Text="{Loc 'ui-options-general-accessibility'}"
+                   FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
+                   StyleClasses="LabelKeyText"/>
+            <CheckBox Name="DisableFiltersCheckBox" Text="{Loc 'ui-options-no-filters'}" />
+        </BoxContainer>
+        <controls:StripeBack HasBottomEdge="False" HasMargins="False">
+            <Button Name="ApplyButton"
+                    Text="{Loc 'ui-options-apply'}"
+                    TextAlign="Center"
+                    HorizontalAlignment="Right" />
+        </controls:StripeBack>
+    </BoxContainer>
+</tabs:DeltaTab>
diff --git a/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml.cs b/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml.cs
new file mode 100644
index 0000000000..892ddfc15b
--- /dev/null
+++ b/Content.Client/DeltaV/Options/UI/Tabs/DeltaTab.xaml.cs
@@ -0,0 +1,46 @@
+using Content.Shared.DeltaV.CCVars;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Configuration;
+
+namespace Content.Client.DeltaV.Options.UI.Tabs;
+
+[GenerateTypedNameReferences]
+public sealed partial class DeltaTab : Control
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+
+    public DeltaTab()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        DisableFiltersCheckBox.OnToggled += OnCheckBoxToggled;
+        DisableFiltersCheckBox.Pressed = _cfg.GetCVar(DCCVars.NoVisionFilters);
+
+        ApplyButton.OnPressed += OnApplyButtonPressed;
+        UpdateApplyButton();
+    }
+
+    private void OnCheckBoxToggled(BaseButton.ButtonToggledEventArgs args)
+    {
+        UpdateApplyButton();
+    }
+
+    private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
+    {
+        _cfg.SetCVar(DCCVars.NoVisionFilters, DisableFiltersCheckBox.Pressed);
+
+        _cfg.SaveToFile();
+        UpdateApplyButton();
+    }
+
+    private void UpdateApplyButton()
+    {
+        var isNoVisionFiltersSame = DisableFiltersCheckBox.Pressed == _cfg.GetCVar(DCCVars.NoVisionFilters);
+
+        ApplyButton.Disabled = isNoVisionFiltersSame;
+    }
+}
diff --git a/Content.Client/DeltaV/Overlays/UltraVisionSystem.cs b/Content.Client/DeltaV/Overlays/UltraVisionSystem.cs
index 00a0f36242..b89ffd1526 100644
--- a/Content.Client/DeltaV/Overlays/UltraVisionSystem.cs
+++ b/Content.Client/DeltaV/Overlays/UltraVisionSystem.cs
@@ -1,11 +1,14 @@
 using Content.Shared.Abilities;
+using Content.Shared.DeltaV.CCVars;
 using Robust.Client.Graphics;
+using Robust.Shared.Configuration;
 
 namespace Content.Client.DeltaV.Overlays;
 
 public sealed partial class UltraVisionSystem : EntitySystem
 {
     [Dependency] private readonly IOverlayManager _overlayMan = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
 
     private UltraVisionOverlay _overlay = default!;
 
@@ -16,16 +19,27 @@ public override void Initialize()
         SubscribeLocalEvent<UltraVisionComponent, ComponentInit>(OnUltraVisionInit);
         SubscribeLocalEvent<UltraVisionComponent, ComponentShutdown>(OnUltraVisionShutdown);
 
+        Subs.CVar(_cfg, DCCVars.NoVisionFilters, OnNoVisionFiltersChanged);
+
         _overlay = new();
     }
 
     private void OnUltraVisionInit(EntityUid uid, UltraVisionComponent component, ComponentInit args)
     {
-        _overlayMan.AddOverlay(_overlay);
+        if (!_cfg.GetCVar(DCCVars.NoVisionFilters))
+            _overlayMan.AddOverlay(_overlay);
     }
 
     private void OnUltraVisionShutdown(EntityUid uid, UltraVisionComponent component, ComponentShutdown args)
     {
         _overlayMan.RemoveOverlay(_overlay);
     }
+
+    private void OnNoVisionFiltersChanged(bool enabled)
+    {
+        if (enabled)
+            _overlayMan.RemoveOverlay(_overlay);
+        else
+            _overlayMan.AddOverlay(_overlay);
+    }
 }
diff --git a/Content.Client/DeviceLinking/DeviceLinkSystem.cs b/Content.Client/DeviceLinking/DeviceLinkSystem.cs
new file mode 100644
index 0000000000..3356e346f6
--- /dev/null
+++ b/Content.Client/DeviceLinking/DeviceLinkSystem.cs
@@ -0,0 +1,8 @@
+using Content.Shared.DeviceLinking;
+
+namespace Content.Client.DeviceLinking;
+
+public sealed class DeviceLinkSystem : SharedDeviceLinkSystem
+{
+
+}
diff --git a/Content.Client/DoAfter/DoAfterSystem.cs b/Content.Client/DoAfter/DoAfterSystem.cs
index 38e1a714ac..b00904a1fe 100644
--- a/Content.Client/DoAfter/DoAfterSystem.cs
+++ b/Content.Client/DoAfter/DoAfterSystem.cs
@@ -38,7 +38,7 @@ public override void Update(float frameTime)
         // ones that depend on the target not moving, because the cancellation of those do afters should be readily
         // predictable by clients.
 
-        var playerEntity = _player.LocalPlayer?.ControlledEntity;
+        var playerEntity = _player.LocalEntity;
 
         if (!TryComp(playerEntity, out ActiveDoAfterComponent? active))
             return;
@@ -69,7 +69,7 @@ public bool TryFindActiveDoAfter<T>(
         out float progress)
         where T : DoAfterEvent
     {
-        var playerEntity = _player.LocalPlayer?.ControlledEntity;
+        var playerEntity = _player.LocalEntity;
 
         doAfter = null;
         @event = null;
diff --git a/Content.Client/Doors/AirlockSystem.cs b/Content.Client/Doors/AirlockSystem.cs
index 4837adf460..58c8730643 100644
--- a/Content.Client/Doors/AirlockSystem.cs
+++ b/Content.Client/Doors/AirlockSystem.cs
@@ -1,7 +1,6 @@
 using Content.Client.Wires.Visualizers;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
-using Content.Shared.Prying.Components;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 
@@ -16,13 +15,6 @@ public override void Initialize()
         base.Initialize();
         SubscribeLocalEvent<AirlockComponent, ComponentStartup>(OnComponentStartup);
         SubscribeLocalEvent<AirlockComponent, AppearanceChangeEvent>(OnAppearanceChange);
-        SubscribeLocalEvent<AirlockComponent, BeforePryEvent>(OnAirlockPryAttempt);
-    }
-
-    private void OnAirlockPryAttempt(EntityUid uid, AirlockComponent component, ref BeforePryEvent args)
-    {
-        // TODO: Temporary until airlocks predicted.
-        args.Cancelled = true;
     }
 
     private void OnComponentStartup(EntityUid uid, AirlockComponent comp, ComponentStartup args)
@@ -104,7 +96,7 @@ private void OnAppearanceChange(EntityUid uid, AirlockComponent comp, ref Appear
                 ||  state == DoorState.Denying
                 || (state == DoorState.Open && comp.OpenUnlitVisible)
                 || (_appearanceSystem.TryGetData<bool>(uid, DoorVisuals.ClosedLights, out var closedLights, args.Component) && closedLights))
-                    && !boltedVisible && !emergencyLightsVisible; ;
+                    && !boltedVisible && !emergencyLightsVisible;
         }
 
         args.Sprite.LayerSetVisible(DoorVisualLayers.BaseUnlit, unlitVisible);
@@ -120,5 +112,17 @@ private void OnAppearanceChange(EntityUid uid, AirlockComponent comp, ref Appear
                 && !boltedVisible
             );
         }
+
+        switch (state)
+        {
+            case DoorState.Open:
+                args.Sprite.LayerSetState(DoorVisualLayers.BaseUnlit, comp.ClosingSpriteState);
+                args.Sprite.LayerSetAnimationTime(DoorVisualLayers.BaseUnlit, 0);
+                break;
+            case DoorState.Closed:
+                args.Sprite.LayerSetState(DoorVisualLayers.BaseUnlit, comp.OpeningSpriteState);
+                args.Sprite.LayerSetAnimationTime(DoorVisualLayers.BaseUnlit, 0);
+                break;
+        }
     }
 }
diff --git a/Content.Client/Doors/DoorBoltSystem.cs b/Content.Client/Doors/DoorBoltSystem.cs
deleted file mode 100644
index 58144cd6e0..0000000000
--- a/Content.Client/Doors/DoorBoltSystem.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Content.Client.Wires.Visualizers;
-using Content.Shared.Doors.Components;
-using Content.Shared.Doors.Systems;
-using Robust.Client.Animations;
-using Robust.Client.GameObjects;
-
-namespace Content.Client.Doors;
-
-public sealed class DoorBoltSystem : SharedDoorBoltSystem
-{
-    // Instantiate sub-class on client for prediction.
-}
diff --git a/Content.Client/Doors/DoorSystem.cs b/Content.Client/Doors/DoorSystem.cs
index 80ce47e0c2..473ae97059 100644
--- a/Content.Client/Doors/DoorSystem.cs
+++ b/Content.Client/Doors/DoorSystem.cs
@@ -3,8 +3,6 @@
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Client.ResourceManagement;
-using Robust.Shared.Audio;
-using Robust.Shared.Player;
 using Robust.Shared.Serialization.TypeSerializers.Implementations;
 using Robust.Shared.Timing;
 
@@ -73,7 +71,7 @@ protected override void OnComponentInit(Entity<DoorComponent> ent, ref Component
 
     private void OnAppearanceChange(EntityUid uid, DoorComponent comp, ref AppearanceChangeEvent args)
     {
-        if (args.Sprite == null || !_gameTiming.IsFirstTimePredicted)
+        if (args.Sprite == null)
             return;
 
         if(!AppearanceSystem.TryGetData<DoorState>(uid, DoorVisuals.State, out var state, args.Component))
@@ -83,9 +81,9 @@ private void OnAppearanceChange(EntityUid uid, DoorComponent comp, ref Appearanc
         {
             if (!_resourceCache.TryGetResource<RSIResource>(SpriteSpecifierSerializer.TextureRoot / baseRsi, out var res))
             {
-                Logger.Error("Unable to load RSI '{0}'. Trace:\n{1}", baseRsi, Environment.StackTrace);
+                Log.Error("Unable to load RSI '{0}'. Trace:\n{1}", baseRsi, Environment.StackTrace);
             }
-            foreach (ISpriteLayer layer in args.Sprite.AllLayers)
+            foreach (var layer in args.Sprite.AllLayers)
             {
                 layer.Rsi = res?.RSI;
             }
@@ -113,31 +111,24 @@ private void OnAppearanceChange(EntityUid uid, DoorComponent comp, ref Appearanc
                 break;
             case DoorState.Opening:
                 if (animPlayer != null && comp.OpeningAnimationTime != 0.0)
-                    _animationSystem.Play(uid, animPlayer, (Animation)comp.OpeningAnimation, DoorComponent.AnimationKey);
+                    _animationSystem.Play((uid, animPlayer), (Animation)comp.OpeningAnimation, DoorComponent.AnimationKey);
                 break;
             case DoorState.Closing:
                 if (animPlayer != null && comp.ClosingAnimationTime != 0.0 && comp.CurrentlyCrushing.Count == 0)
-                    _animationSystem.Play(uid, animPlayer, (Animation)comp.ClosingAnimation, DoorComponent.AnimationKey);
+                    _animationSystem.Play((uid, animPlayer), (Animation)comp.ClosingAnimation, DoorComponent.AnimationKey);
                 break;
             case DoorState.Denying:
-                if (animPlayer != null && comp.DenyingAnimation != default)
-                    _animationSystem.Play(uid, animPlayer, (Animation)comp.DenyingAnimation, DoorComponent.AnimationKey);
+                if (animPlayer != null)
+                    _animationSystem.Play((uid, animPlayer), (Animation)comp.DenyingAnimation, DoorComponent.AnimationKey);
                 break;
             case DoorState.Welded:
                 break;
             case DoorState.Emagging:
-                if (animPlayer != null && comp.EmaggingAnimation != default)
-                    _animationSystem.Play(uid, animPlayer, (Animation)comp.EmaggingAnimation, DoorComponent.AnimationKey);
+                if (animPlayer != null)
+                    _animationSystem.Play((uid, animPlayer), (Animation)comp.EmaggingAnimation, DoorComponent.AnimationKey);
                 break;
             default:
                 throw new ArgumentOutOfRangeException($"Invalid door visual state {state}");
         }
     }
-
-    // TODO AUDIO PREDICT see comments in server-side PlaySound()
-    protected override void PlaySound(EntityUid uid, SoundSpecifier soundSpecifier, AudioParams audioParams, EntityUid? predictingPlayer, bool predicted)
-    {
-        if (GameTiming.InPrediction && GameTiming.IsFirstTimePredicted)
-            Audio.PlayEntity(soundSpecifier, Filter.Local(), uid, false, audioParams);
-    }
 }
diff --git a/Content.Client/Doors/FirelockSystem.cs b/Content.Client/Doors/FirelockSystem.cs
index d4331fd15d..cfd84a4713 100644
--- a/Content.Client/Doors/FirelockSystem.cs
+++ b/Content.Client/Doors/FirelockSystem.cs
@@ -5,7 +5,7 @@ namespace Content.Client.Doors;
 
 public sealed class FirelockSystem : EntitySystem
 {
-    [Dependency] protected readonly SharedAppearanceSystem _appearanceSystem = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Client/Drugs/DrugOverlaySystem.cs b/Content.Client/Drugs/DrugOverlaySystem.cs
index 3c42033be6..9bfa4fdf82 100644
--- a/Content.Client/Drugs/DrugOverlaySystem.cs
+++ b/Content.Client/Drugs/DrugOverlaySystem.cs
@@ -43,13 +43,13 @@ private void OnPlayerDetached(EntityUid uid, SeeingRainbowsComponent component,
 
     private void OnInit(EntityUid uid, SeeingRainbowsComponent component, ComponentInit args)
     {
-        if (_player.LocalPlayer?.ControlledEntity == uid)
+        if (_player.LocalEntity == uid)
             _overlayMan.AddOverlay(_overlay);
     }
 
     private void OnShutdown(EntityUid uid, SeeingRainbowsComponent component, ComponentShutdown args)
     {
-        if (_player.LocalPlayer?.ControlledEntity == uid)
+        if (_player.LocalEntity == uid)
         {
             _overlay.Intoxication = 0;
             _overlayMan.RemoveOverlay(_overlay);
diff --git a/Content.Client/Drugs/RainbowOverlay.cs b/Content.Client/Drugs/RainbowOverlay.cs
index 8372f7ea60..6ef5d0f65c 100644
--- a/Content.Client/Drugs/RainbowOverlay.cs
+++ b/Content.Client/Drugs/RainbowOverlay.cs
@@ -34,7 +34,7 @@ public RainbowOverlay()
 
     protected override void FrameUpdate(FrameEventArgs args)
     {
-        var playerEntity = _playerManager.LocalPlayer?.ControlledEntity;
+        var playerEntity = _playerManager.LocalEntity;
 
         if (playerEntity == null)
             return;
@@ -53,7 +53,7 @@ protected override void FrameUpdate(FrameEventArgs args)
 
     protected override bool BeforeDraw(in OverlayDrawArgs args)
     {
-        if (!_entityManager.TryGetComponent(_playerManager.LocalPlayer?.ControlledEntity, out EyeComponent? eyeComp))
+        if (!_entityManager.TryGetComponent(_playerManager.LocalEntity, out EyeComponent? eyeComp))
             return false;
 
         if (args.Viewport.Eye != eyeComp.Eye)
diff --git a/Content.Client/Drunk/DrunkOverlay.cs b/Content.Client/Drunk/DrunkOverlay.cs
index 96a3beb702..e01719e62c 100644
--- a/Content.Client/Drunk/DrunkOverlay.cs
+++ b/Content.Client/Drunk/DrunkOverlay.cs
@@ -36,7 +36,7 @@ public DrunkOverlay()
     protected override void FrameUpdate(FrameEventArgs args)
     {
 
-        var playerEntity = _playerManager.LocalPlayer?.ControlledEntity;
+        var playerEntity = _playerManager.LocalEntity;
 
         if (playerEntity == null)
             return;
@@ -58,7 +58,7 @@ protected override void FrameUpdate(FrameEventArgs args)
 
     protected override bool BeforeDraw(in OverlayDrawArgs args)
     {
-        if (!_entityManager.TryGetComponent(_playerManager.LocalPlayer?.ControlledEntity, out EyeComponent? eyeComp))
+        if (!_entityManager.TryGetComponent(_playerManager.LocalEntity, out EyeComponent? eyeComp))
             return false;
 
         if (args.Viewport.Eye != eyeComp.Eye)
diff --git a/Content.Client/Drunk/DrunkSystem.cs b/Content.Client/Drunk/DrunkSystem.cs
index dcd2758623..d9c6bb192f 100644
--- a/Content.Client/Drunk/DrunkSystem.cs
+++ b/Content.Client/Drunk/DrunkSystem.cs
@@ -38,13 +38,13 @@ private void OnPlayerDetached(EntityUid uid, DrunkComponent component, LocalPlay
 
     private void OnDrunkInit(EntityUid uid, DrunkComponent component, ComponentInit args)
     {
-        if (_player.LocalPlayer?.ControlledEntity == uid)
+        if (_player.LocalEntity == uid)
             _overlayMan.AddOverlay(_overlay);
     }
 
     private void OnDrunkShutdown(EntityUid uid, DrunkComponent component, ComponentShutdown args)
     {
-        if (_player.LocalPlayer?.ControlledEntity == uid)
+        if (_player.LocalEntity == uid)
         {
             _overlay.CurrentBoozePower = 0;
             _overlayMan.RemoveOverlay(_overlay);
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index 08ee77dad2..dd8f6032f6 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -21,7 +21,7 @@
 using Content.Client.Stylesheets;
 using Content.Client.Viewport;
 using Content.Client.Voting;
-using Content.Shared.Ame;
+using Content.Shared.Ame.Components;
 using Content.Shared.Gravity;
 using Content.Shared.Localizations;
 using Robust.Client;
diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs
index 32ba78085a..1be472b06d 100644
--- a/Content.Client/Examine/ExamineSystem.cs
+++ b/Content.Client/Examine/ExamineSystem.cs
@@ -33,7 +33,6 @@ public sealed class ExamineSystem : ExamineSystemShared
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IEyeManager _eyeManager = default!;
         [Dependency] private readonly VerbSystem _verbSystem = default!;
-        [Dependency] private readonly IBaseClient _client = default!;
 
         public const string StyleClassEntityTooltip = "entity-tooltip";
 
@@ -66,12 +65,10 @@ private void OnExaminedItemDropped(EntityUid item, ItemComponent comp, DroppedEv
         {
             if (!args.User.Valid)
                 return;
-            if (_playerManager.LocalPlayer == null)
-                return;
             if (_examineTooltipOpen == null)
                 return;
 
-            if (item == _examinedEntity && args.User == _playerManager.LocalPlayer.ControlledEntity)
+            if (item == _examinedEntity && args.User == _playerManager.LocalEntity)
                 CloseTooltip();
         }
 
@@ -118,7 +115,7 @@ private bool HandleExamine(in PointerInputCmdHandler.PointerInputCmdArgs args)
                 return false;
             }
 
-            _playerEntity = _playerManager.LocalPlayer?.ControlledEntity ?? default;
+            _playerEntity = _playerManager.LocalEntity ?? default;
 
             if (_playerEntity == default || !CanExamine(_playerEntity, entity))
             {
@@ -149,7 +146,7 @@ private void AddExamineVerb(GetVerbsEvent<ExamineVerb> args)
 
         private void OnExamineInfoResponse(ExamineSystemMessages.ExamineInfoResponseMessage ev)
         {
-            var player = _playerManager.LocalPlayer?.ControlledEntity;
+            var player = _playerManager.LocalEntity;
             if (player == null)
                 return;
 
@@ -356,7 +353,7 @@ public void VerbButtonPressed(BaseButton.ButtonEventArgs obj)
 
         public void DoExamine(EntityUid entity, bool centeredOnCursor = true, EntityUid? userOverride = null)
         {
-            var playerEnt = userOverride ?? _playerManager.LocalPlayer?.ControlledEntity;
+            var playerEnt = userOverride ?? _playerManager.LocalEntity;
             if (playerEnt == null)
                 return;
 
diff --git a/Content.Client/Explosion/ExplosionOverlay.cs b/Content.Client/Explosion/ExplosionOverlay.cs
index 94e8ca5982..2d8c15f1b9 100644
--- a/Content.Client/Explosion/ExplosionOverlay.cs
+++ b/Content.Client/Explosion/ExplosionOverlay.cs
@@ -14,7 +14,6 @@ namespace Content.Client.Explosion;
 public sealed class ExplosionOverlay : Overlay
 {
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IEntityManager _entMan = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
 
diff --git a/Content.Client/Eye/Blinding/BlindingSystem.cs b/Content.Client/Eye/Blinding/BlindingSystem.cs
index 2bff5db4d6..99d215b758 100644
--- a/Content.Client/Eye/Blinding/BlindingSystem.cs
+++ b/Content.Client/Eye/Blinding/BlindingSystem.cs
@@ -43,13 +43,13 @@ private void OnPlayerDetached(EntityUid uid, BlindableComponent component, Local
 
     private void OnBlindInit(EntityUid uid, BlindableComponent component, ComponentInit args)
     {
-        if (_player.LocalPlayer?.ControlledEntity == uid)
+        if (_player.LocalEntity == uid)
             _overlayMan.AddOverlay(_overlay);
     }
 
     private void OnBlindShutdown(EntityUid uid, BlindableComponent component, ComponentShutdown args)
     {
-        if (_player.LocalPlayer?.ControlledEntity == uid)
+        if (_player.LocalEntity == uid)
         {
             _overlayMan.RemoveOverlay(_overlay);
         }
diff --git a/Content.Client/Eye/Blinding/BlurryVisionSystem.cs b/Content.Client/Eye/Blinding/BlurryVisionSystem.cs
index 91090fc460..ba687ead4e 100644
--- a/Content.Client/Eye/Blinding/BlurryVisionSystem.cs
+++ b/Content.Client/Eye/Blinding/BlurryVisionSystem.cs
@@ -36,13 +36,13 @@ private void OnPlayerDetached(EntityUid uid, BlurryVisionComponent component, Lo
 
     private void OnBlurryInit(EntityUid uid, BlurryVisionComponent component, ComponentInit args)
     {
-        if (_player.LocalPlayer?.ControlledEntity == uid)
+        if (_player.LocalEntity == uid)
             _overlayMan.AddOverlay(_overlay);
     }
 
     private void OnBlurryShutdown(EntityUid uid, BlurryVisionComponent component, ComponentShutdown args)
     {
-        if (_player.LocalPlayer?.ControlledEntity == uid)
+        if (_player.LocalEntity == uid)
         {
             _overlayMan.RemoveOverlay(_overlay);
         }
diff --git a/Content.Client/Eye/EyeLerpingSystem.cs b/Content.Client/Eye/EyeLerpingSystem.cs
index 8889b97100..78e1b851fc 100644
--- a/Content.Client/Eye/EyeLerpingSystem.cs
+++ b/Content.Client/Eye/EyeLerpingSystem.cs
@@ -41,7 +41,7 @@ public override void Initialize()
 
     private void OnEyeStartup(EntityUid uid, EyeComponent component, ComponentStartup args)
     {
-        if (_playerManager.LocalPlayer?.ControlledEntity == uid)
+        if (_playerManager.LocalEntity == uid)
             AddEye(uid, component, true);
     }
 
@@ -77,7 +77,7 @@ public void RemoveEye(EntityUid uid)
             return;
 
         // If this is the currently controlled entity, we keep the component.
-        if (_playerManager.LocalPlayer?.ControlledEntity == uid)
+        if (_playerManager.LocalEntity == uid)
             lerp.ManuallyAdded = false;
         else
             RemComp(uid, lerp);
diff --git a/Content.Client/Fax/UI/FaxBoundUi.cs b/Content.Client/Fax/UI/FaxBoundUi.cs
index ef6661b3ef..9b57595d7b 100644
--- a/Content.Client/Fax/UI/FaxBoundUi.cs
+++ b/Content.Client/Fax/UI/FaxBoundUi.cs
@@ -1,15 +1,22 @@
+using System.IO;
+using System.Threading.Tasks;
 using Content.Shared.Fax;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Fax.UI;
 
 [UsedImplicitly]
 public sealed class FaxBoundUi : BoundUserInterface
 {
+    [Dependency] private readonly IFileDialogManager _fileDialogManager = default!;
+
     [ViewVariables]
     private FaxWindow? _window;
 
+    private bool _dialogIsOpen = false;
+
     public FaxBoundUi(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
     }
@@ -22,12 +29,33 @@ protected override void Open()
         _window.OpenCentered();
 
         _window.OnClose += Close;
+        _window.FileButtonPressed += OnFileButtonPressed;
         _window.CopyButtonPressed += OnCopyButtonPressed;
         _window.SendButtonPressed += OnSendButtonPressed;
         _window.RefreshButtonPressed += OnRefreshButtonPressed;
         _window.PeerSelected += OnPeerSelected;
     }
 
+    private async void OnFileButtonPressed()
+    {
+        if (_dialogIsOpen)
+            return;
+            
+        _dialogIsOpen = true;
+        var filters = new FileDialogFilters(new FileDialogFilters.Group("txt"));
+        await using var file = await _fileDialogManager.OpenFile(filters);
+        _dialogIsOpen = false;
+
+        if (_window == null || _window.Disposed || file == null)
+        {
+            return;
+        }
+
+        using var reader = new StreamReader(file);
+        var content = await reader.ReadToEndAsync();
+        SendMessage(new FaxFileMessage(content[..Math.Min(content.Length, FaxFileMessageValidation.MaxContentSize)], _window.OfficePaper));
+    }
+
     private void OnSendButtonPressed()
     {
         SendMessage(new FaxSendMessage());
diff --git a/Content.Client/Fax/UI/FaxWindow.xaml b/Content.Client/Fax/UI/FaxWindow.xaml
index 1e6ef23376..ce22b0e412 100644
--- a/Content.Client/Fax/UI/FaxWindow.xaml
+++ b/Content.Client/Fax/UI/FaxWindow.xaml
@@ -19,6 +19,14 @@
             <OptionButton Name="PeerSelector" HorizontalExpand="True" />
         </BoxContainer>
         <Control HorizontalExpand="True" MinHeight="20" />
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+            <Button Name="FileButton"
+                    Text="{Loc 'fax-machine-ui-file-button'}"
+                    HorizontalExpand="False"/>
+            <Button Name="PaperButton"
+                    Text="{Loc 'fax-machine-ui-paper-button-normal'}"
+                    HorizontalExpand="False"/>
+        </BoxContainer>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <Button Name="CopyButton"
                     Text="{Loc 'fax-machine-ui-copy-button'}"
diff --git a/Content.Client/Fax/UI/FaxWindow.xaml.cs b/Content.Client/Fax/UI/FaxWindow.xaml.cs
index ecc3f4778f..b809af7f4a 100644
--- a/Content.Client/Fax/UI/FaxWindow.xaml.cs
+++ b/Content.Client/Fax/UI/FaxWindow.xaml.cs
@@ -3,21 +3,30 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Fax.UI;
 
 [GenerateTypedNameReferences]
 public sealed partial class FaxWindow : DefaultWindow
 {
+    public event Action? FileButtonPressed;
+    public event Action? PaperButtonPressed;
     public event Action? CopyButtonPressed;
     public event Action? SendButtonPressed;
     public event Action? RefreshButtonPressed;
     public event Action<string>? PeerSelected;
 
+    public bool OfficePaper = false;
+
     public FaxWindow()
     {
         RobustXamlLoader.Load(this);
 
+        PaperButtonPressed += OnPaperButtonPressed;
+
+        FileButton.OnPressed += _ => FileButtonPressed?.Invoke(); 
+        PaperButton.OnPressed += _ => PaperButtonPressed?.Invoke(); 
         CopyButton.OnPressed += _ => CopyButtonPressed?.Invoke();
         SendButton.OnPressed += _ => SendButtonPressed?.Invoke();
         RefreshButton.OnPressed += _ => RefreshButtonPressed?.Invoke();
@@ -80,4 +89,14 @@ private int AddPeerSelect(string name, string address)
         PeerSelector.SetItemMetadata(PeerSelector.ItemCount - 1, address);
         return PeerSelector.ItemCount - 1;
     }
+
+    private void OnPaperButtonPressed()
+    {
+        OfficePaper = !OfficePaper;
+
+        if(OfficePaper)
+            PaperButton.Text = Loc.GetString("fax-machine-ui-paper-button-office");
+        else
+            PaperButton.Text = Loc.GetString("fax-machine-ui-paper-button-normal");
+    }
 }
diff --git a/Content.Client/Flash/FlashOverlay.cs b/Content.Client/Flash/FlashOverlay.cs
index 433ee95e1c..fe9c888227 100644
--- a/Content.Client/Flash/FlashOverlay.cs
+++ b/Content.Client/Flash/FlashOverlay.cs
@@ -51,7 +51,7 @@ public void ReceiveFlash(double duration)
 
         protected override void Draw(in OverlayDrawArgs args)
         {
-            if (!_entityManager.TryGetComponent(_playerManager.LocalPlayer?.ControlledEntity, out EyeComponent? eyeComp))
+            if (!_entityManager.TryGetComponent(_playerManager.LocalEntity, out EyeComponent? eyeComp))
                 return;
 
             if (args.Viewport.Eye != eyeComp.Eye)
diff --git a/Content.Client/Flash/FlashSystem.cs b/Content.Client/Flash/FlashSystem.cs
index 3393662fa4..ad8f8b0b82 100644
--- a/Content.Client/Flash/FlashSystem.cs
+++ b/Content.Client/Flash/FlashSystem.cs
@@ -25,7 +25,7 @@ private void OnFlashableHandleState(EntityUid uid, FlashableComponent component,
                 return;
 
             // Yes, this code is awful. I'm just porting it to an entity system so don't blame me.
-            if (_playerManager.LocalPlayer != null && _playerManager.LocalPlayer.Session.AttachedEntity != uid)
+            if (_playerManager.LocalEntity != uid)
             {
                 return;
             }
diff --git a/Content.Client/Fluids/PuddleOverlay.cs b/Content.Client/Fluids/PuddleOverlay.cs
index 8c8b13a1ef..ac6661cfdd 100644
--- a/Content.Client/Fluids/PuddleOverlay.cs
+++ b/Content.Client/Fluids/PuddleOverlay.cs
@@ -9,7 +9,6 @@ namespace Content.Client.Fluids;
 
 public sealed class PuddleOverlay : Overlay
 {
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IEyeManager _eyeManager = default!;
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
diff --git a/Content.Client/Forensics/ForensicScannerMenu.xaml b/Content.Client/Forensics/ForensicScannerMenu.xaml
index fbfcb06f15..b508fa7433 100644
--- a/Content.Client/Forensics/ForensicScannerMenu.xaml
+++ b/Content.Client/Forensics/ForensicScannerMenu.xaml
@@ -18,7 +18,7 @@
                 Text="{Loc 'forensic-scanner-interface-clear'}" />
         </BoxContainer>
         <Label
-            Name="Name"
+            Name="NameLabel"
             Align="Center" />
         <Label
             Name="Diagnostics"
diff --git a/Content.Client/Forensics/ForensicScannerMenu.xaml.cs b/Content.Client/Forensics/ForensicScannerMenu.xaml.cs
index 8b6152c861..5f7f8e0056 100644
--- a/Content.Client/Forensics/ForensicScannerMenu.xaml.cs
+++ b/Content.Client/Forensics/ForensicScannerMenu.xaml.cs
@@ -29,7 +29,7 @@ public void UpdateState(ForensicScannerBoundUserInterfaceState msg)
             {
                 Print.Disabled = true;
                 Clear.Disabled = true;
-                Name.Text = string.Empty;
+                NameLabel.Text = string.Empty;
                 Diagnostics.Text = string.Empty;
                 return;
             }
@@ -37,7 +37,7 @@ public void UpdateState(ForensicScannerBoundUserInterfaceState msg)
             Print.Disabled = (msg.PrintReadyAt > _gameTiming.CurTime);
             Clear.Disabled = false;
 
-            Name.Text = msg.LastScannedName;
+            NameLabel.Text = msg.LastScannedName;
 
             var text = new StringBuilder();
 
diff --git a/Content.Client/GameTicking/Managers/ClientGameTicker.cs b/Content.Client/GameTicking/Managers/ClientGameTicker.cs
index 1154dca350..df709e9444 100644
--- a/Content.Client/GameTicking/Managers/ClientGameTicker.cs
+++ b/Content.Client/GameTicking/Managers/ClientGameTicker.cs
@@ -1,16 +1,11 @@
 using Content.Client.Gameplay;
 using Content.Client.Lobby;
 using Content.Client.RoundEnd;
-using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Content.Shared.GameWindow;
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
 using Robust.Client.State;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Configuration;
-using Robust.Shared.Player;
 using Robust.Shared.Utility;
 
 namespace Content.Client.GameTicking.Managers
@@ -32,13 +27,11 @@ public sealed class ClientGameTicker : SharedGameTicker
 
         [ViewVariables] public bool AreWeReady { get; private set; }
         [ViewVariables] public bool IsGameStarted { get; private set; }
-        [ViewVariables] public string? LobbySong { get; private set; }
         [ViewVariables] public string? RestartSound { get; private set; }
         [ViewVariables] public string? LobbyBackground { get; private set; }
         [ViewVariables] public bool DisallowedLateJoin { get; private set; }
         [ViewVariables] public string? ServerInfoBlob { get; private set; }
         [ViewVariables] public TimeSpan StartTime { get; private set; }
-        [ViewVariables] public TimeSpan RoundStartTimeSpan { get; private set; }
         [ViewVariables] public new bool Paused { get; private set; }
 
         [ViewVariables] public IReadOnlyDictionary<NetEntity, Dictionary<string, uint?>> JobsAvailable => _jobsAvailable;
@@ -46,7 +39,6 @@ public sealed class ClientGameTicker : SharedGameTicker
 
         public event Action? InfoBlobUpdated;
         public event Action? LobbyStatusUpdated;
-        public event Action? LobbySongUpdated;
         public event Action? LobbyLateJoinStatusUpdated;
         public event Action<IReadOnlyDictionary<NetEntity, Dictionary<string, uint?>>>? LobbyJobsAvailableUpdated;
 
@@ -71,16 +63,6 @@ public override void Initialize()
             _initialized = true;
         }
 
-        public void SetLobbySong(string? song, bool forceUpdate = false)
-        {
-            var updated = song != LobbySong;
-
-            LobbySong = song;
-
-            if (updated || forceUpdate)
-                LobbySongUpdated?.Invoke();
-        }
-
         private void LateJoinStatus(TickerLateJoinStatusEvent message)
         {
             DisallowedLateJoin = message.Disallowed;
@@ -121,7 +103,6 @@ private void LobbyStatus(TickerLobbyStatusEvent message)
             RoundStartTimeSpan = message.RoundStartTimeSpan;
             IsGameStarted = message.IsRoundStarted;
             AreWeReady = message.YouAreReady;
-            SetLobbySong(message.LobbySong);
             LobbyBackground = message.LobbyBackground;
             Paused = message.Paused;
 
@@ -149,7 +130,6 @@ private void LobbyCountdown(TickerLobbyCountdownEvent message)
         private void RoundEnd(RoundEndMessageEvent message)
         {
             // Force an update in the event of this song being the same as the last.
-            SetLobbySong(message.LobbySong, true);
             RestartSound = message.RestartSound;
 
             // Don't open duplicate windows (mainly for replays).
diff --git a/Content.Client/Gameplay/GameplayStateBase.cs b/Content.Client/Gameplay/GameplayStateBase.cs
index 454c063260..bdbd69d108 100644
--- a/Content.Client/Gameplay/GameplayStateBase.cs
+++ b/Content.Client/Gameplay/GameplayStateBase.cs
@@ -203,7 +203,7 @@ protected virtual void OnKeyBindStateChanged(ViewportBoundKeyEventArgs args)
             }; // TODO make entityUid nullable
 
             // client side command handlers will always be sent the local player session.
-            var session = _playerManager.LocalPlayer?.Session;
+            var session = _playerManager.LocalSession;
             if (inputSys.HandleInputCommand(session, func, message))
             {
                 kArgs.Handle();
diff --git a/Content.Client/Ghost/GhostSystem.cs b/Content.Client/Ghost/GhostSystem.cs
index f6913d2578..c42e7cd0e0 100644
--- a/Content.Client/Ghost/GhostSystem.cs
+++ b/Content.Client/Ghost/GhostSystem.cs
@@ -15,7 +15,6 @@ public sealed class GhostSystem : SharedGhostSystem
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly SharedActionsSystem _actions = default!;
         [Dependency] private readonly ContentEyeSystem _contentEye = default!;
-        [Dependency] private readonly EyeSystem _eye = default!;
 
         public int AvailableGhostRoleCount { get; private set; }
 
@@ -41,7 +40,7 @@ private bool GhostVisibility
             }
         }
 
-        public GhostComponent? Player => CompOrNull<GhostComponent>(_playerManager.LocalPlayer?.ControlledEntity);
+        public GhostComponent? Player => CompOrNull<GhostComponent>(_playerManager.LocalEntity);
         public bool IsGhost => Player != null;
 
         public event Action<GhostComponent>? PlayerRemoved;
diff --git a/Content.Client/Gravity/GravitySystem.Shake.cs b/Content.Client/Gravity/GravitySystem.Shake.cs
index 55becdd395..c4356588d3 100644
--- a/Content.Client/Gravity/GravitySystem.Shake.cs
+++ b/Content.Client/Gravity/GravitySystem.Shake.cs
@@ -23,7 +23,7 @@ private void InitializeShake()
 
     private void OnShakeInit(EntityUid uid, GravityShakeComponent component, ComponentInit args)
     {
-        var localPlayer = _playerManager.LocalPlayer?.ControlledEntity;
+        var localPlayer = _playerManager.LocalEntity;
 
         if (!TryComp<TransformComponent>(localPlayer, out var xform) ||
             xform.GridUid != uid && xform.MapUid != uid)
@@ -44,7 +44,7 @@ protected override void ShakeGrid(EntityUid uid, GravityComponent? gravity = nul
         if (!Resolve(uid, ref gravity) || !Timing.IsFirstTimePredicted)
             return;
 
-        var localPlayer = _playerManager.LocalPlayer?.ControlledEntity;
+        var localPlayer = _playerManager.LocalEntity;
 
         if (!TryComp<TransformComponent>(localPlayer, out var xform))
             return;
diff --git a/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml b/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml
index 752c9cc6c2..f46e319abe 100644
--- a/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml
+++ b/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml
@@ -11,7 +11,7 @@
                 <RichTextLabel Name="ReagentName" HorizontalAlignment="Center"/>
             </PanelContainer>
             <BoxContainer Name="RecipesContainer" HorizontalExpand="True">
-                <Collapsible Orientation="Vertical" HorizontalExpand="True">
+                <Collapsible HorizontalExpand="True">
                     <CollapsibleHeading Title="{Loc 'guidebook-reagent-recipes-header'}"/>
                     <CollapsibleBody>
                         <GridContainer Name="RecipesDescriptionContainer"
@@ -24,7 +24,7 @@
                 </Collapsible>
             </BoxContainer>
             <BoxContainer Name="SourcesContainer" HorizontalExpand="True">
-                <Collapsible Orientation="Vertical" HorizontalExpand="True">
+                <Collapsible HorizontalExpand="True">
                     <CollapsibleHeading Title="{Loc 'guidebook-reagent-sources-header'}"/>
                     <CollapsibleBody>
                         <GridContainer Name="SourcesDescriptionContainer"
@@ -37,7 +37,7 @@
                 </Collapsible>
             </BoxContainer>
             <BoxContainer Name="EffectsContainer" HorizontalExpand="True">
-                <Collapsible Orientation="Vertical">
+                <Collapsible>
                     <CollapsibleHeading Title="{Loc 'guidebook-reagent-effects-header'}"/>
                     <CollapsibleBody>
                         <BoxContainer Name="EffectsDescriptionContainer"
diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
index 113c192beb..4776386c1d 100644
--- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
+++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
@@ -98,22 +98,33 @@ public void UpdateGuides(
         }
     }
 
-    private IEnumerable<GuideEntry> GetSortedRootEntries(List<string>? rootEntries)
+    private IEnumerable<GuideEntry> GetSortedEntries(List<string>? rootEntries)
     {
         if (rootEntries == null)
         {
             HashSet<string> entries = new(_entries.Keys);
             foreach (var entry in _entries.Values)
             {
+                if (entry.Children.Count > 0)
+                {
+                    var sortedChildren = entry.Children
+                        .Select(childId => _entries[childId])
+                        .OrderBy(childEntry => childEntry.Priority)
+                        .ThenBy(childEntry => Loc.GetString(childEntry.Name))
+                        .Select(childEntry => childEntry.Id)
+                        .ToList();
+
+                    entry.Children = sortedChildren;
+                }
                 entries.ExceptWith(entry.Children);
             }
             rootEntries = entries.ToList();
         }
 
         return rootEntries
-            .Select(x => _entries[x])
-            .OrderBy(x => x.Priority)
-            .ThenBy(x => Loc.GetString(x.Name));
+            .Select(rootEntryId => _entries[rootEntryId])
+            .OrderBy(rootEntry => rootEntry.Priority)
+            .ThenBy(rootEntry => Loc.GetString(rootEntry.Name));
     }
 
     private void RepopulateTree(List<string>? roots = null, string? forcedRoot = null)
@@ -123,7 +134,7 @@ private void RepopulateTree(List<string>? roots = null, string? forcedRoot = nul
         HashSet<string> addedEntries = new();
 
         TreeItem? parent = forcedRoot == null ? null : AddEntry(forcedRoot, null, addedEntries);
-        foreach (var entry in GetSortedRootEntries(roots))
+        foreach (var entry in GetSortedEntries(roots))
         {
             AddEntry(entry.Id, parent, addedEntries);
         }
diff --git a/Content.Client/Guidebook/GuidebookSystem.cs b/Content.Client/Guidebook/GuidebookSystem.cs
index dffc625cb8..cb13d4ca6e 100644
--- a/Content.Client/Guidebook/GuidebookSystem.cs
+++ b/Content.Client/Guidebook/GuidebookSystem.cs
@@ -55,7 +55,7 @@ public override void Initialize()
     /// </summary>
     public EntityUid GetGuidebookUser()
     {
-        var user = _playerManager.LocalPlayer!.ControlledEntity;
+        var user = _playerManager.LocalEntity;
         if (user != null)
             return user.Value;
 
diff --git a/Content.Client/Hands/Systems/HandsSystem.cs b/Content.Client/Hands/Systems/HandsSystem.cs
index 9ea094a73a..7319b97b42 100644
--- a/Content.Client/Hands/Systems/HandsSystem.cs
+++ b/Content.Client/Hands/Systems/HandsSystem.cs
@@ -22,7 +22,6 @@ namespace Content.Client.Hands.Systems
     [UsedImplicitly]
     public sealed class HandsSystem : SharedHandsSystem
     {
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IUserInterfaceManager _ui = default!;
 
@@ -147,7 +146,7 @@ public override void DoDrop(EntityUid uid, Hand hand, bool doDropInteraction = t
         /// </summary>
         public bool TryGetPlayerHands([NotNullWhen(true)] out HandsComponent? hands)
         {
-            var player = _playerManager.LocalPlayer?.ControlledEntity;
+            var player = _playerManager.LocalEntity;
             hands = null;
             return player != null && TryComp(player.Value, out hands);
         }
@@ -248,7 +247,7 @@ protected override void HandleEntityInserted(EntityUid uid, HandsComponent hands
             UpdateHandVisuals(uid, args.Entity, hand);
             _stripSys.UpdateUi(uid);
 
-            if (uid != _playerManager.LocalPlayer?.ControlledEntity)
+            if (uid != _playerManager.LocalEntity)
                 return;
 
             OnPlayerItemAdded?.Invoke(hand.Name, args.Entity);
@@ -266,7 +265,7 @@ protected override void HandleEntityRemoved(EntityUid uid, HandsComponent hands,
             UpdateHandVisuals(uid, args.Entity, hand);
             _stripSys.UpdateUi(uid);
 
-            if (uid != _playerManager.LocalPlayer?.ControlledEntity)
+            if (uid != _playerManager.LocalEntity)
                 return;
 
             OnPlayerItemRemoved?.Invoke(hand.Name, args.Entity);
@@ -284,7 +283,7 @@ private void UpdateHandVisuals(EntityUid uid, EntityUid held, Hand hand, HandsCo
                 return;
 
             // visual update might involve changes to the entity's effective sprite -> need to update hands GUI.
-            if (uid == _playerManager.LocalPlayer?.ControlledEntity)
+            if (uid == _playerManager.LocalEntity)
                 OnPlayerItemAdded?.Invoke(hand.Name, held);
 
             if (!handComp.ShowInHands)
@@ -375,13 +374,13 @@ private void HandlePlayerDetached(EntityUid uid, HandsComponent component, Local
 
         private void OnHandsStartup(EntityUid uid, HandsComponent component, ComponentStartup args)
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity == uid)
+            if (_playerManager.LocalEntity == uid)
                 OnPlayerHandsAdded?.Invoke(component);
         }
 
         private void OnHandsShutdown(EntityUid uid, HandsComponent component, ComponentShutdown args)
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity == uid)
+            if (_playerManager.LocalEntity == uid)
                 OnPlayerHandsRemoved?.Invoke();
         }
         #endregion
@@ -395,7 +394,7 @@ public override void AddHand(EntityUid uid, string handName, HandLocation handLo
         {
             base.AddHand(uid, handName, handLocation, handsComp);
 
-            if (uid == _playerManager.LocalPlayer?.ControlledEntity)
+            if (uid == _playerManager.LocalEntity)
                 OnPlayerAddHand?.Invoke(handName, handLocation);
 
             if (handsComp == null)
@@ -406,9 +405,9 @@ public override void AddHand(EntityUid uid, string handName, HandLocation handLo
         }
         public override void RemoveHand(EntityUid uid, string handName, HandsComponent? handsComp = null)
         {
-            if (uid == _playerManager.LocalPlayer?.ControlledEntity && handsComp != null &&
+            if (uid == _playerManager.LocalEntity && handsComp != null &&
                 handsComp.Hands.ContainsKey(handName) && uid ==
-                _playerManager.LocalPlayer?.ControlledEntity)
+                _playerManager.LocalEntity)
             {
                 OnPlayerRemoveHand?.Invoke(handName);
             }
@@ -421,7 +420,7 @@ private void OnHandActivated(Entity<HandsComponent>? ent)
             if (ent is not { } hand)
                 return;
 
-            if (_playerManager.LocalPlayer?.ControlledEntity != hand.Owner)
+            if (_playerManager.LocalEntity != hand.Owner)
                 return;
 
             if (hand.Comp.ActiveHand == null)
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml
index 28872ef1d5..401f976862 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml
@@ -32,6 +32,9 @@
                 <Label
                     Name="BloodLevel"
                     Margin="0 5 0 0"/>
+                <Label
+                    Name="Bleeding"
+                    Margin="0 5 0 0"/>
                 <Label
                     Name="patientDamageAmount"
                     Margin="0 15 0 0"/>
diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
index 2f19cd0a05..1d8d415bab 100644
--- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
+++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs
@@ -86,6 +86,16 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
                 ("bloodLevel", float.IsNaN(msg.BloodLevel) ? "N/A" : $"{msg.BloodLevel * 100:F1} %")
             );
 
+            if (msg.Bleeding == true)
+            {
+                Bleeding.Text = Loc.GetString("health-analyzer-window-entity-bleeding-text");
+                Bleeding.FontColorOverride = Color.Red;
+            }
+            else
+            {
+                Bleeding.Text = string.Empty;  // Clear the text
+            }
+
             patientDamageAmount.Text = Loc.GetString(
                 "health-analyzer-window-entity-damage-total-text",
                 ("amount", damageable.TotalDamage)
diff --git a/Content.Client/HotPotato/HotPotatoSystem.cs b/Content.Client/HotPotato/HotPotatoSystem.cs
index 8e9c0f9e19..028a3b70d9 100644
--- a/Content.Client/HotPotato/HotPotatoSystem.cs
+++ b/Content.Client/HotPotato/HotPotatoSystem.cs
@@ -2,10 +2,13 @@
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
+namespace Content.Client.HotPotato;
+
 public sealed class HotPotatoSystem : SharedHotPotatoSystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     public override void Update(float frameTime)
     {
@@ -20,7 +23,7 @@ public override void Update(float frameTime)
             if (_timing.CurTime < comp.TargetTime)
                 continue;
             comp.TargetTime = _timing.CurTime + TimeSpan.FromSeconds(comp.EffectCooldown);
-            Spawn("HotPotatoEffect", Transform(uid).MapPosition.Offset(_random.NextVector2(0.25f)));
+            Spawn("HotPotatoEffect", _transform.GetMapCoordinates(uid).Offset(_random.NextVector2(0.25f)));
         }
     }
 }
diff --git a/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml b/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml
index d32d3ba2cf..78e65db2a3 100644
--- a/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml
+++ b/Content.Client/Humanoid/HumanoidMarkingModifierWindow.xaml
@@ -7,7 +7,7 @@
                 <CheckBox Name="MarkingForced" Text="Force" Pressed="True" />
                 <CheckBox Name="MarkingIgnoreSpecies" Text="Ignore Species" Pressed="True" />
             </BoxContainer>
-            <Collapsible Orientation="Vertical" HorizontalExpand="True">
+            <Collapsible HorizontalExpand="True">
                 <CollapsibleHeading Title="Base layers" />
                 <CollapsibleBody HorizontalExpand="True">
                     <BoxContainer Name="BaseLayersContainer" Orientation="Vertical" HorizontalExpand="True" />
diff --git a/Content.Client/Instruments/InstrumentSystem.cs b/Content.Client/Instruments/InstrumentSystem.cs
index d9c9b66dcb..5bdaa52359 100644
--- a/Content.Client/Instruments/InstrumentSystem.cs
+++ b/Content.Client/Instruments/InstrumentSystem.cs
@@ -29,8 +29,8 @@ public override void Initialize()
 
         UpdatesOutsidePrediction = true;
 
-        _cfg.OnValueChanged(CCVars.MaxMidiEventsPerBatch, OnMaxMidiEventsPerBatchChanged, true);
-        _cfg.OnValueChanged(CCVars.MaxMidiEventsPerSecond, OnMaxMidiEventsPerSecondChanged, true);
+        Subs.CVar(_cfg, CCVars.MaxMidiEventsPerBatch, OnMaxMidiEventsPerBatchChanged, true);
+        Subs.CVar(_cfg, CCVars.MaxMidiEventsPerSecond, OnMaxMidiEventsPerSecondChanged, true);
 
         SubscribeNetworkEvent<InstrumentMidiEventEvent>(OnMidiEventRx);
         SubscribeNetworkEvent<InstrumentStartMidiEvent>(OnMidiStart);
@@ -60,14 +60,6 @@ private void OnHandleState(EntityUid uid, SharedInstrumentComponent component, r
             EndRenderer(uid, true, component);
     }
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-
-        _cfg.UnsubValueChanged(CCVars.MaxMidiEventsPerBatch, OnMaxMidiEventsPerBatchChanged);
-        _cfg.UnsubValueChanged(CCVars.MaxMidiEventsPerSecond, OnMaxMidiEventsPerSecondChanged);
-    }
-
     private void OnShutdown(EntityUid uid, InstrumentComponent component, ComponentShutdown args)
     {
         EndRenderer(uid, false, component);
diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
index 85c9cc1447..da443e3fb5 100644
--- a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
+++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
@@ -168,14 +168,14 @@ private bool PlayCheck()
             if (instrument == null)
                 return false;
 
-            var localPlayer = _owner.PlayerManager.LocalPlayer;
+            var localEntity = _owner.PlayerManager.LocalEntity;
 
             // If we don't have a player or controlled entity, we return.
-            if (localPlayer?.ControlledEntity == null)
+            if (localEntity == null)
                 return false;
 
             // By default, allow an instrument to play itself and skip all other checks
-            if (localPlayer.ControlledEntity == instrumentEnt)
+            if (localEntity == instrumentEnt)
                 return true;
 
             var container = _owner.Entities.System<SharedContainerSystem>();
@@ -183,14 +183,14 @@ private bool PlayCheck()
             container.TryGetContainingContainer(instrumentEnt, out var conMan);
 
             // If the instrument is handheld and we're not holding it, we return.
-            if ((instrument.Handheld && (conMan == null || conMan.Owner != localPlayer.ControlledEntity)))
+            if ((instrument.Handheld && (conMan == null || conMan.Owner != localEntity)))
                 return false;
 
-            if (!_owner.ActionBlocker.CanInteract(localPlayer.ControlledEntity.Value, instrumentEnt))
+            if (!_owner.ActionBlocker.CanInteract(localEntity.Value, instrumentEnt))
                 return false;
 
             // We check that we're in range unobstructed just in case.
-            return _owner.Interactions.InRangeUnobstructed(localPlayer.ControlledEntity.Value, instrumentEnt);
+            return _owner.Interactions.InRangeUnobstructed(localEntity.Value, instrumentEnt);
         }
 
         private void MidiStopButtonOnPressed(ButtonEventArgs? obj)
diff --git a/Content.Client/Interaction/DragDropSystem.cs b/Content.Client/Interaction/DragDropSystem.cs
index 66571a9d27..8baa4d15fe 100644
--- a/Content.Client/Interaction/DragDropSystem.cs
+++ b/Content.Client/Interaction/DragDropSystem.cs
@@ -109,7 +109,7 @@ public override void Initialize()
         UpdatesOutsidePrediction = true;
         UpdatesAfter.Add(typeof(SharedEyeSystem));
 
-        _cfgMan.OnValueChanged(CCVars.DragDropDeadZone, SetDeadZone, true);
+        Subs.CVar(_cfgMan, CCVars.DragDropDeadZone, SetDeadZone, true);
 
         _dropTargetInRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetInRange).Instance();
         _dropTargetOutOfRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetOutOfRange).Instance();
@@ -126,7 +126,6 @@ private void SetDeadZone(float deadZone)
 
     public override void Shutdown()
     {
-        _cfgMan.UnsubValueChanged(CCVars.DragDropDeadZone, SetDeadZone);
         CommandBinds.Unregister<DragDropSystem>();
         base.Shutdown();
     }
@@ -269,7 +268,7 @@ private bool UpdateDrag(float frameTime)
             return false;
         }
 
-        var player = _playerManager.LocalPlayer?.ControlledEntity;
+        var player = _playerManager.LocalEntity;
 
         // still in range of the thing we are dragging?
         if (player == null || !_interactionSystem.InRangeUnobstructed(player.Value, _draggedEntity.Value))
@@ -346,7 +345,7 @@ private bool OnUseMouseUp(in PointerInputCmdHandler.PointerInputCmdArgs args)
             return false;
         }
 
-        var localPlayer = _playerManager.LocalPlayer?.ControlledEntity;
+        var localPlayer = _playerManager.LocalEntity;
 
         if (localPlayer == null || !Exists(_draggedEntity))
         {
@@ -410,7 +409,7 @@ private void HighlightTargets()
             return;
         }
 
-        var user = _playerManager.LocalPlayer?.ControlledEntity;
+        var user = _playerManager.LocalEntity;
 
         if (user == null)
             return;
diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
index 028c035e8a..f8eb12df91 100644
--- a/Content.Client/Inventory/StrippableBoundUserInterface.cs
+++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -30,10 +30,9 @@ namespace Content.Client.Inventory
     [UsedImplicitly]
     public sealed class StrippableBoundUserInterface : BoundUserInterface
     {
-        [Dependency] private readonly IPrototypeManager _protoMan = default!;
         [Dependency] private readonly IUserInterfaceManager _ui = default!;
-        private readonly ExamineSystem _examine = default!;
-        private readonly InventorySystem _inv = default!;
+        private readonly ExamineSystem _examine;
+        private readonly InventorySystem _inv;
         private readonly SharedCuffableSystem _cuffable;
 
         [ViewVariables]
diff --git a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
index 74579b2699..7e7dd2d693 100644
--- a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
+++ b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
@@ -4,6 +4,7 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Kitchen.UI
 {
@@ -18,6 +19,9 @@ public sealed class MicrowaveBoundUserInterface : BoundUserInterface
 
         [ViewVariables]
         private readonly Dictionary<int, ReagentQuantity> _reagents = new();
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+
+        public MicrowaveUpdateUserInterfaceState currentState = default!;
 
         private IEntityManager _entManager;
 
@@ -26,23 +30,47 @@ public MicrowaveBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, ui
             _entManager = IoCManager.Resolve<IEntityManager>();
         }
 
+        public TimeSpan GetCurrentTime()
+        {
+            return _gameTiming.CurTime;
+        }
+
         protected override void Open()
         {
             base.Open();
             _menu = new MicrowaveMenu(this);
             _menu.OpenCentered();
             _menu.OnClose += Close;
-            _menu.StartButton.OnPressed += _ => SendMessage(new MicrowaveStartCookMessage());
-            _menu.EjectButton.OnPressed += _ => SendMessage(new MicrowaveEjectMessage());
+            _menu.StartButton.OnPressed += _ => SendPredictedMessage(new MicrowaveStartCookMessage());
+            _menu.EjectButton.OnPressed += _ => SendPredictedMessage(new MicrowaveEjectMessage());
             _menu.IngredientsList.OnItemSelected += args =>
             {
-                SendMessage(new MicrowaveEjectSolidIndexedMessage(EntMan.GetNetEntity(_solids[args.ItemIndex])));
+                SendPredictedMessage(new MicrowaveEjectSolidIndexedMessage(EntMan.GetNetEntity(_solids[args.ItemIndex])));
             };
 
             _menu.OnCookTimeSelected += (args, buttonIndex) =>
             {
-                var actualButton = (MicrowaveMenu.MicrowaveCookTimeButton) args.Button;
-                SendMessage(new MicrowaveSelectCookTimeMessage(buttonIndex, actualButton.CookTime));
+                var selectedCookTime = (uint) 0;
+
+                if (args.Button is MicrowaveMenu.MicrowaveCookTimeButton microwaveCookTimeButton)
+                {
+                    // args.Button is a MicrowaveCookTimeButton
+                    var actualButton = (MicrowaveMenu.MicrowaveCookTimeButton) args.Button;
+                    selectedCookTime = actualButton.CookTime == 0 ? 0 : actualButton.CookTime;
+                    // SendMessage(new MicrowaveSelectCookTimeMessage((int) selectedCookTime / 5, actualButton.CookTime));
+                    SendPredictedMessage(new MicrowaveSelectCookTimeMessage((int) selectedCookTime / 5, actualButton.CookTime));
+
+                    _menu.CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label",
+                                                                    ("time", selectedCookTime));
+                }
+                else
+                {
+                    // args.Button is a normal button aka instant cook button
+                    SendPredictedMessage(new MicrowaveSelectCookTimeMessage((int) selectedCookTime, 0));
+
+                    _menu.CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label",
+                                                         ("time", Loc.GetString("microwave-menu-instant-button")));
+                }
             };
         }
 
@@ -67,20 +95,47 @@ protected override void UpdateState(BoundUserInterfaceState state)
                 return;
             }
 
-            _menu?.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy);
+
+            _menu?.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0);
+            currentState = cState;
 
             // TODO move this to a component state and ensure the net ids.
             RefreshContentsDisplay(_entManager.GetEntityArray(cState.ContainedSolids));
 
             if (_menu == null) return;
 
-            var currentlySelectedTimeButton = (Button) _menu.CookTimeButtonVbox.GetChild(cState.ActiveButtonIndex);
-            currentlySelectedTimeButton.Pressed = true;
-            var cookTime = cState.ActiveButtonIndex == 0
+            //Set the cook time info label
+            var cookTime = cState.ActiveButtonIndex == 0 
                 ? Loc.GetString("microwave-menu-instant-button")
                 : cState.CurrentCookTime.ToString();
+
+
             _menu.CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label",
                                                          ("time", cookTime));
+            _menu.StartButton.Disabled = cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0;
+            _menu.EjectButton.Disabled = cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0;
+
+
+            //Set the correct button active button
+            if (cState.ActiveButtonIndex == 0)
+            {
+                _menu.InstantCookButton.Pressed = true;
+            }
+            else
+            {
+                var currentlySelectedTimeButton = (Button) _menu.CookTimeButtonVbox.GetChild(cState.ActiveButtonIndex - 1);
+                currentlySelectedTimeButton.Pressed = true;
+            }
+
+            //Set the "micowave light" ui color to indicate if the microwave is busy or not
+            if (cState.IsMicrowaveBusy && cState.ContainedSolids.Length > 0)
+            {
+                _menu.IngredientsPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#947300") };
+            }
+            else
+            {
+                _menu.IngredientsPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#1B1B1E") };
+            }
         }
 
         private void RefreshContentsDisplay(EntityUid[] containedSolids)
diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
index c0418088da..cd81ea0a9b 100644
--- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
+++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
@@ -1,73 +1,113 @@
-<DefaultWindow xmlns="https://spacestation14.io"
-            xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-            Title="{Loc 'microwave-menu-title'}"
-            SetSize="512 256"
-            MinSize="512 256">
-    <BoxContainer Orientation="Horizontal">
-        <ItemList Name="IngredientsList"
-                  Access="Public"
-                  VerticalExpand="True"
-                  HorizontalExpand="True"
-                  SelectMode="Button"
-                  SizeFlagsStretchRatio="2"
-                  MinSize="100 128">
-            <!-- Ingredients are added here by code -->
-        </ItemList>
-        <BoxContainer Orientation="Vertical"
-                      MinWidth="176"
-                      VerticalExpand="True"
-                      HorizontalExpand="True">
-            <BoxContainer Orientation="Vertical"
-                          Align="Center"
-                          SizeFlagsStretchRatio="3">
-                <Button Name="StartButton"
-                        Access="Public"
-                        Text="{Loc 'microwave-menu-start-button'}"
-                        TextAlign="Center" />
-                <Button Name="EjectButton"
-                        Access="Public"
-                        Text="{Loc 'microwave-menu-eject-all-text'}"
-                        ToolTip="{Loc 'microwave-menu-eject-all-tooltip'}"
-                        TextAlign="Center" />
-            </BoxContainer>
-            <Control MinSize="0 15" />
-            <PanelContainer VerticalExpand="True"
-                            HorizontalExpand="True">
-                <PanelContainer VerticalExpand="True"
-                                ModulateSelfOverride="#FF0000"
-                                MinSize="100 128">
-                    <PanelContainer.PanelOverride>
-                        <gfx:StyleBoxFlat BackgroundColor="#00000080" />
-                    </PanelContainer.PanelOverride>
-                    <BoxContainer Orientation="Vertical">
-                        <PanelContainer>
-                            <PanelContainer.PanelOverride>
-                                <gfx:StyleBoxFlat BackgroundColor="#80808032" />
-                            </PanelContainer.PanelOverride>
-                            <Label Name="CookTimeInfoLabel"
-                                   Access="Public"
-                                   Align="Center"
-                                   Modulate="#FFFFFF"
-                                   VAlign="Center" />
-                        </PanelContainer>
-                        <ScrollContainer VerticalExpand="True">
-                            <BoxContainer Name="CookTimeButtonVbox"
-                                          Access="Public"
-                                          Orientation="Vertical"
-                                          VerticalExpand="True"
-                                          Align="Center">
-                                <!-- Cook time buttons are added here by code -->
+<controls:FancyWindow
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    xmlns:style="clr-namespace:Content.Client.Stylesheets"
+    Title="{Loc 'microwave-menu-title'}"
+    MinWidth="512"
+    MinSize="512 256">
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal"  >
+            <PanelContainer
+                Name="IngredientsPanel"
+                Access="Public"
+                MinSize="300 128"
+                Margin="5 5">
+                <PanelContainer.PanelOverride>
+                    <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
+                </PanelContainer.PanelOverride>
+                <ItemList
+                    Name="IngredientsList"
+                    Access="Public"
+                    Margin="5 5"
+                    VerticalExpand="True"
+                    HorizontalExpand="True"
+                    StyleClasses="transparentBackgroundItemList"
+                    SelectMode="Button"
+                    SizeFlagsStretchRatio="3"
+                    ItemSeparation="5"
+                    MinSize="100 128">
+                    <!-- Ingredients are added here by code -->
+                </ItemList>
+            </PanelContainer>
+            <BoxContainer
+                Orientation="Vertical"
+                MinWidth="170"
+                Margin="10 10"
+                VerticalExpand="True"
+                HorizontalExpand="True">
+                <PanelContainer
+                    VerticalExpand="True"
+                    HorizontalExpand="True">
+                    <PanelContainer
+                        VerticalExpand="True"
+                        ModulateSelfOverride="#FF0000"
+                        MinSize="100 128">
+                        <BoxContainer Orientation="Vertical">
+                            <Label
+                                Name="CookTimeInfoLabel"
+                                Access="Public"
+                                Align="Center"
+                                Modulate="#FFFFFF"
+                                VAlign="Center" />
+                            <BoxContainer  Orientation="Vertical">
+                                <Button
+                                    Name="InstantCookButton"
+                                    Access="Public"
+                                    Text="{Loc 'microwave-menu-instant-button'}"
+                                    StyleClasses="OpenLeft"
+                                    ToggleMode="True"
+                                    Margin="0 0 2 0"
+                                    TextAlign="Center" />
+                                <GridContainer
+                                    Name="CookTimeButtonVbox"
+                                    HSeparationOverride="1"
+                                    VSeparationOverride="1"
+                                    HorizontalExpand="True"
+                                    Columns="3"
+                                    Margin="0"
+                                    Access="Public">
+                                    <!-- Cook time buttons are added here by code -->
+                                </GridContainer>
+                                <BoxContainer
+                                    Orientation="Vertical"
+                                    Align="Center"
+                                    SizeFlagsStretchRatio="3">
+                                    <Control MinSize="0 15" />
+                                    <Button
+                                        Name="StartButton"
+                                        Access="Public"
+                                        Text="{Loc 'microwave-menu-start-button'}"
+                                        StyleClasses="ButtonColorGreen"
+                                        TextAlign="Center" />
+                                    <Button
+                                        Name="EjectButton"
+                                        Access="Public"
+                                        Text="{Loc 'microwave-menu-eject-all-text'}"
+                                        ToolTip="{Loc 'microwave-menu-eject-all-tooltip'}"
+                                        StyleClasses="ButtonColorRed"
+                                        TextAlign="Center" />
+                                </BoxContainer>
                             </BoxContainer>
-                        </ScrollContainer>
-                    </BoxContainer>
+                        </BoxContainer>
+                    </PanelContainer>
                 </PanelContainer>
-            </PanelContainer>
+            </BoxContainer>
+        </BoxContainer>
+         <!-- Footer -->
+        <BoxContainer Orientation="Vertical">
+            <PanelContainer StyleClasses="LowDivider" />
+            <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
+                <Label Text="{Loc 'microwave-menu-footer-flavor-left'}" StyleClasses="WindowFooterText" />
+                <Label Text="{Loc 'microwave-menu-footer-flavor-right'}" StyleClasses="WindowFooterText"
+                       HorizontalAlignment="Right" HorizontalExpand="True"  Margin="0 0 5 0" />
+                <TextureRect StyleClasses="NTLogoDark" Stretch="KeepAspectCentered" VerticalAlignment="Center" HorizontalAlignment="Right" SetSize="19 19"/>
+            </BoxContainer>
         </BoxContainer>
     </BoxContainer>
-    <PanelContainer Name="DisableCookingPanelOverlay"
-                    MouseFilter="Stop">
+    <PanelContainer Name="DisableCookingPanelOverlay" MouseFilter="Stop">
         <PanelContainer.PanelOverride>
-            <gfx:StyleBoxFlat BackgroundColor="#00000099" />
+            <gfx:StyleBoxFlat BackgroundColor="#1B1B1E66" />
         </PanelContainer.PanelOverride>
     </PanelContainer>
-</DefaultWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
index 61c6af629d..b292e9f146 100644
--- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
+++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
@@ -1,14 +1,13 @@
-using System;
-using Robust.Client.AutoGenerated;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
+using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Localization;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Kitchen.UI
 {
     [GenerateTypedNameReferences]
-    public sealed partial class MicrowaveMenu : DefaultWindow
+    public sealed partial class MicrowaveMenu : FancyWindow
     {
         public sealed class MicrowaveCookTimeButton : Button
         {
@@ -17,28 +16,43 @@ public sealed class MicrowaveCookTimeButton : Button
 
         public event Action<BaseButton.ButtonEventArgs, int>? OnCookTimeSelected;
 
-        private ButtonGroup CookTimeButtonGroup { get; }
+        public ButtonGroup CookTimeButtonGroup { get; }
+        private readonly MicrowaveBoundUserInterface _owner;
 
         public MicrowaveMenu(MicrowaveBoundUserInterface owner)
         {
             RobustXamlLoader.Load(this);
-
             CookTimeButtonGroup = new ButtonGroup();
+            InstantCookButton.Group = CookTimeButtonGroup;
+            _owner = owner;
+            InstantCookButton.OnPressed += args =>
+            {
+                OnCookTimeSelected?.Invoke(args, 0);
+            };
 
-            for (var i = 0; i <= 30; i += 5)
+            for (var i = 1; i <= 6; i++)
             {
                 var newButton = new MicrowaveCookTimeButton
                 {
-                    Text = i == 0 ? Loc.GetString("microwave-menu-instant-button") : i.ToString(),
-                    CookTime = (uint) i,
+                    Text = (i * 5).ToString(),
                     TextAlign = Label.AlignMode.Center,
                     ToggleMode = true,
+                    CookTime = (uint) (i * 5),
                     Group = CookTimeButtonGroup,
+                    HorizontalExpand = true,
                 };
+                if (i == 4)
+                {
+                    newButton.StyleClasses.Add("OpenRight");
+                }
+                else
+                {
+                    newButton.StyleClasses.Add("OpenBoth");
+                }
                 CookTimeButtonVbox.AddChild(newButton);
-                newButton.OnToggled += args =>
+                newButton.OnPressed += args =>
                 {
-                    OnCookTimeSelected?.Invoke(args, newButton.GetPositionInParent());
+                    OnCookTimeSelected?.Invoke(args, i);
                 };
             }
         }
@@ -47,5 +61,18 @@ public void ToggleBusyDisableOverlayPanel(bool shouldDisable)
         {
             DisableCookingPanelOverlay.Visible = shouldDisable;
         }
+
+        protected override void FrameUpdate(FrameEventArgs args)
+        {
+            base.FrameUpdate(args);
+            if(!_owner.currentState.IsMicrowaveBusy)
+                return;
+
+            if(_owner.currentState.CurrentCookTimeEnd > _owner.GetCurrentTime())
+            {
+                CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label",
+                ("time",_owner.currentState.CurrentCookTimeEnd.Subtract(_owner.GetCurrentTime()).Seconds)); 
+            }
+        }
     }
 }
diff --git a/Content.Client/Labels/EntitySystems/LabelSystem.cs b/Content.Client/Labels/EntitySystems/LabelSystem.cs
new file mode 100644
index 0000000000..baa9f7fee7
--- /dev/null
+++ b/Content.Client/Labels/EntitySystems/LabelSystem.cs
@@ -0,0 +1,7 @@
+using Content.Shared.Labels.EntitySystems;
+
+namespace Content.Client.Labels;
+
+public sealed partial class LabelSystem : SharedLabelSystem
+{
+}
diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
index 9acfb03126..b99d30015e 100644
--- a/Content.Client/LateJoin/LateJoinGui.cs
+++ b/Content.Client/LateJoin/LateJoinGui.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using System.Numerics;
 using Content.Client.CrewManifest;
 using Content.Client.GameTicking.Managers;
@@ -23,7 +24,6 @@ public sealed class LateJoinGui : DefaultWindow
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
         [Dependency] private readonly IConfigurationManager _configManager = default!;
-        [Dependency] private readonly IEntityManager _entManager = default!;
         [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
         [Dependency] private readonly JobRequirementsManager _jobRequirements = default!;
 
@@ -160,8 +160,10 @@ private void RebuildUI()
                 };
 
                 var firstCategory = true;
+                var departments = _prototypeManager.EnumeratePrototypes<DepartmentPrototype>().ToArray();
+                Array.Sort(departments, DepartmentUIComparer.Instance);
 
-                foreach (var department in _prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
+                foreach (var department in departments)
                 {
                     var departmentName = Loc.GetString($"department-{department.ID}");
                     _jobCategories[id] = new Dictionary<string, BoxContainer>();
@@ -177,7 +179,7 @@ private void RebuildUI()
                         jobsAvailable.Add(_prototypeManager.Index<JobPrototype>(jobId));
                     }
 
-                    jobsAvailable.Sort((x, y) => -string.Compare(x.LocalizedName, y.LocalizedName, StringComparison.CurrentCultureIgnoreCase));
+                    jobsAvailable.Sort(JobUIComparer.Instance);
 
                     // Do not display departments with no jobs available.
                     if (jobsAvailable.Count == 0)
@@ -232,7 +234,7 @@ private void RebuildUI()
                         var icon = new TextureRect
                         {
                             TextureScale = new Vector2(2, 2),
-                            Stretch = TextureRect.StretchMode.KeepCentered
+                            VerticalAlignment = VAlignment.Center
                         };
 
                         var jobIcon = _prototypeManager.Index<StatusIconPrototype>(prototype.Icon);
diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
index 457163a5b5..fe31dce062 100644
--- a/Content.Client/Lobby/LobbyState.cs
+++ b/Content.Client/Lobby/LobbyState.cs
@@ -1,3 +1,4 @@
+using Content.Client.Audio;
 using Content.Client.GameTicking.Managers;
 using Content.Client.LateJoin;
 using Content.Client.Lobby.UI;
@@ -34,6 +35,7 @@ public sealed class LobbyState : Robust.Client.State.State
         [ViewVariables] private CharacterSetupGui? _characterSetup;
 
         private ClientGameTicker _gameTicker = default!;
+        private ContentAudioSystem _contentAudioSystem = default!;
 
         protected override Type? LinkedScreenType { get; } = typeof(LobbyGui);
         private LobbyGui? _lobby;
@@ -49,6 +51,8 @@ protected override void Startup()
 
             var chatController = _userInterfaceManager.GetUIController<ChatUIController>();
             _gameTicker = _entityManager.System<ClientGameTicker>();
+            _contentAudioSystem = _entityManager.System<ContentAudioSystem>();
+            _contentAudioSystem.LobbySoundtrackChanged += UpdateLobbySoundtrackInfo;
             _characterSetup = new CharacterSetupGui(_entityManager, _resourceCache, _preferencesManager,
                 _prototypeManager, _configurationManager);
             LayoutContainer.SetAnchorPreset(_characterSetup, LayoutContainer.LayoutPreset.Wide);
@@ -93,6 +97,7 @@ protected override void Shutdown()
             _gameTicker.InfoBlobUpdated -= UpdateLobbyUi;
             _gameTicker.LobbyStatusUpdated -= LobbyStatusUpdated;
             _gameTicker.LobbyLateJoinStatusUpdated -= LobbyLateJoinStatusUpdated;
+            _contentAudioSystem.LobbySoundtrackChanged -= UpdateLobbySoundtrackInfo;
 
             _voteManager.ClearPopupContainer();
 
@@ -207,22 +212,28 @@ private void UpdateLobbyUi()
             {
                 _lobby!.ServerInfo.SetInfoBlob(_gameTicker.ServerInfoBlob);
             }
+        }
 
-            if (_gameTicker.LobbySong == null)
+        private void UpdateLobbySoundtrackInfo(LobbySoundtrackChangedEvent ev)
+        {
+            if (ev.SoundtrackFilename == null)
             {
                 _lobby!.LobbySong.SetMarkup(Loc.GetString("lobby-state-song-no-song-text"));
             }
-            else if (_resourceCache.TryGetResource<AudioResource>(_gameTicker.LobbySong, out var lobbySongResource))
+            else if (
+                ev.SoundtrackFilename != null
+                && _resourceCache.TryGetResource<AudioResource>(ev.SoundtrackFilename, out var lobbySongResource)
+                )
             {
                 var lobbyStream = lobbySongResource.AudioStream;
 
-                var title = string.IsNullOrEmpty(lobbyStream.Title) ?
-                    Loc.GetString("lobby-state-song-unknown-title") :
-                    lobbyStream.Title;
+                var title = string.IsNullOrEmpty(lobbyStream.Title)
+                    ? Loc.GetString("lobby-state-song-unknown-title")
+                    : lobbyStream.Title;
 
-                var artist = string.IsNullOrEmpty(lobbyStream.Artist) ?
-                    Loc.GetString("lobby-state-song-unknown-artist") :
-                    lobbyStream.Artist;
+                var artist = string.IsNullOrEmpty(lobbyStream.Artist)
+                    ? Loc.GetString("lobby-state-song-unknown-artist")
+                    : lobbyStream.Artist;
 
                 var markup = Loc.GetString("lobby-state-song-text",
                     ("songTitle", title),
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml.cs b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
index d45a99c16f..69867ea90c 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml.cs
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
@@ -1,5 +1,6 @@
 using Content.Client.Chat.UI;
 using Content.Client.Info;
+using Content.Client.Message;
 using Content.Client.Preferences;
 using Content.Client.Preferences.UI;
 using Content.Client.UserInterface.Screens;
@@ -33,6 +34,8 @@ public LobbyGui()
             SetAnchorPreset(MainContainer, LayoutPreset.Wide);
             SetAnchorPreset(Background, LayoutPreset.Wide);
 
+            LobbySong.SetMarkup(Loc.GetString("lobby-state-song-no-song-text"));
+
             LeaveButton.OnPressed += _ => _consoleHost.ExecuteCommand("disconnect");
             OptionsButton.OnPressed += _ => _userInterfaceManager.GetUIController<OptionsUIController>().ToggleWindow();
         }
diff --git a/Content.Client/Lock/Visualizers/LockVisualizerSystem.cs b/Content.Client/Lock/Visualizers/LockVisualizerSystem.cs
new file mode 100644
index 0000000000..1329a69ad2
--- /dev/null
+++ b/Content.Client/Lock/Visualizers/LockVisualizerSystem.cs
@@ -0,0 +1,38 @@
+using Content.Shared.Storage;
+using Content.Shared.Lock;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.Lock.Visualizers;
+
+public sealed class LockVisualizerSystem : VisualizerSystem<LockVisualsComponent>
+{
+    protected override void OnAppearanceChange(EntityUid uid, LockVisualsComponent comp, ref AppearanceChangeEvent args)
+    {
+        if (args.Sprite == null
+            || !AppearanceSystem.TryGetData<bool>(uid, LockVisuals.Locked, out _, args.Component))
+            return;
+
+        // Lock state for the entity.
+        if (!AppearanceSystem.TryGetData<bool>(uid, LockVisuals.Locked, out var locked, args.Component))
+            locked = true;
+
+        var unlockedStateExist = args.Sprite.BaseRSI?.TryGetState(comp.StateUnlocked, out _);
+
+        if (AppearanceSystem.TryGetData<bool>(uid, StorageVisuals.Open, out var open, args.Component))
+        {
+            args.Sprite.LayerSetVisible(LockVisualLayers.Lock, !open);
+        }
+        else if (!(bool) unlockedStateExist!)
+            args.Sprite.LayerSetVisible(LockVisualLayers.Lock, locked);
+
+        if (!open && (bool) unlockedStateExist!)
+        {
+            args.Sprite.LayerSetState(LockVisualLayers.Lock, locked ? comp.StateLocked : comp.StateUnlocked);
+        }
+    }
+}
+
+public enum LockVisualLayers : byte
+{
+    Lock
+}
diff --git a/Content.Client/Lock/Visualizers/LockVisualsComponent.cs b/Content.Client/Lock/Visualizers/LockVisualsComponent.cs
new file mode 100644
index 0000000000..93844d6d82
--- /dev/null
+++ b/Content.Client/Lock/Visualizers/LockVisualsComponent.cs
@@ -0,0 +1,20 @@
+namespace Content.Client.Lock.Visualizers;
+
+[RegisterComponent]
+[Access(typeof(LockVisualizerSystem))]
+public sealed partial class LockVisualsComponent : Component
+{
+    /// <summary>
+    /// The RSI state used for the lock indicator while the entity is locked.
+    /// </summary>
+    [DataField("stateLocked")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public string? StateLocked = "locked";
+
+    /// <summary>
+    /// The RSI state used for the lock indicator entity is unlocked.
+    /// </summary>
+    [DataField("stateUnlocked")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public string? StateUnlocked = "unlocked";
+}
diff --git a/Content.Client/MainMenu/UI/MainMenuControl.xaml b/Content.Client/MainMenu/UI/MainMenuControl.xaml
index e1d0652b93..d6c3f4b941 100644
--- a/Content.Client/MainMenu/UI/MainMenuControl.xaml
+++ b/Content.Client/MainMenu/UI/MainMenuControl.xaml
@@ -2,46 +2,46 @@
          xmlns:pllax="clr-namespace:Content.Client.Parallax"
          xmlns:clog="clr-namespace:Content.Client.Changelog">
     <pllax:ParallaxControl />
-    <LayoutContainer>
-        <BoxContainer Name="VBox"
-                      Orientation="Vertical"
-                      StyleIdentifier="mainMenuVBox"
-                      MinWidth="512">
-            <TextureRect Name="Logo"
-                         Stretch="KeepCentered" />
-            <Control MinSize="0 24" />
-            <BoxContainer Orientation="Horizontal"
-                          SeparationOverride="4">
-                <Label Text="{Loc 'main-menu-username-label'}" />
-                <LineEdit Name="UsernameBox"
-                          Access="Public"
-                          PlaceHolder="{Loc 'main-menu-username-text'}"
-                          HorizontalExpand="True" />
-            </BoxContainer>
+    <BoxContainer Name="VBox"
+                  Orientation="Vertical"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Center"
+                  HorizontalExpand="True"
+                  VerticalExpand="True"
+                  StyleIdentifier="mainMenuVBox"
+                  SeparationOverride="3">
+        <TextureRect Name="Logo"
+                     Stretch="KeepCentered"/>
+        <GridContainer Columns="2">
+            <Label Text="{Loc 'main-menu-username-label'}" />
+            <LineEdit Name="UsernameBox"
+                      Access="Public"
+                      PlaceHolder="{Loc 'main-menu-username-text'}"
+                      HorizontalExpand="True" />
+            <Label Text="{Loc 'main-menu-address-label'}"/>
             <LineEdit Name="AddressBox"
                       Access="Public"
                       Text="localhost"
                       PlaceHolder="server address:port"
                       HorizontalExpand="True" />
-            <Button Name="DirectConnectButton"
-                    Access="Public"
-                    Text="{Loc 'main-menu-direct-connect-button'}"
-                    TextAlign="Center"
-                    StyleIdentifier="mainMenu" />
-            <Control MinSize="0 2" />
-            <Button Name="OptionsButton"
-                    Access="Public"
-                    Text="{Loc 'main-menu-options-button'}"
-                    TextAlign="Center"
-                    StyleIdentifier="mainMenu" />
-            <Button Name="QuitButton"
-                    Access="Public"
-                    Text="{Loc 'main-menu-quit-button'}"
-                    TextAlign="Center"
-                    StyleIdentifier="mainMenu" />
-            <clog:ChangelogButton
-                Name="ChangelogButton"
-                Access="Public"/>
-        </BoxContainer>
-    </LayoutContainer>
+        </GridContainer>
+        <Button Name="DirectConnectButton"
+                Access="Public"
+                Text="{Loc 'main-menu-direct-connect-button'}"
+                TextAlign="Center"
+                StyleIdentifier="mainMenu"/>
+        <Button Name="OptionsButton"
+                Access="Public"
+                Text="{Loc 'main-menu-options-button'}"
+                TextAlign="Center"
+                StyleIdentifier="mainMenu"/>
+        <Button Name="QuitButton"
+                Access="Public"
+                Text="{Loc 'main-menu-quit-button'}"
+                TextAlign="Center"
+                StyleIdentifier="mainMenu"/>
+        <clog:ChangelogButton
+            Name="ChangelogButton"
+            Access="Public"/>
+    </BoxContainer>
 </Control>
diff --git a/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml b/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml
new file mode 100644
index 0000000000..2b600845ca
--- /dev/null
+++ b/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml
@@ -0,0 +1,71 @@
+<Control xmlns="https://spacestation14.io"
+         xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+         MouseFilter="Stop">
+    <PanelContainer StyleClasses="BackgroundOpenLeft"/>
+    <PanelContainer>
+        <PanelContainer.PanelOverride>
+            <graphics:StyleBoxFlat BorderColor="#25252A" BorderThickness="0 0 0 3"/>
+        </PanelContainer.PanelOverride>
+    </PanelContainer>
+    <BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
+        <Control Margin="0 0 1 0">
+            <PanelContainer StyleClasses="WindowHeadingBackground" />
+            <BoxContainer Margin="4 2 8 0" Orientation="Horizontal">
+                <Label Name="Title" Text="{Loc news-write-ui-new-article}"
+                       HorizontalExpand="True" VAlign="Center" StyleClasses="FancyWindowTitle" />
+            </BoxContainer>
+        </Control>
+        <PanelContainer StyleClasses="LowDivider" Margin="0 0 1 0"/>
+        <BoxContainer Orientation="Horizontal">
+            <Label Text="{Loc news-write-ui-article-name-label}" Margin="17 10 0 9" VerticalAlignment="Center"/>
+            <LineEdit Name="TitleField" Margin="6 10 0 9" MinWidth="260" MinHeight="23" Access="Public"/>
+            <Control HorizontalExpand="True" />
+            <Label Name="RichTextInfoLabel" Text="?" MouseFilter="Pass" Margin="14 0" StyleClasses="LabelSecondaryColor"/>
+        </BoxContainer>
+        <Control Name="TextEditPanel" VerticalExpand="True" Margin="11 0 11 0">
+            <PanelContainer>
+                <PanelContainer.PanelOverride>
+                    <graphics:StyleBoxFlat BackgroundColor="#202023" BorderThickness="1" BorderColor="#3B3E56"/>
+                </PanelContainer.PanelOverride>
+            </PanelContainer>
+            <TextEdit Name="ContentField" Margin="0 1" Access="Public"/>
+        </Control>
+        <Control Name="PreviewPanel" Visible="False" VerticalExpand="True" Margin="11 0 11 0">
+            <PanelContainer>
+                <PanelContainer.PanelOverride>
+                    <graphics:StyleBoxFlat BorderThickness="1" BorderColor="#3B3E56"/>
+                </PanelContainer.PanelOverride>
+            </PanelContainer>
+            <ScrollContainer HScrollEnabled="True">
+                <RichTextLabel Name="PreviewLabel" VerticalAlignment="Top" Margin="9 3" MaxWidth="360"/>
+            </ScrollContainer>
+        </Control>
+        <BoxContainer Orientation="Horizontal" Margin="12 5 12 8">
+            <Control>
+                <Button Name="ButtonCancel" SetHeight="32" SetWidth="85"
+                        StyleClasses="ButtonColorRed" Text="{Loc news-write-ui-cancel-text}"/>
+            </Control>
+            <Control HorizontalExpand="True"/>
+            <BoxContainer Orientation="Horizontal">
+                <Button Name="ButtonPreview" SetHeight="32" SetWidth="85"
+                        StyleClasses="OpenRight" Text="{Loc news-write-ui-preview-text}"/>
+                <Button Name="ButtonPublish" SetHeight="32" SetWidth="85" Text="{Loc news-write-ui-publish-text}" Access="Public"/>
+            </BoxContainer>
+        </BoxContainer>
+    </BoxContainer>
+    <PanelContainer>
+        <PanelContainer.PanelOverride>
+            <graphics:StyleBoxFlat BorderThickness="2 0 0 0" BorderColor="#1d1d22"/>
+        </PanelContainer.PanelOverride>
+    </PanelContainer>
+    <PanelContainer HorizontalAlignment="Left" VerticalAlignment="Top" SetHeight="27" SetWidth="2">
+        <PanelContainer.PanelOverride>
+            <graphics:StyleBoxFlat BorderColor="#2a2a2d" BorderThickness="0 0 0 2"/>
+        </PanelContainer.PanelOverride>
+    </PanelContainer>
+    <PanelContainer HorizontalAlignment="Left" VerticalAlignment="Top" SetHeight="25" SetWidth="2">
+        <PanelContainer.PanelOverride>
+            <graphics:StyleBoxFlat BackgroundColor="#1b1b1f"/>
+        </PanelContainer.PanelOverride>
+    </PanelContainer>
+</Control>
diff --git a/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs b/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs
new file mode 100644
index 0000000000..2918faa83d
--- /dev/null
+++ b/Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml.cs
@@ -0,0 +1,109 @@
+using Content.Client.Message;
+using Content.Client.Stylesheets;
+using Content.Shared.MassMedia.Systems;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Utility;
+
+namespace Content.Client.MassMedia.Ui;
+
+[GenerateTypedNameReferences]
+public sealed partial class ArticleEditorPanel : Control
+{
+    public event Action? PublishButtonPressed;
+
+    private bool _preview;
+
+    public ArticleEditorPanel()
+    {
+        RobustXamlLoader.Load(this);
+
+        ButtonPublish.StyleClasses.Add(StyleBase.ButtonOpenLeft);
+        ButtonPublish.StyleClasses.Add(StyleNano.StyleClassButtonColorGreen);
+
+        ContentField.GetChild(0).Margin = new Thickness(9, 3);
+        // Customize scrollbar width and margin. This is not possible in xaml
+        var scrollbar = ContentField.GetChild(1);
+        scrollbar.SetWidth = 6f;
+        scrollbar.Margin = new Thickness(9, 0, 2 , 0);
+
+        RichTextInfoLabel.TooltipSupplier = sender =>
+        {
+            var label = new RichTextLabel();
+            label.SetMarkup(Loc.GetString("news-write-ui-richtext-tooltip"));
+
+            var tooltip = new Tooltip();
+            tooltip.GetChild(0).Children.Clear();
+            tooltip.GetChild(0).Children.Add(label);
+
+            return tooltip;
+        };
+
+        ButtonPreview.OnPressed += OnPreview;
+        ButtonCancel.OnPressed += OnCancel;
+        ButtonPublish.OnPressed += OnPublish;
+
+        TitleField.OnTextChanged += args => OnTextChanged(args.Text.Length, args.Control, SharedNewsSystem.MaxTitleLength);
+        ContentField.OnTextChanged += args => OnTextChanged(Rope.CalcTotalLength(args.TextRope), args.Control, SharedNewsSystem.MaxContentLength);
+    }
+
+    private void OnTextChanged(long length, Control control, long maxLength)
+    {
+        if (length > maxLength)
+        {
+            control.ModulateSelfOverride = Color.Red;
+            control.ToolTip = Loc.GetString("news-writer-text-length-exceeded");
+        }
+        else
+        {
+            control.ModulateSelfOverride = null;
+            control.ToolTip = string.Empty;
+        }
+    }
+
+    private void OnPreview(BaseButton.ButtonEventArgs eventArgs)
+    {
+        _preview = !_preview;
+
+        TextEditPanel.Visible = !_preview;
+        PreviewPanel.Visible = _preview;
+        PreviewLabel.SetMarkup(Rope.Collapse(ContentField.TextRope));
+    }
+
+    private void OnCancel(BaseButton.ButtonEventArgs eventArgs)
+    {
+        Reset();
+        Visible = false;
+    }
+
+    private void OnPublish(BaseButton.ButtonEventArgs eventArgs)
+    {
+        PublishButtonPressed?.Invoke();
+        Reset();
+        Visible = false;
+    }
+
+    private void Reset()
+    {
+        _preview = false;
+        TextEditPanel.Visible = true;
+        PreviewPanel.Visible = false;
+        PreviewLabel.SetMarkup("");
+        TitleField.Text = "";
+        ContentField.TextRope = Rope.Leaf.Empty;
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (!disposing)
+            return;
+
+        ButtonPreview.OnPressed -= OnPreview;
+        ButtonCancel.OnPressed -= OnCancel;
+        ButtonPublish.OnPressed -= OnPublish;
+    }
+}
diff --git a/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml b/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml
deleted file mode 100644
index 2da84e9eb1..0000000000
--- a/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Control xmlns="https://spacestation14.io"
-         xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
-    <BoxContainer Orientation="Vertical" HorizontalExpand="True" Margin="0 0 0 12">
-        <BoxContainer Orientation="Horizontal" HorizontalExpand="True" VerticalExpand="True">
-            <PanelContainer HorizontalExpand="True" VerticalExpand="True">
-                <PanelContainer.PanelOverride>
-                    <gfx:StyleBoxFlat BackgroundColor="#4c6530"/>
-                </PanelContainer.PanelOverride>
-                <Label Name="Name" Margin="6 6 6 6" HorizontalAlignment="Center"/>
-            </PanelContainer>
-        </BoxContainer>
-        <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-            <PanelContainer HorizontalExpand="True" VerticalExpand="True">
-                <PanelContainer.PanelOverride>
-                    <gfx:StyleBoxFlat BackgroundColor="#33333f"/>
-                </PanelContainer.PanelOverride>
-                <RichTextLabel Name="Author" HorizontalExpand="True" VerticalAlignment="Bottom" Margin="6 6 6 6"/>
-                <Button Name="Delete"
-                        Text="{Loc 'news-write-ui-delete-text'}"
-                        HorizontalAlignment="Right"
-                        Margin="8 6 6 6"
-                        Access="Public"/>
-            </PanelContainer>
-        </BoxContainer>
-    </BoxContainer>
-</Control>
diff --git a/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml.cs b/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml.cs
deleted file mode 100644
index 47c0018804..0000000000
--- a/Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Content.Client.Message;
-using Content.Shared.Research.Prototypes;
-using Robust.Client.AutoGenerated;
-using Robust.Client.GameObjects;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Utility;
-
-namespace Content.Client.MassMedia.Ui;
-
-[GenerateTypedNameReferences]
-public sealed partial class MiniArticleCardControl : Control
-{
-    public Action? OnDeletePressed;
-    public int ArtcileNum;
-
-    public MiniArticleCardControl(string name, string author)
-    {
-        RobustXamlLoader.Load(this);
-
-        Name.Text = name;
-        Author.SetMarkup(author);
-
-        Delete.OnPressed += _ => OnDeletePressed?.Invoke();
-    }
-}
diff --git a/Content.Client/MassMedia/Ui/NewsArticleCard.xaml b/Content.Client/MassMedia/Ui/NewsArticleCard.xaml
new file mode 100644
index 0000000000..abfc1cbcf1
--- /dev/null
+++ b/Content.Client/MassMedia/Ui/NewsArticleCard.xaml
@@ -0,0 +1,29 @@
+<Control xmlns="https://spacestation14.io"
+         xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+         xmlns:system="clr-namespace:System;assembly=System.Runtime"
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+         Margin="0 0 0 8">
+    <PanelContainer StyleClasses="AngleRect" ModulateSelfOverride="#2b2b31"/>
+    <BoxContainer Orientation="Vertical" SetHeight="60">
+        <Control HorizontalExpand="True" SetHeight="27">
+            <PanelContainer>
+                <PanelContainer.PanelOverride>
+                    <gfx:StyleBoxFlat BorderColor="#3B3E56" BorderThickness="0 0 0 1"/>
+                </PanelContainer.PanelOverride>
+            </PanelContainer>
+            <Label Name="TitleLabel" Margin="12 0 6 0" HorizontalAlignment="Left"/>
+        </Control>
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+            <Label FontColorOverride="#b1b1b2" StyleClasses="LabelSmall" Name="AuthorLabel" Margin="14 6 6 6"/>
+            <Control HorizontalExpand="True"/>
+            <Label FontColorOverride="#b1b1b2" StyleClasses="LabelSmall" Name="PublishTimeLabel" Margin="6 6 6 6"/>
+            <controls:ConfirmButton Name="DeleteButton" Text="{Loc news-write-ui-delete-text}"
+                    HorizontalAlignment="Right" Margin="8 6 6 6" SetHeight="19" SetWidth="52" Access="Public">
+                <Button.StyleClasses>
+                    <system:String>ButtonSmall</system:String>
+                    <system:String>ButtonColorRed</system:String>
+                </Button.StyleClasses>
+            </controls:ConfirmButton>
+        </BoxContainer>
+    </BoxContainer>
+</Control>
diff --git a/Content.Client/MassMedia/Ui/NewsArticleCard.xaml.cs b/Content.Client/MassMedia/Ui/NewsArticleCard.xaml.cs
new file mode 100644
index 0000000000..f6fa3e00be
--- /dev/null
+++ b/Content.Client/MassMedia/Ui/NewsArticleCard.xaml.cs
@@ -0,0 +1,47 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.MassMedia.Ui;
+
+[GenerateTypedNameReferences]
+public sealed partial class NewsArticleCard : Control
+{
+    private string? _authorMarkup;
+    private TimeSpan? _publicationTime;
+
+    public Action? OnDeletePressed;
+    public int ArtcileNumber;
+
+    public string? Title
+    {
+        get => TitleLabel.Text;
+        set => TitleLabel.Text = value?.Length <= 30 ? value : $"{value?[..30]}...";
+    }
+
+    public string? Author
+    {
+        get => _authorMarkup;
+        set
+        {
+            _authorMarkup = value;
+            AuthorLabel.Text = _authorMarkup ?? "";
+        }
+    }
+
+    public TimeSpan? PublicationTime
+    {
+        get => _publicationTime;
+        set
+        {
+            _publicationTime = value;
+            PublishTimeLabel.Text = value?.ToString(@"hh\:mm\:ss") ?? "";
+        }
+    }
+
+    public NewsArticleCard()
+    {
+        RobustXamlLoader.Load(this);
+        DeleteButton.OnPressed += _ => OnDeletePressed?.Invoke();
+    }
+}
diff --git a/Content.Client/MassMedia/Ui/NewsWriteBoundUserInterface.cs b/Content.Client/MassMedia/Ui/NewsWriteBoundUserInterface.cs
deleted file mode 100644
index d1d61d5adb..0000000000
--- a/Content.Client/MassMedia/Ui/NewsWriteBoundUserInterface.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using JetBrains.Annotations;
-using Content.Shared.MassMedia.Components;
-using Content.Shared.MassMedia.Systems;
-using Robust.Shared.Utility;
-
-namespace Content.Client.MassMedia.Ui
-{
-    [UsedImplicitly]
-    public sealed class NewsWriteBoundUserInterface : BoundUserInterface
-    {
-        [ViewVariables]
-        private NewsWriteMenu? _menu;
-
-        [ViewVariables]
-        private string _windowName = Loc.GetString("news-read-ui-default-title");
-
-        public NewsWriteBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
-        {
-        }
-
-        protected override void Open()
-        {
-            _menu = new NewsWriteMenu(_windowName);
-
-            _menu.OpenCentered();
-            _menu.OnClose += Close;
-
-            _menu.ShareButtonPressed += OnShareButtonPressed;
-            _menu.DeleteButtonPressed += OnDeleteButtonPressed;
-
-            SendMessage(new NewsWriteArticlesRequestMessage());
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            _menu?.Close();
-            _menu?.Dispose();
-        }
-
-        protected override void UpdateState(BoundUserInterfaceState state)
-        {
-            base.UpdateState(state);
-            if (_menu == null || state is not NewsWriteBoundUserInterfaceState cast)
-                return;
-
-            _menu.UpdateUI(cast.Articles, cast.ShareAvalible);
-        }
-
-        private void OnShareButtonPressed()
-        {
-            if (_menu == null || _menu.NameInput.Text.Length == 0)
-                return;
-
-            var stringContent = Rope.Collapse(_menu.ContentInput.TextRope);
-
-            if (stringContent.Length == 0)
-                return;
-
-            var stringName = _menu.NameInput.Text.Trim();
-            var name = stringName[..Math.Min(stringName.Length, (SharedNewsSystem.MaxNameLength))];
-            var content = stringContent[..Math.Min(stringContent.Length, (SharedNewsSystem.MaxArticleLength))];
-            _menu.ContentInput.TextRope = new Rope.Leaf(string.Empty);
-            _menu.NameInput.Text = string.Empty;
-            SendMessage(new NewsWriteShareMessage(name, content));
-        }
-
-        private void OnDeleteButtonPressed(int articleNum)
-        {
-            if (_menu == null)
-                return;
-
-            SendMessage(new NewsWriteDeleteMessage(articleNum));
-        }
-    }
-}
diff --git a/Content.Client/MassMedia/Ui/NewsWriteMenu.xaml b/Content.Client/MassMedia/Ui/NewsWriteMenu.xaml
deleted file mode 100644
index 08d113f8a9..0000000000
--- a/Content.Client/MassMedia/Ui/NewsWriteMenu.xaml
+++ /dev/null
@@ -1,68 +0,0 @@
-<DefaultWindow
-    xmlns="https://spacestation14.io"
-    xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
-    Title="{Loc 'news-write-ui-default-title'}"
-    MinSize="680 512"
-    SetSize="680 512">
-    <BoxContainer Orientation="Horizontal"
-                  HorizontalExpand="True"
-                  VerticalExpand="True">
-        <BoxContainer Orientation="Vertical"
-                      VerticalExpand="True"
-                      SizeFlagsStretchRatio="2"
-                      Margin="10 0 10 10"
-                      MinWidth="350">
-            <Label Text="{Loc 'news-write-ui-articles-label'}" HorizontalAlignment="Center"/>
-            <customControls:HSeparator StyleClasses="LowDivider" Margin="0 0 0 10"/>
-            <PanelContainer VerticalExpand="True">
-                <PanelContainer.PanelOverride>
-                    <gfx:StyleBoxFlat BackgroundColor="#1B1B1E" />
-                </PanelContainer.PanelOverride>
-                <ScrollContainer
-                    HScrollEnabled="False"
-                    HorizontalExpand="True"
-                    VerticalExpand="True">
-                    <BoxContainer
-                        Name="ArticleCardsContainer"
-                        Orientation="Vertical"
-                        VerticalExpand="True">
-                    </BoxContainer>
-                </ScrollContainer>
-            </PanelContainer>
-        </BoxContainer>
-        <BoxContainer Orientation="Vertical"
-                      VerticalExpand="True"
-                      HorizontalExpand="True"
-                      Margin="15 0 0 0">
-            <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-                <Label Text="{Loc 'news-write-ui-article-name-label'}"/>
-                <LineEdit Name="NameInput"
-                          MinSize="60 0"
-                          VerticalAlignment="Top"
-                          Margin="4 0 0 0"
-                          Access="Public"
-                          HorizontalExpand="True"/>
-            </BoxContainer>
-            <customControls:HSeparator StyleClasses="LowDivider" Margin="0 5 0 5"/>
-            <Label Text="{Loc 'news-write-ui-article-content-label'}" Margin="0 0 0 5"/>
-            <PanelContainer Name="InputContainer"
-                            VerticalAlignment="Stretch"
-                            VerticalExpand="True"
-                            HorizontalExpand="True">
-                <PanelContainer.PanelOverride>
-                    <gfx:StyleBoxFlat BackgroundColor="#333237"/>
-                </PanelContainer.PanelOverride>
-                <TextEdit Name="ContentInput" Access="Public" />
-            </PanelContainer>
-            <Button Name="Share"
-                    MinWidth="30"
-                    HorizontalAlignment="Left"
-                    Text="{Loc 'news-write-ui-share-text'}"
-                    Access="Public"
-                    Margin="0 4 4 4">
-            </Button>
-        </BoxContainer>
-    </BoxContainer>
-</DefaultWindow>
diff --git a/Content.Client/MassMedia/Ui/NewsWriteMenu.xaml.cs b/Content.Client/MassMedia/Ui/NewsWriteMenu.xaml.cs
deleted file mode 100644
index b3cbf0cf2c..0000000000
--- a/Content.Client/MassMedia/Ui/NewsWriteMenu.xaml.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Prototypes;
-using Content.Shared.MassMedia.Systems;
-
-namespace Content.Client.MassMedia.Ui;
-
-[GenerateTypedNameReferences]
-public sealed partial class NewsWriteMenu : DefaultWindow
-{
-    public event Action? ShareButtonPressed;
-    public event Action<int>? DeleteButtonPressed;
-
-    public NewsWriteMenu(string name)
-    {
-        RobustXamlLoader.Load(this);
-        IoCManager.InjectDependencies(this);
-
-        if (Window != null)
-            Window.Title = name;
-
-        Share.OnPressed += _ => ShareButtonPressed?.Invoke();
-    }
-
-    public void UpdateUI(NewsArticle[] articles, bool shareAvalible)
-    {
-        ArticleCardsContainer.Children.Clear();
-
-        for (int i = 0; i < articles.Length; i++)
-        {
-            var article = articles[i];
-            var mini = new MiniArticleCardControl(article.Name, (article.Author != null ? article.Author : Loc.GetString("news-read-ui-no-author")));
-            mini.ArtcileNum = i;
-            mini.OnDeletePressed += () => DeleteButtonPressed?.Invoke(mini.ArtcileNum);
-
-            ArticleCardsContainer.AddChild(mini);
-        }
-
-        Share.Disabled = !shareAvalible;
-    }
-}
diff --git a/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs b/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs
new file mode 100644
index 0000000000..80eca82e32
--- /dev/null
+++ b/Content.Client/MassMedia/Ui/NewsWriterBoundUserInterface.cs
@@ -0,0 +1,84 @@
+using JetBrains.Annotations;
+using Content.Shared.MassMedia.Systems;
+using Content.Shared.MassMedia.Components;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+
+namespace Content.Client.MassMedia.Ui;
+
+[UsedImplicitly]
+public sealed class NewsWriterBoundUserInterface : BoundUserInterface
+{
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+
+    [ViewVariables]
+    private NewsWriterMenu? _menu;
+
+    public NewsWriterBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+
+    }
+
+    protected override void Open()
+    {
+        _menu = new NewsWriterMenu(_gameTiming);
+
+        _menu.OpenCentered();
+        _menu.OnClose += Close;
+
+        _menu.ArticleEditorPanel.PublishButtonPressed += OnPublishButtonPressed;
+        _menu.DeleteButtonPressed += OnDeleteButtonPressed;
+
+        SendMessage(new NewsWriterArticlesRequestMessage());
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (!disposing)
+            return;
+
+        _menu?.Close();
+        _menu?.Dispose();
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+        if (state is not NewsWriterBoundUserInterfaceState cast)
+            return;
+
+        _menu?.UpdateUI(cast.Articles, cast.PublishEnabled, cast.NextPublish);
+    }
+
+    private void OnPublishButtonPressed()
+    {
+        var title = _menu?.ArticleEditorPanel.TitleField.Text.Trim() ?? "";
+        if (_menu == null || title.Length == 0)
+            return;
+
+        var stringContent = Rope.Collapse(_menu.ArticleEditorPanel.ContentField.TextRope).Trim();
+
+        if (stringContent.Length == 0)
+            return;
+
+        var name = title.Length <= SharedNewsSystem.MaxTitleLength
+            ? title
+            : $"{title[..(SharedNewsSystem.MaxTitleLength - 3)]}...";
+
+        var content = stringContent.Length <= SharedNewsSystem.MaxContentLength
+            ? stringContent
+            : $"{stringContent[..(SharedNewsSystem.MaxContentLength - 3)]}...";
+
+
+        SendMessage(new NewsWriterPublishMessage(name, content));
+    }
+
+    private void OnDeleteButtonPressed(int articleNum)
+    {
+        if (_menu == null)
+            return;
+
+        SendMessage(new NewsWriterDeleteMessage(articleNum));
+    }
+}
diff --git a/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml b/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml
new file mode 100644
index 0000000000..64932bc6cf
--- /dev/null
+++ b/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml
@@ -0,0 +1,45 @@
+<controls:FancyWindow
+    xmlns="https://spacestation14.io"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    xmlns:ui="clr-namespace:Content.Client.MassMedia.Ui"
+    xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    Title="{Loc 'news-write-ui-default-title'}"
+    MinSize="348 443"
+    SetSize="348 443">
+
+    <ui:ArticleEditorPanel Name="ArticleEditorPanel" HorizontalAlignment="Left" VerticalExpand="True"
+                           MinWidth="410" MinHeight="370" Margin="0 0 0 30" Access="Public" Visible="False"/>
+
+    <BoxContainer Orientation="Vertical" VerticalExpand="True">
+        <Control VerticalExpand="True" HorizontalExpand="True" Margin="10 10 10 0">
+            <PanelContainer Name="MainPanel" HorizontalExpand="False" VerticalExpand="True">
+                <PanelContainer.PanelOverride>
+                    <graphics:StyleBoxFlat BackgroundColor="#202023" />
+                </PanelContainer.PanelOverride>
+            </PanelContainer>
+            <ScrollContainer Name="ArticleListScrollbar" HorizontalExpand="True" VerticalExpand="True" HScrollEnabled="True">
+                <BoxContainer Name="ArticlesContainer" Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True" Margin="6 6 6 6">
+                </BoxContainer>
+            </ScrollContainer>
+        </Control>
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="12 7 12 9">
+            <BoxContainer Orientation="Horizontal">
+                <Label Name="ArticleCount" Text="{Loc news-write-ui-article-count-0}"/>
+            </BoxContainer>
+            <Control HorizontalExpand="True"/>
+            <Control>
+                <Button Name="ButtonCreate" SetHeight="26" MinWidth="83" Text="{Loc news-write-ui-create-text}"/>
+            </Control>
+        </BoxContainer>
+        <Control SetHeight="30" Margin="2 0 0 0">
+            <PanelContainer Name="FooterPanel">
+                <PanelContainer.PanelOverride>
+                    <graphics:StyleBoxFlat BorderColor="#5A5A5A" BorderThickness="0 2 0 0" />
+                </PanelContainer.PanelOverride>
+            </PanelContainer>
+            <BoxContainer Name="ContentFooter" HorizontalExpand="True" SetHeight="28">
+                <Label Text="{Loc news-write-ui-footer-text}" VerticalAlignment="Center" Margin="6 0" StyleClasses="PdaContentFooterText"/>
+            </BoxContainer>
+        </Control>
+    </BoxContainer>
+</controls:FancyWindow>
diff --git a/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs b/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs
new file mode 100644
index 0000000000..e2d57935e3
--- /dev/null
+++ b/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs
@@ -0,0 +1,97 @@
+using Content.Client.UserInterface.Controls;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.XAML;
+using Content.Shared.MassMedia.Systems;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Timing;
+
+namespace Content.Client.MassMedia.Ui;
+
+[GenerateTypedNameReferences]
+public sealed partial class NewsWriterMenu : FancyWindow
+{
+    private readonly IGameTiming _gameTiming;
+
+    private TimeSpan? _nextPublish;
+
+    public event Action<int>? DeleteButtonPressed;
+
+    public NewsWriterMenu(IGameTiming gameTiming)
+    {
+        RobustXamlLoader.Load(this);
+
+        _gameTiming = gameTiming;
+        ContentsContainer.RectClipContent = false;
+
+        // Customize scrollbar width and margin. This is not possible in xaml
+        var scrollbar = ArticleListScrollbar.GetChild(1);
+        scrollbar.SetWidth = 6f;
+        scrollbar.Margin = new Thickness(0, 0, 2 , 0);
+
+        ButtonCreate.OnPressed += OnCreate;
+    }
+
+    public void UpdateUI(NewsArticle[] articles, bool publishEnabled, TimeSpan nextPublish)
+    {
+        ArticlesContainer.Children.Clear();
+        ArticleCount.Text = Loc.GetString("news-write-ui-article-count-text", ("count", articles.Length));
+
+        //Iterate backwards to have the newest article at the top
+        for (var i = articles.Length - 1; i >= 0 ; i--)
+        {
+            var article = articles[i];
+            var control = new NewsArticleCard
+            {
+                Title = article.Title,
+                Author = article.Author ?? Loc.GetString("news-read-ui-no-author"),
+                PublicationTime = article.ShareTime,
+                ArtcileNumber = i
+            };
+            control.OnDeletePressed += () => DeleteButtonPressed?.Invoke(control.ArtcileNumber);
+
+            ArticlesContainer.AddChild(control);
+        }
+
+        ButtonCreate.Disabled = !publishEnabled;
+        _nextPublish = nextPublish;
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+        if (!_nextPublish.HasValue)
+            return;
+
+        var remainingTime = _nextPublish.Value.Subtract(_gameTiming.CurTime);
+        if (remainingTime.TotalSeconds <= 0)
+        {
+            _nextPublish = null;
+            ButtonCreate.Text = Loc.GetString("news-write-ui-create-text");
+            return;
+        }
+
+        ButtonCreate.Text = remainingTime.Seconds.ToString("D2");
+    }
+
+    protected override void Resized()
+    {
+        base.Resized();
+        var margin = ArticleEditorPanel.Margin;
+        // Bandaid for the funny 1 pixel margin differences
+        ArticleEditorPanel.Margin =  new Thickness(Width - 1, margin.Top, margin.Right, margin.Bottom);
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (!disposing)
+            return;
+
+        ButtonCreate.OnPressed -= OnCreate;
+    }
+
+    private void OnCreate(BaseButton.ButtonEventArgs buttonEventArgs)
+    {
+        ArticleEditorPanel.Visible = true;
+    }
+}
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs
index fcecbad465..340cc9af89 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs
@@ -1,6 +1,7 @@
 using Content.Client.Pinpointer.UI;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Timing;
 
 namespace Content.Client.Medical.CrewMonitoring;
 
@@ -16,7 +17,7 @@ public CrewMonitoringNavMapControl() : base()
     {
         WallColor = new Color(192, 122, 196);
         TileColor = new(71, 42, 72);
-        _backgroundColor = Color.FromSrgb(TileColor.WithAlpha(_backgroundOpacity));
+        BackgroundColor = Color.FromSrgb(TileColor.WithAlpha(BackgroundOpacity));
 
         _trackedEntityLabel = new Label
         {
@@ -30,7 +31,7 @@ public CrewMonitoringNavMapControl() : base()
         {
             PanelOverride = new StyleBoxFlat
             {
-                BackgroundColor = _backgroundColor,
+                BackgroundColor = BackgroundColor,
             },
 
             Margin = new Thickness(5f, 10f),
@@ -43,9 +44,9 @@ public CrewMonitoringNavMapControl() : base()
         this.AddChild(_trackedEntityPanel);
     }
 
-    protected override void Draw(DrawingHandleScreen handle)
+    protected override void FrameUpdate(FrameEventArgs args)
     {
-        base.Draw(handle);
+        base.FrameUpdate(args);
 
         if (Focus == null)
         {
diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
index d8c87899db..39326c8a99 100644
--- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
+++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs
@@ -23,7 +23,6 @@ namespace Content.Client.Medical.CrewMonitoring;
 [GenerateTypedNameReferences]
 public sealed partial class CrewMonitoringWindow : FancyWindow
 {
-    private List<Control> _rowsContent = new();
     private readonly IEntityManager _entManager;
     private readonly IPrototypeManager _prototypeManager;
     private readonly SpriteSystem _spriteSystem;
@@ -100,7 +99,6 @@ public void ShowSensors(List<SuitSensorStatus> sensors, EntityUid monitor, Entit
                 };
 
                 SensorsTable.AddChild(spacer);
-                _rowsContent.Add(spacer);
             }
 
             var deparmentLabel = new RichTextLabel()
@@ -113,7 +111,6 @@ public void ShowSensors(List<SuitSensorStatus> sensors, EntityUid monitor, Entit
             deparmentLabel.StyleClasses.Add(StyleNano.StyleClassTooltipActionDescription);
 
             SensorsTable.AddChild(deparmentLabel);
-            _rowsContent.Add(deparmentLabel);
 
             PopulateDepartmentList(departmentSensors);
         }
@@ -129,7 +126,6 @@ public void ShowSensors(List<SuitSensorStatus> sensors, EntityUid monitor, Entit
             };
 
             SensorsTable.AddChild(spacer);
-            _rowsContent.Add(spacer);
 
             var deparmentLabel = new RichTextLabel()
             {
@@ -141,7 +137,6 @@ public void ShowSensors(List<SuitSensorStatus> sensors, EntityUid monitor, Entit
             deparmentLabel.StyleClasses.Add(StyleNano.StyleClassTooltipActionDescription);
 
             SensorsTable.AddChild(deparmentLabel);
-            _rowsContent.Add(deparmentLabel);
 
             PopulateDepartmentList(remainingSensors);
         }
@@ -175,7 +170,6 @@ private void PopulateDepartmentList(IEnumerable<SuitSensorStatus> departmentSens
                 sensorButton.AddStyleClass(StyleNano.StyleClassButtonColorGreen);
 
             SensorsTable.AddChild(sensorButton);
-            _rowsContent.Add(sensorButton);
 
             // Primary container to hold the button UI elements
             var mainContainer = new BoxContainer()
@@ -265,7 +259,7 @@ private void PopulateDepartmentList(IEnumerable<SuitSensorStatus> departmentSens
                 var jobIcon = new TextureRect()
                 {
                     TextureScale = new Vector2(2f, 2f),
-                    Stretch = TextureRect.StretchMode.KeepCentered,
+                    VerticalAlignment = VAlignment.Center,
                     Texture = _spriteSystem.Frame0(proto.Icon),
                     Margin = new Thickness(5, 0, 5, 0),
                 };
@@ -422,7 +416,6 @@ private bool TryGetNextScrollPosition([NotNullWhen(true)] out float? nextScrollP
     private void ClearOutDatedData()
     {
         SensorsTable.RemoveAllChildren();
-        _rowsContent.Clear();
         NavMap.TrackedCoordinates.Clear();
         NavMap.TrackedEntities.Clear();
         NavMap.LocalizedNames.Clear();
diff --git a/Content.Client/MouseRotator/MouseRotatorSystem.cs b/Content.Client/MouseRotator/MouseRotatorSystem.cs
index 9615862dc5..44e8205355 100644
--- a/Content.Client/MouseRotator/MouseRotatorSystem.cs
+++ b/Content.Client/MouseRotator/MouseRotatorSystem.cs
@@ -23,7 +23,7 @@ public override void Update(float frameTime)
         if (!_timing.IsFirstTimePredicted || !_input.MouseScreenPosition.IsValid)
             return;
 
-        var player = _player.LocalPlayer?.ControlledEntity;
+        var player = _player.LocalEntity;
 
         if (player == null || !TryComp<MouseRotatorComponent>(player, out var rotator))
             return;
diff --git a/Content.Client/Movement/Systems/ContentEyeSystem.cs b/Content.Client/Movement/Systems/ContentEyeSystem.cs
index d8f73b0057..182ac92ae0 100644
--- a/Content.Client/Movement/Systems/ContentEyeSystem.cs
+++ b/Content.Client/Movement/Systems/ContentEyeSystem.cs
@@ -23,7 +23,7 @@ public void RequestZoom(EntityUid uid, Vector2 zoom, bool ignoreLimit, ContentEy
 
     public void RequestToggleFov()
     {
-        if (_player.LocalPlayer?.ControlledEntity is { } player)
+        if (_player.LocalEntity is { } player)
             RequestToggleFov(player);
     }
 
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
index 20f1fb8d7c..c04b42f249 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs
@@ -7,6 +7,7 @@
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.NetworkConfigurator;
 
@@ -160,7 +161,7 @@ private enum ButtonPosition
     /// </summary>
     private sealed class LinksRender : Control
     {
-        public readonly List<(string, string)> Links = new();
+        public readonly List<(ProtoId<SourcePortPrototype>, ProtoId<SinkPortPrototype>)> Links = new();
         public readonly Dictionary<string, Button> SourceButtons = new();
         public readonly Dictionary<string, Button> SinkButtons = new();
         private readonly BoxContainer _leftButtonContainer;
diff --git a/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs b/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
index 0cc090fcae..2fd4f29655 100644
--- a/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
+++ b/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
@@ -52,8 +52,7 @@ public bool ConfiguredListIsTracked(EntityUid uid, NetworkConfiguratorComponent?
     /// </summary>
     public void ToggleVisualization(EntityUid uid, bool toggle, NetworkConfiguratorComponent? component = null)
     {
-        if (_playerManager.LocalPlayer == null
-            || _playerManager.LocalPlayer.ControlledEntity == null
+        if (_playerManager.LocalEntity == null
             || !Resolve(uid, ref component)
             || component.ActiveDeviceList == null)
             return;
@@ -77,7 +76,7 @@ public void ToggleVisualization(EntityUid uid, bool toggle, NetworkConfiguratorC
         {
             var overlay = new NetworkConfiguratorLinkOverlay();
             _overlay.AddOverlay(overlay);
-            var player = _playerManager.LocalPlayer.ControlledEntity.Value;
+            var player = _playerManager.LocalEntity.Value;
             overlay.Action = Spawn(Action);
             _actions.AddActionDirect(player, overlay.Action.Value);
         }
diff --git a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs
index 20103a9743..ec055b3240 100644
--- a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs
+++ b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs
@@ -3,6 +3,7 @@
 using Content.Shared.NukeOps;
 using JetBrains.Annotations;
 using Robust.Shared.Configuration;
+using Robust.Shared.Timing;
 
 namespace Content.Client.NukeOps;
 
@@ -10,6 +11,8 @@ namespace Content.Client.NukeOps;
 public sealed class WarDeclaratorBoundUserInterface : BoundUserInterface
 {
     [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly ILocalizationManager _localizationManager = default!;
 
     [ViewVariables]
     private WarDeclaratorWindow? _window;
@@ -20,7 +23,7 @@ protected override void Open()
     {
         base.Open();
 
-        _window = new WarDeclaratorWindow();
+        _window = new WarDeclaratorWindow(_gameTiming, _localizationManager);
         if (State != null)
             UpdateState(State);
 
@@ -42,7 +45,8 @@ protected override void UpdateState(BoundUserInterfaceState state)
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
-        if (disposing) _window?.Dispose();
+        if (disposing)
+            _window?.Dispose();
     }
 
     private void OnWarDeclaratorActivated(string message)
diff --git a/Content.Client/NukeOps/WarDeclaratorWindow.xaml b/Content.Client/NukeOps/WarDeclaratorWindow.xaml
index f90ed865a0..43381158a2 100644
--- a/Content.Client/NukeOps/WarDeclaratorWindow.xaml
+++ b/Content.Client/NukeOps/WarDeclaratorWindow.xaml
@@ -1,4 +1,5 @@
-<DefaultWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
+               xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                Title="{Loc 'war-declarator-ui-header'}">
     <BoxContainer Orientation="Vertical" SeparationOverride="4" MinWidth="440">
@@ -7,12 +8,16 @@
                   MinHeight="200"
                   Access="Public" />
         <Button Name="WarButton"
-                Text="{Loc 'war-declarator-ui-war-button'}"
+                Text="{Loc 'war-declarator-ui-try-war-button'}"
                 StyleClasses="Caution"
                 Access="Public"/>
-        <Label Name="StatusLabel"
-               Access="Public"/>
-        <Label Name="InfoLabel"
-               Access="Public"/>
+        <BoxContainer Orientation="Vertical" HorizontalExpand="True">
+            <Label Name="StatusLabel"
+                   Align="Center"
+                   Access="Public"/>
+            <Label Name="InfoLabel"
+                   Align="Center"
+                   Access="Public"/>
+        </BoxContainer>
     </BoxContainer>
-</DefaultWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
index 104e776daa..b4a3f1c7fa 100644
--- a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
+++ b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs
@@ -1,8 +1,7 @@
 using Content.Client.Stylesheets;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.NukeOps;
 using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -10,74 +9,83 @@
 namespace Content.Client.NukeOps;
 
 [GenerateTypedNameReferences]
-public sealed partial class WarDeclaratorWindow : DefaultWindow
+public sealed partial class WarDeclaratorWindow : FancyWindow
 {
     private readonly IGameTiming _gameTiming;
 
     public event Action<string>? OnActivated;
 
     private TimeSpan _endTime;
-    private TimeSpan _timeStamp;
+    private TimeSpan _shuttleDisabledTime;
     private WarConditionStatus _status;
 
-    public WarDeclaratorWindow()
+    public WarDeclaratorWindow(IGameTiming gameTiming, ILocalizationManager localizationManager)
     {
         RobustXamlLoader.Load(this);
 
-        _gameTiming = IoCManager.Resolve<IGameTiming>();
+        _gameTiming = gameTiming;
 
         WarButton.OnPressed += (_) => OnActivated?.Invoke(Rope.Collapse(MessageEdit.TextRope));
 
-        var loc = IoCManager.Resolve<ILocalizationManager>();
-        MessageEdit.Placeholder = new Rope.Leaf(loc.GetString("war-declarator-message-placeholder"));
+        MessageEdit.Placeholder = new Rope.Leaf(localizationManager.GetString("war-declarator-message-placeholder"));
     }
 
-    protected override void Draw(DrawingHandleScreen handle)
+    protected override void FrameUpdate(FrameEventArgs args)
     {
-        base.Draw(handle);
         UpdateTimer();
     }
 
     public void UpdateState(WarDeclaratorBoundUserInterfaceState state)
     {
-        WarButton.Disabled = state.Status != WarConditionStatus.YES_WAR;
+        if (state.Status == null)
+            return;
+
+        WarButton.Disabled = state.Status == WarConditionStatus.WarReady;
 
-        _timeStamp = state.Delay;
         _endTime = state.EndTime;
-        _status = state.Status;
+        _shuttleDisabledTime = state.ShuttleDisabledTime;
+        _status = state.Status.Value;
+
+        UpdateStatus(state.Status.Value);
+
+    }
 
-        switch(state.Status)
+    private void UpdateStatus(WarConditionStatus status)
+    {
+        switch (status)
         {
-            case WarConditionStatus.WAR_READY:
+            case WarConditionStatus.WarReady:
+                WarButton.Disabled = true;
                 StatusLabel.Text = Loc.GetString("war-declarator-boost-declared");
-                InfoLabel.Text = Loc.GetString("war-declarator-conditions-ready");
-                StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateLow);
-                break;
-            case WarConditionStatus.WAR_DELAY:
-                StatusLabel.Text = Loc.GetString("war-declarator-boost-declared-delay");
                 UpdateTimer();
                 StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateLow);
                 break;
-            case WarConditionStatus.YES_WAR:
+            case WarConditionStatus.YesWar:
+                WarButton.Text = Loc.GetString("war-declarator-ui-war-button");
                 StatusLabel.Text = Loc.GetString("war-declarator-boost-possible");
                 UpdateTimer();
                 StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateGood);
                 break;
-            case WarConditionStatus.NO_WAR_SMALL_CREW:
+            case WarConditionStatus.NoWarSmallCrew:
                 StatusLabel.Text = Loc.GetString("war-declarator-boost-impossible");
-                InfoLabel.Text = Loc.GetString("war-declarator-conditions-small-crew", ("min", state.MinCrew));
+                InfoLabel.Text = Loc.GetString("war-declarator-conditions-small-crew");
                 StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateNone);
                 break;
-            case WarConditionStatus.NO_WAR_SHUTTLE_DEPARTED:
+            case WarConditionStatus.NoWarShuttleDeparted:
                 StatusLabel.Text = Loc.GetString("war-declarator-boost-impossible");
                 InfoLabel.Text = Loc.GetString("war-declarator-conditions-left-outpost");
                 StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateNone);
                 break;
-            case WarConditionStatus.NO_WAR_TIMEOUT:
+            case WarConditionStatus.NoWarTimeout:
                 StatusLabel.Text = Loc.GetString("war-declarator-boost-impossible");
                 InfoLabel.Text = Loc.GetString("war-declarator-conditions-time-out");
                 StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateNone);
                 break;
+            case WarConditionStatus.NoWarUnknown:
+                StatusLabel.Text = Loc.GetString("war-declarator-boost-impossible");
+                InfoLabel.Text = Loc.GetString("war-declarator-conditions-unknown");
+                StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateNone);
+                break;
             default:
                 StatusLabel.Text = Loc.GetString("war-declarator-boost-impossible");
                 InfoLabel.Text = Loc.GetString("war-declarator-conditions-unknown");
@@ -86,43 +94,24 @@ public void UpdateState(WarDeclaratorBoundUserInterfaceState state)
         }
     }
 
-    public void UpdateTimer()
+    private void UpdateTimer()
     {
         switch(_status)
         {
-            case WarConditionStatus.YES_WAR:
-                var gameruleTime = _gameTiming.CurTime.Subtract(_timeStamp);
-                var timeLeft = _endTime.Subtract(gameruleTime);
-
+            case WarConditionStatus.YesWar:
+                var timeLeft = _endTime.Subtract(_gameTiming.CurTime);
                 if (timeLeft > TimeSpan.Zero)
-                {
-                    InfoLabel.Text = Loc.GetString("war-declarator-boost-timer", ("minutes", timeLeft.Minutes), ("seconds", timeLeft.Seconds));
-                }
+                    InfoLabel.Text = Loc.GetString("war-declarator-boost-timer", ("time", timeLeft.ToString("mm\\:ss")));
                 else
-                {
-                    _status = WarConditionStatus.NO_WAR_TIMEOUT;
-                    StatusLabel.Text = Loc.GetString("war-declarator-boost-impossible");
-                    InfoLabel.Text = Loc.GetString("war-declarator-conditions-time-out");
-                    StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateNone);
-                    WarButton.Disabled = true;
-                }
+                    UpdateStatus(WarConditionStatus.NoWarTimeout);
                 break;
-            case WarConditionStatus.WAR_DELAY:
-                var timeAfterDeclaration = _gameTiming.CurTime.Subtract(_timeStamp);
-                var timeRemain = _endTime.Subtract(timeAfterDeclaration);
-
-                if (timeRemain > TimeSpan.Zero)
-                {
-                    InfoLabel.Text = Loc.GetString("war-declarator-boost-timer", ("minutes", timeRemain.Minutes), ("seconds", timeRemain.Seconds));
-                }
+
+            case WarConditionStatus.WarReady:
+                var time = _shuttleDisabledTime.Subtract(_gameTiming.CurTime);
+                if (time > TimeSpan.Zero)
+                    InfoLabel.Text = Loc.GetString("war-declarator-boost-timer", ("time", time.ToString("mm\\:ss")));
                 else
-                {
-                    _status = WarConditionStatus.WAR_READY;
-                    StatusLabel.Text = Loc.GetString("war-declarator-boost-declared");
                     InfoLabel.Text = Loc.GetString("war-declarator-conditions-ready");
-                    StatusLabel.SetOnlyStyleClass(StyleNano.StyleClassPowerStateLow);
-                    WarButton.Disabled = true;
-                }
                 break;
             default:
                 return;
diff --git a/Content.Client/Nutrition/EntitySystems/OpenableSystem.cs b/Content.Client/Nutrition/EntitySystems/OpenableSystem.cs
new file mode 100644
index 0000000000..f8c3f7c447
--- /dev/null
+++ b/Content.Client/Nutrition/EntitySystems/OpenableSystem.cs
@@ -0,0 +1,7 @@
+using Content.Shared.Nutrition.EntitySystems;
+
+namespace Content.Client.Nutrition.EntitySystems;
+
+public sealed class OpenableSystem : SharedOpenableSystem
+{
+}
diff --git a/Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs b/Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs
index 38dfd79cf3..2da90e877e 100644
--- a/Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs
+++ b/Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs
@@ -1,11 +1,14 @@
 using Content.Shared.Abilities;
+using Content.Shared.DeltaV.CCVars;
 using Robust.Client.Graphics;
+using Robust.Shared.Configuration;
 
 namespace Content.Client.Nyanotrasen.Overlays;
 
 public sealed partial class DogVisionSystem : EntitySystem
 {
     [Dependency] private readonly IOverlayManager _overlayMan = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
 
     private DogVisionOverlay _overlay = default!;
 
@@ -16,16 +19,27 @@ public override void Initialize()
         SubscribeLocalEvent<DogVisionComponent, ComponentInit>(OnDogVisionInit);
         SubscribeLocalEvent<DogVisionComponent, ComponentShutdown>(OnDogVisionShutdown);
 
+        Subs.CVar(_cfg, DCCVars.NoVisionFilters, OnNoVisionFiltersChanged);
+
         _overlay = new();
     }
 
     private void OnDogVisionInit(EntityUid uid, DogVisionComponent component, ComponentInit args)
     {
-        _overlayMan.AddOverlay(_overlay);
+        if (!_cfg.GetCVar(DCCVars.NoVisionFilters))
+            _overlayMan.AddOverlay(_overlay);
     }
 
     private void OnDogVisionShutdown(EntityUid uid, DogVisionComponent component, ComponentShutdown args)
     {
         _overlayMan.RemoveOverlay(_overlay);
     }
+
+    private void OnNoVisionFiltersChanged(bool enabled)
+    {
+        if (enabled)
+            _overlayMan.RemoveOverlay(_overlay);
+        else
+            _overlayMan.AddOverlay(_overlay);
+    }
 }
diff --git a/Content.Client/Options/OptionsVisualizerComponent.cs b/Content.Client/Options/OptionsVisualizerComponent.cs
new file mode 100644
index 0000000000..87999f381c
--- /dev/null
+++ b/Content.Client/Options/OptionsVisualizerComponent.cs
@@ -0,0 +1,84 @@
+using Content.Shared.CCVar;
+
+namespace Content.Client.Options;
+
+/// <summary>
+/// Allows specifying sprite alternatives depending on the client's accessibility options.
+/// </summary>
+/// <remarks>
+/// A list of layer mappings is given that the component applies to,
+/// and it will pick one entry to apply based on the settings configuration. Example:
+///
+/// <code>
+/// - type: Sprite
+///   sprite: Effects/optionsvisualizertest.rsi
+///   layers:
+///   - state: none
+///     map: [ "layer" ]
+/// - type: OptionsVisualizer
+///   visuals:
+///     layer:
+///     - options: Default
+///       data: { state: none }
+///     - options: Test
+///       data: { state: test }
+///     - options: ReducedMotion
+///       data: { state: motion }
+///     - options: [Test, ReducedMotion]
+///       data: { state: both }
+/// </code>
+/// </remarks>
+/// <seealso cref="OptionsVisualizerSystem"/>
+/// <seealso cref="OptionVisualizerOptions"/>
+[RegisterComponent]
+public sealed partial class OptionsVisualizerComponent : Component
+{
+    /// <summary>
+    /// A mapping storing data about which sprite layer keys should be controlled.
+    /// </summary>
+    /// <remarks>
+    /// Each layer stores an array of possible options. The last entry with a
+    /// <see cref="LayerDatum.Options"/> matching the active user preferences will be picked.
+    /// This allows choosing a priority if multiple entries are matched.
+    /// </remarks>
+    [DataField(required: true)]
+    public Dictionary<string, LayerDatum[]> Visuals = default!;
+
+    /// <summary>
+    /// A single option for a layer to be selected.
+    /// </summary>
+    [DataDefinition]
+    public sealed partial class LayerDatum
+    {
+        /// <summary>
+        /// Which options must be set by the user to make this datum match.
+        /// </summary>
+        [DataField]
+        public OptionVisualizerOptions Options { get; set; }
+
+        /// <summary>
+        /// The sprite layer data to set on the sprite when this datum matches.
+        /// </summary>
+        [DataField]
+        public PrototypeLayerData Data { get; set; }
+    }
+}
+
+[Flags]
+public enum OptionVisualizerOptions
+{
+    /// <summary>
+    /// Corresponds to no special options being set, can be used as a "default" state.
+    /// </summary>
+    Default = 0,
+
+    /// <summary>
+    /// Corresponds to the <see cref="CCVars.DebugOptionVisualizerTest"/> CVar being set.
+    /// </summary>
+    Test = 1 << 0,
+
+    /// <summary>
+    /// Corresponds to the <see cref="CCVars.ReducedMotion"/> CVar being set.
+    /// </summary>
+    ReducedMotion = 1 << 1,
+}
diff --git a/Content.Client/Options/OptionsVisualizerSystem.cs b/Content.Client/Options/OptionsVisualizerSystem.cs
new file mode 100644
index 0000000000..2a297e3802
--- /dev/null
+++ b/Content.Client/Options/OptionsVisualizerSystem.cs
@@ -0,0 +1,97 @@
+using Content.Shared.CCVar;
+using Robust.Client.GameObjects;
+using Robust.Shared.Configuration;
+using Robust.Shared.Reflection;
+
+namespace Content.Client.Options;
+
+/// <summary>
+/// Implements <see cref="OptionsVisualizerComponent"/>.
+/// </summary>
+public sealed class OptionsVisualizerSystem : EntitySystem
+{
+    private static readonly (OptionVisualizerOptions, CVarDef<bool>)[] OptionVars =
+    {
+        (OptionVisualizerOptions.Test, CCVars.DebugOptionVisualizerTest),
+        (OptionVisualizerOptions.ReducedMotion, CCVars.ReducedMotion),
+    };
+
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IReflectionManager _reflection = default!;
+
+    private OptionVisualizerOptions _currentOptions;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        foreach (var (_, cvar) in OptionVars)
+        {
+            Subs.CVar(_cfg, cvar, _ => CVarChanged());
+        }
+
+        UpdateActiveOptions();
+
+        SubscribeLocalEvent<OptionsVisualizerComponent, ComponentStartup>(OnComponentStartup);
+    }
+
+    private void CVarChanged()
+    {
+        UpdateActiveOptions();
+        UpdateAllComponents();
+    }
+
+    private void UpdateActiveOptions()
+    {
+        _currentOptions = OptionVisualizerOptions.Default;
+
+        foreach (var (value, cVar) in OptionVars)
+        {
+            if (_cfg.GetCVar(cVar))
+                _currentOptions |= value;
+        }
+    }
+
+    private void UpdateAllComponents()
+    {
+        var query = EntityQueryEnumerator<OptionsVisualizerComponent, SpriteComponent>();
+        while (query.MoveNext(out _, out var component, out var sprite))
+        {
+            UpdateComponent(component, sprite);
+        }
+    }
+
+    private void OnComponentStartup(EntityUid uid, OptionsVisualizerComponent component, ComponentStartup args)
+    {
+        if (!TryComp(uid, out SpriteComponent? sprite))
+            return;
+
+        UpdateComponent(component, sprite);
+    }
+
+    private void UpdateComponent(OptionsVisualizerComponent component, SpriteComponent sprite)
+    {
+        foreach (var (layerKeyRaw, layerData) in component.Visuals)
+        {
+            object layerKey = _reflection.TryParseEnumReference(layerKeyRaw, out var @enum)
+                ? @enum
+                : layerKeyRaw;
+
+            OptionsVisualizerComponent.LayerDatum? matchedDatum = null;
+            foreach (var datum in layerData)
+            {
+                if ((datum.Options & _currentOptions) != datum.Options)
+                    continue;
+
+                matchedDatum = datum;
+            }
+
+            if (matchedDatum == null)
+                continue;
+
+            var layerIndex = sprite.LayerMapReserveBlank(layerKey);
+            sprite.LayerSetData(layerIndex, matchedDatum.Data);
+        }
+    }
+}
+
diff --git a/Content.Client/Options/UI/OptionsMenu.xaml b/Content.Client/Options/UI/OptionsMenu.xaml
index ab3b88ca4e..69daaa2cea 100644
--- a/Content.Client/Options/UI/OptionsMenu.xaml
+++ b/Content.Client/Options/UI/OptionsMenu.xaml
@@ -1,5 +1,6 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
+            xmlns:dtabs="clr-namespace:Content.Client.DeltaV.Options.UI.Tabs"
             Title="{Loc 'ui-options-title'}"
             MinSize="800 450">
     <TabContainer Name="Tabs" Access="Public">
@@ -8,5 +9,6 @@
         <tabs:KeyRebindTab Name="KeyRebindTab" />
         <tabs:AudioTab Name="AudioTab" />
         <tabs:NetworkTab Name="NetworkTab" />
+        <dtabs:DeltaTab Name="DeltaTab" />
     </TabContainer>
 </DefaultWindow>
diff --git a/Content.Client/Options/UI/OptionsMenu.xaml.cs b/Content.Client/Options/UI/OptionsMenu.xaml.cs
index c3a8e66470..bb2c1ce0ed 100644
--- a/Content.Client/Options/UI/OptionsMenu.xaml.cs
+++ b/Content.Client/Options/UI/OptionsMenu.xaml.cs
@@ -20,6 +20,7 @@ public OptionsMenu()
             Tabs.SetTabTitle(2, Loc.GetString("ui-options-tab-controls"));
             Tabs.SetTabTitle(3, Loc.GetString("ui-options-tab-audio"));
             Tabs.SetTabTitle(4, Loc.GetString("ui-options-tab-network"));
+            Tabs.SetTabTitle(5, Loc.GetString("ui-options-tab-deltav")); // DeltaV specific settings
 
             UpdateTabs();
         }
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml b/Content.Client/Options/UI/Tabs/MiscTab.xaml
index db176db456..fc94ab7b0a 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml
@@ -22,6 +22,7 @@
                    FontColorOverride="{xNamespace:Static s:StyleNano.NanoGold}"
                    StyleClasses="LabelKeyText"/>
             <CheckBox Name="ReducedMotionCheckBox" Text="{Loc 'ui-options-reduced-motion'}" />
+            <CheckBox Name="EnableColorNameCheckBox" Text="{Loc 'ui-options-enable-color-name'}" />
             <BoxContainer Orientation="Horizontal">
                 <Label Text="{Loc 'ui-options-screen-shake-intensity'}" Margin="8 0" />
                 <Slider Name="ScreenShakeIntensitySlider"
diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
index b5dcf6477b..d7a600dd79 100644
--- a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
@@ -63,6 +63,7 @@ public MiscTab()
             OpaqueStorageWindowCheckBox.OnToggled += OnCheckBoxToggled;
             FancySpeechBubblesCheckBox.OnToggled += OnCheckBoxToggled;
             FancyNameBackgroundsCheckBox.OnToggled += OnCheckBoxToggled;
+            EnableColorNameCheckBox.OnToggled += OnCheckBoxToggled;
             ReducedMotionCheckBox.OnToggled += OnCheckBoxToggled;
             ScreenShakeIntensitySlider.OnValueChanged += OnScreenShakeIntensitySliderChanged;
             // ToggleWalk.OnToggled += OnCheckBoxToggled;
@@ -76,6 +77,7 @@ public MiscTab()
             OpaqueStorageWindowCheckBox.Pressed = _cfg.GetCVar(CCVars.OpaqueStorageWindow);
             FancySpeechBubblesCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatEnableFancyBubbles);
             FancyNameBackgroundsCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatFancyNameBackground);
+            EnableColorNameCheckBox.Pressed = _cfg.GetCVar(CCVars.ChatEnableColorName);
             ReducedMotionCheckBox.Pressed = _cfg.GetCVar(CCVars.ReducedMotion);
             ScreenShakeIntensitySlider.Value = _cfg.GetCVar(CCVars.ScreenShakeIntensity) * 100f;
             // ToggleWalk.Pressed = _cfg.GetCVar(CCVars.ToggleWalk);
@@ -120,6 +122,7 @@ private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
             _cfg.SetCVar(CCVars.LoocAboveHeadShow, ShowLoocAboveHeadCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ChatEnableFancyBubbles, FancySpeechBubblesCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ChatFancyNameBackground, FancyNameBackgroundsCheckBox.Pressed);
+            _cfg.SetCVar(CCVars.ChatEnableColorName, EnableColorNameCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ReducedMotion, ReducedMotionCheckBox.Pressed);
             _cfg.SetCVar(CCVars.ScreenShakeIntensity, ScreenShakeIntensitySlider.Value / 100f);
             // _cfg.SetCVar(CCVars.ToggleWalk, ToggleWalk.Pressed);
@@ -145,6 +148,7 @@ private void UpdateApplyButton()
             var isLoocShowSame = ShowLoocAboveHeadCheckBox.Pressed == _cfg.GetCVar(CCVars.LoocAboveHeadShow);
             var isFancyChatSame = FancySpeechBubblesCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatEnableFancyBubbles);
             var isFancyBackgroundSame = FancyNameBackgroundsCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatFancyNameBackground);
+            var isEnableColorNameSame = EnableColorNameCheckBox.Pressed == _cfg.GetCVar(CCVars.ChatEnableColorName);
             var isReducedMotionSame = ReducedMotionCheckBox.Pressed == _cfg.GetCVar(CCVars.ReducedMotion);
             var isScreenShakeIntensitySame = Math.Abs(ScreenShakeIntensitySlider.Value / 100f - _cfg.GetCVar(CCVars.ScreenShakeIntensity)) < 0.01f;
             // var isToggleWalkSame = ToggleWalk.Pressed == _cfg.GetCVar(CCVars.ToggleWalk);
@@ -159,6 +163,7 @@ private void UpdateApplyButton()
                                    isLoocShowSame &&
                                    isFancyChatSame &&
                                    isFancyBackgroundSame &&
+                                   isEnableColorNameSame &&
                                    isReducedMotionSame &&
                                    isScreenShakeIntensitySame &&
                                    // isToggleWalkSame &&
diff --git a/Content.Client/Outline/InteractionOutlineSystem.cs b/Content.Client/Outline/InteractionOutlineSystem.cs
index bb341785d0..3dbbafbcaa 100644
--- a/Content.Client/Outline/InteractionOutlineSystem.cs
+++ b/Content.Client/Outline/InteractionOutlineSystem.cs
@@ -40,17 +40,10 @@ public override void Initialize()
     {
         base.Initialize();
 
-        _configManager.OnValueChanged(CCVars.OutlineEnabled, SetCvarEnabled);
+        Subs.CVar(_configManager, CCVars.OutlineEnabled, SetCvarEnabled);
         UpdatesAfter.Add(typeof(SharedEyeSystem));
     }
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-
-        _configManager.UnsubValueChanged(CCVars.OutlineEnabled, SetCvarEnabled);
-    }
-
     public void SetCvarEnabled(bool cvarEnabled)
     {
         _cvarEnabled = cvarEnabled;
@@ -94,8 +87,8 @@ public override void FrameUpdate(float frameTime)
             return;
 
         // If there is no local player, there is no session, and therefore nothing to do here.
-        var localPlayer = _playerManager.LocalPlayer;
-        if (localPlayer == null)
+        var localSession = _playerManager.LocalSession;
+        if (localSession == null)
             return;
 
         // TODO InteractionOutlineComponent
@@ -135,9 +128,9 @@ public override void FrameUpdate(float frameTime)
         }
 
         var inRange = false;
-        if (localPlayer.ControlledEntity != null && !Deleted(entityToClick))
+        if (localSession.AttachedEntity != null && !Deleted(entityToClick))
         {
-            inRange = _interactionSystem.InRangeUnobstructed(localPlayer.ControlledEntity.Value, entityToClick.Value);
+            inRange = _interactionSystem.InRangeUnobstructed(localSession.AttachedEntity.Value, entityToClick.Value);
         }
 
         InteractionOutlineComponent? outline;
diff --git a/Content.Client/Outline/TargetOutlineSystem.cs b/Content.Client/Outline/TargetOutlineSystem.cs
index 1c396585b3..2a6867f51f 100644
--- a/Content.Client/Outline/TargetOutlineSystem.cs
+++ b/Content.Client/Outline/TargetOutlineSystem.cs
@@ -114,7 +114,7 @@ public override void Update(float frameTime)
 
     private void HighlightTargets()
     {
-        if (_playerManager.LocalPlayer?.ControlledEntity is not { Valid: true } player)
+        if (_playerManager.LocalEntity is not { Valid: true } player)
             return;
 
         // remove current highlights
diff --git a/Content.Client/Paper/UI/PaperBoundUserInterface.cs b/Content.Client/Paper/UI/PaperBoundUserInterface.cs
index 30f1502779..4b0ac868f0 100644
--- a/Content.Client/Paper/UI/PaperBoundUserInterface.cs
+++ b/Content.Client/Paper/UI/PaperBoundUserInterface.cs
@@ -1,6 +1,5 @@
 using JetBrains.Annotations;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Input;
 using Robust.Shared.Utility;
 using static Content.Shared.Paper.SharedPaperComponent;
 
@@ -22,15 +21,7 @@ protected override void Open()
 
         _window = new PaperWindow();
         _window.OnClose += Close;
-        _window.Input.OnKeyBindDown += args => // Solution while TextEdit don't have events
-        {
-            if (args.Function == EngineKeyFunctions.TextSubmit)
-            {
-                var text = Rope.Collapse(_window.Input.TextRope);
-                Input_OnTextEntered(text);
-                args.Handle();
-            }
-        };
+        _window.OnSaved += Input_OnTextEntered;
 
         if (EntMan.TryGetComponent<PaperVisualsComponent>(Owner, out var visuals))
         {
diff --git a/Content.Client/Paper/UI/PaperWindow.xaml b/Content.Client/Paper/UI/PaperWindow.xaml
index 279dd72b27..2344afd5ef 100644
--- a/Content.Client/Paper/UI/PaperWindow.xaml
+++ b/Content.Client/Paper/UI/PaperWindow.xaml
@@ -25,5 +25,9 @@
                 </PanelContainer>
             </ScrollContainer>
         </PanelContainer>
+        <!-- Bottom buttons for editing -->
+        <BoxContainer Name="EditButtons" Orientation="Horizontal" HorizontalAlignment="Right" Margin="6">
+            <Button Name="SaveButton" />
+        </BoxContainer>
     </BoxContainer>
 </paper:PaperWindow>
diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs
index c3192a495d..7a5fd65264 100644
--- a/Content.Client/Paper/UI/PaperWindow.xaml.cs
+++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs
@@ -2,18 +2,22 @@
 using Content.Shared.Paper;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
+using Robust.Client.Input;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Utility;
 using Robust.Client.UserInterface.RichText;
+using Robust.Shared.Input;
 
 namespace Content.Client.Paper.UI
 {
     [GenerateTypedNameReferences]
     public sealed partial class PaperWindow : BaseWindow
     {
+        [Dependency] private readonly IInputManager _inputManager = default!;
+
         private static Color DefaultTextColor = new(25, 25, 25);
 
         // <summary>
@@ -41,8 +45,11 @@ public sealed partial class PaperWindow : BaseWindow
             typeof(ItalicTag)
         };
 
+        public event Action<string>? OnSaved;
+
         public PaperWindow()
         {
+            IoCManager.InjectDependencies(this);
             RobustXamlLoader.Load(this);
 
             // We can't configure the RichTextLabel contents from xaml, so do it here:
@@ -50,6 +57,23 @@ public PaperWindow()
 
             // Hook up the close button:
             CloseButton.OnPressed += _ => Close();
+
+            Input.OnKeyBindDown += args => // Solution while TextEdit don't have events
+            {
+                if (args.Function == EngineKeyFunctions.MultilineTextSubmit)
+                {
+                    RunOnSaved();
+                    args.Handle();
+                }
+            };
+
+            SaveButton.OnPressed += _ =>
+            {
+                RunOnSaved();
+            };
+
+            SaveButton.Text = Loc.GetString("paper-ui-save-button",
+                ("keybind", _inputManager.GetKeyFunctionButtonString(EngineKeyFunctions.MultilineTextSubmit)));
         }
 
         /// <summary>
@@ -196,6 +220,7 @@ public void Populate(SharedPaperComponent.PaperBoundUserInterfaceState state)
             bool isEditing = state.Mode == SharedPaperComponent.PaperAction.Write;
             bool wasEditing = InputContainer.Visible;
             InputContainer.Visible = isEditing;
+            EditButtons.Visible = isEditing;
 
             var msg = new FormattedMessage();
             msg.AddMarkupPermissive(state.Text);
@@ -266,5 +291,10 @@ protected override DragMode GetDragModeFor(Vector2 relativeMousePos)
             }
             return mode & _allowedResizeModes;
         }
+
+        private void RunOnSaved()
+        {
+            OnSaved?.Invoke(Rope.Collapse(Input.TextRope));
+        }
     }
 }
diff --git a/Content.Client/Parallax/ParallaxSystem.cs b/Content.Client/Parallax/ParallaxSystem.cs
index 720da72e80..db4cec0be8 100644
--- a/Content.Client/Parallax/ParallaxSystem.cs
+++ b/Content.Client/Parallax/ParallaxSystem.cs
@@ -13,7 +13,6 @@ public sealed class ParallaxSystem : SharedParallaxSystem
     [Dependency] private readonly IMapManager _map = default!;
     [Dependency] private readonly IOverlayManager _overlay = default!;
     [Dependency] private readonly IParallaxManager _parallax = default!;
-    [Dependency] private readonly IPrototypeManager _protoManager = default!;
 
     [ValidatePrototypeId<ParallaxPrototype>]
     private const string Fallback = "Default";
diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs
index 763f7b0114..7a8a6e39cf 100644
--- a/Content.Client/Physics/Controllers/MoverController.cs
+++ b/Content.Client/Physics/Controllers/MoverController.cs
@@ -30,13 +30,13 @@ public override void Initialize()
         private void OnUpdatePredicted(EntityUid uid, InputMoverComponent component, ref UpdateIsPredictedEvent args)
         {
             // Enable prediction if an entity is controlled by the player
-            if (uid == _playerManager.LocalPlayer?.ControlledEntity)
+            if (uid == _playerManager.LocalEntity)
                 args.IsPredicted = true;
         }
 
         private void OnUpdateRelayTargetPredicted(EntityUid uid, MovementRelayTargetComponent component, ref UpdateIsPredictedEvent args)
         {
-            if (component.Source == _playerManager.LocalPlayer?.ControlledEntity)
+            if (component.Source == _playerManager.LocalEntity)
                 args.IsPredicted = true;
         }
 
@@ -45,7 +45,7 @@ private void OnUpdatePullablePredicted(EntityUid uid, SharedPullableComponent co
             // Enable prediction if an entity is being pulled by the player.
             // Disable prediction if an entity is being pulled by some non-player entity.
 
-            if (component.Puller == _playerManager.LocalPlayer?.ControlledEntity)
+            if (component.Puller == _playerManager.LocalEntity)
                 args.IsPredicted = true;
             else if (component.Puller != null)
                 args.BlockPrediction = true;
@@ -84,7 +84,7 @@ public override void UpdateBeforeSolve(bool prediction, float frameTime)
         {
             base.UpdateBeforeSolve(prediction, frameTime);
 
-            if (_playerManager.LocalPlayer?.ControlledEntity is not {Valid: true} player)
+            if (_playerManager.LocalEntity is not {Valid: true} player)
                 return;
 
             if (RelayQuery.TryGetComponent(player, out var relayMover))
diff --git a/Content.Client/Pinpointer/UI/NavMapControl.cs b/Content.Client/Pinpointer/UI/NavMapControl.cs
index 3b426e73d8..a8ec7b37a0 100644
--- a/Content.Client/Pinpointer/UI/NavMapControl.cs
+++ b/Content.Client/Pinpointer/UI/NavMapControl.cs
@@ -25,12 +25,14 @@ namespace Content.Client.Pinpointer.UI;
 [UsedImplicitly, Virtual]
 public partial class NavMapControl : MapGridControl
 {
-    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private IResourceCache _cache = default!;
     private readonly SharedTransformSystem _transformSystem;
 
     public EntityUid? Owner;
     public EntityUid? MapUid;
 
+    protected override bool Draggable => true;
+
     // Actions
     public event Action<NetEntity?>? TrackedEntitySelectedAction;
     public event Action<DrawingHandleScreen>? PostWallDrawingAction;
@@ -47,23 +49,17 @@ public partial class NavMapControl : MapGridControl
     // Constants
     protected float UpdateTime = 1.0f;
     protected float MaxSelectableDistance = 10f;
-    protected float RecenterMinimum = 0.05f;
     protected float MinDragDistance = 5f;
     protected static float MinDisplayedRange = 8f;
     protected static float MaxDisplayedRange = 128f;
     protected static float DefaultDisplayedRange = 48f;
 
     // Local variables
-    private Vector2 _offset;
-    private bool _draggin;
-    private Vector2 _startDragPosition = default!;
-    private bool _recentering = false;
     private float _updateTimer = 0.25f;
-    private Dictionary<Color, Color> _sRGBLookUp = new Dictionary<Color, Color>();
-    public Color _backgroundColor;
-    public float _backgroundOpacity = 0.9f;
+    private Dictionary<Color, Color> _sRGBLookUp = new();
+    protected Color BackgroundColor;
+    protected float BackgroundOpacity = 0.9f;
     private int _targetFontsize = 8;
-    private IResourceCache _cache;
 
     // Components
     private NavMapComponent? _navMap;
@@ -100,10 +96,9 @@ public partial class NavMapControl : MapGridControl
     public NavMapControl() : base(MinDisplayedRange, MaxDisplayedRange, DefaultDisplayedRange)
     {
         IoCManager.InjectDependencies(this);
-        _cache = IoCManager.Resolve<IResourceCache>();
 
-        _transformSystem = _entManager.System<SharedTransformSystem>();
-        _backgroundColor = Color.FromSrgb(TileColor.WithAlpha(_backgroundOpacity));
+        _transformSystem = EntManager.System<SharedTransformSystem>();
+        BackgroundColor = Color.FromSrgb(TileColor.WithAlpha(BackgroundOpacity));
 
         RectClipContent = true;
         HorizontalExpand = true;
@@ -145,21 +140,16 @@ public NavMapControl() : base(MinDisplayedRange, MaxDisplayedRange, DefaultDispl
 
         _recenter.OnPressed += args =>
         {
-            _recentering = true;
+            Recentering = true;
         };
 
         ForceNavMapUpdate();
     }
 
-    public void ForceRecenter()
-    {
-        _recentering = true;
-    }
-
     public void ForceNavMapUpdate()
     {
-        _entManager.TryGetComponent(MapUid, out _navMap);
-        _entManager.TryGetComponent(MapUid, out _grid);
+        EntManager.TryGetComponent(MapUid, out _navMap);
+        EntManager.TryGetComponent(MapUid, out _grid);
 
         UpdateNavMap();
     }
@@ -167,29 +157,15 @@ public void ForceNavMapUpdate()
     public void CenterToCoordinates(EntityCoordinates coordinates)
     {
         if (_physics != null)
-            _offset = new Vector2(coordinates.X, coordinates.Y) - _physics.LocalCenter;
+            Offset = new Vector2(coordinates.X, coordinates.Y) - _physics.LocalCenter;
 
         _recenter.Disabled = false;
     }
 
-    protected override void KeyBindDown(GUIBoundKeyEventArgs args)
-    {
-        base.KeyBindDown(args);
-
-        if (args.Function == EngineKeyFunctions.Use)
-        {
-            _startDragPosition = args.PointerLocation.Position;
-            _draggin = true;
-        }
-    }
-
     protected override void KeyBindUp(GUIBoundKeyEventArgs args)
     {
         base.KeyBindUp(args);
 
-        if (args.Function == EngineKeyFunctions.Use)
-            _draggin = false;
-
         if (args.Function == EngineKeyFunctions.UIClick)
         {
             if (TrackedEntitySelectedAction == null)
@@ -199,15 +175,15 @@ protected override void KeyBindUp(GUIBoundKeyEventArgs args)
                 return;
 
             // If the cursor has moved a significant distance, exit
-            if ((_startDragPosition - args.PointerLocation.Position).Length() > MinDragDistance)
+            if ((StartDragPosition - args.PointerLocation.Position).Length() > MinDragDistance)
                 return;
 
             // Get the clicked position
-            var offset = _offset + _physics.LocalCenter;
+            var offset = Offset + _physics.LocalCenter;
             var localPosition = args.PointerLocation.Position - GlobalPixelPosition;
 
             // Convert to a world position
-            var unscaledPosition = (localPosition - MidpointVector) / MinimapScale;
+            var unscaledPosition = (localPosition - MidPointVector) / MinimapScale;
             var worldPosition = _transformSystem.GetWorldMatrix(_xform).Transform(new Vector2(unscaledPosition.X, -unscaledPosition.Y) + offset);
 
             // Find closest tracked entity in range
@@ -219,7 +195,7 @@ protected override void KeyBindUp(GUIBoundKeyEventArgs args)
                 if (!blip.Selectable)
                     continue;
 
-                var currentDistance = (blip.Coordinates.ToMapPos(_entManager, _transformSystem) - worldPosition).Length();
+                var currentDistance = (blip.Coordinates.ToMapPos(EntManager, _transformSystem) - worldPosition).Length();
 
                 if (closestDistance < currentDistance || currentDistance * MinimapScale > MaxSelectableDistance)
                     continue;
@@ -251,15 +227,8 @@ protected override void MouseMove(GUIMouseMoveEventArgs args)
     {
         base.MouseMove(args);
 
-        if (!_draggin)
-            return;
-
-        _recentering = false;
-        _offset -= new Vector2(args.Relative.X, -args.Relative.Y) / MidPoint * WorldRange;
-
-        if (_offset != Vector2.Zero)
+        if (Offset != Vector2.Zero)
             _recenter.Disabled = false;
-
         else
             _recenter.Disabled = true;
     }
@@ -269,36 +238,21 @@ protected override void Draw(DrawingHandleScreen handle)
         base.Draw(handle);
 
         // Get the components necessary for drawing the navmap
-        _entManager.TryGetComponent(MapUid, out _navMap);
-        _entManager.TryGetComponent(MapUid, out _grid);
-        _entManager.TryGetComponent(MapUid, out _xform);
-        _entManager.TryGetComponent(MapUid, out _physics);
-        _entManager.TryGetComponent(MapUid, out _fixtures);
+        EntManager.TryGetComponent(MapUid, out _navMap);
+        EntManager.TryGetComponent(MapUid, out _grid);
+        EntManager.TryGetComponent(MapUid, out _xform);
+        EntManager.TryGetComponent(MapUid, out _physics);
+        EntManager.TryGetComponent(MapUid, out _fixtures);
 
         // Map re-centering
-        if (_recentering)
-        {
-            var frameTime = Timing.FrameTime;
-            var diff = _offset * (float) frameTime.TotalSeconds;
-
-            if (_offset.LengthSquared() < RecenterMinimum)
-            {
-                _offset = Vector2.Zero;
-                _recentering = false;
-                _recenter.Disabled = true;
-            }
-            else
-            {
-                _offset -= diff * 5f;
-            }
-        }
+        _recenter.Disabled = DrawRecenter();
 
         _zoom.Text = Loc.GetString("navmap-zoom", ("value", $"{(DefaultDisplayedRange / WorldRange ):0.0}"));
 
         if (_navMap == null || _xform == null)
             return;
 
-        var offset = _offset;
+        var offset = Offset;
 
         if (_physics != null)
             offset += _physics.LocalCenter;
@@ -317,7 +271,7 @@ protected override void Draw(DrawingHandleScreen handle)
                 {
                     var vert = poly.Vertices[i] - offset;
 
-                    verts[i] = Scale(new Vector2(vert.X, -vert.Y));
+                    verts[i] = ScalePosition(new Vector2(vert.X, -vert.Y));
                 }
 
                 handle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, verts[..poly.VertexCount], TileColor);
@@ -348,8 +302,8 @@ protected override void Draw(DrawingHandleScreen handle)
 
                 foreach (var chunkedLine in chunkedLines)
                 {
-                    var start = Scale(chunkedLine.Origin - new Vector2(offset.X, -offset.Y));
-                    var end = Scale(chunkedLine.Terminus - new Vector2(offset.X, -offset.Y));
+                    var start = ScalePosition(chunkedLine.Origin - new Vector2(offset.X, -offset.Y));
+                    var end = ScalePosition(chunkedLine.Terminus - new Vector2(offset.X, -offset.Y));
 
                     walls.Add(start);
                     walls.Add(end);
@@ -375,7 +329,7 @@ protected override void Draw(DrawingHandleScreen handle)
         foreach (var airlock in _navMap.Airlocks)
         {
             var position = airlock.Position - offset;
-            position = Scale(position with { Y = -position.Y });
+            position = ScalePosition(position with { Y = -position.Y });
             airlockLines.Add(position + airlockBuffer);
             airlockLines.Add(position - airlockBuffer * foobarVec);
 
@@ -418,10 +372,10 @@ protected override void Draw(DrawingHandleScreen handle)
             foreach (var beacon in _navMap.Beacons)
             {
                 var position = beacon.Position - offset;
-                position = Scale(position with { Y = -position.Y });
+                position = ScalePosition(position with { Y = -position.Y });
 
                 var textDimensions = handle.GetDimensions(font, beacon.Text, 1f);
-                handle.DrawRect(new UIBox2(position - textDimensions / 2 - rectBuffer, position + textDimensions / 2 + rectBuffer), _backgroundColor);
+                handle.DrawRect(new UIBox2(position - textDimensions / 2 - rectBuffer, position + textDimensions / 2 + rectBuffer), BackgroundColor);
                 handle.DrawString(font, position - textDimensions / 2, beacon.Text, beacon.Color);
             }
         }
@@ -435,12 +389,12 @@ protected override void Draw(DrawingHandleScreen handle)
         {
             if (lit && value.Visible)
             {
-                var mapPos = coord.ToMap(_entManager, _transformSystem);
+                var mapPos = coord.ToMap(EntManager, _transformSystem);
 
                 if (mapPos.MapId != MapId.Nullspace)
                 {
                     var position = _transformSystem.GetInvWorldMatrix(_xform).Transform(mapPos.Position) - offset;
-                    position = Scale(new Vector2(position.X, -position.Y));
+                    position = ScalePosition(new Vector2(position.X, -position.Y));
 
                     handle.DrawCircle(position, float.Sqrt(MinimapScale) * 2f, value.Color);
                 }
@@ -461,12 +415,12 @@ protected override void Draw(DrawingHandleScreen handle)
             if (!iconVertexUVs.TryGetValue((blip.Texture, blip.Color), out var vertexUVs))
                 vertexUVs = new();
 
-            var mapPos = blip.Coordinates.ToMap(_entManager, _transformSystem);
+            var mapPos = blip.Coordinates.ToMap(EntManager, _transformSystem);
 
             if (mapPos.MapId != MapId.Nullspace)
             {
                 var position = _transformSystem.GetInvWorldMatrix(_xform).Transform(mapPos.Position) - offset;
-                position = Scale(new Vector2(position.X, -position.Y));
+                position = ScalePosition(new Vector2(position.X, -position.Y));
 
                 var scalingCoefficient = 2.5f;
                 var positionOffset = scalingCoefficient * float.Sqrt(MinimapScale);
@@ -628,14 +582,9 @@ public Dictionary<Vector2i, List<NavMapLine>> GetDecodedWallChunks
         return decodedOutput;
     }
 
-    protected Vector2 Scale(Vector2 position)
-    {
-        return position * MinimapScale + MidpointVector;
-    }
-
     protected Vector2 GetOffset()
     {
-        return _offset + (_physics != null ? _physics.LocalCenter : new Vector2());
+        return Offset + (_physics?.LocalCenter ?? new Vector2());
     }
 }
 
diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
index 5027f77663..3b1e65c34e 100644
--- a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
+++ b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
@@ -95,7 +95,7 @@ public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessag
             return true;
         }
 
-        var player = _playerManager.LocalPlayer?.Session;
+        var player = _playerManager.LocalSession;
         if (player == null)
             return true;
 
diff --git a/Content.Client/Pointing/PointingSystem.Visualizer.cs b/Content.Client/Pointing/PointingSystem.Visualizer.cs
index 63ce882e06..e15923618a 100644
--- a/Content.Client/Pointing/PointingSystem.Visualizer.cs
+++ b/Content.Client/Pointing/PointingSystem.Visualizer.cs
@@ -1,7 +1,8 @@
 using Content.Client.Pointing.Components;
 using Content.Shared.Pointing;
-using Robust.Client.GameObjects;
 using Robust.Client.Animations;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
 using Robust.Shared.Animations;
 using System.Numerics;
 
@@ -9,7 +10,9 @@ namespace Content.Client.Pointing;
 
 public sealed partial class PointingSystem : SharedPointingSystem
 {
+    [Dependency] private readonly IEyeManager _eyeManager = default!;
     [Dependency] private readonly AnimationPlayerSystem _animationPlayer = default!;
+    [Dependency] private readonly TransformSystem _transformSystem = default!;
 
     public void InitializeVisualizer()
     {
@@ -27,6 +30,8 @@ private void BeginPointAnimation(EntityUid uid, Vector2 startPosition, Vector2 o
         if (_animationPlayer.HasRunningAnimation(uid, animationKey))
             return;
 
+        startPosition = new Angle(_eyeManager.CurrentEye.Rotation + _transformSystem.GetWorldRotation(uid)).RotateVec(startPosition);
+
         var animation = new Animation
         {
             Length = PointDuration,
diff --git a/Content.Client/Popups/PopupOverlay.cs b/Content.Client/Popups/PopupOverlay.cs
index 5adc2e1ff0..1305d8bb94 100644
--- a/Content.Client/Popups/PopupOverlay.cs
+++ b/Content.Client/Popups/PopupOverlay.cs
@@ -1,12 +1,6 @@
-using System.Numerics;
-using Content.Client.Examine;
-using Content.Shared.CCVar;
 using Content.Shared.Examine;
-using Content.Shared.Interaction;
-using Content.Shared.Popups;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
-using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Shared;
 using Robust.Shared.Configuration;
@@ -26,11 +20,9 @@ public sealed class PopupOverlay : Overlay
     private readonly IPlayerManager _playerMgr;
     private readonly IUserInterfaceManager _uiManager;
     private readonly PopupSystem _popup;
+    private readonly PopupUIController _controller;
 
     private readonly ShaderInstance _shader;
-    private readonly Font _smallFont;
-    private readonly Font _mediumFont;
-    private readonly Font _largeFont;
 
     public override OverlaySpace Space => OverlaySpace.ScreenSpace;
 
@@ -39,8 +31,8 @@ public PopupOverlay(
         IEntityManager entManager,
         IPlayerManager playerMgr,
         IPrototypeManager protoManager,
-        IResourceCache cache,
         IUserInterfaceManager uiManager,
+        PopupUIController controller,
         PopupSystem popup)
     {
         _configManager = configManager;
@@ -48,11 +40,9 @@ public PopupOverlay(
         _playerMgr = playerMgr;
         _uiManager = uiManager;
         _popup = popup;
+        _controller = controller;
 
         _shader = protoManager.Index<ShaderPrototype>("unshaded").Instance();
-        _smallFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Italic.ttf"), 10);
-        _mediumFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Italic.ttf"), 12);
-        _largeFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-BoldItalic.ttf"), 14);
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -68,19 +58,18 @@ protected override void Draw(in OverlayDrawArgs args)
             scale = _uiManager.DefaultUIScale;
 
         DrawWorld(args.ScreenHandle, args, scale);
-        DrawScreen(args.ScreenHandle, args, scale);
 
         args.DrawingHandle.UseShader(null);
     }
 
     private void DrawWorld(DrawingHandleScreen worldHandle, OverlayDrawArgs args, float scale)
     {
-        if (_popup.WorldLabels.Count == 0)
+        if (_popup.WorldLabels.Count == 0 || args.ViewportControl == null)
             return;
 
-        var matrix = args.ViewportControl!.GetWorldToScreenMatrix();
+        var matrix = args.ViewportControl.GetWorldToScreenMatrix();
         var viewPos = new MapCoordinates(args.WorldAABB.Center, args.MapId);
-        var ourEntity = _playerMgr.LocalPlayer?.ControlledEntity;
+        var ourEntity = _playerMgr.LocalEntity;
 
         foreach (var popup in _popup.WorldLabels)
         {
@@ -92,62 +81,12 @@ private void DrawWorld(DrawingHandleScreen worldHandle, OverlayDrawArgs args, fl
             var distance = (mapPos.Position - args.WorldBounds.Center).Length();
 
             // Should handle fade here too wyci.
-            if (!args.WorldAABB.Contains(mapPos.Position) || !ExamineSystemShared.InRangeUnOccluded(viewPos, mapPos, distance,
+            if (!args.WorldBounds.Contains(mapPos.Position) || !ExamineSystemShared.InRangeUnOccluded(viewPos, mapPos, distance,
                     e => e == popup.InitialPos.EntityId || e == ourEntity, entMan: _entManager))
                 continue;
 
             var pos = matrix.Transform(mapPos.Position);
-            DrawPopup(popup, worldHandle, pos, scale);
+            _controller.DrawPopup(popup, worldHandle, pos, scale);
         }
     }
-
-    private void DrawScreen(DrawingHandleScreen screenHandle, OverlayDrawArgs args, float scale)
-    {
-        foreach (var popup in _popup.CursorLabels)
-        {
-            // Different window
-            if (popup.InitialPos.Window != args.ViewportControl?.Window?.Id)
-                continue;
-
-            DrawPopup(popup, screenHandle, popup.InitialPos.Position, scale);
-        }
-    }
-
-    private void DrawPopup(PopupSystem.PopupLabel popup, DrawingHandleScreen handle, Vector2 position, float scale)
-    {
-        var lifetime = PopupSystem.GetPopupLifetime(popup);
-
-        // Keep alpha at 1 until TotalTime passes half its lifetime, then gradually decrease to 0.
-        var alpha = MathF.Min(1f, 1f - MathF.Max(0f, popup.TotalTime - lifetime / 2) * 2 / lifetime);
-
-        var updatedPosition = position - new Vector2(0f, MathF.Min(8f, 12f * (popup.TotalTime * popup.TotalTime + popup.TotalTime)));
-        var font = _smallFont;
-        var color = Color.White.WithAlpha(alpha);
-
-        switch (popup.Type)
-        {
-            case PopupType.SmallCaution:
-                color = Color.Red;
-                break;
-            case PopupType.Medium:
-                font = _mediumFont;
-                color = Color.LightGray;
-                break;
-            case PopupType.MediumCaution:
-                font = _mediumFont;
-                color = Color.Red;
-                break;
-            case PopupType.Large:
-                font = _largeFont;
-                color = Color.LightGray;
-                break;
-            case PopupType.LargeCaution:
-                font = _largeFont;
-                color = Color.Red;
-                break;
-        }
-
-        var dimensions = handle.GetDimensions(font, popup.Text, scale);
-        handle.DrawString(font, updatedPosition - dimensions / 2f, popup.Text, scale, color.WithAlpha(alpha));
-    }
 }
diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs
index d9e66c79fa..cf96c41241 100644
--- a/Content.Client/Popups/PopupSystem.cs
+++ b/Content.Client/Popups/PopupSystem.cs
@@ -23,7 +23,6 @@ public sealed class PopupSystem : SharedPopupSystem
         [Dependency] private readonly IOverlayManager _overlay = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IPrototypeManager _prototype = default!;
-        [Dependency] private readonly IResourceCache _resource = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly IUserInterfaceManager _uiManager = default!;
         [Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
@@ -45,7 +44,14 @@ public override void Initialize()
             SubscribeNetworkEvent<PopupEntityEvent>(OnPopupEntityEvent);
             SubscribeNetworkEvent<RoundRestartCleanupEvent>(OnRoundRestart);
             _overlay
-                .AddOverlay(new PopupOverlay(_configManager, EntityManager, _playerManager, _prototype, _resource, _uiManager, this));
+                .AddOverlay(new PopupOverlay(
+                    _configManager,
+                    EntityManager,
+                    _playerManager,
+                    _prototype,
+                    _uiManager,
+                    _uiManager.GetUIController<PopupUIController>(),
+                    this));
         }
 
         public override void Shutdown()
@@ -144,7 +150,7 @@ public override void PopupEntity(string? message, EntityUid uid, ICommonSession
                 PopupEntity(message, uid, type);
         }
 
-        public override void PopupEntity(string? message, EntityUid uid, Filter filter, bool recordReplay, PopupType type=PopupType.Small)
+        public override void PopupEntity(string? message, EntityUid uid, Filter filter, bool recordReplay, PopupType type = PopupType.Small)
         {
             if (!filter.Recipients.Contains(_playerManager.LocalSession))
                 return;
@@ -164,6 +170,12 @@ public override void PopupEntity(string? message, EntityUid uid, PopupType type
                 PopupMessage(message, type, transform.Coordinates, uid, true);
         }
 
+        public override void PopupPredicted(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small)
+        {
+            if (recipient != null && _timing.IsFirstTimePredicted)
+                PopupEntity(message, uid, recipient.Value, type);
+        }
+
         #endregion
 
         #region Network Event Handlers
diff --git a/Content.Client/Popups/PopupUIController.cs b/Content.Client/Popups/PopupUIController.cs
new file mode 100644
index 0000000000..8ce8ae21e1
--- /dev/null
+++ b/Content.Client/Popups/PopupUIController.cs
@@ -0,0 +1,121 @@
+using System.Numerics;
+using Content.Client.Gameplay;
+using Content.Shared.Popups;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controllers;
+
+namespace Content.Client.Popups;
+
+/// <summary>
+/// Handles screens-space popups. World popups are handled via PopupOverlay.
+/// </summary>
+public sealed class PopupUIController : UIController, IOnStateEntered<GameplayState>, IOnStateExited<GameplayState>
+{
+    [UISystemDependency] private readonly PopupSystem? _popup = default!;
+
+    private Font _smallFont = default!;
+    private Font _mediumFont = default!;
+    private Font _largeFont = default!;
+
+    private PopupRootControl? _popupControl;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        var cache = IoCManager.Resolve<IResourceCache>();
+
+        _smallFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Italic.ttf"), 10);
+        _mediumFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Italic.ttf"), 12);
+        _largeFont = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-BoldItalic.ttf"), 14);
+    }
+
+    public void OnStateEntered(GameplayState state)
+    {
+        _popupControl = new PopupRootControl(_popup, this);
+
+        UIManager.RootControl.AddChild(_popupControl);
+    }
+
+    public void OnStateExited(GameplayState state)
+    {
+        if (_popupControl == null)
+            return;
+
+        UIManager.RootControl.RemoveChild(_popupControl);
+        _popupControl = null;
+    }
+
+    public void DrawPopup(PopupSystem.PopupLabel popup, DrawingHandleScreen handle, Vector2 position, float scale)
+    {
+        var lifetime = PopupSystem.GetPopupLifetime(popup);
+
+        // Keep alpha at 1 until TotalTime passes half its lifetime, then gradually decrease to 0.
+        var alpha = MathF.Min(1f, 1f - MathF.Max(0f, popup.TotalTime - lifetime / 2) * 2 / lifetime);
+
+        var updatedPosition = position - new Vector2(0f, MathF.Min(8f, 12f * (popup.TotalTime * popup.TotalTime + popup.TotalTime)));
+        var font = _smallFont;
+        var color = Color.White.WithAlpha(alpha);
+
+        switch (popup.Type)
+        {
+            case PopupType.SmallCaution:
+                color = Color.Red;
+                break;
+            case PopupType.Medium:
+                font = _mediumFont;
+                color = Color.LightGray;
+                break;
+            case PopupType.MediumCaution:
+                font = _mediumFont;
+                color = Color.Red;
+                break;
+            case PopupType.Large:
+                font = _largeFont;
+                color = Color.LightGray;
+                break;
+            case PopupType.LargeCaution:
+                font = _largeFont;
+                color = Color.Red;
+                break;
+        }
+
+        var dimensions = handle.GetDimensions(font, popup.Text, scale);
+        handle.DrawString(font, updatedPosition - dimensions / 2f, popup.Text, scale, color.WithAlpha(alpha));
+    }
+
+    /// <summary>
+    /// Handles drawing all screen popups.
+    /// </summary>
+    private sealed class PopupRootControl : Control
+    {
+        private readonly PopupSystem? _popup;
+        private readonly PopupUIController _controller;
+
+        public PopupRootControl(PopupSystem? system, PopupUIController controller)
+        {
+            _popup = system;
+            _controller = controller;
+        }
+
+        protected override void Draw(DrawingHandleScreen handle)
+        {
+            base.Draw(handle);
+
+            if (_popup == null)
+                return;
+
+            // Different window
+            var windowId = UserInterfaceManager.RootControl.Window.Id;
+
+            foreach (var popup in _popup.CursorLabels)
+            {
+                if (popup.InitialPos.Window != windowId)
+                    continue;
+
+                _controller.DrawPopup(popup, handle, popup.InitialPos.Position, UIScale);
+            }
+        }
+    }
+}
diff --git a/Content.Client/Power/PowerMonitoringConsoleNavMapControl.cs b/Content.Client/Power/PowerMonitoringConsoleNavMapControl.cs
index 9f537f3858..902d6bb7e6 100644
--- a/Content.Client/Power/PowerMonitoringConsoleNavMapControl.cs
+++ b/Content.Client/Power/PowerMonitoringConsoleNavMapControl.cs
@@ -33,7 +33,7 @@ public PowerMonitoringConsoleNavMapControl() : base()
         // Set colors
         TileColor = new Color(30, 57, 67);
         WallColor = new Color(102, 164, 217);
-        _backgroundColor = Color.FromSrgb(TileColor.WithAlpha(_backgroundOpacity));
+        BackgroundColor = Color.FromSrgb(TileColor.WithAlpha(BackgroundOpacity));
 
         PostWallDrawingAction += DrawAllCableNetworks;
     }
@@ -93,8 +93,8 @@ public void DrawCableNetwork(DrawingHandleScreen handle, Dictionary<Vector2i, Li
                     if (HiddenLineGroups.Contains(chunkedLine.Group))
                         continue;
 
-                    var start = Scale(chunkedLine.Origin - new Vector2(offset.X, -offset.Y));
-                    var end = Scale(chunkedLine.Terminus - new Vector2(offset.X, -offset.Y));
+                    var start = ScalePosition(chunkedLine.Origin - new Vector2(offset.X, -offset.Y));
+                    var end = ScalePosition(chunkedLine.Terminus - new Vector2(offset.X, -offset.Y));
 
                     cableNetworks[(int) chunkedLine.Group].Add(start);
                     cableNetworks[(int) chunkedLine.Group].Add(end);
@@ -139,22 +139,22 @@ public void DrawCableNetwork(DrawingHandleScreen handle, Dictionary<Vector2i, Li
                     if (HiddenLineGroups.Contains(chunkedLine.Group))
                         continue;
 
-                    var leftTop = Scale(new Vector2
+                    var leftTop = ScalePosition(new Vector2
                         (Math.Min(chunkedLine.Origin.X, chunkedLine.Terminus.X) - 0.1f,
                         Math.Min(chunkedLine.Origin.Y, chunkedLine.Terminus.Y) - 0.1f)
                         - new Vector2(offset.X, -offset.Y));
 
-                    var rightTop = Scale(new Vector2
+                    var rightTop = ScalePosition(new Vector2
                         (Math.Max(chunkedLine.Origin.X, chunkedLine.Terminus.X) + 0.1f,
                         Math.Min(chunkedLine.Origin.Y, chunkedLine.Terminus.Y) - 0.1f)
                         - new Vector2(offset.X, -offset.Y));
 
-                    var leftBottom = Scale(new Vector2
+                    var leftBottom = ScalePosition(new Vector2
                         (Math.Min(chunkedLine.Origin.X, chunkedLine.Terminus.X) - 0.1f,
                         Math.Max(chunkedLine.Origin.Y, chunkedLine.Terminus.Y) + 0.1f)
                         - new Vector2(offset.X, -offset.Y));
 
-                    var rightBottom = Scale(new Vector2
+                    var rightBottom = ScalePosition(new Vector2
                         (Math.Max(chunkedLine.Origin.X, chunkedLine.Terminus.X) + 0.1f,
                         Math.Max(chunkedLine.Origin.Y, chunkedLine.Terminus.Y) + 0.1f)
                         - new Vector2(offset.X, -offset.Y));
diff --git a/Content.Client/Preferences/ClientPreferencesManager.cs b/Content.Client/Preferences/ClientPreferencesManager.cs
index 34b2c33140..b518493c9d 100644
--- a/Content.Client/Preferences/ClientPreferencesManager.cs
+++ b/Content.Client/Preferences/ClientPreferencesManager.cs
@@ -3,8 +3,10 @@
 using System.Linq;
 using Content.Shared.Preferences;
 using Robust.Client;
+using Robust.Shared.Configuration;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Preferences
@@ -18,6 +20,8 @@ public sealed class ClientPreferencesManager : IClientPreferencesManager
     {
         [Dependency] private readonly IClientNetManager _netManager = default!;
         [Dependency] private readonly IBaseClient _baseClient = default!;
+        [Dependency] private readonly IConfigurationManager _cfg = default!;
+        [Dependency] private readonly IPrototypeManager _prototypes = default!;
 
         public event Action? OnServerDataLoaded;
 
@@ -60,7 +64,7 @@ public void SelectCharacter(int slot)
 
         public void UpdateCharacter(ICharacterProfile profile, int slot)
         {
-            profile.EnsureValid();
+            profile.EnsureValid(_cfg, _prototypes);
             var characters = new Dictionary<int, ICharacterProfile>(Preferences.Characters) {[slot] = profile};
             Preferences = new PlayerPreferences(characters, Preferences.SelectedCharacterIndex, Preferences.AdminOOCColor);
             var msg = new MsgUpdateCharacter
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
index eb553de8e1..d0dd02a58a 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
@@ -58,6 +58,7 @@
                                 <BoxContainer HorizontalExpand="True">
                                     <Label Text="{Loc 'humanoid-profile-editor-species-label'}" />
                                     <Control HorizontalExpand="True"/>
+                                    <TextureButton Name="SpeciesInfoButton" Scale="0.3 0.3" VerticalAlignment="Center"></TextureButton>
                                     <OptionButton Name="CSpeciesButton" HorizontalAlignment="Right" />
                                 </BoxContainer>
                                 <!-- Age -->
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index 116a1dc292..3e2e379328 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -1,11 +1,13 @@
 using System.Linq;
 using System.Numerics;
+using Content.Client.Guidebook;
 using Content.Client.Humanoid;
 using Content.Client.Lobby.UI;
 using Content.Client.Message;
 using Content.Client.Players.PlayTimeTracking;
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Controls;
+using Content.Client.UserInterface.Systems.Guidebook;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Content.Shared.Humanoid;
@@ -116,6 +118,8 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
             _configurationManager = configurationManager;
             _markingManager = IoCManager.Resolve<MarkingManager>();
 
+            SpeciesInfoButton.ToolTip = Loc.GetString("humanoid-profile-editor-guidebook-button-tooltip");
+
             #region Left
 
             #region Randomize
@@ -523,10 +527,30 @@ public HumanoidProfileEditor(IClientPreferencesManager preferencesManager, IProt
 
             preferencesManager.OnServerDataLoaded += LoadServerData;
 
+            SpeciesInfoButton.OnPressed += OnSpeciesInfoButtonPressed;
+
+            UpdateSpeciesGuidebookIcon();
 
             IsDirty = false;
         }
 
+        private void OnSpeciesInfoButtonPressed(BaseButton.ButtonEventArgs args)
+        {
+            var guidebookController = UserInterfaceManager.GetUIController<GuidebookUIController>();
+            var species = Profile?.Species ?? SharedHumanoidAppearanceSystem.DefaultSpecies;
+            var page = "Species";
+            if (_prototypeManager.HasIndex<GuideEntryPrototype>(species))
+                page = species;
+
+            if (_prototypeManager.TryIndex<GuideEntryPrototype>("Species", out var guideRoot))
+            {
+                var dict = new Dictionary<string, GuideEntry>();
+                dict.Add("Species", guideRoot);
+                //TODO: Don't close the guidebook if its already open, just go to the correct page
+                guidebookController.ToggleGuidebook(dict, includeChildren:true, selected: page);
+            }
+        }
+
         private void ToggleClothes(BaseButton.ButtonEventArgs obj)
         {
             RebuildSpriteView();
@@ -539,10 +563,8 @@ private void UpdateRoleRequirements()
             _jobCategories.Clear();
             var firstCategory = true;
 
-            var departments = _prototypeManager.EnumeratePrototypes<DepartmentPrototype>()
-                .OrderByDescending(department => department.Weight)
-                .ThenBy(department => Loc.GetString($"department-{department.ID}"))
-                .ToList();
+            var departments = _prototypeManager.EnumeratePrototypes<DepartmentPrototype>().ToArray();
+            Array.Sort(departments, DepartmentUIComparer.Instance);
 
             foreach (var department in departments)
             {
@@ -590,9 +612,8 @@ private void UpdateRoleRequirements()
 
                 var jobs = department.Roles.Select(jobId => _prototypeManager.Index<JobPrototype>(jobId))
                     .Where(job => job.SetPreference)
-                    .OrderByDescending(job => job.Weight)
-                    .ThenBy(job => job.LocalizedName)
-                    .ToList();
+                    .ToArray();
+                Array.Sort(jobs, JobUIComparer.Instance);
 
                 foreach (var job in jobs)
                 {
@@ -825,6 +846,7 @@ private void SetSpecies(string newSpecies)
             CMarkings.SetSpecies(newSpecies); // Repopulate the markings tab as well.
             UpdateSexControls(); // update sex for new species
             RebuildSpriteView(); // they might have different inv so we need a new dummy
+            UpdateSpeciesGuidebookIcon();
             IsDirty = true;
             _needUpdatePreview = true;
         }
@@ -976,6 +998,25 @@ private void UpdateSkinColor()
 
         }
 
+        public void UpdateSpeciesGuidebookIcon()
+        {
+            SpeciesInfoButton.StyleClasses.Clear();
+
+            var species = Profile?.Species;
+            if (species is null)
+                return;
+
+            if (!_prototypeManager.TryIndex<SpeciesPrototype>(species, out var speciesProto))
+                return;
+
+            // Don't display the info button if no guide entry is found
+            if (!_prototypeManager.HasIndex<GuideEntryPrototype>(species))
+                return;
+
+            var style = speciesProto.GuideBookIcon;
+            SpeciesInfoButton.StyleClasses.Add(style);
+        }
+
         private void UpdateMarkings()
         {
             if (Profile == null)
@@ -1347,7 +1388,7 @@ public JobPrioritySelector(JobPrototype proto, IPrototypeManager protoMan)
                 var icon = new TextureRect
                 {
                     TextureScale = new Vector2(2, 2),
-                    Stretch = TextureRect.StretchMode.KeepCentered
+                    VerticalAlignment = VAlignment.Center
                 };
                 var jobIcon = protoMan.Index<StatusIconPrototype>(proto.Icon);
                 icon.Texture = jobIcon.Icon.Frame0();
diff --git a/Content.Client/Replay/ContentReplayPlaybackManager.cs b/Content.Client/Replay/ContentReplayPlaybackManager.cs
index 37c066f594..bc979575f5 100644
--- a/Content.Client/Replay/ContentReplayPlaybackManager.cs
+++ b/Content.Client/Replay/ContentReplayPlaybackManager.cs
@@ -121,7 +121,7 @@ private bool OnHandleReplayMessage(object message, bool skipEffects)
                 // Mark as handled -- the event won't get raised.
                 return true;
             case TickerJoinGameEvent:
-                if (!_entMan.EntityExists(_player.LocalPlayer?.ControlledEntity))
+                if (!_entMan.EntityExists(_player.LocalEntity))
                     _entMan.System<ReplaySpectatorSystem>().SetSpectatorPosition(default);
                 return true;
             case ChatMessage chat:
diff --git a/Content.Client/Replay/ReplayConGroup.cs b/Content.Client/Replay/ReplayConGroup.cs
index 8e85632683..cec20df412 100644
--- a/Content.Client/Replay/ReplayConGroup.cs
+++ b/Content.Client/Replay/ReplayConGroup.cs
@@ -4,7 +4,7 @@ namespace Content.Client.Replay;
 
 public sealed class ReplayConGroup : IClientConGroupImplementation
 {
-    public event Action? ConGroupUpdated;
+    public event Action? ConGroupUpdated { add { } remove { } }
     public bool CanAdminMenu() => true;
     public bool CanAdminPlace() => true;
     public bool CanCommand(string cmdName) => true;
diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
index 52abd0df08..b364b83312 100644
--- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs
@@ -63,7 +63,7 @@ public void  UpdatePanels(ResearchConsoleBoundInterfaceState state)
             MinHeight = 10
         });
 
-        var hasAccess = _player.LocalPlayer?.ControlledEntity is not { } local ||
+        var hasAccess = _player.LocalEntity is not { } local ||
                         !_entity.TryGetComponent<AccessReaderComponent>(Entity, out var access) ||
                         _accessReader.IsAllowed(local, Entity, access);
         foreach (var techId in _technologyDatabase.CurrentTechnologyCards)
diff --git a/Content.Client/Salvage/SalvageSystem.cs b/Content.Client/Salvage/SalvageSystem.cs
index 0a73c727a4..fb305c5fdc 100644
--- a/Content.Client/Salvage/SalvageSystem.cs
+++ b/Content.Client/Salvage/SalvageSystem.cs
@@ -36,7 +36,7 @@ private void OnPlayAmbientMusic(ref PlayAmbientMusicEvent ev)
         if (ev.Cancelled)
             return;
 
-        var player = _playerManager.LocalPlayer?.ControlledEntity;
+        var player = _playerManager.LocalEntity;
 
         if (!TryComp<TransformComponent>(player, out var xform) ||
             !TryComp<SalvageExpeditionComponent>(xform.MapUid, out var expedition) ||
diff --git a/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs
index 41db4bb0b4..4bd44a47a8 100644
--- a/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs
+++ b/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Shuttles.BUIStates;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
+using RadarConsoleWindow = Content.Client.Shuttles.UI.RadarConsoleWindow;
 
 namespace Content.Client.Shuttles.BUI;
 
@@ -36,9 +37,9 @@ protected override void Dispose(bool disposing)
     protected override void UpdateState(BoundUserInterfaceState state)
     {
         base.UpdateState(state);
-        if (state is not RadarConsoleBoundInterfaceState cState) return;
+        if (state is not NavBoundUserInterfaceState cState)
+            return;
 
-        _window?.SetMatrix(EntMan.GetCoordinates(cState.Coordinates), cState.Angle);
-        _window?.UpdateState(cState);
+        _window?.UpdateState(cState.State);
     }
 }
diff --git a/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
index 1df8416ad7..af7b6055c8 100644
--- a/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
+++ b/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
@@ -2,7 +2,7 @@
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Events;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
+using Robust.Shared.Map;
 
 namespace Content.Client.Shuttles.BUI;
 
@@ -20,58 +20,66 @@ protected override void Open()
     {
         base.Open();
         _window = new ShuttleConsoleWindow();
-        _window.UndockPressed += OnUndockPressed;
-        _window.StartAutodockPressed += OnAutodockPressed;
-        _window.StopAutodockPressed += OnStopAutodockPressed;
-        _window.DestinationPressed += OnDestinationPressed;
         _window.OpenCentered();
-        _window.OnClose += OnClose;
+        _window.OnClose += Close;
+
+        _window.RequestFTL += OnFTLRequest;
+        _window.RequestBeaconFTL += OnFTLBeaconRequest;
+        _window.DockRequest += OnDockRequest;
+        _window.UndockRequest += OnUndockRequest;
     }
 
-    private void OnDestinationPressed(NetEntity obj)
+    private void OnUndockRequest(NetEntity entity)
     {
-        SendMessage(new ShuttleConsoleFTLRequestMessage()
+        SendMessage(new UndockRequestMessage()
         {
-            Destination = obj,
+            DockEntity = entity,
         });
     }
 
-    private void OnClose()
+    private void OnDockRequest(NetEntity entity, NetEntity target)
     {
-        Close();
+        SendMessage(new DockRequestMessage()
+        {
+            DockEntity = entity,
+            TargetDockEntity = target,
+        });
     }
 
-    protected override void Dispose(bool disposing)
+    private void OnFTLBeaconRequest(NetEntity ent, Angle angle)
     {
-        base.Dispose(disposing);
-
-        if (disposing)
+        SendMessage(new ShuttleConsoleFTLBeaconMessage()
         {
-            _window?.Dispose();
-        }
+            Beacon = ent,
+            Angle = angle,
+        });
     }
 
-    private void OnStopAutodockPressed(NetEntity obj)
+    private void OnFTLRequest(MapCoordinates obj, Angle angle)
     {
-        SendMessage(new StopAutodockRequestMessage() { DockEntity = obj });
+        SendMessage(new ShuttleConsoleFTLPositionMessage()
+        {
+            Coordinates = obj,
+            Angle = angle,
+        });
     }
 
-    private void OnAutodockPressed(NetEntity obj)
+    protected override void Dispose(bool disposing)
     {
-        SendMessage(new AutodockRequestMessage() { DockEntity = obj });
-    }
+        base.Dispose(disposing);
 
-    private void OnUndockPressed(NetEntity obj)
-    {
-        SendMessage(new UndockRequestMessage() { DockEntity = obj });
+        if (disposing)
+        {
+            _window?.Dispose();
+        }
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
     {
         base.UpdateState(state);
-        if (state is not ShuttleConsoleBoundInterfaceState cState) return;
+        if (state is not ShuttleBoundUserInterfaceState cState)
+            return;
 
-        _window?.SetMatrix(EntMan.GetCoordinates(cState.Coordinates), cState.Angle);
-        _window?.UpdateState(cState);
+        _window?.UpdateState(Owner, cState);
     }
 }
diff --git a/Content.Client/Shuttles/ShuttleConsoleComponent.cs b/Content.Client/Shuttles/ShuttleConsoleComponent.cs
index 53b0dee848..f2c297751b 100644
--- a/Content.Client/Shuttles/ShuttleConsoleComponent.cs
+++ b/Content.Client/Shuttles/ShuttleConsoleComponent.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Shuttles.Components;
 
-namespace Content.Client.Shuttles
-{
-    [RegisterComponent]
-    public sealed partial class ShuttleConsoleComponent : SharedShuttleConsoleComponent {}
-}
+namespace Content.Client.Shuttles;
+
+[RegisterComponent]
+public sealed partial class ShuttleConsoleComponent : SharedShuttleConsoleComponent {}
diff --git a/Content.Client/Shuttles/Systems/DockingSystem.cs b/Content.Client/Shuttles/Systems/DockingSystem.cs
index 143f0a971b..d3261693a3 100644
--- a/Content.Client/Shuttles/Systems/DockingSystem.cs
+++ b/Content.Client/Shuttles/Systems/DockingSystem.cs
@@ -1,5 +1,7 @@
-using Content.Shared.Shuttles.Events;
+using Content.Shared.Shuttles.Systems;
 
 namespace Content.Client.Shuttles.Systems;
 
-public sealed class DockingSystem : EntitySystem {}
+public sealed class DockingSystem : SharedDockingSystem
+{
+}
diff --git a/Content.Client/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Client/Shuttles/Systems/ShuttleConsoleSystem.cs
index 20fff4acfa..3bf4bc966a 100644
--- a/Content.Client/Shuttles/Systems/ShuttleConsoleSystem.cs
+++ b/Content.Client/Shuttles/Systems/ShuttleConsoleSystem.cs
@@ -35,7 +35,7 @@ public override void Shutdown()
         protected override void HandlePilotShutdown(EntityUid uid, PilotComponent component, ComponentShutdown args)
         {
             base.HandlePilotShutdown(uid, component, args);
-            if (_playerManager.LocalPlayer?.ControlledEntity != uid) return;
+            if (_playerManager.LocalEntity != uid) return;
 
             _input.Contexts.SetActiveContext("human");
         }
diff --git a/Content.Client/Shuttles/Systems/ShuttleSystem.Console.cs b/Content.Client/Shuttles/Systems/ShuttleSystem.Console.cs
new file mode 100644
index 0000000000..c134b7157c
--- /dev/null
+++ b/Content.Client/Shuttles/Systems/ShuttleSystem.Console.cs
@@ -0,0 +1,55 @@
+using Content.Client.Resources;
+using Content.Client.Shuttles.UI;
+using Content.Shared.Shuttles.Components;
+using Content.Shared.Shuttles.UI.MapObjects;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Physics.Components;
+
+namespace Content.Client.Shuttles.Systems;
+
+public sealed partial class ShuttleSystem
+{
+    [Dependency] private readonly IResourceCache _resource = default!;
+
+    /// <summary>
+    /// Gets the parallax to use for the specified map or uses the fallback if not available.
+    /// </summary>
+    public Texture GetTexture(Entity<ShuttleMapParallaxComponent?> entity)
+    {
+        if (!Resolve(entity, ref entity.Comp, false))
+        {
+            return _resource.GetTexture(ShuttleMapParallaxComponent.FallbackTexture);
+        }
+
+        return _resource.GetTexture(entity.Comp.TexturePath);
+    }
+
+    /// <summary>
+    /// Gets the map coordinates of a map object.
+    /// </summary>
+    public MapCoordinates GetMapCoordinates(IMapObject mapObj)
+    {
+        switch (mapObj)
+        {
+            case ShuttleBeaconObject beacon:
+                return GetCoordinates(beacon.Coordinates).ToMap(EntityManager, XformSystem);
+            case ShuttleExclusionObject exclusion:
+                return GetCoordinates(exclusion.Coordinates).ToMap(EntityManager, XformSystem);
+            case GridMapObject grid:
+                var gridXform = Transform(grid.Entity);
+
+                if (HasComp<MapComponent>(grid.Entity))
+                {
+                    return new MapCoordinates(gridXform.LocalPosition, gridXform.MapID);
+                }
+
+                Entity<PhysicsComponent?, TransformComponent?> gridEnt = (grid.Entity, null, gridXform);
+                return new MapCoordinates(Maps.GetGridPosition(gridEnt), gridXform.MapID);
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
+    }
+}
diff --git a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml
new file mode 100644
index 0000000000..c3c1802166
--- /dev/null
+++ b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml
@@ -0,0 +1,2 @@
+<controls1:MapGridControl
+    xmlns:controls1="clr-namespace:Content.Client.UserInterface.Controls" />
diff --git a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
new file mode 100644
index 0000000000..035823af43
--- /dev/null
+++ b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
@@ -0,0 +1,324 @@
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Shuttles.Components;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Map.Components;
+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;
+
+/// <summary>
+/// Provides common functionality for radar-like displays on shuttle consoles.
+/// </summary>
+[GenerateTypedNameReferences]
+[Virtual]
+public partial class BaseShuttleControl : MapGridControl
+{
+    [Dependency] private readonly IParallelManager _parallel = default!;
+    protected readonly SharedMapSystem Maps;
+
+    protected readonly Font Font;
+
+    private GridDrawJob _drawJob;
+
+    // Cache grid drawing data as it can be expensive to build
+    public readonly Dictionary<EntityUid, GridDrawData> GridData = new();
+
+    // Per-draw caching
+    private readonly List<Vector2i> _gridTileList = new();
+    private readonly HashSet<Vector2i> _gridNeighborSet = new();
+    private readonly List<(Vector2 Start, Vector2 End)> _edges = new();
+
+    private Vector2[] _allVertices = Array.Empty<Vector2>();
+
+    private (DirectionFlag, Vector2i)[] _neighborDirections;
+
+    public BaseShuttleControl() : this(32f, 32f, 32f)
+    {
+    }
+
+    public BaseShuttleControl(float minRange, float maxRange, float range) : base(minRange, maxRange, range)
+    {
+        RobustXamlLoader.Load(this);
+        Maps = EntManager.System<SharedMapSystem>();
+        Font = new VectorFont(IoCManager.Resolve<IResourceCache>().GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 12);
+
+        _drawJob = new GridDrawJob()
+        {
+            ScaledVertices = _allVertices,
+        };
+
+        _neighborDirections = new (DirectionFlag, Vector2i)[4];
+
+        for (var i = 0; i < 4; i++)
+        {
+            var dir = (DirectionFlag) Math.Pow(2, i);
+            var dirVec = dir.AsDir().ToIntVec();
+            _neighborDirections[i] = (dir, dirVec);
+        }
+    }
+
+    protected void DrawData(DrawingHandleScreen handle, string text)
+    {
+        var coordsDimensions = handle.GetDimensions(Font, text, UIScale);
+        const float coordsMargins = 5f;
+
+        handle.DrawString(Font,
+            new Vector2(coordsMargins, Height) - new Vector2(0f, coordsDimensions.Y + coordsMargins),
+            text,
+            Color.FromSrgb(IFFComponent.SelfColor));
+    }
+
+    protected void DrawCircles(DrawingHandleScreen handle)
+    {
+        // Equatorial lines
+        var gridLines = Color.LightGray.WithAlpha(0.01f);
+
+        // Each circle is this x distance of the last one.
+        const float EquatorialMultiplier = 2f;
+
+        var minDistance = MathF.Pow(EquatorialMultiplier, EquatorialMultiplier * 1.5f);
+        var maxDistance = MathF.Pow(2f, EquatorialMultiplier * 6f);
+        var cornerDistance = MathF.Sqrt(WorldRange * WorldRange + WorldRange * WorldRange);
+
+        var origin = ScalePosition(-new Vector2(Offset.X, -Offset.Y));
+        var distOffset = -24f;
+
+        for (var radius = minDistance; radius <= maxDistance; radius *= EquatorialMultiplier)
+        {
+            if (radius > cornerDistance)
+                continue;
+
+            var color = Color.ToSrgb(gridLines).WithAlpha(0.05f);
+            var scaledRadius = MinimapScale * radius;
+            var text = $"{radius:0}m";
+            var textDimensions = handle.GetDimensions(Font, text, UIScale);
+
+            handle.DrawCircle(origin, scaledRadius, color, false);
+            handle.DrawString(Font, ScalePosition(new Vector2(0f, -radius)) - new Vector2(0f, textDimensions.Y), text, color);
+        }
+
+        const int gridLinesRadial = 8;
+
+        for (var i = 0; i < gridLinesRadial; i++)
+        {
+            Angle angle = (Math.PI / gridLinesRadial) * i;
+            // TODO: Handle distance properly.
+            var aExtent = angle.ToVec() * ScaledMinimapRadius * 1.42f;
+            var lineColor = Color.MediumSpringGreen.WithAlpha(0.02f);
+            handle.DrawLine(origin - aExtent, origin + aExtent, lineColor);
+        }
+    }
+
+    protected void DrawGrid(DrawingHandleScreen handle, Matrix3 matrix, Entity<MapGridComponent> grid, Color color, float alpha = 0.01f)
+    {
+        var rator = Maps.GetAllTilesEnumerator(grid.Owner, grid.Comp);
+        var minimapScale = MinimapScale;
+        var midpoint = new Vector2(MidPoint, MidPoint);
+        var tileSize = grid.Comp.TileSize;
+
+        // Check if we even have data
+        // TODO: Need to prune old grid-data if we don't draw it.
+        var gridData = GridData.GetOrNew(grid.Owner);
+
+        if (gridData.LastBuild < grid.Comp.LastTileModifiedTick)
+        {
+            gridData.Vertices.Clear();
+            _gridTileList.Clear();
+            _gridNeighborSet.Clear();
+
+            // Okay so there's 2 steps to this
+            // 1. Is that get we get a set of all tiles. This is used to decompose into triangle-strips
+            // 2. Is that we get a list of all tiles. This is used for edge data to decompose into line-strips.
+            while (rator.MoveNext(out var tileRef))
+            {
+                var index = tileRef.Value.GridIndices;
+                _gridNeighborSet.Add(index);
+                _gridTileList.Add(index);
+
+                var bl = Maps.TileToVector(grid, index);
+                var br = bl + new Vector2(tileSize, 0f);
+                var tr = bl + new Vector2(tileSize, tileSize);
+                var tl = bl + new Vector2(0f, tileSize);
+
+                gridData.Vertices.Add(bl);
+                gridData.Vertices.Add(br);
+                gridData.Vertices.Add(tl);
+
+                gridData.Vertices.Add(br);
+                gridData.Vertices.Add(tl);
+                gridData.Vertices.Add(tr);
+            }
+
+            gridData.EdgeIndex = gridData.Vertices.Count;
+            _edges.Clear();
+
+            foreach (var index in _gridTileList)
+            {
+                // We get all of the raw lines up front
+                // then we decompose them into longer lines in a separate step.
+                foreach (var (dir, dirVec) in _neighborDirections)
+                {
+                    var neighbor = index + dirVec;
+
+                    if (_gridNeighborSet.Contains(neighbor))
+                        continue;
+
+                    var bl = Maps.TileToVector(grid, index);
+                    var br = bl + new Vector2(tileSize, 0f);
+                    var tr = bl + new Vector2(tileSize, tileSize);
+                    var tl = bl + new Vector2(0f, tileSize);
+
+                    // Could probably rotate this but this might be faster?
+                    Vector2 actualStart;
+                    Vector2 actualEnd;
+
+                    switch (dir)
+                    {
+                        case DirectionFlag.South:
+                            actualStart = bl;
+                            actualEnd = br;
+                            break;
+                        case DirectionFlag.East:
+                            actualStart = br;
+                            actualEnd = tr;
+                            break;
+                        case DirectionFlag.North:
+                            actualStart = tr;
+                            actualEnd = tl;
+                            break;
+                        case DirectionFlag.West:
+                            actualStart = tl;
+                            actualEnd = bl;
+                            break;
+                        default:
+                            throw new NotImplementedException();
+                    }
+
+                    _edges.Add((actualStart, actualEnd));
+                }
+            }
+
+            // Decompose the edges into longer lines to save data.
+            // Now we decompose the lines into longer lines (less data to send to the GPU)
+            var decomposed = true;
+
+            while (decomposed)
+            {
+                decomposed = false;
+
+                for (var i = 0; i < _edges.Count; i++)
+                {
+                    var (start, end) = _edges[i];
+                    var neighborFound = false;
+                    var neighborIndex = 0;
+                    Vector2 neighborStart;
+                    Vector2 neighborEnd = Vector2.Zero;
+
+                    // Does our end correspond with another start?
+                    for (var j = i + 1; j < _edges.Count; j++)
+                    {
+                        (neighborStart, neighborEnd) = _edges[j];
+
+                        if (!end.Equals(neighborStart))
+                            continue;
+
+                        neighborFound = true;
+                        neighborIndex = j;
+                        break;
+                    }
+
+                    if (!neighborFound)
+                        continue;
+
+                    // Check if our start and the neighbor's end are collinear
+                    if (!CollinearSimplifier.IsCollinear(start, end, neighborEnd, 10f * float.Epsilon))
+                        continue;
+
+                    decomposed = true;
+                    _edges[i] = (start, neighborEnd);
+                    _edges.RemoveAt(neighborIndex);
+                }
+            }
+
+            gridData.Vertices.EnsureCapacity(_edges.Count * 2);
+
+            foreach (var edge in _edges)
+            {
+                gridData.Vertices.Add(edge.Start);
+                gridData.Vertices.Add(edge.End);
+            }
+
+            gridData.LastBuild = grid.Comp.LastTileModifiedTick;
+        }
+
+        var totalData = gridData.Vertices.Count;
+        var triCount = gridData.EdgeIndex;
+        var edgeCount = totalData - gridData.EdgeIndex;
+        Extensions.EnsureLength(ref _allVertices, totalData);
+
+        _drawJob.MidPoint = midpoint;
+        _drawJob.Matrix = matrix;
+        _drawJob.MinimapScale = minimapScale;
+        _drawJob.Vertices = gridData.Vertices;
+        _drawJob.ScaledVertices = _allVertices;
+
+        _parallel.ProcessNow(_drawJob, totalData);
+
+        const float BatchSize = 3f * 4096;
+
+        for (var i = 0; i < Math.Ceiling(triCount / BatchSize); i++)
+        {
+            var start = (int) (i * BatchSize);
+            var end = (int) Math.Min(triCount, start + BatchSize);
+            var count = end - start;
+            handle.DrawPrimitives(DrawPrimitiveTopology.TriangleList, new Span<Vector2>(_allVertices, start, count), color.WithAlpha(alpha));
+        }
+
+        handle.DrawPrimitives(DrawPrimitiveTopology.LineList, new Span<Vector2>(_allVertices, gridData.EdgeIndex, edgeCount), color);
+    }
+
+    private record struct GridDrawJob : IParallelRobustJob
+    {
+        public int BatchSize => 16;
+
+        public float MinimapScale;
+        public Vector2 MidPoint;
+        public Matrix3 Matrix;
+
+        public List<Vector2> Vertices;
+        public Vector2[] ScaledVertices;
+
+        public void Execute(int index)
+        {
+            var vert = Vertices[index];
+            var adjustedVert = Matrix.Transform(vert);
+            adjustedVert = adjustedVert with { Y = -adjustedVert.Y };
+
+            var scaledVert = ScalePosition(adjustedVert, MinimapScale, MidPoint);
+            ScaledVertices[index] = scaledVert;
+        }
+    }
+}
+
+public sealed class GridDrawData
+{
+    /*
+     * List of lists because we use LineStrip and TriangleStrip respectively (less data to pass to the GPU).
+     */
+
+    public List<Vector2> Vertices = new();
+
+    /// <summary>
+    /// Vertices index from when edges start.
+    /// </summary>
+    public int EdgeIndex;
+
+    public GameTick LastBuild;
+}
diff --git a/Content.Client/Shuttles/UI/DockObject.xaml b/Content.Client/Shuttles/UI/DockObject.xaml
new file mode 100644
index 0000000000..bae625658b
--- /dev/null
+++ b/Content.Client/Shuttles/UI/DockObject.xaml
@@ -0,0 +1,11 @@
+<controls:PanelContainer HorizontalExpand="True"
+                         xmlns:controls="https://spacestation14.io"
+                         Margin="0 3">
+    <controls:BoxContainer Name="Contents" Orientation="Vertical"
+                           Margin="3">
+        <controls:Label Name="DockedLabel"
+                        HorizontalAlignment="Center"
+                        Margin="3 5"/>
+        <controls:BoxContainer Orientation="Vertical" Name="DockContainer"/>
+    </controls:BoxContainer>
+</controls:PanelContainer>
diff --git a/Content.Client/Shuttles/UI/DockObject.xaml.cs b/Content.Client/Shuttles/UI/DockObject.xaml.cs
new file mode 100644
index 0000000000..9dae6b7a4d
--- /dev/null
+++ b/Content.Client/Shuttles/UI/DockObject.xaml.cs
@@ -0,0 +1,61 @@
+using System.Text;
+using Content.Shared.Shuttles.BUIStates;
+using Content.Shared.Shuttles.Systems;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Map;
+
+namespace Content.Client.Shuttles.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class DockObject : PanelContainer
+{
+    public event Action? UndockPressed;
+    public event Action? ViewPressed;
+
+    public BoxContainer ContentsContainer => Contents;
+
+    public DockObject()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        PanelOverride = new StyleBoxFlat(new Color(30, 30, 34));
+    }
+
+    public void AddDock(DockingPortState state, ShuttleDockControl dockControl)
+    {
+        var viewButton = new Button()
+        {
+            Text = Loc.GetString("shuttle-console-view"),
+        };
+
+        viewButton.OnPressed += args =>
+        {
+            dockControl.SetViewedDock(state);
+        };
+
+        var container = new BoxContainer()
+        {
+            Orientation = BoxContainer.LayoutOrientation.Vertical,
+            Children =
+            {
+                new Label()
+                {
+                    Text = state.Name,
+                    HorizontalAlignment = HAlignment.Center,
+                },
+                viewButton
+            }
+        };
+
+        DockContainer.AddChild(container);
+    }
+
+    public void SetName(string value)
+    {
+        DockedLabel.Text = value;
+    }
+}
diff --git a/Content.Client/Shuttles/UI/DockingControl.cs b/Content.Client/Shuttles/UI/DockingControl.cs
deleted file mode 100644
index c0ddeff86c..0000000000
--- a/Content.Client/Shuttles/UI/DockingControl.cs
+++ /dev/null
@@ -1,272 +0,0 @@
-using System.Numerics;
-using Content.Client.UserInterface.Controls;
-using Content.Shared.Shuttles.BUIStates;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Collision.Shapes;
-
-namespace Content.Client.Shuttles.UI;
-
-/// <summary>
-/// Displays the docking view from a specific docking port
-/// </summary>
-[Virtual]
-public class DockingControl : Control
-{
-    private readonly IEntityManager _entManager;
-    private readonly IMapManager _mapManager;
-
-    private float _range = 8f;
-    private float _rangeSquared = 0f;
-
-    private Vector2 RangeVector => new Vector2(_range, _range);
-
-    private const float GridLinesDistance = 32f;
-
-    private int MidPoint => SizeFull / 2;
-    private Vector2 MidPointVector => new Vector2(MidPoint, MidPoint);
-
-    private int SizeFull => (int) (MapGridControl.UIDisplayRadius * 2 * UIScale);
-    private int ScaledMinimapRadius => (int) (MapGridControl.UIDisplayRadius * UIScale);
-    private float MinimapScale => _range != 0 ? ScaledMinimapRadius / _range : 0f;
-
-    public NetEntity? ViewedDock;
-    public EntityUid? GridEntity;
-
-    public EntityCoordinates? Coordinates;
-    public Angle? Angle;
-
-    /// <summary>
-    /// Stored by GridID then by docks
-    /// </summary>
-    public Dictionary<NetEntity, List<DockingInterfaceState>> Docks = new();
-
-    private List<Entity<MapGridComponent>> _grids = new();
-
-    public DockingControl()
-    {
-        _entManager = IoCManager.Resolve<IEntityManager>();
-        _mapManager = IoCManager.Resolve<IMapManager>();
-        _rangeSquared = _range * _range;
-        MinSize = new Vector2(SizeFull, SizeFull);
-    }
-
-    protected override void Draw(DrawingHandleScreen handle)
-    {
-        base.Draw(handle);
-
-        var fakeAA = new Color(0.08f, 0.08f, 0.08f);
-
-        handle.DrawCircle(new Vector2(MidPoint, MidPoint), ScaledMinimapRadius + 1, fakeAA);
-        handle.DrawCircle(new Vector2(MidPoint, MidPoint), ScaledMinimapRadius, Color.Black);
-
-        var gridLines = new Color(0.08f, 0.08f, 0.08f);
-        var gridLinesRadial = 8;
-        var gridLinesEquatorial = (int) Math.Floor(_range / GridLinesDistance);
-
-        for (var i = 1; i < gridLinesEquatorial + 1; i++)
-        {
-            handle.DrawCircle(new Vector2(MidPoint, MidPoint), GridLinesDistance * MinimapScale * i, gridLines, false);
-        }
-
-        for (var i = 0; i < gridLinesRadial; i++)
-        {
-            Angle angle = (Math.PI / gridLinesRadial) * i;
-            var aExtent = angle.ToVec() * ScaledMinimapRadius;
-            handle.DrawLine(new Vector2(MidPoint, MidPoint) - aExtent, new Vector2(MidPoint, MidPoint) + aExtent, gridLines);
-        }
-
-        if (Coordinates == null ||
-            Angle == null ||
-            !_entManager.TryGetComponent<TransformComponent>(GridEntity, out var gridXform)) return;
-
-        var rotation = Matrix3.CreateRotation(-Angle.Value + Math.PI);
-        var matrix = Matrix3.CreateTranslation(-Coordinates.Value.Position);
-
-        // Draw the fixtures around the dock before drawing it
-        if (_entManager.TryGetComponent<FixturesComponent>(GridEntity, out var fixtures))
-        {
-            foreach (var fixture in fixtures.Fixtures.Values)
-            {
-                var poly = (PolygonShape) fixture.Shape;
-
-                for (var i = 0; i < poly.VertexCount; i++)
-                {
-                    var start = matrix.Transform(poly.Vertices[i]);
-                    var end = matrix.Transform(poly.Vertices[(i + 1) % poly.VertexCount]);
-
-                    var startOut = start.LengthSquared() > _rangeSquared;
-                    var endOut = end.LengthSquared() > _rangeSquared;
-
-                    // We need to draw to the radar border so we'll cap the range,
-                    // but if none of the verts are in range then just leave it.
-                    if (startOut && endOut)
-                        continue;
-
-                    start.Y = -start.Y;
-                    end.Y = -end.Y;
-
-                    // If start is outside we draw capped from end to start
-                    if (startOut)
-                    {
-                        // It's called Jobseeker now.
-                        if (!MathHelper.TryGetIntersecting(start, end, _range, out var newStart))
-                            continue;
-
-                        start = newStart.Value;
-                    }
-                    // otherwise vice versa
-                    else if (endOut)
-                    {
-                        if (!MathHelper.TryGetIntersecting(end, start, _range, out var newEnd))
-                            continue;
-
-                        end = newEnd.Value;
-                    }
-
-                    handle.DrawLine(ScalePosition(start), ScalePosition(end), Color.Goldenrod);
-                }
-            }
-        }
-
-        // Draw the dock's collision
-        handle.DrawRect(new UIBox2(
-            ScalePosition(rotation.Transform(new Vector2(-0.2f, -0.7f))),
-            ScalePosition(rotation.Transform(new Vector2(0.2f, -0.5f)))), Color.Aquamarine);
-
-        // Draw the dock itself
-        handle.DrawRect(new UIBox2(
-            ScalePosition(rotation.Transform(new Vector2(-0.5f, 0.5f))),
-            ScalePosition(rotation.Transform(new Vector2(0.5f, -0.5f)))), Color.Green);
-
-        // Draw nearby grids
-        var worldPos = gridXform.WorldMatrix.Transform(Coordinates.Value.Position);
-        var gridInvMatrix = gridXform.InvWorldMatrix;
-        Matrix3.Multiply(in gridInvMatrix, in matrix, out var invMatrix);
-
-        // TODO: Getting some overdraw so need to fix that.
-        var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
-
-        _grids.Clear();
-        _mapManager.FindGridsIntersecting(gridXform.MapID, new Box2(worldPos - RangeVector, worldPos + RangeVector), ref _grids);
-
-        foreach (var grid in _grids)
-        {
-            if (grid.Owner == GridEntity)
-                continue;
-
-            // Draw the fixtures before drawing any docks in range.
-            if (!_entManager.TryGetComponent<FixturesComponent>(grid, out var gridFixtures))
-                continue;
-
-            var gridMatrix = xformQuery.GetComponent(grid).WorldMatrix;
-
-            Matrix3.Multiply(in gridMatrix, in invMatrix, out var matty);
-
-            foreach (var (_, fixture) in gridFixtures.Fixtures)
-            {
-                var poly = (PolygonShape) fixture.Shape;
-
-                for (var i = 0; i < poly.VertexCount; i++)
-                {
-                    // This is because the same line might be on different fixtures so we don't want to draw it twice.
-                    var startPos = poly.Vertices[i];
-                    var endPos = poly.Vertices[(i + 1) % poly.VertexCount];
-
-                    var start = matty.Transform(startPos);
-                    var end = matty.Transform(endPos);
-
-                    var startOut = start.LengthSquared() > _rangeSquared;
-                    var endOut = end.LengthSquared() > _rangeSquared;
-
-                    // We need to draw to the radar border so we'll cap the range,
-                    // but if none of the verts are in range then just leave it.
-                    if (startOut && endOut)
-                        continue;
-
-                    start.Y = -start.Y;
-                    end.Y = -end.Y;
-
-                    // If start is outside we draw capped from end to start
-                    if (startOut)
-                    {
-                        // It's called Jobseeker now.
-                        if (!MathHelper.TryGetIntersecting(start, end, _range, out var newStart)) continue;
-                        start = newStart.Value;
-                    }
-                    // otherwise vice versa
-                    else if (endOut)
-                    {
-                        if (!MathHelper.TryGetIntersecting(end, start, _range, out var newEnd)) continue;
-                        end = newEnd.Value;
-                    }
-
-                    handle.DrawLine(ScalePosition(start), ScalePosition(end), Color.Aquamarine);
-                }
-            }
-
-            // Draw any docks on that grid
-            if (Docks.TryGetValue(_entManager.GetNetEntity(grid), out var gridDocks))
-            {
-                foreach (var dock in gridDocks)
-                {
-                    var position = matty.Transform(dock.Coordinates.Position);
-
-                    if (position.Length() > _range - 0.8f)
-                        continue;
-
-                    var otherDockRotation = Matrix3.CreateRotation(dock.Angle);
-
-                    // Draw the dock's collision
-                    var verts = new[]
-                    {
-                        matty.Transform(dock.Coordinates.Position +
-                                        otherDockRotation.Transform(new Vector2(-0.2f, -0.7f))),
-                        matty.Transform(dock.Coordinates.Position +
-                                        otherDockRotation.Transform(new Vector2(0.2f, -0.7f))),
-                        matty.Transform(dock.Coordinates.Position +
-                                        otherDockRotation.Transform(new Vector2(0.2f, -0.5f))),
-                        matty.Transform(dock.Coordinates.Position +
-                                        otherDockRotation.Transform(new Vector2(-0.2f, -0.5f))),
-                    };
-
-                    for (var i = 0; i < verts.Length; i++)
-                    {
-                        var vert = verts[i];
-                        vert.Y = -vert.Y;
-                        verts[i] = ScalePosition(vert);
-                    }
-
-                    handle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, verts, Color.Turquoise);
-
-                    // Draw the dock itself
-                    verts = new[]
-                    {
-                        matty.Transform(dock.Coordinates.Position + new Vector2(-0.5f, -0.5f)),
-                        matty.Transform(dock.Coordinates.Position + new Vector2(0.5f, -0.5f)),
-                        matty.Transform(dock.Coordinates.Position + new Vector2(0.5f, 0.5f)),
-                        matty.Transform(dock.Coordinates.Position + new Vector2(-0.5f, 0.5f)),
-                    };
-
-                    for (var i = 0; i < verts.Length; i++)
-                    {
-                        var vert = verts[i];
-                        vert.Y = -vert.Y;
-                        verts[i] = ScalePosition(vert);
-                    }
-
-                    handle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, verts, Color.Green);
-                }
-            }
-        }
-
-    }
-
-    private Vector2 ScalePosition(Vector2 value)
-    {
-        return value * MinimapScale + MidPointVector;
-    }
-}
diff --git a/Content.Client/Shuttles/UI/DockingScreen.xaml b/Content.Client/Shuttles/UI/DockingScreen.xaml
new file mode 100644
index 0000000000..7c112b6daf
--- /dev/null
+++ b/Content.Client/Shuttles/UI/DockingScreen.xaml
@@ -0,0 +1,28 @@
+<controls:BoxContainer Visible="False"
+               HorizontalExpand="True"
+               xmlns:controls="https://spacestation14.io"
+               xmlns:controls1="clr-namespace:Content.Client.UserInterface.Controls"
+               xmlns:ui="clr-namespace:Content.Client.Shuttles.UI">
+    <ui:ShuttleDockControl Name="DockingControl"
+                       MouseFilter="Stop"
+                       VerticalAlignment="Stretch"
+                       VerticalExpand="True"
+                       HorizontalExpand="True"
+                       Margin="5 4 10 5"/>
+    <controls:BoxContainer Name="RightDisplayDock"
+                           VerticalAlignment="Top"
+                           HorizontalAlignment="Right"
+                           MinWidth="256"
+                           MaxWidth="256"
+                           Align="Center"
+                           Margin="5 0 5 5"
+                           Orientation="Vertical">
+        <controls1:StripeBack MinSize="48 48">
+            <controls:Label Name="DockingPortsLabel" Text="{controls:Loc 'shuttle-console-docks-label'}" HorizontalAlignment="Center"/>
+        </controls1:StripeBack>
+        <controls:ScrollContainer VerticalExpand="True" HScrollEnabled="False"
+                                  ReturnMeasure="True">
+            <controls:BoxContainer Name="DockPorts" Orientation="Vertical"/>
+        </controls:ScrollContainer>
+    </controls:BoxContainer>
+</controls:BoxContainer>
diff --git a/Content.Client/Shuttles/UI/DockingScreen.xaml.cs b/Content.Client/Shuttles/UI/DockingScreen.xaml.cs
new file mode 100644
index 0000000000..c0aa794214
--- /dev/null
+++ b/Content.Client/Shuttles/UI/DockingScreen.xaml.cs
@@ -0,0 +1,183 @@
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using Content.Shared.Shuttles.BUIStates;
+using Content.Shared.Shuttles.Systems;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Shuttles.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class DockingScreen : BoxContainer
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    private readonly SharedShuttleSystem _shuttles;
+
+    /// <summary>
+    /// Stored by GridID then by docks
+    /// </summary>
+    public Dictionary<NetEntity, List<DockingPortState>> Docks = new();
+
+    /// <summary>
+    /// Store the dock buttons for the side buttons.
+    /// </summary>
+    private readonly Dictionary<NetEntity, Button> _ourDockButtons = new();
+
+    public event Action<NetEntity, NetEntity>? DockRequest;
+    public event Action<NetEntity>? UndockRequest;
+
+    public DockingScreen()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+        _shuttles = _entManager.System<SharedShuttleSystem>();
+
+        DockingControl.OnViewDock += OnView;
+        DockingControl.DockRequest += (entity, netEntity) =>
+        {
+            DockRequest?.Invoke(entity, netEntity);
+        };
+        DockingControl.UndockRequest += entity =>
+        {
+            UndockRequest?.Invoke(entity);
+        };
+    }
+
+    private void OnView(NetEntity obj)
+    {
+        if (_ourDockButtons.TryGetValue(obj, out var viewed))
+        {
+            viewed.Pressed = true;
+        }
+    }
+
+    public void UpdateState(EntityUid? shuttle, DockingInterfaceState state)
+    {
+        Docks = state.Docks;
+        DockingControl.DockState = state;
+        DockingControl.GridEntity = shuttle;
+        BuildDocks(shuttle);
+    }
+
+    private void BuildDocks(EntityUid? shuttle)
+    {
+        DockingControl.BuildDocks(shuttle);
+        var currentDock = DockingControl.ViewedDock;
+        // DockedWith.DisposeAllChildren();
+        DockPorts.DisposeAllChildren();
+        _ourDockButtons.Clear();
+
+        if (shuttle == null)
+        {
+            DockingControl.SetViewedDock(null);
+            return;
+        }
+
+        var shuttleNent = _entManager.GetNetEntity(shuttle.Value);
+
+        if (!Docks.TryGetValue(shuttleNent, out var shuttleDocks) || shuttleDocks.Count <= 0)
+            return;
+
+        var dockText = new StringBuilder();
+        var buttonGroup = new ButtonGroup();
+        var idx = 0;
+        var selected = false;
+
+        // Build the dock buttons for our docks.
+        foreach (var dock in shuttleDocks)
+        {
+            idx++;
+            dockText.Clear();
+            dockText.Append(dock.Name);
+
+            var button = new Button()
+            {
+                Text = dockText.ToString(),
+                ToggleMode = true,
+                Group = buttonGroup,
+                Margin = new Thickness(0f, 3f),
+            };
+
+            button.OnMouseEntered += args =>
+            {
+                DockingControl.HighlightedDock = dock.Entity;
+            };
+
+            button.OnMouseExited += args =>
+            {
+                DockingControl.HighlightedDock = null;
+            };
+
+            button.Label.Margin = new Thickness(3f);
+
+            if (currentDock == dock.Entity)
+            {
+                selected = true;
+                button.Pressed = true;
+            }
+
+            button.OnPressed += args =>
+            {
+                OnDockPress(dock);
+            };
+
+            _ourDockButtons[dock.Entity] = button;
+            DockPorts.AddChild(button);
+        }
+
+        // Button group needs one selected so just show the first one.
+        if (!selected)
+        {
+            var buttonOne = shuttleDocks[0];
+            OnDockPress(buttonOne);
+        }
+
+        var shuttleContainers = new Dictionary<NetEntity, DockObject>();
+
+        foreach (var dock in shuttleDocks.OrderBy(x => x.GridDockedWith))
+        {
+            if (dock.GridDockedWith == null)
+                continue;
+
+            DockObject? dockContainer;
+
+            if (!shuttleContainers.TryGetValue(dock.GridDockedWith.Value, out dockContainer))
+            {
+                dockContainer = new DockObject();
+                shuttleContainers[dock.GridDockedWith.Value] = dockContainer;
+                var dockGrid = _entManager.GetEntity(dock.GridDockedWith);
+                string? iffLabel = null;
+
+                if (_entManager.EntityExists(dockGrid))
+                {
+                    iffLabel = _shuttles.GetIFFLabel(dockGrid.Value);
+                }
+
+                iffLabel ??= Loc.GetString("shuttle-console-unknown");
+                dockContainer.SetName(iffLabel);
+                // DockedWith.AddChild(dockContainer);
+            }
+
+            dockContainer.AddDock(dock, DockingControl);
+
+            dockContainer.ViewPressed += () =>
+            {
+                OnDockPress(dock);
+            };
+
+            dockContainer.UndockPressed += () =>
+            {
+                UndockRequest?.Invoke(dock.Entity);
+            };
+        }
+    }
+
+    private void OnDockPress(DockingPortState state)
+    {
+        DockingControl.SetViewedDock(state);
+    }
+}
diff --git a/Content.Client/Shuttles/UI/MapScreen.xaml b/Content.Client/Shuttles/UI/MapScreen.xaml
new file mode 100644
index 0000000000..7db61b9e34
--- /dev/null
+++ b/Content.Client/Shuttles/UI/MapScreen.xaml
@@ -0,0 +1,66 @@
+<controls:BoxContainer Visible="False"
+       HorizontalExpand="True"
+       xmlns:controls="https://spacestation14.io"
+       xmlns:controls1="clr-namespace:Content.Client.UserInterface.Controls"
+       xmlns:ui="clr-namespace:Content.Client.Shuttles.UI">
+            <ui:ShuttleMapControl Name="MapRadar"
+                             MouseFilter="Stop"
+                             Margin="5 4 10 5"
+                             HorizontalExpand="True"
+                             VerticalExpand="True"
+                             VerticalAlignment="Stretch"/>
+            <controls:BoxContainer Name="RightDisplayMap"
+                          VerticalAlignment="Top"
+                          HorizontalAlignment="Right"
+                          MinWidth="256"
+                          MaxWidth="256"
+                          Margin="5 0 5 5"
+                          Orientation="Vertical"
+                          VerticalExpand="True">
+                <controls1:StripeBack
+                    MinSize="48 48">
+                    <controls:Label Name="MapDisplayLabel" Text="{controls:Loc 'shuttle-console-ftl-label'}"
+                                    VerticalExpand="True"
+                                    HorizontalAlignment="Center"/>
+                </controls1:StripeBack>
+                <controls:Label Name="MapFTLState"
+                                Text="{controls:Loc 'shuttle-console-ftl-state-Available'}"
+                                VerticalAlignment="Stretch"
+                                HorizontalAlignment="Center"/>
+                <controls:ProgressBar Name="FTLBar" HorizontalExpand="True"
+                                      Margin="5"
+                                      MinValue="0.0"
+                                      MaxValue="1.0"
+                                      Value="1.0"/>
+                <controls:BoxContainer Orientation="Vertical">
+                <!-- Normal buttons -->
+                <controls1:StripeBack MinSize="48 48">
+                    <controls:Label Name="SettingsLabel" Text="{controls:Loc 'shuttle-console-map-settings'}"
+                           HorizontalAlignment="Center"/>
+                </controls1:StripeBack>
+                <controls:Button Name="MapBeaconsButton"
+                                 Text="{controls:Loc 'shuttle-console-map-beacons'}"
+                                 TextAlign="Center"
+                                 ToggleMode="True"
+                                 Pressed="True"/>
+                <controls:Button Name="MapFTLButton"
+                                 ToggleMode="True"
+                                 Text="{controls:Loc 'shuttle-console-ftl-button'}"
+                                 TextAlign="Center"/>
+                <controls:Button Name="MapRebuildButton"
+                        Text="{controls:Loc 'shuttle-console-map-rebuild'}"
+                        TextAlign="Center"/>
+                <!-- Map objects -->
+                <controls1:StripeBack MinSize="48 48">
+                    <controls:Label Name="HyperspaceLabel" Text="{controls:Loc 'shuttle-console-map-objects'}"
+                           HorizontalAlignment="Center"/>
+                </controls1:StripeBack>
+                <controls:ScrollContainer VerticalExpand="True" HScrollEnabled="False"
+                                 ReturnMeasure="True">
+                    <controls:BoxContainer Name="HyperspaceDestinations"
+                                  Orientation="Vertical"
+                                  VerticalExpand="True"/>
+                </controls:ScrollContainer>
+            </controls:BoxContainer>
+        </controls:BoxContainer>
+</controls:BoxContainer>
diff --git a/Content.Client/Shuttles/UI/MapScreen.xaml.cs b/Content.Client/Shuttles/UI/MapScreen.xaml.cs
new file mode 100644
index 0000000000..65a11d345d
--- /dev/null
+++ b/Content.Client/Shuttles/UI/MapScreen.xaml.cs
@@ -0,0 +1,535 @@
+using System.Linq;
+using System.Numerics;
+using Content.Client.Shuttles.Systems;
+using Content.Shared.Shuttles.BUIStates;
+using Content.Shared.Shuttles.Components;
+using Content.Shared.Shuttles.Systems;
+using Content.Shared.Shuttles.UI.MapObjects;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Player;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Shuttles.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class MapScreen : BoxContainer
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    private readonly SharedAudioSystem _audio;
+    private readonly SharedMapSystem _maps;
+    private readonly ShuttleSystem _shuttles;
+    private readonly SharedTransformSystem _xformSystem;
+
+    private EntityUid? _console;
+    private EntityUid? _shuttleEntity;
+
+    private FTLState _state;
+    private float _ftlDuration;
+
+    private List<ShuttleBeaconObject> _beacons = new();
+    private List<ShuttleExclusionObject> _exclusions = new();
+
+    /// <summary>
+    /// When the next FTL state change happens.
+    /// </summary>
+    private TimeSpan _nextFtlTime;
+
+    private TimeSpan _nextPing;
+    private TimeSpan _pingCooldown = TimeSpan.FromSeconds(3);
+    private TimeSpan _nextMapDequeue;
+
+    private float _minMapDequeue = 0.05f;
+    private float _maxMapDequeue = 0.25f;
+
+    private StyleBoxFlat _ftlStyle;
+
+    public event Action<MapCoordinates, Angle>? RequestFTL;
+    public event Action<NetEntity, Angle>? RequestBeaconFTL;
+
+    private readonly Dictionary<MapId, BoxContainer> _mapHeadings = new();
+    private readonly Dictionary<MapId, List<IMapObject>> _mapObjects = new();
+    private readonly List<(MapId mapId, IMapObject mapobj)> _pendingMapObjects = new();
+
+    /// <summary>
+    /// Store the names of map object controls for re-sorting later.
+    /// </summary>
+    private Dictionary<Control, string> _mapObjectControls = new();
+
+    private List<Control> _sortChildren = new();
+
+    public MapScreen()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _audio = _entManager.System<SharedAudioSystem>();
+        _maps = _entManager.System<SharedMapSystem>();
+        _shuttles = _entManager.System<ShuttleSystem>();
+        _xformSystem = _entManager.System<SharedTransformSystem>();
+
+        MapRebuildButton.OnPressed += MapRebuildPressed;
+
+        OnVisibilityChanged += OnVisChange;
+
+        MapFTLButton.OnToggled += FtlPreviewToggled;
+
+        _ftlStyle = new StyleBoxFlat(Color.LimeGreen);
+        FTLBar.ForegroundStyleBoxOverride = _ftlStyle;
+
+        // Just pass it on up.
+        MapRadar.RequestFTL += (coords, angle) =>
+        {
+            RequestFTL?.Invoke(coords, angle);
+        };
+
+        MapRadar.RequestBeaconFTL += (ent, angle) =>
+        {
+            RequestBeaconFTL?.Invoke(ent, angle);
+        };
+
+        MapBeaconsButton.OnToggled += args =>
+        {
+            MapRadar.ShowBeacons = args.Pressed;
+        };
+    }
+
+    public void UpdateState(ShuttleMapInterfaceState state)
+    {
+        // Only network the accumulator due to ping making the thing fonky.
+        // This should work better with predicting network states as they come in.
+        _beacons = state.Destinations;
+        _exclusions = state.Exclusions;
+        _state = state.FTLState;
+        _ftlDuration = state.FTLDuration;
+        _nextFtlTime = _timing.CurTime + TimeSpan.FromSeconds(_ftlDuration);
+        MapRadar.InFtl = true;
+        MapFTLState.Text = Loc.GetString($"shuttle-console-ftl-state-{_state.ToString()}");
+
+        switch (_state)
+        {
+            case FTLState.Available:
+                SetFTLAllowed(true);
+                _ftlStyle.BackgroundColor = Color.FromHex("#80C71F");
+                MapRadar.InFtl = false;
+                break;
+            case FTLState.Starting:
+                SetFTLAllowed(false);
+                _ftlStyle.BackgroundColor = Color.FromHex("#169C9C");
+                break;
+            case FTLState.Travelling:
+                SetFTLAllowed(false);
+                _ftlStyle.BackgroundColor = Color.FromHex("#8932B8");
+                break;
+            case FTLState.Arriving:
+                SetFTLAllowed(false);
+                _ftlStyle.BackgroundColor = Color.FromHex("#F9801D");
+                break;
+            case FTLState.Cooldown:
+                SetFTLAllowed(false);
+                // Scroll to the FTL spot
+                if (_entManager.TryGetComponent(_shuttleEntity, out TransformComponent? shuttleXform))
+                {
+                    var targetOffset = _maps.GetGridPosition(_shuttleEntity.Value);
+                    MapRadar.SetMap(shuttleXform.MapID, targetOffset, recentering: true);
+                }
+
+                _ftlStyle.BackgroundColor = Color.FromHex("#B02E26");
+                MapRadar.InFtl = false;
+                break;
+            // Fallback in case no FTL state or the likes.
+            default:
+                SetFTLAllowed(false);
+                _ftlStyle.BackgroundColor = Color.FromHex("#B02E26");
+                MapRadar.InFtl = false;
+                break;
+        }
+
+        if (IsFTLBlocked())
+        {
+            MapRebuildButton.Disabled = true;
+            ClearMapObjects();
+        }
+    }
+
+    private void SetFTLAllowed(bool value)
+    {
+        if (value)
+        {
+            MapFTLButton.Disabled = false;
+        }
+        else
+        {
+            // Unselect FTL
+            MapFTLButton.Pressed = false;
+            MapRadar.FtlMode = false;
+            MapFTLButton.Disabled = true;
+        }
+    }
+
+    private void FtlPreviewToggled(BaseButton.ButtonToggledEventArgs obj)
+    {
+        MapRadar.FtlMode = obj.Pressed;
+    }
+
+    public void SetConsole(EntityUid? console)
+    {
+        _console = console;
+    }
+
+    public void SetShuttle(EntityUid? shuttle)
+    {
+        _shuttleEntity = shuttle;
+        MapRadar.SetShuttle(shuttle);
+    }
+
+    private void OnVisChange(Control obj)
+    {
+        if (!obj.Visible)
+            return;
+
+        // Centre map screen to the shuttle.
+        if (_shuttleEntity != null)
+        {
+            var mapPos = _xformSystem.GetMapCoordinates(_shuttleEntity.Value);
+            MapRadar.SetMap(mapPos.MapId, mapPos.Position);
+        }
+    }
+
+    /// <summary>
+    /// Does a sonar-like effect on the map.
+    /// </summary>
+    public void PingMap()
+    {
+        if (_console != null)
+        {
+            _audio.PlayEntity(new SoundPathSpecifier("/Audio/Effects/Shuttle/radar_ping.ogg"), Filter.Local(), _console.Value, true);
+        }
+
+        RebuildMapObjects();
+        BumpMapDequeue();
+
+        _nextPing = _timing.CurTime + _pingCooldown;
+        MapRebuildButton.Disabled = true;
+    }
+
+    private void BumpMapDequeue()
+    {
+        _nextMapDequeue = _timing.CurTime + TimeSpan.FromSeconds(_random.NextFloat(_minMapDequeue, _maxMapDequeue));
+    }
+
+    private void MapRebuildPressed(BaseButton.ButtonEventArgs obj)
+    {
+        PingMap();
+    }
+
+    /// <summary>
+    /// Clears all sector objects across all maps (e.g. if we start FTLing or need to re-ping).
+    /// </summary>
+    private void ClearMapObjects()
+    {
+        _mapObjectControls.Clear();
+        HyperspaceDestinations.DisposeAllChildren();
+        _pendingMapObjects.Clear();
+        _mapObjects.Clear();
+        _mapHeadings.Clear();
+    }
+
+    /// <summary>
+    /// Gets all map objects at time of ping and adds them to pending to be added over time.
+    /// </summary>
+    private void RebuildMapObjects()
+    {
+        ClearMapObjects();
+
+        if (_shuttleEntity == null)
+            return;
+
+        var mapComps = _entManager.AllEntityQueryEnumerator<MapComponent, TransformComponent, MetaDataComponent>();
+        MapId ourMap = MapId.Nullspace;
+
+        if (_entManager.TryGetComponent(_shuttleEntity, out TransformComponent? shuttleXform))
+        {
+            ourMap = shuttleXform.MapID;
+        }
+
+        while (mapComps.MoveNext(out var mapComp, out var mapXform, out var mapMetadata))
+        {
+            if (!_shuttles.CanFTLTo(_shuttleEntity.Value, mapComp.MapId))
+               continue;
+
+            var mapName = mapMetadata.EntityName;
+
+            if (string.IsNullOrEmpty(mapName))
+            {
+                mapName = Loc.GetString("shuttle-console-unknown");
+            }
+
+            var heading = new CollapsibleHeading(mapName);
+
+            heading.MinHeight = 32f;
+            heading.AddStyleClass(ContainerButton.StyleClassButton);
+            heading.HorizontalAlignment = HAlignment.Stretch;
+            heading.Label.HorizontalAlignment = HAlignment.Center;
+            heading.Label.HorizontalExpand = true;
+            heading.HorizontalExpand = true;
+
+            var gridContents = new BoxContainer()
+            {
+                Orientation = LayoutOrientation.Vertical,
+                VerticalExpand = true,
+            };
+
+            var body = new CollapsibleBody()
+            {
+                HorizontalAlignment = HAlignment.Stretch,
+                VerticalAlignment = VAlignment.Top,
+                HorizontalExpand = true,
+                Children =
+                {
+                    gridContents
+                }
+            };
+
+            var mapButton = new Collapsible(heading, body);
+
+            heading.OnToggled += args =>
+            {
+                if (args.Pressed)
+                {
+                    HideOtherCollapsibles(mapButton);
+                }
+            };
+
+            _mapHeadings.Add(mapComp.MapId, gridContents);
+
+            foreach (var grid in _mapManager.GetAllMapGrids(mapComp.MapId))
+            {
+                var gridObj = new GridMapObject()
+                {
+                    Name = _entManager.GetComponent<MetaDataComponent>(grid.Owner).EntityName,
+                    Entity = grid.Owner
+                };
+
+                // Always show our shuttle immediately
+                if (grid.Owner == _shuttleEntity)
+                {
+                    AddMapObject(mapComp.MapId, gridObj);
+                }
+                else
+                {
+                    _pendingMapObjects.Add((mapComp.MapId, gridObj));
+                }
+            }
+
+            foreach (var (beacon, _) in _shuttles.GetExclusions(mapComp.MapId, _exclusions))
+            {
+                _pendingMapObjects.Add((mapComp.MapId, beacon));
+            }
+
+            foreach (var (beacon, _) in _shuttles.GetBeacons(mapComp.MapId, _beacons))
+            {
+                _pendingMapObjects.Add((mapComp.MapId, beacon));
+            }
+
+            HyperspaceDestinations.AddChild(mapButton);
+
+            // Zoom in to our map
+            if (mapComp.MapId == MapRadar.ViewingMap)
+            {
+                mapButton.BodyVisible = true;
+            }
+        }
+
+        // Need to sort from furthest way to nearest (as we will pop from the end of the list first).
+        // Also prioritise those on our map first.
+        var shuttlePos = _xformSystem.GetWorldPosition(_shuttleEntity.Value);
+
+        _pendingMapObjects.Sort((x, y) =>
+        {
+            if (x.mapId == ourMap && y.mapId != ourMap)
+                return 1;
+
+            if (y.mapId == ourMap && x.mapId != ourMap)
+                return -1;
+
+            var yMapPos = _shuttles.GetMapCoordinates(y.mapobj);
+            var xMapPos = _shuttles.GetMapCoordinates(x.mapobj);
+
+            return (yMapPos.Position - shuttlePos).Length().CompareTo((xMapPos.Position - shuttlePos).Length());
+        });
+    }
+
+    /// <summary>
+    /// Hides other maps upon the specified collapsible being selected (AKA hacky collapsible groups).
+    /// </summary>
+    private void HideOtherCollapsibles(Collapsible collapsible)
+    {
+        foreach (var child in HyperspaceDestinations.Children)
+        {
+            if (child is not Collapsible childCollapse || childCollapse == collapsible)
+                continue;
+
+            childCollapse.BodyVisible = false;
+        }
+    }
+
+    /// <summary>
+    /// Returns true if we shouldn't be able to select the FTL button.
+    /// </summary>
+    private bool IsFTLBlocked()
+    {
+        switch (_state)
+        {
+            case FTLState.Available:
+                return false;
+            default:
+                return true;
+        }
+    }
+
+    private void OnMapObjectPress(IMapObject mapObject)
+    {
+        if (IsFTLBlocked())
+            return;
+
+        var coordinates = _shuttles.GetMapCoordinates(mapObject);
+
+        // If it's our map then scroll, otherwise just set position there.
+        MapRadar.SetMap(coordinates.MapId, coordinates.Position, recentering: true);
+    }
+
+    public void SetMap(MapId mapId, Vector2 position)
+    {
+        MapRadar.SetMap(mapId, position);
+        MapRadar.Offset = position;
+    }
+
+    /// <summary>
+    /// Adds a map object to the specified sector map.
+    /// </summary>
+    private void AddMapObject(MapId mapId, IMapObject mapObj)
+    {
+        var gridContents = _mapHeadings[mapId];
+        var existing = _mapObjects.GetOrNew(mapId);
+        existing.Add(mapObj);
+
+        var gridButton = new Button()
+        {
+            Text = mapObj.Name,
+            HorizontalExpand = true,
+        };
+
+        var gridContainer = new BoxContainer()
+        {
+            Children =
+            {
+                new Control()
+                {
+                    MinWidth = 32f,
+                },
+                gridButton
+            }
+        };
+
+        _mapObjectControls.Add(gridContainer, mapObj.Name);
+        gridContents.AddChild(gridContainer);
+
+        gridButton.OnPressed += args =>
+        {
+            OnMapObjectPress(mapObj);
+        };
+
+        if (gridContents.ChildCount > 1)
+        {
+            // Re-sort the children
+            _sortChildren.Clear();
+
+            foreach (var child in gridContents.Children)
+            {
+                DebugTools.Assert(_mapObjectControls.ContainsKey(child));
+                _sortChildren.Add(child);
+            }
+
+            foreach (var child in _sortChildren)
+            {
+                child.Orphan();
+            }
+
+            _sortChildren.Sort((x, y) =>
+            {
+                var xText = _mapObjectControls[x];
+                var yText = _mapObjectControls[y];
+
+                return string.Compare(xText, yText, StringComparison.CurrentCultureIgnoreCase);
+            });
+
+            foreach (var control in _sortChildren)
+            {
+                gridContents.AddChild(control);
+            }
+        }
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        var curTime = _timing.CurTime;
+
+        if (_nextMapDequeue < curTime && _pendingMapObjects.Count > 0)
+        {
+            var mapObj = _pendingMapObjects[^1];
+            _pendingMapObjects.RemoveAt(_pendingMapObjects.Count - 1);
+            AddMapObject(mapObj.mapId, mapObj.mapobj);
+            BumpMapDequeue();
+        }
+
+        if (!IsFTLBlocked() && _nextPing < curTime)
+        {
+            MapRebuildButton.Disabled = false;
+        }
+
+        var ftlDiff = (float) (_nextFtlTime - _timing.CurTime).TotalSeconds;
+
+        float ftlRatio;
+
+        if (_ftlDuration.Equals(0f))
+        {
+            ftlRatio = 1f;
+        }
+        else
+        {
+            ftlRatio = Math.Clamp(1f - (ftlDiff / _ftlDuration), 0f, 1f);
+        }
+
+        FTLBar.Value = ftlRatio;
+    }
+
+    protected override void Draw(DrawingHandleScreen handle)
+    {
+        MapRadar.SetMapObjects(_mapObjects);
+        base.Draw(handle);
+    }
+
+    public void Startup()
+    {
+        if (_entManager.TryGetComponent(_shuttleEntity, out TransformComponent? shuttleXform))
+        {
+            SetMap(shuttleXform.MapID, _maps.GetGridPosition((_shuttleEntity.Value, null, shuttleXform)));
+        }
+    }
+}
diff --git a/Content.Client/Shuttles/UI/NavScreen.xaml b/Content.Client/Shuttles/UI/NavScreen.xaml
new file mode 100644
index 0000000000..c97aeda05b
--- /dev/null
+++ b/Content.Client/Shuttles/UI/NavScreen.xaml
@@ -0,0 +1,69 @@
+<controls:BoxContainer Visible="False"
+              HorizontalExpand="True"
+              xmlns:controls="https://spacestation14.io"
+              xmlns:ui="clr-namespace:Content.Client.Shuttles.UI"
+              xmlns:controls1="clr-namespace:Content.Client.UserInterface.Controls">
+                <ui:ShuttleNavControl Name="NavRadar"
+                                 MouseFilter="Stop"
+                                 VerticalAlignment="Stretch"
+                                 VerticalExpand="True"
+                                 HorizontalExpand="True"
+                                 Margin="5 4 10 5"/>
+                <!-- Nav controls -->
+                <controls:BoxContainer Name="RightDisplayNav"
+                      VerticalAlignment="Top"
+                      HorizontalAlignment="Right"
+                      VerticalExpand="True"
+                      MinWidth="256"
+                      MaxWidth="256"
+                      Margin="5 0 5 5"
+                      Orientation="Vertical">
+                    <controls1:StripeBack
+                        MinSize="48 48">
+                        <controls:Label Name="NavDisplayLabel" Text="{controls:Loc 'shuttle-console-display-label'}"
+                               VerticalExpand="True"
+                               HorizontalAlignment="Center"/>
+                    </controls1:StripeBack>
+                    <controls:GridContainer Columns="2"
+                                   HorizontalAlignment="Stretch"
+                                   VerticalAlignment="Top"
+                                   HorizontalExpand="True"
+                                   Margin="3"
+                                   Name="ReadonlyDisplay">
+                        <controls:Label Text="{controls:Loc 'shuttle-console-position'}"/>
+                        <controls:Label Name="GridPosition"
+                               Text="0.0, 0.0"
+                               HorizontalExpand="True"
+                               Align="Right"/>
+                        <controls:Label Text="{controls:Loc 'shuttle-console-orientation'}"/>
+                        <controls:Label Name="GridOrientation"
+                               Text="0.0"
+                               HorizontalExpand="True"
+                               Align="Right"/>
+                        <controls:Label Text="{controls:Loc 'shuttle-console-linear-velocity'}"/>
+                        <controls:Label Name="GridLinearVelocity"
+                               Text="0.0, 0.0"
+                               HorizontalExpand="True"
+                               Align="Right"/>
+                        <controls:Label Text="{controls:Loc 'shuttle-console-angular-velocity'}"/>
+                        <controls:Label Name="GridAngularVelocity"
+                               Text="0.0"
+                               HorizontalExpand="True"
+                               Align="Right"/>
+                    </controls:GridContainer>
+                    <controls1:StripeBack
+                        MinSize="48 48">
+                        <controls:Label Name="NavSettingsLabel" Text="{controls:Loc 'shuttle-console-nav-settings'}"
+                               VerticalExpand="True"
+                               HorizontalAlignment="Center"/>
+                    </controls1:StripeBack>
+                    <controls:Button Name="IFFToggle"
+                            Text="{controls:Loc 'shuttle-console-iff-toggle'}"
+                            TextAlign="Center"
+                            ToggleMode="True"/>
+                    <controls:Button Name="DockToggle"
+                            Text="{controls:Loc 'shuttle-console-dock-toggle'}"
+                            TextAlign="Center"
+                            ToggleMode="True"/>
+                </controls:BoxContainer>
+            </controls:BoxContainer>
diff --git a/Content.Client/Shuttles/UI/NavScreen.xaml.cs b/Content.Client/Shuttles/UI/NavScreen.xaml.cs
new file mode 100644
index 0000000000..b7b757ea48
--- /dev/null
+++ b/Content.Client/Shuttles/UI/NavScreen.xaml.cs
@@ -0,0 +1,85 @@
+using Content.Shared.Shuttles.BUIStates;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Map;
+using Robust.Shared.Physics.Components;
+
+namespace Content.Client.Shuttles.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class NavScreen : BoxContainer
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    private SharedTransformSystem _xformSystem;
+
+    private EntityUid? _shuttleEntity;
+
+    public NavScreen()
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+        _xformSystem = _entManager.System<SharedTransformSystem>();
+
+        IFFToggle.OnToggled += OnIFFTogglePressed;
+        IFFToggle.Pressed = NavRadar.ShowIFF;
+
+        DockToggle.OnToggled += OnDockTogglePressed;
+        DockToggle.Pressed = NavRadar.ShowDocks;
+    }
+
+    public void SetShuttle(EntityUid? shuttle)
+    {
+        _shuttleEntity = shuttle;
+    }
+
+    private void OnIFFTogglePressed(BaseButton.ButtonEventArgs args)
+    {
+        NavRadar.ShowIFF ^= true;
+        args.Button.Pressed = NavRadar.ShowIFF;
+    }
+
+    private void OnDockTogglePressed(BaseButton.ButtonEventArgs args)
+    {
+        NavRadar.ShowDocks ^= true;
+        args.Button.Pressed = NavRadar.ShowDocks;
+    }
+
+    public void UpdateState(NavInterfaceState scc)
+    {
+        NavRadar.UpdateState(scc);
+    }
+
+    public void SetMatrix(EntityCoordinates? coordinates, Angle? angle)
+    {
+        _shuttleEntity = coordinates?.EntityId;
+        NavRadar.SetMatrix(coordinates, angle);
+    }
+
+    protected override void Draw(DrawingHandleScreen handle)
+    {
+        base.Draw(handle);
+
+        if (!_entManager.TryGetComponent(_shuttleEntity, out TransformComponent? gridXform) ||
+            !_entManager.TryGetComponent(_shuttleEntity, out PhysicsComponent? gridBody))
+        {
+            return;
+        }
+
+        var (_, worldRot, worldMatrix) = _xformSystem.GetWorldPositionRotationMatrix(gridXform);
+        var worldPos = worldMatrix.Transform(gridBody.LocalCenter);
+
+        // Get the positive reduced angle.
+        var displayRot = -worldRot.Reduced();
+
+        GridPosition.Text = $"{worldPos.X:0.0}, {worldPos.Y:0.0}";
+        GridOrientation.Text = $"{displayRot.Degrees:0.0}";
+
+        var gridVelocity = gridBody.LinearVelocity;
+        gridVelocity = displayRot.RotateVec(gridVelocity);
+        // Get linear velocity relative to the console entity
+        GridLinearVelocity.Text = $"{gridVelocity.X + 10f * float.Epsilon:0.0}, {gridVelocity.Y + 10f * float.Epsilon:0.0}";
+        GridAngularVelocity.Text = $"{-gridBody.AngularVelocity + 10f * float.Epsilon:0.0}";
+    }
+}
diff --git a/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml b/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml
index 26aca5da62..f62e59b4ad 100644
--- a/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml
+++ b/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml
@@ -4,7 +4,7 @@
                       Title="{Loc 'radar-console-window-title'}"
                       SetSize="648 648"
                       MinSize="256 256">
-    <ui:RadarControl Name="RadarScreen"
+    <ui:ShuttleNavControl Name="RadarScreen"
                      Margin="4"
                      HorizontalExpand = "True"
                      VerticalExpand = "True"/>
diff --git a/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml.cs b/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml.cs
index 1a6f216e8b..7f1149365b 100644
--- a/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml.cs
+++ b/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml.cs
@@ -9,20 +9,15 @@ namespace Content.Client.Shuttles.UI;
 
 [GenerateTypedNameReferences]
 public sealed partial class RadarConsoleWindow : FancyWindow,
-    IComputerWindow<RadarConsoleBoundInterfaceState>
+    IComputerWindow<NavInterfaceState>
 {
     public RadarConsoleWindow()
     {
         RobustXamlLoader.Load(this);
     }
 
-    public void UpdateState(RadarConsoleBoundInterfaceState scc)
+    public void UpdateState(NavInterfaceState scc)
     {
         RadarScreen.UpdateState(scc);
     }
-
-    public void SetMatrix(EntityCoordinates? coordinates, Angle? angle)
-    {
-        RadarScreen.SetMatrix(coordinates, angle);
-    }
 }
diff --git a/Content.Client/Shuttles/UI/RadarControl.cs b/Content.Client/Shuttles/UI/RadarControl.cs
deleted file mode 100644
index 45e6da22f4..0000000000
--- a/Content.Client/Shuttles/UI/RadarControl.cs
+++ /dev/null
@@ -1,433 +0,0 @@
-using System.Numerics;
-using Content.Client.UserInterface.Controls;
-using Content.Shared.Shuttles.BUIStates;
-using Content.Shared.Shuttles.Components;
-using JetBrains.Annotations;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Collections;
-using Robust.Shared.Input;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Utility;
-
-namespace Content.Client.Shuttles.UI;
-
-/// <summary>
-/// Displays nearby grids inside of a control.
-/// </summary>
-public sealed class RadarControl : MapGridControl
-{
-    [Dependency] private readonly IEntityManager _entManager = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
-    private SharedTransformSystem _transform;
-
-    private const float GridLinesDistance = 32f;
-
-    /// <summary>
-    /// Used to transform all of the radar objects. Typically is a shuttle console parented to a grid.
-    /// </summary>
-    private EntityCoordinates? _coordinates;
-
-    private Angle? _rotation;
-
-    /// <summary>
-    /// Shows a label on each radar object.
-    /// </summary>
-    private Dictionary<EntityUid, Control> _iffControls = new();
-
-    private Dictionary<EntityUid, List<DockingInterfaceState>> _docks = new();
-
-    public bool ShowIFF { get; set; } = true;
-    public bool ShowDocks { get; set; } = true;
-
-    /// <summary>
-    /// Currently hovered docked to show on the map.
-    /// </summary>
-    public NetEntity? HighlightedDock;
-
-    /// <summary>
-    /// Raised if the user left-clicks on the radar control with the relevant entitycoordinates.
-    /// </summary>
-    public Action<EntityCoordinates>? OnRadarClick;
-
-    private List<Entity<MapGridComponent>> _grids = new();
-
-    public RadarControl() : base(64f, 256f, 256f)
-    {
-        _transform = _entManager.System<SharedTransformSystem>();
-    }
-
-    public void SetMatrix(EntityCoordinates? coordinates, Angle? angle)
-    {
-        _coordinates = coordinates;
-        _rotation = angle;
-    }
-
-    protected override void KeyBindUp(GUIBoundKeyEventArgs args)
-    {
-        base.KeyBindUp(args);
-
-        if (_coordinates == null || _rotation == null || args.Function != EngineKeyFunctions.UIClick ||
-            OnRadarClick == null)
-        {
-            return;
-        }
-
-        var a = InverseScalePosition(args.RelativePosition);
-        var relativeWorldPos = new Vector2(a.X, -a.Y);
-        relativeWorldPos = _rotation.Value.RotateVec(relativeWorldPos);
-        var coords = _coordinates.Value.Offset(relativeWorldPos);
-        OnRadarClick?.Invoke(coords);
-    }
-
-    /// <summary>
-    /// Gets the entitycoordinates of where the mouseposition is, relative to the control.
-    /// </summary>
-    [PublicAPI]
-    public EntityCoordinates GetMouseCoordinates(ScreenCoordinates screen)
-    {
-        if (_coordinates == null || _rotation == null)
-        {
-            return EntityCoordinates.Invalid;
-        }
-
-        var pos = screen.Position / UIScale - GlobalPosition;
-
-        var a = InverseScalePosition(pos);
-        var relativeWorldPos = new Vector2(a.X, -a.Y);
-        relativeWorldPos = _rotation.Value.RotateVec(relativeWorldPos);
-        var coords = _coordinates.Value.Offset(relativeWorldPos);
-        return coords;
-    }
-
-    public void UpdateState(RadarConsoleBoundInterfaceState ls)
-    {
-        WorldMaxRange = ls.MaxRange;
-
-        if (WorldMaxRange < WorldRange)
-        {
-            ActualRadarRange = WorldMaxRange;
-        }
-
-        if (WorldMaxRange < WorldMinRange)
-            WorldMinRange = WorldMaxRange;
-
-        ActualRadarRange = Math.Clamp(ActualRadarRange, WorldMinRange, WorldMaxRange);
-
-        _docks.Clear();
-
-        foreach (var state in ls.Docks)
-        {
-            var coordinates = state.Coordinates;
-            var grid = _docks.GetOrNew(_entManager.GetEntity(coordinates.NetEntity));
-            grid.Add(state);
-        }
-    }
-
-    protected override void Draw(DrawingHandleScreen handle)
-    {
-        base.Draw(handle);
-
-        var fakeAA = new Color(0.08f, 0.08f, 0.08f);
-
-        handle.DrawCircle(new Vector2(MidPoint, MidPoint), ScaledMinimapRadius + 1, fakeAA);
-        handle.DrawCircle(new Vector2(MidPoint, MidPoint), ScaledMinimapRadius, Color.Black);
-
-        // No data
-        if (_coordinates == null || _rotation == null)
-        {
-            Clear();
-            return;
-        }
-
-        var gridLines = new Color(0.08f, 0.08f, 0.08f);
-        var gridLinesRadial = 8;
-        var gridLinesEquatorial = (int) Math.Floor(WorldRange / GridLinesDistance);
-
-        for (var i = 1; i < gridLinesEquatorial + 1; i++)
-        {
-            handle.DrawCircle(new Vector2(MidPoint, MidPoint), GridLinesDistance * MinimapScale * i, gridLines, false);
-        }
-
-        for (var i = 0; i < gridLinesRadial; i++)
-        {
-            Angle angle = (Math.PI / gridLinesRadial) * i;
-            var aExtent = angle.ToVec() * ScaledMinimapRadius;
-            handle.DrawLine(new Vector2(MidPoint, MidPoint) - aExtent, new Vector2(MidPoint, MidPoint) + aExtent, gridLines);
-        }
-
-        var metaQuery = _entManager.GetEntityQuery<MetaDataComponent>();
-        var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
-        var fixturesQuery = _entManager.GetEntityQuery<FixturesComponent>();
-        var bodyQuery = _entManager.GetEntityQuery<PhysicsComponent>();
-
-        if (!xformQuery.TryGetComponent(_coordinates.Value.EntityId, out var xform)
-            || xform.MapID == MapId.Nullspace)
-        {
-            Clear();
-            return;
-        }
-
-        var (pos, rot) = _transform.GetWorldPositionRotation(xform);
-        var offset = _coordinates.Value.Position;
-        var offsetMatrix = Matrix3.CreateInverseTransform(pos, rot + _rotation.Value);
-
-        // Draw our grid in detail
-        var ourGridId = xform.GridUid;
-        if (_entManager.TryGetComponent<MapGridComponent>(ourGridId, out var ourGrid) &&
-            fixturesQuery.HasComponent(ourGridId.Value))
-        {
-            var ourGridMatrix = _transform.GetWorldMatrix(ourGridId.Value);
-            Matrix3.Multiply(in ourGridMatrix, in offsetMatrix, out var matrix);
-
-            DrawGrid(handle, matrix, ourGrid, Color.MediumSpringGreen, true);
-            DrawDocks(handle, ourGridId.Value, matrix);
-        }
-
-        var invertedPosition = _coordinates.Value.Position - offset;
-        invertedPosition.Y = -invertedPosition.Y;
-        // Don't need to transform the InvWorldMatrix again as it's already offset to its position.
-
-        // Draw radar position on the station
-        handle.DrawCircle(ScalePosition(invertedPosition), 5f, Color.Lime);
-
-        var shown = new HashSet<EntityUid>();
-
-        _grids.Clear();
-        _mapManager.FindGridsIntersecting(xform.MapID, new Box2(pos - MaxRadarRangeVector, pos + MaxRadarRangeVector), ref _grids, approx: true, includeMap: false);
-
-        // Draw other grids... differently
-        foreach (var grid in _grids)
-        {
-            var gUid = grid.Owner;
-            if (gUid == ourGridId || !fixturesQuery.HasComponent(gUid))
-                continue;
-
-            var gridBody = bodyQuery.GetComponent(gUid);
-            if (gridBody.Mass < 10f)
-            {
-                ClearLabel(gUid);
-                continue;
-            }
-
-            _entManager.TryGetComponent<IFFComponent>(gUid, out var iff);
-
-            // Hide it entirely.
-            if (iff != null &&
-                (iff.Flags & IFFFlags.Hide) != 0x0)
-            {
-                continue;
-            }
-
-            shown.Add(gUid);
-            var name = metaQuery.GetComponent(gUid).EntityName;
-
-            if (name == string.Empty)
-                name = Loc.GetString("shuttle-console-unknown");
-
-            var gridMatrix = _transform.GetWorldMatrix(gUid);
-            Matrix3.Multiply(in gridMatrix, in offsetMatrix, out var matty);
-            var color = iff?.Color ?? Color.Gold;
-
-            // Others default:
-            // Color.FromHex("#FFC000FF")
-            // Hostile default: Color.Firebrick
-
-            if (ShowIFF &&
-                (iff == null && IFFComponent.ShowIFFDefault ||
-                 (iff.Flags & IFFFlags.HideLabel) == 0x0))
-            {
-                var gridBounds = grid.Comp.LocalAABB;
-                Label label;
-
-                if (!_iffControls.TryGetValue(gUid, out var control))
-                {
-                    label = new Label()
-                    {
-                        HorizontalAlignment = HAlignment.Left,
-                    };
-
-                    _iffControls[gUid] = label;
-                    AddChild(label);
-                }
-                else
-                {
-                    label = (Label) control;
-                }
-
-                label.FontColorOverride = color;
-                var gridCentre = matty.Transform(gridBody.LocalCenter);
-                gridCentre.Y = -gridCentre.Y;
-                var distance = gridCentre.Length();
-
-                // y-offset the control to always render below the grid (vertically)
-                var yOffset = Math.Max(gridBounds.Height, gridBounds.Width) * MinimapScale / 1.8f / UIScale;
-
-                // The actual position in the UI. We offset the matrix position to render it off by half its width
-                // plus by the offset.
-                var uiPosition = ScalePosition(gridCentre) / UIScale - new Vector2(label.Width / 2f, -yOffset);
-
-                // Look this is uggo so feel free to cleanup. We just need to clamp the UI position to within the viewport.
-                uiPosition = new Vector2(Math.Clamp(uiPosition.X, 0f, Width - label.Width),
-                    Math.Clamp(uiPosition.Y, 10f, Height - label.Height));
-
-                label.Visible = true;
-                label.Text = Loc.GetString("shuttle-console-iff-label", ("name", name), ("distance", $"{distance:0.0}"));
-                LayoutContainer.SetPosition(label, uiPosition);
-            }
-            else
-            {
-                ClearLabel(gUid);
-            }
-
-            // Detailed view
-            DrawGrid(handle, matty, grid, color, true);
-
-            DrawDocks(handle, gUid, matty);
-        }
-
-        foreach (var (ent, _) in _iffControls)
-        {
-            if (shown.Contains(ent)) continue;
-            ClearLabel(ent);
-        }
-    }
-
-    private void Clear()
-    {
-        foreach (var (_, label) in _iffControls)
-        {
-            label.Dispose();
-        }
-
-        _iffControls.Clear();
-    }
-
-    private void ClearLabel(EntityUid uid)
-    {
-        if (!_iffControls.TryGetValue(uid, out var label)) return;
-        label.Dispose();
-        _iffControls.Remove(uid);
-    }
-
-    private void DrawDocks(DrawingHandleScreen handle, EntityUid uid, Matrix3 matrix)
-    {
-        if (!ShowDocks)
-            return;
-
-        const float DockScale = 1f;
-
-        if (_docks.TryGetValue(uid, out var docks))
-        {
-            foreach (var state in docks)
-            {
-                var position = state.Coordinates.Position;
-                var uiPosition = matrix.Transform(position);
-
-                if (uiPosition.Length() > WorldRange - DockScale)
-                    continue;
-
-                var color = HighlightedDock == state.Entity ? state.HighlightedColor : state.Color;
-
-                uiPosition.Y = -uiPosition.Y;
-
-                var verts = new[]
-                {
-                    matrix.Transform(position + new Vector2(-DockScale, -DockScale)),
-                    matrix.Transform(position + new Vector2(DockScale, -DockScale)),
-                    matrix.Transform(position + new Vector2(DockScale, DockScale)),
-                    matrix.Transform(position + new Vector2(-DockScale, DockScale)),
-                };
-
-                for (var i = 0; i < verts.Length; i++)
-                {
-                    var vert = verts[i];
-                    vert.Y = -vert.Y;
-                    verts[i] = ScalePosition(vert);
-                }
-
-                handle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, verts, color.WithAlpha(0.8f));
-                handle.DrawPrimitives(DrawPrimitiveTopology.LineStrip, verts, color);
-            }
-        }
-    }
-
-    private void DrawGrid(DrawingHandleScreen handle, Matrix3 matrix, MapGridComponent grid, Color color, bool drawInterior)
-    {
-        var rator = grid.GetAllTilesEnumerator();
-        var edges = new ValueList<Vector2>();
-
-        while (rator.MoveNext(out var tileRef))
-        {
-            // TODO: Short-circuit interior chunk nodes
-            // This can be optimised a lot more if required.
-            Vector2? tileVec = null;
-
-            // Iterate edges and see which we can draw
-            for (var i = 0; i < 4; i++)
-            {
-                var dir = (DirectionFlag) Math.Pow(2, i);
-                var dirVec = dir.AsDir().ToIntVec();
-
-                if (!grid.GetTileRef(tileRef.Value.GridIndices + dirVec).Tile.IsEmpty)
-                    continue;
-
-                Vector2 start;
-                Vector2 end;
-                tileVec ??= (Vector2) tileRef.Value.GridIndices * grid.TileSize;
-
-                // Draw line
-                // Could probably rotate this but this might be faster?
-                switch (dir)
-                {
-                    case DirectionFlag.South:
-                        start = tileVec.Value;
-                        end = tileVec.Value + new Vector2(grid.TileSize, 0f);
-                        break;
-                    case DirectionFlag.East:
-                        start = tileVec.Value + new Vector2(grid.TileSize, 0f);
-                        end = tileVec.Value + new Vector2(grid.TileSize, grid.TileSize);
-                        break;
-                    case DirectionFlag.North:
-                        start = tileVec.Value + new Vector2(grid.TileSize, grid.TileSize);
-                        end = tileVec.Value + new Vector2(0f, grid.TileSize);
-                        break;
-                    case DirectionFlag.West:
-                        start = tileVec.Value + new Vector2(0f, grid.TileSize);
-                        end = tileVec.Value;
-                        break;
-                    default:
-                        throw new NotImplementedException();
-                }
-
-                var adjustedStart = matrix.Transform(start);
-                var adjustedEnd = matrix.Transform(end);
-
-                if (adjustedStart.Length() > ActualRadarRange || adjustedEnd.Length() > ActualRadarRange)
-                    continue;
-
-                start = ScalePosition(new Vector2(adjustedStart.X, -adjustedStart.Y));
-                end = ScalePosition(new Vector2(adjustedEnd.X, -adjustedEnd.Y));
-
-                edges.Add(start);
-                edges.Add(end);
-            }
-        }
-
-        handle.DrawPrimitives(DrawPrimitiveTopology.LineList, edges.Span, color);
-    }
-
-    private Vector2 ScalePosition(Vector2 value)
-    {
-        return value * MinimapScale + MidpointVector;
-    }
-
-    private Vector2 InverseScalePosition(Vector2 value)
-    {
-        return (value - MidpointVector) / MinimapScale;
-    }
-}
diff --git a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
index 3243863260..ec5340e6b4 100644
--- a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
+++ b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
@@ -2,109 +2,42 @@
                       xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                       xmlns:ui="clr-namespace:Content.Client.Shuttles.UI"
                       Title="{Loc 'shuttle-console-window-title'}"
-                      SetSize="1180 648"
-                      MinSize="788 320">
-    <GridContainer Columns="3"
-                  HorizontalAlignment="Stretch"
-                  Margin="5 5 5 5">
-        <BoxContainer Name="LeftDisplay"
-                      VerticalAlignment="Top"
-                      HorizontalAlignment="Left"
-                      MinWidth="256"
-                      MaxWidth="256"
-                      Align="Center"
-                      Orientation="Vertical">
-            <BoxContainer Orientation="Vertical">
-                <controls:StripeBack>
-                    <Label Name="DockingPortsLabel" Text="{Loc 'shuttle-console-dock-label'}" HorizontalAlignment="Center"/>
-                </controls:StripeBack>
-                <BoxContainer Name="DockPorts"
-                              Orientation="Vertical"/>
-            </BoxContainer>
-            <BoxContainer Orientation="Vertical">
-                <controls:StripeBack>
-                    <Label Name="HyperspaceLabel" Text="{Loc 'shuttle-console-hyperspace-label'}" HorizontalAlignment="Center"/>
-                </controls:StripeBack>
-                <BoxContainer Name="HyperspaceDestinations"
-                              Orientation="Vertical"/>
-            </BoxContainer>
+                      SetSize="960 762"
+                      MinSize="960 762">
+    <BoxContainer Orientation="Vertical">
+        <!-- Top row mode buttons -->
+        <BoxContainer Name="ModeButtons"
+                       Orientation="Horizontal"
+                       HorizontalAlignment="Stretch"
+                       MinSize="52 52"
+                       Margin="5">
+            <Button Name="NavModeButton"
+                    ToggleMode="True"
+                    HorizontalExpand="True"
+                    VerticalExpand="True"
+                    Text="NAV"
+                    Margin="5"/>
+            <Button Name="MapModeButton"
+                    ToggleMode="True"
+                    HorizontalExpand="True"
+                    VerticalExpand="True"
+                    Text="MAP"
+                    Margin="5"/>
+            <Button Name="DockModeButton"
+                    ToggleMode="True"
+                    HorizontalExpand="True"
+                    VerticalExpand="True"
+                    Text="DOCK"
+                    Margin="5"/>
         </BoxContainer>
-        <PanelContainer MinSize="256 256"
-                        HorizontalAlignment = "Stretch"
-                        HorizontalExpand = "True"
-                        VerticalExpand = "True">
-            <ui:RadarControl Name="RadarScreen"
-                             MouseFilter="Stop"
-                             Margin="4"
-                             HorizontalExpand = "True"
-                             VerticalExpand = "True"/>
-            <ui:DockingControl Name="DockingScreen"
-                               Visible="False"
-                               MouseFilter="Stop"
-                               Margin="4"
-                               HorizontalExpand = "True"
-                               VerticalExpand = "True"/>
-        </PanelContainer>
-        <BoxContainer Name="RightDisplay"
-                      VerticalAlignment="Top"
-                      HorizontalAlignment="Right"
-                      MinWidth="256"
-                      MaxWidth="256"
-                      Align="Center"
-                      Orientation="Vertical">
-            <controls:StripeBack>
-                <Label Name="DisplayLabel" Text="{Loc 'shuttle-console-display-label'}" HorizontalAlignment="Center"/>
-            </controls:StripeBack>
-            <BoxContainer Name="ReadonlyDisplay">
-                <GridContainer Columns="2"
-                               HorizontalAlignment="Stretch"
-                               VerticalAlignment="Top">
-                    <Label Text="{Loc 'shuttle-console-ftl-state'}"/>
-                    <Label Name="FTLState"
-                           Text="{Loc 'ftl-shuttle-console-available'}"
-                           HorizontalAlignment="Right"/>
-                    <Label Text="{Loc 'shuttle-console-ftl-timer'}"/>
-                    <Label Name="FTLTimer"
-                           Text="0.0"
-                           HorizontalAlignment="Right"/>
-                    <Label Text="{Loc 'shuttle-console-max-radar'}"/>
-                    <Label Name="MaxRadarRange"
-                           Text="0.0"
-                           HorizontalAlignment="Right"/>
-                    <Label Text="{Loc 'shuttle-console-radar'}"/>
-                    <Label Name="RadarRange"
-                           Text="0.0"
-                           HorizontalAlignment="Right"/>
-                    <Label Text="{Loc 'shuttle-console-position'}"/>
-                    <Label Name="GridPosition"
-                           Text="0.0, 0.0"
-                           Align="Right"/>
-                    <Label Text="{Loc 'shuttle-console-orientation'}"/>
-                    <Label Name="GridOrientation"
-                           Text="0.0"
-                           Align="Right"/>
-                    <Label Text="{Loc 'shuttle-console-linear-velocity'}"/>
-                    <Label Name="GridLinearVelocity"
-                           Text="0.0, 0.0"
-                           Align="Right"/>
-                    <Label Text="{Loc 'shuttle-console-angular-velocity'}"/>
-                    <Label Name="GridAngularVelocity"
-                           Text="0.0"
-                           Align="Right"/>
-                </GridContainer>
-            </BoxContainer>
-            <Button Name="IFFToggle"
-                    Text="{Loc 'shuttle-console-iff-toggle'}"
-                    TextAlign="Center"
-                    ToggleMode="True"/>
-            <Button Name="DockToggle"
-                    Text="{Loc 'shuttle-console-dock-toggle'}"
-                    TextAlign="Center"
-                    ToggleMode="True"/>
-            <Button Name="UndockButton"
-                    Text="{Loc 'shuttle-console-undock'}"
-                    TextAlign="Center"
-                    Disabled="True"/>
+        <!-- Contents box -->
+        <BoxContainer Name="Contents"
+                      HorizontalAlignment="Stretch"
+                      VerticalExpand="True"
+                      Margin="5">
+            <ui:NavScreen Name="NavContainer" Visible="False"/>
+            <ui:MapScreen Name="MapContainer" Visible="False"/>
+            <ui:DockingScreen Name="DockContainer" Visible="False"/>
         </BoxContainer>
-    </GridContainer>
+    </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
index d67227549a..a4b42fb672 100644
--- a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
@@ -1,340 +1,148 @@
+using System.Numerics;
 using Content.Client.Computer;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Shuttles.BUIStates;
-using Content.Shared.Shuttles.Components;
-using Content.Shared.Shuttles.Systems;
 using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Map;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Timing;
-using Robust.Shared.Utility;
 
 namespace Content.Client.Shuttles.UI;
 
 [GenerateTypedNameReferences]
 public sealed partial class ShuttleConsoleWindow : FancyWindow,
-    IComputerWindow<ShuttleConsoleBoundInterfaceState>
+    IComputerWindow<ShuttleBoundUserInterfaceState>
 {
-    private readonly IEntityManager _entManager;
-    private readonly IGameTiming _timing;
+    [Dependency] private readonly IEntityManager _entManager = default!;
 
-    private EntityUid? _shuttleEntity;
+    private ShuttleConsoleMode _mode = ShuttleConsoleMode.Nav;
 
-    /// <summary>
-    /// Currently selected dock button for camera.
-    /// </summary>
-    private BaseButton? _selectedDock;
+    public event Action<MapCoordinates, Angle>? RequestFTL;
+    public event Action<NetEntity, Angle>? RequestBeaconFTL;
 
-    /// <summary>
-    /// Stored by grid entityid then by states
-    /// </summary>
-    private readonly Dictionary<NetEntity, List<DockingInterfaceState>> _docks = new();
-
-    private readonly Dictionary<BaseButton, NetEntity> _destinations = new();
-
-    /// <summary>
-    /// Next FTL state change.
-    /// </summary>
-    public TimeSpan FTLTime;
-
-    public Action<NetEntity>? UndockPressed;
-    public Action<NetEntity>? StartAutodockPressed;
-    public Action<NetEntity>? StopAutodockPressed;
-    public Action<NetEntity>? DestinationPressed;
+    public event Action<NetEntity, NetEntity>? DockRequest;
+    public event Action<NetEntity>? UndockRequest;
 
     public ShuttleConsoleWindow()
     {
         RobustXamlLoader.Load(this);
-        _entManager = IoCManager.Resolve<IEntityManager>();
-        _timing = IoCManager.Resolve<IGameTiming>();
-
-        WorldRangeChange(RadarScreen.WorldRange);
-        RadarScreen.WorldRangeChanged += WorldRangeChange;
-
-        IFFToggle.OnToggled += OnIFFTogglePressed;
-        IFFToggle.Pressed = RadarScreen.ShowIFF;
-
-        DockToggle.OnToggled += OnDockTogglePressed;
-        DockToggle.Pressed = RadarScreen.ShowDocks;
-
-        UndockButton.OnPressed += OnUndockPressed;
-    }
-
-    private void WorldRangeChange(float value)
-    {
-        RadarRange.Text = $"{value:0}";
-    }
-
-    private void OnIFFTogglePressed(BaseButton.ButtonEventArgs args)
-    {
-        RadarScreen.ShowIFF ^= true;
-        args.Button.Pressed = RadarScreen.ShowIFF;
-    }
-
-    private void OnDockTogglePressed(BaseButton.ButtonEventArgs args)
-    {
-        RadarScreen.ShowDocks ^= true;
-        args.Button.Pressed = RadarScreen.ShowDocks;
-    }
+        IoCManager.InjectDependencies(this);
 
-    private void OnUndockPressed(BaseButton.ButtonEventArgs args)
-    {
-        if (DockingScreen.ViewedDock == null) return;
-        UndockPressed?.Invoke(DockingScreen.ViewedDock.Value);
-    }
+        // Mode switching
+        NavModeButton.OnPressed += NavPressed;
+        MapModeButton.OnPressed += MapPressed;
+        DockModeButton.OnPressed += DockPressed;
 
-    public void SetMatrix(EntityCoordinates? coordinates, Angle? angle)
-    {
-        _shuttleEntity = coordinates?.EntityId;
-        RadarScreen.SetMatrix(coordinates, angle);
-    }
+        // Modes are exclusive
+        var group = new ButtonGroup();
 
-    public void UpdateState(ShuttleConsoleBoundInterfaceState scc)
-    {
-        UpdateDocks(scc.Docks);
-        UpdateFTL(scc.Destinations, scc.FTLState, scc.FTLTime);
-        RadarScreen.UpdateState(scc);
-        MaxRadarRange.Text = $"{scc.MaxRange:0}";
-    }
+        NavModeButton.Group = group;
+        MapModeButton.Group = group;
+        DockModeButton.Group = group;
 
-    private void UpdateFTL(List<(NetEntity Entity, string Destination, bool Enabled)> destinations, FTLState state, TimeSpan time)
-    {
-        HyperspaceDestinations.DisposeAllChildren();
-        _destinations.Clear();
+        NavModeButton.Pressed = true;
+        SetupMode(_mode);
 
-        if (destinations.Count == 0)
-        {
-            HyperspaceDestinations.AddChild(new Label()
-            {
-                Text = Loc.GetString("shuttle-console-hyperspace-none"),
-                HorizontalAlignment = HAlignment.Center,
-            });
-        }
-        else
+        MapContainer.RequestFTL += (coords, angle) =>
         {
-            destinations.Sort((x, y) => string.Compare(x.Destination, y.Destination, StringComparison.Ordinal));
-
-            foreach (var destination in destinations)
-            {
-                var button = new Button()
-                {
-                    Disabled = !destination.Enabled,
-                    Text = destination.Destination,
-                };
-
-                _destinations[button] = destination.Entity;
-                button.OnPressed += OnHyperspacePressed;
-                HyperspaceDestinations.AddChild(button);
-            }
-        }
-
-        string stateText;
+            RequestFTL?.Invoke(coords, angle);
+        };
 
-        switch (state)
+        MapContainer.RequestBeaconFTL += (ent, angle) =>
         {
-            case Shared.Shuttles.Systems.FTLState.Available:
-                stateText = Loc.GetString("shuttle-console-ftl-available");
-                break;
-            case Shared.Shuttles.Systems.FTLState.Starting:
-                stateText = Loc.GetString("shuttle-console-ftl-starting");
-                break;
-            case Shared.Shuttles.Systems.FTLState.Travelling:
-                stateText = Loc.GetString("shuttle-console-ftl-travelling");
-                break;
-            case Shared.Shuttles.Systems.FTLState.Cooldown:
-                stateText = Loc.GetString("shuttle-console-ftl-cooldown");
-                break;
-            case Shared.Shuttles.Systems.FTLState.Arriving:
-                stateText = Loc.GetString("shuttle-console-ftl-arriving");
-                break;
-            default:
-                throw new ArgumentOutOfRangeException(nameof(state), state, null);
-        }
+            RequestBeaconFTL?.Invoke(ent, angle);
+        };
 
-        FTLState.Text = stateText;
-        // Add a buffer due to lag or whatever
-        time += TimeSpan.FromSeconds(0.3);
-        FTLTime = time;
-        FTLTimer.Text = GetFTLText();
-    }
-
-    private string GetFTLText()
-    {
-        return $"{Math.Max(0, (FTLTime - _timing.CurTime).TotalSeconds):0.0}";
-    }
+        DockContainer.DockRequest += (entity, netEntity) =>
+        {
+            DockRequest?.Invoke(entity, netEntity);
+        };
 
-    private void OnHyperspacePressed(BaseButton.ButtonEventArgs obj)
-    {
-        var ent = _destinations[obj.Button];
-        DestinationPressed?.Invoke(ent);
+        DockContainer.UndockRequest += entity =>
+        {
+            UndockRequest?.Invoke(entity);
+        };
     }
 
-    #region Docking
-
-    private void UpdateDocks(List<DockingInterfaceState> docks)
+    private void ClearModes(ShuttleConsoleMode mode)
     {
-        // TODO: We should check for changes so any existing highlighted doesn't delete.
-        // We also need to make up some pseudonumber as well for these.
-        _docks.Clear();
-
-        foreach (var dock in docks)
+        if (mode != ShuttleConsoleMode.Nav)
         {
-            var grid = _docks.GetOrNew(dock.Coordinates.NetEntity);
-            grid.Add(dock);
+            NavContainer.Visible = false;
         }
 
-        DockPorts.DisposeAllChildren();
-        DockingScreen.Docks = _docks;
-        var shuttleNetEntity = _entManager.GetNetEntity(_shuttleEntity);
-
-        if (shuttleNetEntity != null && _docks.TryGetValue(shuttleNetEntity.Value, out var gridDocks))
+        if (mode != ShuttleConsoleMode.Map)
         {
-            var index = 1;
-
-            foreach (var state in gridDocks)
-            {
-                var pressed = state.Entity == DockingScreen.ViewedDock;
-
-                string suffix;
-
-                if (state.Connected)
-                {
-                    suffix = Loc.GetString("shuttle-console-docked", ("index", index));
-                }
-                else
-                {
-                    suffix = $"{index}";
-                }
-
-                var button = new Button()
-                {
-                    Text = Loc.GetString("shuttle-console-dock-button", ("suffix", suffix)),
-                    ToggleMode = true,
-                    Pressed = pressed,
-                    Margin = new Thickness(0f, 1f),
-                };
-
-                if (pressed)
-                {
-                    _selectedDock = button;
-                }
+            MapContainer.Visible = false;
+            MapContainer.SetMap(MapId.Nullspace, Vector2.Zero);
+        }
 
-                button.OnMouseEntered += args => OnDockMouseEntered(args, state);
-                button.OnMouseExited += args => OnDockMouseExited(args, state);
-                button.OnToggled += args => OnDockToggled(args, state);
-                DockPorts.AddChild(button);
-                index++;
-            }
+        if (mode != ShuttleConsoleMode.Dock)
+        {
+            DockContainer.Visible = false;
         }
     }
 
-    private void OnDockMouseEntered(GUIMouseHoverEventArgs obj, DockingInterfaceState state)
+    private void NavPressed(BaseButton.ButtonEventArgs obj)
     {
-        RadarScreen.HighlightedDock = state.Entity;
+        SwitchMode(ShuttleConsoleMode.Nav);
     }
 
-    private void OnDockMouseExited(GUIMouseHoverEventArgs obj, DockingInterfaceState state)
+    private void MapPressed(BaseButton.ButtonEventArgs obj)
     {
-        RadarScreen.HighlightedDock = null;
+        SwitchMode(ShuttleConsoleMode.Map);
     }
 
-    /// <summary>
-    /// Shows a docking camera instead of radar screen.
-    /// </summary>
-    private void OnDockToggled(BaseButton.ButtonEventArgs obj, DockingInterfaceState state)
+    private void DockPressed(BaseButton.ButtonEventArgs obj)
     {
-        if (_selectedDock != null)
-        {
-            // If it got untoggled via other means then we'll stop viewing the old dock.
-            if (DockingScreen.ViewedDock != null && DockingScreen.ViewedDock != state.Entity)
-            {
-                StopAutodockPressed?.Invoke(DockingScreen.ViewedDock.Value);
-            }
-
-            _selectedDock.Pressed = false;
-            _selectedDock = null;
-        }
-
-        if (!obj.Button.Pressed)
-        {
-            if (DockingScreen.ViewedDock != null)
-            {
-                StopAutodockPressed?.Invoke(DockingScreen.ViewedDock.Value);
-                DockingScreen.ViewedDock = null;
-            }
-
-            UndockButton.Disabled = true;
-            DockingScreen.Visible = false;
-            RadarScreen.Visible = true;
-        }
-        else
-        {
-            if (_shuttleEntity != null)
-            {
-                DockingScreen.Coordinates = _entManager.GetCoordinates(state.Coordinates);
-                DockingScreen.Angle = state.Angle;
-            }
-            else
-            {
-                DockingScreen.Coordinates = null;
-                DockingScreen.Angle = null;
-            }
-
-            UndockButton.Disabled = false;
-            RadarScreen.Visible = false;
-            DockingScreen.Visible = true;
-            DockingScreen.ViewedDock = state.Entity;
-            StartAutodockPressed?.Invoke(state.Entity);
-            DockingScreen.GridEntity = _shuttleEntity;
-            _selectedDock = obj.Button;
-        }
+        SwitchMode(ShuttleConsoleMode.Dock);
     }
 
-    public override void Close()
+    private void SetupMode(ShuttleConsoleMode mode)
     {
-        base.Close();
-        if (DockingScreen.ViewedDock != null)
+        switch (mode)
         {
-            StopAutodockPressed?.Invoke(DockingScreen.ViewedDock.Value);
+            case ShuttleConsoleMode.Nav:
+                NavContainer.Visible = true;
+                break;
+            case ShuttleConsoleMode.Map:
+                MapContainer.Visible = true;
+                MapContainer.Startup();
+                break;
+            case ShuttleConsoleMode.Dock:
+                DockContainer.Visible = true;
+                break;
+            default:
+                throw new NotImplementedException();
         }
     }
 
-    #endregion
-
-    protected override void Draw(DrawingHandleScreen handle)
+    public void SwitchMode(ShuttleConsoleMode mode)
     {
-        base.Draw(handle);
-
-        if (!_entManager.TryGetComponent<PhysicsComponent>(_shuttleEntity, out var gridBody) ||
-            !_entManager.TryGetComponent<TransformComponent>(_shuttleEntity, out var gridXform))
-        {
+        if (_mode == mode)
             return;
-        }
-
-        if (_entManager.TryGetComponent<MetaDataComponent>(_shuttleEntity, out var metadata) && metadata.EntityPaused)
-        {
-            FTLTime += _timing.FrameTime;
-        }
 
-        FTLTimer.Text = GetFTLText();
-
-        var (_, worldRot, worldMatrix) = gridXform.GetWorldPositionRotationMatrix();
-        var worldPos = worldMatrix.Transform(gridBody.LocalCenter);
+        _mode = mode;
+        ClearModes(mode);
+        SetupMode(_mode);
+    }
 
-        // Get the positive reduced angle.
-        var displayRot = -worldRot.Reduced();
+    public enum ShuttleConsoleMode : byte
+    {
+        Nav,
+        Map,
+        Dock,
+    }
 
-        GridPosition.Text = $"{worldPos.X:0.0}, {worldPos.Y:0.0}";
-        GridOrientation.Text = $"{displayRot.Degrees:0.0}";
+    public void UpdateState(EntityUid owner, ShuttleBoundUserInterfaceState cState)
+    {
+        var coordinates = _entManager.GetCoordinates(cState.NavState.Coordinates);
+        NavContainer.SetShuttle(coordinates?.EntityId);
+        MapContainer.SetShuttle(coordinates?.EntityId);
+        MapContainer.SetConsole(owner);
 
-        var gridVelocity = gridBody.LinearVelocity;
-        gridVelocity = displayRot.RotateVec(gridVelocity);
-        // Get linear velocity relative to the console entity
-        GridLinearVelocity.Text = $"{gridVelocity.X:0.0}, {gridVelocity.Y:0.0}";
-        GridAngularVelocity.Text = $"{-gridBody.AngularVelocity:0.0}";
+        NavContainer.UpdateState(cState.NavState);
+        MapContainer.UpdateState(cState.MapState);
+        DockContainer.UpdateState(coordinates?.EntityId, cState.DockState);
     }
 }
diff --git a/Content.Client/Shuttles/UI/ShuttleDockControl.xaml b/Content.Client/Shuttles/UI/ShuttleDockControl.xaml
new file mode 100644
index 0000000000..b1bbb4c629
--- /dev/null
+++ b/Content.Client/Shuttles/UI/ShuttleDockControl.xaml
@@ -0,0 +1 @@
+<ui:BaseShuttleControl xmlns:ui="clr-namespace:Content.Client.Shuttles.UI"/>
diff --git a/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs
new file mode 100644
index 0000000000..f03c440295
--- /dev/null
+++ b/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs
@@ -0,0 +1,458 @@
+using System.Numerics;
+using Content.Client.Shuttles.Systems;
+using Content.Shared.Shuttles.BUIStates;
+using Content.Shared.Shuttles.Components;
+using Content.Shared.Shuttles.Systems;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Shuttles.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class ShuttleDockControl : BaseShuttleControl
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    private readonly DockingSystem _dockSystem;
+    private readonly SharedShuttleSystem _shuttles;
+    private readonly SharedTransformSystem _xformSystem;
+
+    public NetEntity? HighlightedDock;
+
+    public NetEntity? ViewedDock => _viewedState?.Entity;
+    private DockingPortState? _viewedState;
+
+    public EntityUid? GridEntity;
+
+    private EntityCoordinates? _coordinates;
+    private Angle? _angle;
+
+    public DockingInterfaceState? DockState = null;
+
+    private List<Entity<MapGridComponent>> _grids = new();
+
+    private readonly HashSet<DockingPortState> _drawnDocks = new();
+    private readonly Dictionary<DockingPortState, Button> _dockButtons = new();
+
+    /// <summary>
+    /// Store buttons for every other dock
+    /// </summary>
+    private readonly Dictionary<DockingPortState, Control> _dockContainers = new();
+
+    private static readonly TimeSpan DockChangeCooldown = TimeSpan.FromSeconds(0.5);
+
+    /// <summary>
+    /// Rate-limiting for docking changes
+    /// </summary>
+    private TimeSpan _nextDockChange;
+
+    public event Action<NetEntity>? OnViewDock;
+    public event Action<NetEntity, NetEntity>? DockRequest;
+    public event Action<NetEntity>? UndockRequest;
+
+    public ShuttleDockControl() : base(2f, 32f, 8f)
+    {
+        RobustXamlLoader.Load(this);
+        _dockSystem = EntManager.System<DockingSystem>();
+        _shuttles = EntManager.System<SharedShuttleSystem>();
+        _xformSystem = EntManager.System<SharedTransformSystem>();
+        MinSize = new Vector2(SizeFull, SizeFull);
+    }
+
+    public void SetViewedDock(DockingPortState? dockState)
+    {
+        _viewedState = dockState;
+
+        if (dockState != null)
+        {
+            _coordinates = EntManager.GetCoordinates(dockState.Coordinates);
+            _angle = dockState.Angle;
+            OnViewDock?.Invoke(dockState.Entity);
+        }
+        else
+        {
+            _coordinates = null;
+            _angle = null;
+        }
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+        HideDocks();
+        _drawnDocks.Clear();
+    }
+
+    protected override void Draw(DrawingHandleScreen handle)
+    {
+        base.Draw(handle);
+
+        DrawBacking(handle);
+
+        if (_coordinates == null ||
+            _angle == null ||
+            DockState == null ||
+            !EntManager.TryGetComponent<TransformComponent>(GridEntity, out var gridXform))
+        {
+            DrawNoSignal(handle);
+            return;
+        }
+
+        DrawCircles(handle);
+        var gridNent = EntManager.GetNetEntity(GridEntity);
+        var mapPos = _xformSystem.ToMapCoordinates(_coordinates.Value);
+        var ourGridMatrix = _xformSystem.GetWorldMatrix(gridXform.Owner);
+        var dockMatrix = Matrix3.CreateTransform(_coordinates.Value.Position, Angle.Zero);
+        Matrix3.Multiply(dockMatrix, ourGridMatrix, out var offsetMatrix);
+
+        offsetMatrix = offsetMatrix.Invert();
+
+        // Draw nearby grids
+        var controlBounds = PixelSizeBox;
+        _grids.Clear();
+        _mapManager.FindGridsIntersecting(gridXform.MapID, new Box2(mapPos.Position - WorldRangeVector, mapPos.Position + WorldRangeVector), ref _grids);
+
+        // offset the dotted-line position to the bounds.
+        Vector2? viewedDockPos = _viewedState != null ? MidPointVector : null;
+
+        if (viewedDockPos != null)
+        {
+            viewedDockPos = viewedDockPos.Value + _angle.Value.RotateVec(new Vector2(0f,-0.6f) * MinimapScale);
+        }
+
+        var canDockChange = _timing.CurTime > _nextDockChange;
+        var lineOffset = (float) _timing.RealTime.TotalSeconds * 30f;
+
+        foreach (var grid in _grids)
+        {
+            EntManager.TryGetComponent(grid.Owner, out IFFComponent? iffComp);
+
+            if (grid.Owner != GridEntity && !_shuttles.CanDraw(grid.Owner, iffComp: iffComp))
+                continue;
+
+            var gridMatrix = _xformSystem.GetWorldMatrix(grid.Owner);
+            Matrix3.Multiply(in gridMatrix, in offsetMatrix, out var matty);
+            var color = _shuttles.GetIFFColor(grid.Owner, grid.Owner == GridEntity, component: iffComp);
+
+            DrawGrid(handle, matty, grid, color);
+
+            // Draw any docks on that grid
+            if (!DockState.Docks.TryGetValue(EntManager.GetNetEntity(grid), out var gridDocks))
+                continue;
+
+            foreach (var dock in gridDocks)
+            {
+                if (ViewedDock == dock.Entity)
+                    continue;
+
+                var position = matty.Transform(dock.Coordinates.Position);
+
+                var otherDockRotation = Matrix3.CreateRotation(dock.Angle);
+                var scaledPos = ScalePosition(position with {Y = -position.Y});
+
+                if (!controlBounds.Contains(scaledPos.Floored()))
+                    continue;
+
+                // Draw the dock's collision
+                var collisionBL = matty.Transform(dock.Coordinates.Position +
+                                                  otherDockRotation.Transform(new Vector2(-0.2f, -0.7f)));
+                var collisionBR = matty.Transform(dock.Coordinates.Position +
+                                                  otherDockRotation.Transform(new Vector2(0.2f, -0.7f)));
+                var collisionTR = matty.Transform(dock.Coordinates.Position +
+                                                  otherDockRotation.Transform(new Vector2(0.2f, -0.5f)));
+                var collisionTL = matty.Transform(dock.Coordinates.Position +
+                                                  otherDockRotation.Transform(new Vector2(-0.2f, -0.5f)));
+
+                var verts = new[]
+                {
+                    collisionBL,
+                    collisionBR,
+                    collisionBR,
+                    collisionTR,
+                    collisionTR,
+                    collisionTL,
+                    collisionTL,
+                    collisionBL,
+                };
+
+                for (var i = 0; i < verts.Length; i++)
+                {
+                    var vert = verts[i];
+                    vert.Y = -vert.Y;
+                    verts[i] = ScalePosition(vert);
+                }
+
+                var collisionCenter = verts[0] + verts[1] + verts[3] + verts[5];
+
+                var otherDockConnection = Color.ToSrgb(Color.Pink);
+                handle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, verts, otherDockConnection.WithAlpha(0.2f));
+                handle.DrawPrimitives(DrawPrimitiveTopology.LineList, verts, otherDockConnection);
+
+                // Draw the dock itself
+                var dockBL = matty.Transform(dock.Coordinates.Position + new Vector2(-0.5f, -0.5f));
+                var dockBR = matty.Transform(dock.Coordinates.Position + new Vector2(0.5f, -0.5f));
+                var dockTR = matty.Transform(dock.Coordinates.Position + new Vector2(0.5f, 0.5f));
+                var dockTL = matty.Transform(dock.Coordinates.Position + new Vector2(-0.5f, 0.5f));
+
+                verts = new[]
+                {
+                    dockBL,
+                    dockBR,
+                    dockBR,
+                    dockTR,
+                    dockTR,
+                    dockTL,
+                    dockTL,
+                    dockBL
+                };
+
+                for (var i = 0; i < verts.Length; i++)
+                {
+                    var vert = verts[i];
+                    vert.Y = -vert.Y;
+                    verts[i] = ScalePosition(vert);
+                }
+
+                Color otherDockColor;
+
+                if (HighlightedDock == dock.Entity)
+                {
+                    otherDockColor = Color.ToSrgb(Color.Magenta);
+                }
+                else
+                {
+                    otherDockColor = Color.ToSrgb(Color.Purple);
+                }
+
+                /*
+                 * Can draw in these conditions:
+                 * 1. Same grid
+                 * 2. It's in range
+                 *
+                 * We don't want to draw stuff far away that's docked because it will just overlap our buttons
+                 */
+
+                var canDraw = grid.Owner == GridEntity;
+                _dockButtons.TryGetValue(dock, out var dockButton);
+
+                // Rate limit
+                if (dockButton != null && dock.GridDockedWith != null)
+                {
+                    dockButton.Disabled = !canDockChange;
+                }
+
+                // If the dock is in range then also do highlighting
+                if (viewedDockPos != null && dock.Coordinates.NetEntity != gridNent)
+                {
+                    collisionCenter /= 4;
+                    var range = viewedDockPos.Value - collisionCenter;
+
+                    if (range.Length() < SharedDockingSystem.DockingHiglightRange * MinimapScale)
+                    {
+                        if (_viewedState?.GridDockedWith == null)
+                        {
+                            var coordsOne = EntManager.GetCoordinates(_viewedState!.Coordinates);
+                            var coordsTwo = EntManager.GetCoordinates(dock.Coordinates);
+                            var mapOne = _xformSystem.ToMapCoordinates(coordsOne);
+                            var mapTwo = _xformSystem.ToMapCoordinates(coordsTwo);
+
+                            var rotA = _xformSystem.GetWorldRotation(coordsOne.EntityId) + _viewedState!.Angle;
+                            var rotB = _xformSystem.GetWorldRotation(coordsTwo.EntityId) + dock.Angle;
+
+                            var distance = (mapOne.Position - mapTwo.Position).Length();
+
+                            var inAlignment = _dockSystem.InAlignment(mapOne, rotA, mapTwo, rotB);
+                            var canDock = distance < SharedDockingSystem.DockRange && inAlignment;
+
+                            if (dockButton != null)
+                                dockButton.Disabled = !canDock || !canDockChange;
+
+                            var lineColor = inAlignment ? Color.Lime : Color.Red;
+                            handle.DrawDottedLine(viewedDockPos.Value, collisionCenter, lineColor, offset: lineOffset);
+                        }
+
+                        canDraw = true;
+                    }
+                    else
+                    {
+                        if (dockButton != null)
+                            dockButton.Disabled = true;
+                    }
+                }
+
+                handle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, verts, otherDockColor.WithAlpha(0.2f));
+                handle.DrawPrimitives(DrawPrimitiveTopology.LineList, verts, otherDockColor);
+
+                // Position the dock control above it
+                var container = _dockContainers[dock];
+                container.Visible = canDraw;
+
+                if (canDraw)
+                {
+                    // Because it's being layed out top-down we have to arrange for first frame.
+                    container.Arrange(PixelRect);
+                    var containerPos = scaledPos / UIScale - container.DesiredSize / 2 - new Vector2(0f, 0.75f) * MinimapScale;
+                    SetPosition(container, containerPos);
+                }
+
+                _drawnDocks.Add(dock);
+            }
+        }
+
+        // Draw the dock's collision
+        var invertedPosition = Vector2.Zero;
+        invertedPosition.Y = -invertedPosition.Y;
+        var rotation = Matrix3.CreateRotation(-_angle.Value + MathF.PI);
+        var ourDockConnection = new UIBox2(
+            ScalePosition(rotation.Transform(new Vector2(-0.2f, -0.7f))),
+            ScalePosition(rotation.Transform(new Vector2(0.2f, -0.5f))));
+
+        var ourDock = new UIBox2(
+            ScalePosition(rotation.Transform(new Vector2(-0.5f, 0.5f))),
+            ScalePosition(rotation.Transform(new Vector2(0.5f, -0.5f))));
+
+        var dockColor = Color.Magenta;
+        var connectionColor = Color.Pink;
+
+        handle.DrawRect(ourDockConnection, connectionColor.WithAlpha(0.2f));
+        handle.DrawRect(ourDockConnection, connectionColor, filled: false);
+
+        // Draw the dock itself
+        handle.DrawRect(ourDock, dockColor.WithAlpha(0.2f));
+        handle.DrawRect(ourDock, dockColor, filled: false);
+    }
+
+    private void HideDocks()
+    {
+        foreach (var (dock, control) in _dockContainers)
+        {
+            if (_drawnDocks.Contains(dock))
+                continue;
+
+            control.Visible = false;
+        }
+    }
+
+    public void BuildDocks(EntityUid? shuttle)
+    {
+        var viewedEnt = ViewedDock;
+        _viewedState = null;
+
+        foreach (var btn in _dockButtons.Values)
+        {
+            btn.Dispose();
+        }
+
+        foreach (var container in _dockContainers.Values)
+        {
+            container.Dispose();
+        }
+
+        _dockButtons.Clear();
+        _dockContainers.Clear();
+
+        if (DockState == null)
+            return;
+
+        var gridNent = EntManager.GetNetEntity(GridEntity);
+
+        foreach (var (otherShuttle, docks) in DockState.Docks)
+        {
+            // If it's our shuttle we add a view button
+
+            foreach (var dock in docks)
+            {
+                if (dock.Entity == viewedEnt)
+                {
+                    _viewedState = dock;
+                }
+
+                var container = new BoxContainer()
+                {
+                    Orientation = BoxContainer.LayoutOrientation.Vertical,
+                    Margin = new Thickness(3),
+                };
+
+                var panel = new PanelContainer()
+                {
+                    HorizontalAlignment = HAlignment.Center,
+                    VerticalAlignment = VAlignment.Center,
+                    PanelOverride = new StyleBoxFlat(new Color(30, 30, 34, 200)),
+                    Children =
+                    {
+                        container,
+                    }
+                };
+
+                Button button;
+
+                if (otherShuttle == gridNent)
+                {
+                    button = new Button()
+                    {
+                        Text = Loc.GetString("shuttle-console-view"),
+                    };
+
+                    button.OnPressed += args =>
+                    {
+                        SetViewedDock(dock);
+                    };
+                }
+                else
+                {
+                    if (dock.Connected)
+                    {
+                        button = new Button()
+                        {
+                            Text = Loc.GetString("shuttle-console-undock"),
+                        };
+
+                        button.OnPressed += args =>
+                        {
+                            _nextDockChange = _timing.CurTime + DockChangeCooldown;
+                            UndockRequest?.Invoke(dock.Entity);
+                        };
+                    }
+                    else
+                    {
+                        button = new Button()
+                        {
+                            Text = Loc.GetString("shuttle-console-dock"),
+                            Disabled = true,
+                        };
+
+                        button.OnPressed += args =>
+                        {
+                            if (ViewedDock == null)
+                                return;
+
+                            _nextDockChange = _timing.CurTime + DockChangeCooldown;
+                            DockRequest?.Invoke(ViewedDock.Value, dock.Entity);
+                        };
+                    }
+
+                    _dockButtons.Add(dock, button);
+                }
+
+                container.AddChild(new Label()
+                {
+                    Text = dock.Name,
+                    HorizontalAlignment = HAlignment.Center,
+                });
+
+                button.HorizontalAlignment = HAlignment.Center;
+                container.AddChild(button);
+
+                AddChild(panel);
+                panel.Measure(Vector2Helpers.Infinity);
+                _dockContainers[dock] = panel;
+            }
+        }
+    }
+}
diff --git a/Content.Client/Shuttles/UI/ShuttleMapControl.xaml b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml
new file mode 100644
index 0000000000..18abb9c9bc
--- /dev/null
+++ b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml
@@ -0,0 +1 @@
+<ui:ShuttleMapControl xmlns:ui="clr-namespace:Content.Client.Shuttles.UI" />
diff --git a/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
new file mode 100644
index 0000000000..55ef55a6c7
--- /dev/null
+++ b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs
@@ -0,0 +1,613 @@
+using System.Buffers;
+using System.Numerics;
+using Content.Client.Shuttles.Systems;
+using Content.Shared.Shuttles.Components;
+using Content.Shared.Shuttles.UI.MapObjects;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Collections;
+using Robust.Shared.Input;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Shuttles.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class ShuttleMapControl : BaseShuttleControl
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IInputManager _inputs = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    private readonly ShuttleSystem _shuttles;
+    private readonly SharedTransformSystem _xformSystem;
+
+    protected override bool Draggable => true;
+
+    public bool ShowBeacons = true;
+    public MapId ViewingMap = MapId.Nullspace;
+
+    private EntityUid? _shuttleEntity;
+
+    private readonly Font _font;
+
+    private readonly EntityQuery<PhysicsComponent> _physicsQuery;
+
+    /// <summary>
+    /// Toggles FTL mode on. This shows a pre-vis for FTLing a grid.
+    /// </summary>
+    public bool FtlMode;
+
+    private Angle _ftlAngle;
+
+    /// <summary>
+    /// Are we currently in FTL.
+    /// </summary>
+    public bool InFtl;
+
+    /// <summary>
+    /// Raised when a request to FTL to a particular spot is raised.
+    /// </summary>
+    public event Action<MapCoordinates, Angle>? RequestFTL;
+
+    public event Action<NetEntity, Angle>? RequestBeaconFTL;
+
+    /// <summary>
+    /// Set every draw to determine the beacons that are clickable for mouse events
+    /// </summary>
+    private List<IMapObject> _beacons = new();
+
+    // Per frame data to avoid re-allocating
+    private readonly List<IMapObject> _mapObjects = new();
+    private readonly Dictionary<Color, List<Vector2>> _verts = new();
+    private readonly Dictionary<Color, List<Vector2>> _edges = new();
+    private readonly Dictionary<Color, List<(Vector2, string)>> _strings = new();
+    private readonly List<ShuttleExclusionObject> _viewportExclusions = new();
+
+    public ShuttleMapControl() : base(256f, 512f, 512f)
+    {
+        RobustXamlLoader.Load(this);
+        _shuttles = EntManager.System<ShuttleSystem>();
+        _xformSystem = EntManager.System<SharedTransformSystem>();
+        var cache = IoCManager.Resolve<IResourceCache>();
+
+        _physicsQuery = EntManager.GetEntityQuery<PhysicsComponent>();
+
+        _font = new VectorFont(cache.GetResource<FontResource>("/EngineFonts/NotoSans/NotoSans-Regular.ttf"), 10);
+    }
+
+    public void SetMap(MapId mapId, Vector2 offset, bool recentering = false)
+    {
+        ViewingMap = mapId;
+        TargetOffset = offset;
+        Recentering = recentering;
+    }
+
+    public void SetShuttle(EntityUid? entity)
+    {
+        _shuttleEntity = entity;
+    }
+
+    protected override void MouseMove(GUIMouseMoveEventArgs args)
+    {
+        // No move for you.
+        if (FtlMode)
+            return;
+
+        base.MouseMove(args);
+    }
+
+    protected override void KeyBindUp(GUIBoundKeyEventArgs args)
+    {
+        if (FtlMode && ViewingMap != MapId.Nullspace)
+        {
+            if (args.Function == EngineKeyFunctions.UIClick)
+            {
+                var mapUid = _mapManager.GetMapEntityId(ViewingMap);
+
+                var beaconsOnly = EntManager.TryGetComponent(mapUid, out FTLDestinationComponent? destComp) &&
+                                  destComp.BeaconsOnly;
+
+                var mapTransform = Matrix3.CreateInverseTransform(Offset, Angle.Zero);
+
+                if (beaconsOnly && TryGetBeacon(_beacons, mapTransform, args.RelativePosition, PixelRect, out var foundBeacon, out _))
+                {
+                    RequestBeaconFTL?.Invoke(foundBeacon.Entity, _ftlAngle);
+                }
+                else
+                {
+                    // We'll send the "adjusted" position and server will adjust it back when relevant.
+                    var mapCoords = new MapCoordinates(InverseMapPosition(args.RelativePosition), ViewingMap);
+                    RequestFTL?.Invoke(mapCoords, _ftlAngle);
+                }
+            }
+        }
+
+        base.KeyBindUp(args);
+    }
+
+    protected override void MouseWheel(GUIMouseWheelEventArgs args)
+    {
+        // Scroll handles FTL rotation if you're in FTL mode.
+        if (FtlMode)
+        {
+            _ftlAngle += Angle.FromDegrees(15f) * args.Delta.Y;
+            _ftlAngle = _ftlAngle.Reduced();
+            return;
+        }
+
+        base.MouseWheel(args);
+    }
+
+    private void DrawParallax(DrawingHandleScreen handle)
+    {
+        if (!EntManager.TryGetComponent(_shuttleEntity, out TransformComponent? shuttleXform) || shuttleXform.MapUid == null)
+            return;
+
+        // TODO: Figure out how the fuck to make this common between the 3 slightly different parallax methods and move to parallaxsystem.
+        // Draw background texture
+        var tex = _shuttles.GetTexture(shuttleXform.MapUid.Value);
+
+        // Size of the texture in world units.
+        var size = tex.Size * MinimapScale * 1f;
+
+        var position = ScalePosition(new Vector2(-Offset.X, Offset.Y));
+        var slowness = 1f;
+
+        // The "home" position is the effective origin of this layer.
+        // Parallax shifting is relative to the home, and shifts away from the home and towards the Eye centre.
+        // The effects of this are such that a slowness of 1 anchors the layer to the centre of the screen, while a slowness of 0 anchors the layer to the world.
+        // (For values 0.0 to 1.0 this is in effect a lerp, but it's deliberately unclamped.)
+        // The ParallaxAnchor adapts the parallax for station positioning and possibly map-specific tweaks.
+        var home = Vector2.Zero;
+        var scrolled = Vector2.Zero;
+
+        // Origin - start with the parallax shift itself.
+        var originBL = (position - home) * slowness + scrolled;
+
+        // Place at the home.
+        originBL += home;
+
+        // Centre the image.
+        originBL -= size / 2;
+
+        // Remove offset so we can floor.
+        var botLeft = new Vector2(0f, 0f);
+        var topRight = botLeft + Size;
+
+        var flooredBL = botLeft - originBL;
+
+        // Floor to background size.
+        flooredBL = (flooredBL / size).Floored() * size;
+
+        // Re-offset.
+        flooredBL += originBL;
+
+        for (var x = flooredBL.X; x < topRight.X; x += size.X)
+        {
+            for (var y = flooredBL.Y; y < topRight.Y; y += size.Y)
+            {
+                handle.DrawTextureRect(tex, new UIBox2(x, y, x + size.X, y + size.Y));
+            }
+        }
+    }
+
+    /// <summary>
+    /// Gets the map objects that intersect the viewport.
+    /// </summary>
+    /// <param name="mapObjects"></param>
+    /// <returns></returns>
+    private List<IMapObject> GetViewportMapObjects(Matrix3 matty, List<IMapObject> mapObjects)
+    {
+        var results = new List<IMapObject>();
+        var viewBox = SizeBox.Scale(1.2f);
+
+        foreach (var mapObj in mapObjects)
+        {
+            // If it's a grid-map skip it.
+            if (mapObj is GridMapObject gridObj && EntManager.HasComponent<MapComponent>(gridObj.Entity))
+                continue;
+
+            var mapCoords = _shuttles.GetMapCoordinates(mapObj);
+
+            var relativePos = matty.Transform(mapCoords.Position);
+            relativePos = relativePos with { Y = -relativePos.Y };
+            var uiPosition = ScalePosition(relativePos);
+
+            if (!viewBox.Contains(uiPosition.Floored()))
+                continue;
+
+            results.Add(mapObj);
+        }
+
+        return results;
+    }
+
+    protected override void Draw(DrawingHandleScreen handle)
+    {
+        base.Draw(handle);
+
+        if (ViewingMap == MapId.Nullspace)
+            return;
+
+        var mapObjects = _mapObjects;
+        DrawRecenter();
+
+        if (InFtl || mapObjects.Count == 0)
+        {
+            DrawBacking(handle);
+            DrawNoSignal(handle);
+            return;
+        }
+
+        DrawParallax(handle);
+
+        var viewedMapUid = _mapManager.GetMapEntityId(ViewingMap);
+        var matty = Matrix3.CreateInverseTransform(Offset, Angle.Zero);
+        var realTime = _timing.RealTime;
+        var viewBox = new Box2(Offset - WorldRangeVector, Offset + WorldRangeVector);
+        var viewportObjects = GetViewportMapObjects(matty, mapObjects);
+        _viewportExclusions.Clear();
+
+        // Draw our FTL range + no FTL zones
+        // Do it up here because we want this layered below most things.
+        if (FtlMode)
+        {
+            if (EntManager.TryGetComponent<TransformComponent>(_shuttleEntity, out var shuttleXform))
+            {
+                var gridUid = _shuttleEntity.Value;
+                var gridPhysics = _physicsQuery.GetComponent(gridUid);
+                var (gridPos, gridRot) = _xformSystem.GetWorldPositionRotation(shuttleXform);
+                gridPos = Maps.GetGridPosition((gridUid, gridPhysics), gridPos, gridRot);
+
+                var gridRelativePos = matty.Transform(gridPos);
+                gridRelativePos = gridRelativePos with { Y = -gridRelativePos.Y };
+                var gridUiPos = ScalePosition(gridRelativePos);
+
+                var range = _shuttles.GetFTLRange(gridUid);
+                range *= MinimapScale;
+                handle.DrawCircle(gridUiPos, range, Color.Gold, filled: false);
+            }
+        }
+
+        var exclusionColor = Color.Red;
+
+        // Exclusions need a bumped range so we check all the ones on the map.
+        foreach (var mapObj in mapObjects)
+        {
+            if (mapObj is not ShuttleExclusionObject exclusion)
+                continue;
+
+            // Check if it even intersects the viewport.
+            var coords = EntManager.GetCoordinates(exclusion.Coordinates);
+            var mapCoords = _xformSystem.ToMapCoordinates(coords);
+            var enlargedBounds = viewBox.Enlarged(exclusion.Range);
+
+            if (mapCoords.MapId != ViewingMap ||
+                !enlargedBounds.Contains(mapCoords.Position))
+            {
+                continue;
+            }
+
+            var adjustedPos = matty.Transform(mapCoords.Position);
+            var localPos = ScalePosition(adjustedPos with { Y = -adjustedPos.Y});
+            handle.DrawCircle(localPos, exclusion.Range * MinimapScale, exclusionColor.WithAlpha(0.05f));
+            handle.DrawCircle(localPos, exclusion.Range * MinimapScale, exclusionColor, filled: false);
+
+            _viewportExclusions.Add(exclusion);
+        }
+
+        _verts.Clear();
+        _edges.Clear();
+        _strings.Clear();
+
+        // Add beacons if relevant.
+        var beaconsOnly = _shuttles.IsBeaconMap(viewedMapUid);
+        var controlLocalBounds = PixelRect;
+        _beacons.Clear();
+
+        if (ShowBeacons)
+        {
+            var beaconColor = Color.AliceBlue;
+
+            foreach (var (beaconName, coords, mapO) in GetBeacons(viewportObjects, matty, controlLocalBounds))
+            {
+                var localPos = matty.Transform(coords.Position);
+                localPos = localPos with { Y = -localPos.Y };
+                var beaconUiPos = ScalePosition(localPos);
+                var mapObject = GetMapObject(localPos, Angle.Zero, scale: 0.75f, scalePosition: true);
+
+                var existingVerts = _verts.GetOrNew(beaconColor);
+                var existingEdges = _edges.GetOrNew(beaconColor);
+
+                AddMapObject(existingEdges, existingVerts, mapObject);
+                _beacons.Add(mapO);
+
+                var existingStrings = _strings.GetOrNew(beaconColor);
+                existingStrings.Add((beaconUiPos, beaconName));
+            }
+        }
+
+        foreach (var mapObj in viewportObjects)
+        {
+            if (mapObj is not GridMapObject gridObj || !EntManager.TryGetComponent(gridObj.Entity, out MapGridComponent? mapGrid))
+                continue;
+
+            Entity<MapGridComponent> grid = (gridObj.Entity, mapGrid);
+            IFFComponent? iffComp = null;
+
+            // Rudimentary IFF for now, if IFF hiding on then we don't show on the map at all
+            if (grid.Owner != _shuttleEntity &&
+                EntManager.TryGetComponent(grid, out iffComp) &&
+                (iffComp.Flags & (IFFFlags.Hide | IFFFlags.HideLabel)) != 0x0)
+            {
+                continue;
+            }
+
+            var gridColor = _shuttles.GetIFFColor(grid, self: _shuttleEntity == grid.Owner, component: iffComp);
+
+            var existingVerts = _verts.GetOrNew(gridColor);
+            var existingEdges = _edges.GetOrNew(gridColor);
+
+            var gridPhysics = _physicsQuery.GetComponent(grid.Owner);
+            var (gridPos, gridRot) = _xformSystem.GetWorldPositionRotation(grid.Owner);
+            gridPos = Maps.GetGridPosition((grid, gridPhysics), gridPos, gridRot);
+
+            var gridRelativePos = matty.Transform(gridPos);
+            gridRelativePos = gridRelativePos with { Y = -gridRelativePos.Y };
+            var gridUiPos = ScalePosition(gridRelativePos);
+
+            var mapObject = GetMapObject(gridRelativePos, Angle.Zero, scalePosition: true);
+            AddMapObject(existingEdges, existingVerts, mapObject);
+
+            // Text
+            // Force drawing it at this point.
+            var iffText = _shuttles.GetIFFLabel(grid, self: true, component: iffComp);
+
+            if (string.IsNullOrEmpty(iffText))
+                continue;
+
+            var existingStrings = _strings.GetOrNew(gridColor);
+            existingStrings.Add((gridUiPos, iffText));
+        }
+
+        // Batch the colors whoopie
+        // really only affects forks with lots of grids.
+        foreach (var (color, sendVerts) in _verts)
+        {
+            handle.DrawPrimitives(DrawPrimitiveTopology.TriangleList, sendVerts, color.WithAlpha(0.05f));
+        }
+
+        foreach (var (color, sendEdges) in _edges)
+        {
+            handle.DrawPrimitives(DrawPrimitiveTopology.LineList, sendEdges, color);
+        }
+
+        foreach (var (color, sendStrings) in _strings)
+        {
+            var adjustedColor = Color.FromSrgb(color);
+
+            foreach (var (gridUiPos, iffText) in sendStrings)
+            {
+                var textWidth = handle.GetDimensions(_font, iffText, UIScale);
+                handle.DrawString(_font, gridUiPos + textWidth with { X = -textWidth.X / 2f }, iffText, adjustedColor);
+            }
+        }
+
+        var mousePos = _inputs.MouseScreenPosition;
+        var mouseLocalPos = GetLocalPosition(mousePos);
+
+        // Draw dotted line from our own shuttle entity to mouse.
+        if (FtlMode)
+        {
+            if (mousePos.Window != WindowId.Invalid)
+            {
+                // If mouse inbounds then draw it.
+                if (_shuttleEntity != null && controlLocalBounds.Contains(mouseLocalPos.Floored()) &&
+                    EntManager.TryGetComponent(_shuttleEntity, out TransformComponent? shuttleXform) &&
+                    shuttleXform.MapID != MapId.Nullspace)
+                {
+                    // If it's a beacon only map then snap the mouse to a nearby spot.
+                    ShuttleBeaconObject foundBeacon = default;
+
+                    // Check for beacons around mouse and snap to that.
+                    if (beaconsOnly && TryGetBeacon(viewportObjects, matty, mouseLocalPos, controlLocalBounds, out foundBeacon, out var foundLocalPos))
+                    {
+                        mouseLocalPos = foundLocalPos;
+                    }
+
+                    var grid = EntManager.GetComponent<MapGridComponent>(_shuttleEntity.Value);
+
+                    var (gridPos, gridRot) = _xformSystem.GetWorldPositionRotation(shuttleXform);
+                    gridPos = Maps.GetGridPosition(_shuttleEntity.Value, gridPos, gridRot);
+
+                    // do NOT apply LocalCenter operation here because it will be adjusted in FTLFree.
+                    var mouseMapPos = InverseMapPosition(mouseLocalPos);
+
+                    var ftlFree = (!beaconsOnly || foundBeacon != default) &&
+                                  _shuttles.FTLFree(_shuttleEntity.Value, new EntityCoordinates(viewedMapUid, mouseMapPos), _ftlAngle, _viewportExclusions);
+
+                    var color = ftlFree ? Color.LimeGreen : Color.Magenta;
+
+                    var gridRelativePos = matty.Transform(gridPos);
+                    gridRelativePos = gridRelativePos with { Y = -gridRelativePos.Y };
+                    var gridUiPos = ScalePosition(gridRelativePos);
+
+                    // Draw FTL buffer around the mouse.
+                    var ourFTLBuffer = _shuttles.GetFTLBufferRange(_shuttleEntity.Value, grid);
+                    ourFTLBuffer *= MinimapScale;
+                    handle.DrawCircle(mouseLocalPos, ourFTLBuffer, Color.Magenta.WithAlpha(0.01f));
+                    handle.DrawCircle(mouseLocalPos, ourFTLBuffer, Color.Magenta, filled: false);
+
+                    // Draw line from our shuttle to target
+                    // Might need to clip the line if it's too far? But my brain wasn't working so F.
+                    handle.DrawDottedLine(gridUiPos, mouseLocalPos, color, (float) realTime.TotalSeconds * 30f);
+
+                    // Draw shuttle pre-vis
+                    var mouseVerts = GetMapObject(mouseLocalPos, _ftlAngle, scale: MinimapScale);
+
+                    handle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, mouseVerts.Span, color.WithAlpha(0.05f));
+                    handle.DrawPrimitives(DrawPrimitiveTopology.LineLoop, mouseVerts.Span, color);
+
+                    // Draw a notch indicating direction.
+                    var ftlLength = GetMapObjectRadius() + 16f;
+                    var ftlEnd = mouseLocalPos + _ftlAngle.RotateVec(new Vector2(0f, -ftlLength));
+
+                    handle.DrawLine(mouseLocalPos, ftlEnd, color);
+                }
+            }
+        }
+
+        // Draw the coordinates
+        var mapOffset = MidPointVector;
+
+        if (mousePos.Window != WindowId.Invalid &&
+            controlLocalBounds.Contains(mouseLocalPos.Floored()))
+        {
+            mapOffset = mouseLocalPos;
+        }
+
+        mapOffset = InverseMapPosition(mapOffset);
+        var coordsText = $"{mapOffset.X:0.0}, {mapOffset.Y:0.0}";
+        DrawData(handle, coordsText);
+    }
+
+    private void AddMapObject(List<Vector2> edges, List<Vector2> verts, ValueList<Vector2> mapObject)
+    {
+        var bottom = mapObject[0];
+        var right = mapObject[1];
+        var top = mapObject[2];
+        var left = mapObject[3];
+
+        // Diamond interior
+        verts.Add(bottom);
+        verts.Add(right);
+        verts.Add(top);
+
+        verts.Add(bottom);
+        verts.Add(top);
+        verts.Add(left);
+
+        // Diamond edges
+        edges.Add(bottom);
+        edges.Add(right);
+        edges.Add(right);
+        edges.Add(top);
+        edges.Add(top);
+        edges.Add(left);
+        edges.Add(left);
+        edges.Add(bottom);
+    }
+
+    /// <summary>
+    /// Returns the beacons that intersect the viewport.
+    /// </summary>
+    private IEnumerable<(string Beacon, MapCoordinates Coordinates, IMapObject MapObject)> GetBeacons(List<IMapObject> mapObjs, Matrix3 mapTransform, UIBox2i area)
+    {
+        foreach (var mapO in mapObjs)
+        {
+            if (mapO is not ShuttleBeaconObject beacon)
+                continue;
+
+            var beaconCoords = EntManager.GetCoordinates(beacon.Coordinates).ToMap(EntManager, _xformSystem);
+            var position = mapTransform.Transform(beaconCoords.Position);
+            var localPos = ScalePosition(position with {Y = -position.Y});
+
+            // If beacon not on screen then ignore it.
+            if (!area.Contains(localPos.Floored()))
+                continue;
+
+            yield return (beacon.Name, beaconCoords, mapO);
+        }
+    }
+
+    private float GetMapObjectRadius(float scale = 1f) => WorldRange / 40f * scale;
+
+    private ValueList<Vector2> GetMapObject(Vector2 localPos, Angle angle, float scale = 1f, bool scalePosition = false)
+    {
+        // Constant size diamonds
+        var diamondRadius = GetMapObjectRadius();
+
+        var mapObj = new ValueList<Vector2>(4)
+        {
+            localPos + angle.RotateVec(new Vector2(0f, -2f * diamondRadius)) * scale,
+            localPos + angle.RotateVec(new Vector2(diamondRadius, 0f)) * scale,
+            localPos + angle.RotateVec(new Vector2(0f, 2f * diamondRadius)) * scale,
+            localPos + angle.RotateVec(new Vector2(-diamondRadius, 0f)) * scale,
+        };
+
+        if (scalePosition)
+        {
+            for (var i = 0; i < mapObj.Count; i++)
+            {
+                mapObj[i] = ScalePosition(mapObj[i]);
+            }
+        }
+
+        return mapObj;
+    }
+
+    private bool TryGetBeacon(IEnumerable<IMapObject> mapObjects, Matrix3 mapTransform, Vector2 mousePos, UIBox2i area, out ShuttleBeaconObject foundBeacon, out Vector2 foundLocalPos)
+    {
+        // In pixels
+        const float BeaconSnapRange = 32f;
+        float nearestValue = float.MaxValue;
+        foundLocalPos = Vector2.Zero;
+        foundBeacon = default;
+
+        foreach (var mapObj in mapObjects)
+        {
+            if (mapObj is not ShuttleBeaconObject beaconObj)
+                continue;
+
+            var beaconCoords = _xformSystem.ToMapCoordinates(EntManager.GetCoordinates(beaconObj.Coordinates));
+
+            if (beaconCoords.MapId != ViewingMap)
+                continue;
+
+            // Invalid beacon?
+            if (!_shuttles.CanFTLBeacon(beaconObj.Coordinates))
+                continue;
+
+            var position = mapTransform.Transform(beaconCoords.Position);
+            var localPos = ScalePosition(position with {Y = -position.Y});
+
+            // If beacon not on screen then ignore it.
+            if (!area.Contains(localPos.Floored()))
+                continue;
+
+            var distance = (localPos - mousePos).Length();
+
+            if (distance > BeaconSnapRange ||
+                distance > nearestValue)
+            {
+                continue;
+            }
+
+            foundLocalPos = localPos;
+            nearestValue = distance;
+            foundBeacon = beaconObj;
+        }
+
+        return foundBeacon != default;
+    }
+
+    /// <summary>
+    /// Sets the map objects for the next draw.
+    /// </summary>
+    public void SetMapObjects(Dictionary<MapId, List<IMapObject>> mapObjects)
+    {
+        _mapObjects.Clear();
+
+        if (mapObjects.TryGetValue(ViewingMap, out var obbies))
+        {
+            _mapObjects.AddRange(obbies);
+        }
+    }
+}
diff --git a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml
new file mode 100644
index 0000000000..f517a30c18
--- /dev/null
+++ b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml
@@ -0,0 +1 @@
+<ui:BaseShuttleControl xmlns:ui="clr-namespace:Content.Client.Shuttles.UI" />
diff --git a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
new file mode 100644
index 0000000000..00ee6890b2
--- /dev/null
+++ b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs
@@ -0,0 +1,290 @@
+using System.Numerics;
+using Content.Shared.Shuttles.BUIStates;
+using Content.Shared.Shuttles.Components;
+using Content.Shared.Shuttles.Systems;
+using JetBrains.Annotations;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Collections;
+using Robust.Shared.Input;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Utility;
+
+namespace Content.Client.Shuttles.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class ShuttleNavControl : BaseShuttleControl
+{
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    private readonly SharedShuttleSystem _shuttles;
+    private readonly SharedTransformSystem _transform;
+
+    /// <summary>
+    /// Used to transform all of the radar objects. Typically is a shuttle console parented to a grid.
+    /// </summary>
+    private EntityCoordinates? _coordinates;
+
+    private Angle? _rotation;
+
+    private Dictionary<NetEntity, List<DockingPortState>> _docks = new();
+
+    public bool ShowIFF { get; set; } = true;
+    public bool ShowDocks { get; set; } = true;
+
+    /// <summary>
+    /// Raised if the user left-clicks on the radar control with the relevant entitycoordinates.
+    /// </summary>
+    public Action<EntityCoordinates>? OnRadarClick;
+
+    private List<Entity<MapGridComponent>> _grids = new();
+
+    public ShuttleNavControl() : base(64f, 256f, 256f)
+    {
+        RobustXamlLoader.Load(this);
+        _shuttles = EntManager.System<SharedShuttleSystem>();
+        _transform = EntManager.System<SharedTransformSystem>();
+    }
+
+    public void SetMatrix(EntityCoordinates? coordinates, Angle? angle)
+    {
+        _coordinates = coordinates;
+        _rotation = angle;
+    }
+
+    protected override void KeyBindUp(GUIBoundKeyEventArgs args)
+    {
+        base.KeyBindUp(args);
+
+        if (_coordinates == null || _rotation == null || args.Function != EngineKeyFunctions.UIClick ||
+            OnRadarClick == null)
+        {
+            return;
+        }
+
+        var a = InverseScalePosition(args.RelativePosition);
+        var relativeWorldPos = new Vector2(a.X, -a.Y);
+        relativeWorldPos = _rotation.Value.RotateVec(relativeWorldPos);
+        var coords = _coordinates.Value.Offset(relativeWorldPos);
+        OnRadarClick?.Invoke(coords);
+    }
+
+    /// <summary>
+    /// Gets the entitycoordinates of where the mouseposition is, relative to the control.
+    /// </summary>
+    [PublicAPI]
+    public EntityCoordinates GetMouseCoordinates(ScreenCoordinates screen)
+    {
+        if (_coordinates == null || _rotation == null)
+        {
+            return EntityCoordinates.Invalid;
+        }
+
+        var pos = screen.Position / UIScale - GlobalPosition;
+
+        var a = InverseScalePosition(pos);
+        var relativeWorldPos = new Vector2(a.X, -a.Y);
+        relativeWorldPos = _rotation.Value.RotateVec(relativeWorldPos);
+        var coords = _coordinates.Value.Offset(relativeWorldPos);
+        return coords;
+    }
+
+    public void UpdateState(NavInterfaceState state)
+    {
+        SetMatrix(EntManager.GetCoordinates(state.Coordinates), state.Angle);
+
+        WorldMaxRange = state.MaxRange;
+
+        if (WorldMaxRange < WorldRange)
+        {
+            ActualRadarRange = WorldMaxRange;
+        }
+
+        if (WorldMaxRange < WorldMinRange)
+            WorldMinRange = WorldMaxRange;
+
+        ActualRadarRange = Math.Clamp(ActualRadarRange, WorldMinRange, WorldMaxRange);
+
+        _docks = state.Docks;
+    }
+
+    protected override void Draw(DrawingHandleScreen handle)
+    {
+        base.Draw(handle);
+
+        DrawBacking(handle);
+        DrawCircles(handle);
+
+        // No data
+        if (_coordinates == null || _rotation == null)
+        {
+            return;
+        }
+
+        var xformQuery = EntManager.GetEntityQuery<TransformComponent>();
+        var fixturesQuery = EntManager.GetEntityQuery<FixturesComponent>();
+        var bodyQuery = EntManager.GetEntityQuery<PhysicsComponent>();
+
+        if (!xformQuery.TryGetComponent(_coordinates.Value.EntityId, out var xform)
+            || xform.MapID == MapId.Nullspace)
+        {
+            return;
+        }
+
+        var mapPos = _transform.ToMapCoordinates(_coordinates.Value);
+        var offset = _coordinates.Value.Position;
+        var posMatrix = Matrix3.CreateTransform(offset, _rotation.Value);
+        var (_, ourEntRot, ourEntMatrix) = _transform.GetWorldPositionRotationMatrix(_coordinates.Value.EntityId);
+        Matrix3.Multiply(posMatrix, ourEntMatrix, out var ourWorldMatrix);
+        var ourWorldMatrixInvert = ourWorldMatrix.Invert();
+
+        // Draw our grid in detail
+        var ourGridId = xform.GridUid;
+        if (EntManager.TryGetComponent<MapGridComponent>(ourGridId, out var ourGrid) &&
+            fixturesQuery.HasComponent(ourGridId.Value))
+        {
+            var ourGridMatrix = _transform.GetWorldMatrix(ourGridId.Value);
+            Matrix3.Multiply(in ourGridMatrix, in ourWorldMatrixInvert, out var matrix);
+            var color = _shuttles.GetIFFColor(ourGridId.Value, self: true);
+
+            DrawGrid(handle, matrix, (ourGridId.Value, ourGrid), color);
+            DrawDocks(handle, ourGridId.Value, matrix);
+        }
+
+        var invertedPosition = _coordinates.Value.Position - offset;
+        invertedPosition.Y = -invertedPosition.Y;
+        // Don't need to transform the InvWorldMatrix again as it's already offset to its position.
+
+        // Draw radar position on the station
+        var radarPos = invertedPosition;
+        const float radarVertRadius = 2f;
+
+        var radarPosVerts = new Vector2[]
+        {
+            ScalePosition(radarPos + new Vector2(0f, -radarVertRadius)),
+            ScalePosition(radarPos + new Vector2(radarVertRadius / 2f, 0f)),
+            ScalePosition(radarPos + new Vector2(0f, radarVertRadius)),
+            ScalePosition(radarPos + new Vector2(radarVertRadius / -2f, 0f)),
+        };
+
+        handle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, radarPosVerts, Color.Lime);
+
+        var rot = ourEntRot + _rotation.Value;
+        var viewBounds = new Box2Rotated(new Box2(-WorldRange, -WorldRange, WorldRange, WorldRange).Translated(mapPos.Position), rot, mapPos.Position);
+        var viewAABB = viewBounds.CalcBoundingBox();
+
+        _grids.Clear();
+        _mapManager.FindGridsIntersecting(xform.MapID, new Box2(mapPos.Position - MaxRadarRangeVector, mapPos.Position + MaxRadarRangeVector), ref _grids, approx: true, includeMap: false);
+
+        // Draw other grids... differently
+        foreach (var grid in _grids)
+        {
+            var gUid = grid.Owner;
+            if (gUid == ourGridId || !fixturesQuery.HasComponent(gUid))
+                continue;
+
+            var gridBody = bodyQuery.GetComponent(gUid);
+            EntManager.TryGetComponent<IFFComponent>(gUid, out var iff);
+
+            if (!_shuttles.CanDraw(gUid, gridBody, iff))
+                continue;
+
+            var gridMatrix = _transform.GetWorldMatrix(gUid);
+            Matrix3.Multiply(in gridMatrix, in ourWorldMatrixInvert, out var matty);
+            var color = _shuttles.GetIFFColor(grid, self: false, iff);
+
+            // Others default:
+            // Color.FromHex("#FFC000FF")
+            // Hostile default: Color.Firebrick
+            var labelName = _shuttles.GetIFFLabel(grid, self: false, iff);
+
+            if (ShowIFF &&
+                 labelName != null)
+            {
+                var gridBounds = grid.Comp.LocalAABB;
+
+                var gridCentre = matty.Transform(gridBody.LocalCenter);
+                gridCentre.Y = -gridCentre.Y;
+                var distance = gridCentre.Length();
+                var labelText = Loc.GetString("shuttle-console-iff-label", ("name", labelName),
+                    ("distance", $"{distance:0.0}"));
+
+                // yes 1.0 scale is intended here.
+                var labelDimensions = handle.GetDimensions(Font, labelText, 1f);
+
+                // y-offset the control to always render below the grid (vertically)
+                var yOffset = Math.Max(gridBounds.Height, gridBounds.Width) * MinimapScale / 1.8f;
+
+                // The actual position in the UI. We offset the matrix position to render it off by half its width
+                // plus by the offset.
+                var uiPosition = ScalePosition(gridCentre)- new Vector2(labelDimensions.X / 2f, -yOffset);
+
+                // Look this is uggo so feel free to cleanup. We just need to clamp the UI position to within the viewport.
+                uiPosition = new Vector2(Math.Clamp(uiPosition.X, 0f, PixelWidth - labelDimensions.X ),
+                    Math.Clamp(uiPosition.Y, 0f, PixelHeight - labelDimensions.Y));
+
+                handle.DrawString(Font, uiPosition, labelText, color);
+            }
+
+            // Detailed view
+            var gridAABB = gridMatrix.TransformBox(grid.Comp.LocalAABB);
+
+            // Skip drawing if it's out of range.
+            if (!gridAABB.Intersects(viewAABB))
+                continue;
+
+            DrawGrid(handle, matty, grid, color);
+            DrawDocks(handle, gUid, matty);
+        }
+    }
+
+    private void DrawDocks(DrawingHandleScreen handle, EntityUid uid, Matrix3 matrix)
+    {
+        if (!ShowDocks)
+            return;
+
+        const float DockScale = 0.6f;
+        var nent = EntManager.GetNetEntity(uid);
+
+        if (_docks.TryGetValue(nent, out var docks))
+        {
+            foreach (var state in docks)
+            {
+                var position = state.Coordinates.Position;
+                var uiPosition = matrix.Transform(position);
+
+                if (uiPosition.Length() > (WorldRange * 2f) - DockScale)
+                    continue;
+
+                var color = Color.ToSrgb(Color.Magenta);
+
+                var verts = new[]
+                {
+                    matrix.Transform(position + new Vector2(-DockScale, -DockScale)),
+                    matrix.Transform(position + new Vector2(DockScale, -DockScale)),
+                    matrix.Transform(position + new Vector2(DockScale, DockScale)),
+                    matrix.Transform(position + new Vector2(-DockScale, DockScale)),
+                };
+
+                for (var i = 0; i < verts.Length; i++)
+                {
+                    var vert = verts[i];
+                    vert.Y = -vert.Y;
+                    verts[i] = ScalePosition(vert);
+                }
+
+                handle.DrawPrimitives(DrawPrimitiveTopology.TriangleFan, verts, color.WithAlpha(0.8f));
+                handle.DrawPrimitives(DrawPrimitiveTopology.LineStrip, verts, color);
+            }
+        }
+    }
+
+    private Vector2 InverseScalePosition(Vector2 value)
+    {
+        return (value - MidPointVector) / MinimapScale;
+    }
+}
diff --git a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
index 565c3b8e43..4135490416 100644
--- a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
+++ b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs
@@ -19,8 +19,6 @@ public sealed partial class LawDisplay : Control
     [Dependency] private readonly IChatManager _chatManager = default!;
     [Dependency] private readonly EntityManager _entityManager = default!;
 
-    public event Action<BaseButton.ButtonEventArgs>? OnLawAnnouncementButtonPressed;
-
     public LawDisplay(EntityUid uid, SiliconLaw law, HashSet<string>? radioChannels)
     {
         RobustXamlLoader.Load(this);
diff --git a/Content.Client/Singularity/Systems/EmitterSystem.cs b/Content.Client/Singularity/Systems/EmitterSystem.cs
index 5eb80928d8..e3396d74a2 100644
--- a/Content.Client/Singularity/Systems/EmitterSystem.cs
+++ b/Content.Client/Singularity/Systems/EmitterSystem.cs
@@ -1,7 +1,5 @@
-using Content.Client.Storage.Visualizers;
-using Content.Shared.Singularity.Components;
+using Content.Shared.Singularity.Components;
 using Content.Shared.Singularity.EntitySystems;
-using Content.Shared.Storage;
 using Robust.Client.GameObjects;
 
 namespace Content.Client.Singularity.Systems;
@@ -21,14 +19,6 @@ private void OnAppearanceChange(EntityUid uid, EmitterComponent component, ref A
         if (args.Sprite == null)
             return;
 
-        if (args.Sprite.LayerMapTryGet(StorageVisualLayers.Lock, out var lockLayer))
-        {
-            if (!_appearance.TryGetData<bool>(uid, StorageVisuals.Locked, out var locked, args.Component))
-                locked = false;
-
-            args.Sprite.LayerSetVisible(lockLayer, locked);
-        }
-
         if (!_appearance.TryGetData<EmitterVisualState>(uid, EmitterVisuals.VisualState, out var state, args.Component))
             state = EmitterVisualState.Off;
 
diff --git a/Content.Client/Sprite/SpriteFadeSystem.cs b/Content.Client/Sprite/SpriteFadeSystem.cs
index d4ed1285a8..dda3a6c948 100644
--- a/Content.Client/Sprite/SpriteFadeSystem.cs
+++ b/Content.Client/Sprite/SpriteFadeSystem.cs
@@ -39,7 +39,7 @@ public override void FrameUpdate(float frameTime)
     {
         base.FrameUpdate(frameTime);
 
-        var player = _playerManager.LocalPlayer?.ControlledEntity;
+        var player = _playerManager.LocalEntity;
         var spriteQuery = GetEntityQuery<SpriteComponent>();
         var change = ChangeRate * frameTime;
 
diff --git a/Content.Client/StatusIcon/StatusIconOverlay.cs b/Content.Client/StatusIcon/StatusIconOverlay.cs
index 3e7161b1fb..1cfb4c2a55 100644
--- a/Content.Client/StatusIcon/StatusIconOverlay.cs
+++ b/Content.Client/StatusIcon/StatusIconOverlay.cs
@@ -5,6 +5,7 @@
 using Robust.Shared.Enums;
 using System.Numerics;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
 
 namespace Content.Client.StatusIcon;
 
@@ -12,6 +13,7 @@ public sealed class StatusIconOverlay : Overlay
 {
     [Dependency] private readonly IEntityManager _entity = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
 
     private readonly SpriteSystem _sprite;
     private readonly TransformSystem _transform;
@@ -72,7 +74,9 @@ protected override void Draw(in OverlayDrawArgs args)
 
             foreach (var proto in icons)
             {
-                var texture = _sprite.Frame0(proto.Icon);
+
+                var curTime = _timing.RealTime;
+                var texture = _sprite.GetFrame(proto.Icon, curTime);
 
                 float yOffset;
                 float xOffset;
@@ -84,21 +88,27 @@ protected override void Draw(in OverlayDrawArgs args)
                 {
                     if (accOffsetL + texture.Height > sprite.Bounds.Height * EyeManager.PixelsPerMeter)
                         break;
-                    accOffsetL += texture.Height;
+                    if (proto.Layer == StatusIconLayer.Base)
+                    {
+                        accOffsetL += texture.Height;
+                        countL++;
+                    }
                     yOffset = (bounds.Height + sprite.Offset.Y) / 2f - (float) accOffsetL / EyeManager.PixelsPerMeter;
                     xOffset = -(bounds.Width + sprite.Offset.X) / 2f;
 
-                    countL++;
                 }
                 else
                 {
                     if (accOffsetR + texture.Height > sprite.Bounds.Height * EyeManager.PixelsPerMeter)
                         break;
-                    accOffsetR += texture.Height;
+                    if (proto.Layer == StatusIconLayer.Base)
+                    {
+                        accOffsetR += texture.Height;
+                        countR++;
+                    }
                     yOffset = (bounds.Height + sprite.Offset.Y) / 2f - (float) accOffsetR / EyeManager.PixelsPerMeter;
                     xOffset = (bounds.Width + sprite.Offset.X) / 2f - (float) texture.Width / EyeManager.PixelsPerMeter;
 
-                    countR++;
                 }
 
                 var position = new Vector2(xOffset, yOffset);
diff --git a/Content.Client/StatusIcon/StatusIconSystem.cs b/Content.Client/StatusIcon/StatusIconSystem.cs
index bd708b63d0..980fd9f2a9 100644
--- a/Content.Client/StatusIcon/StatusIconSystem.cs
+++ b/Content.Client/StatusIcon/StatusIconSystem.cs
@@ -20,16 +20,8 @@ public sealed class StatusIconSystem : SharedStatusIconSystem
     /// <inheritdoc/>
     public override void Initialize()
     {
-        _configuration.OnValueChanged(CCVars.LocalStatusIconsEnabled, OnLocalStatusIconChanged, true);
-        _configuration.OnValueChanged(CCVars.GlobalStatusIconsEnabled, OnGlobalStatusIconChanged, true);
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-
-        _configuration.UnsubValueChanged(CCVars.LocalStatusIconsEnabled, OnLocalStatusIconChanged);
-        _configuration.UnsubValueChanged(CCVars.GlobalStatusIconsEnabled, OnGlobalStatusIconChanged);
+        Subs.CVar(_configuration, CCVars.LocalStatusIconsEnabled, OnLocalStatusIconChanged, true);
+        Subs.CVar(_configuration, CCVars.GlobalStatusIconsEnabled, OnGlobalStatusIconChanged, true);
     }
 
     private void OnLocalStatusIconChanged(bool obj)
diff --git a/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs b/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs
index 772f516a69..ee4f2fdfd6 100644
--- a/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs
+++ b/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs
@@ -70,25 +70,11 @@ protected override void OnAppearanceChange(EntityUid uid, EntityStorageVisualsCo
                     args.Sprite.LayerSetState(StorageVisualLayers.Base, comp.StateBaseClosed);
             }
         }
-
-        // Lock state for the storage entity. TODO: Split into its own visualizer.
-        if (AppearanceSystem.TryGetData<bool>(uid, StorageVisuals.CanLock, out var canLock, args.Component) && canLock)
-        {
-            if (!AppearanceSystem.TryGetData<bool>(uid, StorageVisuals.Locked, out var locked, args.Component))
-                locked = true;
-
-            args.Sprite.LayerSetVisible(StorageVisualLayers.Lock, !open);
-            if (!open)
-            {
-                args.Sprite.LayerSetState(StorageVisualLayers.Lock, locked ? comp.StateLocked : comp.StateUnlocked);
-            }
-        }
     }
 }
 
 public enum StorageVisualLayers : byte
 {
     Base,
-    Door,
-    Lock
+    Door
 }
diff --git a/Content.Client/Storage/Visualizers/EntityStorageVisualsComponent.cs b/Content.Client/Storage/Visualizers/EntityStorageVisualsComponent.cs
index dc171d6c54..2215d8cd70 100644
--- a/Content.Client/Storage/Visualizers/EntityStorageVisualsComponent.cs
+++ b/Content.Client/Storage/Visualizers/EntityStorageVisualsComponent.cs
@@ -32,20 +32,6 @@ public sealed partial class EntityStorageVisualsComponent : Component
     [ViewVariables(VVAccess.ReadWrite)]
     public string? StateDoorClosed;
 
-    /// <summary>
-    /// The RSI state used for the lock indicator while the storage is locked.
-    /// </summary>
-    [DataField("stateLocked")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public string? StateLocked = "locked";
-
-    /// <summary>
-    /// The RSI state used for the lock indicator while the storage is unlocked.
-    /// </summary>
-    [DataField("stateUnlocked")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public string? StateUnlocked = "unlocked";
-
     /// <summary>
     /// The drawdepth the object has when it's open
     /// </summary>
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index c909e3db3c..e1f32a9e5e 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -74,6 +74,7 @@ public sealed class StyleNano : StyleBase
         public const string StyleClassLabelKeyText = "LabelKeyText";
         public const string StyleClassLabelSecondaryColor = "LabelSecondaryColor";
         public const string StyleClassLabelBig = "LabelBig";
+        public const string StyleClassLabelSmall = "LabelSmall";
         public const string StyleClassButtonBig = "ButtonBig";
 
         public const string StyleClassPopupMessageSmall = "PopupMessageSmall";
@@ -329,6 +330,12 @@ public StyleNano(IResourceCache resCache) : base(resCache)
             chatFilterButton.SetPatchMargin(StyleBox.Margin.All, 5);
             chatFilterButton.SetPadding(StyleBox.Margin.All, 2);
 
+            var smallButtonTex = resCache.GetTexture("/Textures/Interface/Nano/button_small.svg.96dpi.png");
+            var smallButtonBase = new StyleBoxTexture
+            {
+                Texture = smallButtonTex,
+            };
+
             var textureInvertedTriangle = resCache.GetTexture("/Textures/Interface/Nano/inverted_triangle.svg.png");
 
             var lineEditTex = resCache.GetTexture("/Textures/Interface/Nano/lineedit.png");
@@ -646,6 +653,23 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                     .Pseudo(ContainerButton.StylePseudoClassDisabled)
                     .Prop(Control.StylePropertyModulateSelf, ButtonColorCautionDisabled),
 
+                // Colors for confirm buttons confirm states.
+                Element<ConfirmButton>()
+                    .Pseudo(ConfirmButton.ConfirmPrefix + ContainerButton.StylePseudoClassNormal)
+                    .Prop(Control.StylePropertyModulateSelf, ButtonColorCautionDefault),
+
+                Element<ConfirmButton>()
+                    .Pseudo(ConfirmButton.ConfirmPrefix + ContainerButton.StylePseudoClassHover)
+                    .Prop(Control.StylePropertyModulateSelf, ButtonColorCautionHovered),
+
+                Element<ConfirmButton>()
+                    .Pseudo(ConfirmButton.ConfirmPrefix + ContainerButton.StylePseudoClassPressed)
+                    .Prop(Control.StylePropertyModulateSelf, ButtonColorCautionPressed),
+
+                Element<ConfirmButton>()
+                    .Pseudo(ConfirmButton.ConfirmPrefix + ContainerButton.StylePseudoClassDisabled)
+                    .Prop(Control.StylePropertyModulateSelf, ButtonColorCautionDisabled),
+
                 new StyleRule(new SelectorChild(
                     new SelectorElement(typeof(Button), null, null, new[] {ContainerButton.StylePseudoClassDisabled}),
                     new SelectorElement(typeof(Label), null, null, null)),
@@ -998,6 +1022,18 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                         itemListBackgroundSelected)
                 }),
 
+                 new StyleRule(new SelectorElement(typeof(ItemList), new[] {"transparentBackgroundItemList"}, null, null), new[]
+                {
+                    new StyleProperty(ItemList.StylePropertyBackground,
+                        new StyleBoxFlat {BackgroundColor = Color.Transparent}),
+                    new StyleProperty(ItemList.StylePropertyItemBackground,
+                        itemListItemBackground),
+                    new StyleProperty(ItemList.StylePropertyDisabledItemBackground,
+                        itemListItemBackgroundDisabled),
+                    new StyleProperty(ItemList.StylePropertySelectedItemBackground,
+                        itemListBackgroundSelected)
+                }),
+
                 // Tree
                 new StyleRule(new SelectorElement(typeof(Tree), null, null, null), new[]
                 {
@@ -1177,14 +1213,6 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                         new StyleProperty(StripeBack.StylePropertyBackground, stripeBack),
                     }),
 
-                // StyleClassLabelBig
-                new StyleRule(
-                    SelectorElement.Class(StyleClassLabelBig),
-                    new[]
-                    {
-                        new StyleProperty("font", notoSans16),
-                    }),
-
                 // StyleClassItemStatus
                 new StyleRule(SelectorElement.Class(StyleClassItemStatus), new[]
                 {
@@ -1291,10 +1319,29 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                     new StyleProperty(PanelContainer.StylePropertyPanel, new StyleBoxFlat { BackgroundColor = NanoGold, ContentMarginBottomOverride = 2, ContentMarginLeftOverride = 2}),
                 }),
 
+                // Labels ---
+                Element<Label>().Class(StyleClassLabelBig)
+                    .Prop(Label.StylePropertyFont, notoSans16),
+
+                Element<Label>().Class(StyleClassLabelSmall)
+                 .Prop(Label.StylePropertyFont, notoSans10),
+                // ---
+
+                // Different Background shapes ---
                 Element<PanelContainer>().Class(ClassAngleRect)
                     .Prop(PanelContainer.StylePropertyPanel, BaseAngleRect)
                     .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#252525")),
 
+                Element<PanelContainer>().Class("BackgroundOpenRight")
+                    .Prop(PanelContainer.StylePropertyPanel, BaseButtonOpenRight)
+                    .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#25252A")),
+
+                Element<PanelContainer>().Class("BackgroundOpenLeft")
+                    .Prop(PanelContainer.StylePropertyPanel, BaseButtonOpenLeft)
+                    .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#25252A")),
+                // ---
+
+                // Dividers
                 Element<PanelContainer>().Class(ClassLowDivider)
                     .Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat
                     {
@@ -1345,6 +1392,14 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                     .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#753131")),
                 // ---
 
+                // Profile Editor
+                Element<TextureButton>().Class("SpeciesInfoDefault")
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/VerbIcons/information.svg.192dpi.png")),
+
+                Element<TextureButton>().Class("SpeciesInfoWarning")
+                    .Prop(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/info.svg.192dpi.png"))
+                    .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#eeee11")),
+
                 // The default look of paper in UIs. Pages can have components which override this
                 Element<PanelContainer>().Class("PaperDefaultBorder")
                     .Prop(PanelContainer.StylePropertyPanel, paperBackground),
@@ -1381,6 +1436,15 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                     .Prop(Control.StylePropertyModulateSelf, ButtonColorGoodHovered),
                 // ---
 
+                // Small Button ---
+                Element<Button>().Class("ButtonSmall")
+                    .Prop(ContainerButton.StylePropertyStyleBox, smallButtonBase),
+
+                Child().Parent(Element<Button>().Class("ButtonSmall"))
+                    .Child(Element<Label>())
+                    .Prop(Label.StylePropertyFont, notoSans8),
+                // ---
+
                 Element<Label>().Class("StatusFieldTitle")
                     .Prop("font-color", NanoGold),
 
@@ -1478,7 +1542,6 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                     {
                         BackgroundColor = FancyTreeSelectedRowColor,
                     }),
-
             }).ToList());
         }
     }
diff --git a/Content.Client/SubFloor/SubFloorHideSystem.cs b/Content.Client/SubFloor/SubFloorHideSystem.cs
index 482ab94a00..64d3afc640 100644
--- a/Content.Client/SubFloor/SubFloorHideSystem.cs
+++ b/Content.Client/SubFloor/SubFloorHideSystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.DrawDepth;
 using Content.Shared.SubFloor;
 using Robust.Client.GameObjects;
 
@@ -62,6 +63,18 @@ private void OnAppearanceChanged(EntityUid uid, SubFloorHideComponent component,
         }
 
         args.Sprite.Visible = hasVisibleLayer || revealed;
+
+        // allows a t-ray to show wires/pipes above carpets/puddles
+        if (scannerRevealed)
+        {
+            component.OriginalDrawDepth ??= args.Sprite.DrawDepth;
+            args.Sprite.DrawDepth = (int) Shared.DrawDepth.DrawDepth.FloorObjects + 1;
+        }
+        else if (component.OriginalDrawDepth.HasValue)
+        {
+            args.Sprite.DrawDepth = component.OriginalDrawDepth.Value;
+            component.OriginalDrawDepth = null;
+        }
     }
 
     private void UpdateAll()
diff --git a/Content.Client/SubFloor/TrayScannerSystem.cs b/Content.Client/SubFloor/TrayScannerSystem.cs
index f4ba455303..95bce03c0f 100644
--- a/Content.Client/SubFloor/TrayScannerSystem.cs
+++ b/Content.Client/SubFloor/TrayScannerSystem.cs
@@ -33,7 +33,7 @@ public override void Update(float frameTime)
             return;
 
         // TODO: Multiple viewports or w/e
-        var player = _player.LocalPlayer?.ControlledEntity;
+        var player = _player.LocalEntity;
         var xformQuery = GetEntityQuery<TransformComponent>();
 
         if (!xformQuery.TryGetComponent(player, out var playerXform))
diff --git a/Content.Client/Tabletop/TabletopSystem.cs b/Content.Client/Tabletop/TabletopSystem.cs
index c71c34d0ef..696c1455e0 100644
--- a/Content.Client/Tabletop/TabletopSystem.cs
+++ b/Content.Client/Tabletop/TabletopSystem.cs
@@ -64,7 +64,8 @@ public override void FrameUpdate(float frameTime)
                 return;
 
             // If there is no player entity, return
-            if (_playerManager.LocalPlayer is not { ControlledEntity: { } playerEntity }) return;
+            if (_playerManager.LocalEntity is not { } playerEntity)
+                return;
 
             if (!CanSeeTable(playerEntity, _table))
             {
@@ -85,7 +86,7 @@ public override void FrameUpdate(float frameTime)
             // If the dragged entity has another dragging player, drop the item
             // This should happen if the local player is dragging an item, and another player grabs it out of their hand
             if (draggableComponent.DraggingPlayer != null &&
-                draggableComponent.DraggingPlayer != _playerManager.LocalPlayer?.Session.UserId)
+                draggableComponent.DraggingPlayer != _playerManager.LocalSession!.UserId)
             {
                 StopDragging(false);
                 return;
@@ -186,7 +187,7 @@ private bool OnUseSecondary(in PointerInputCmdArgs args)
         private bool OnMouseDown(in PointerInputCmdArgs args)
         {
             // Return if no player entity
-            if (_playerManager.LocalPlayer is not {ControlledEntity: { } playerEntity})
+            if (_playerManager.LocalEntity is not { } playerEntity)
                 return false;
 
             var entity = args.EntityUid;
diff --git a/Content.Client/Traits/ParacusiaSystem.cs b/Content.Client/Traits/ParacusiaSystem.cs
index c661254bc9..3789f24cb0 100644
--- a/Content.Client/Traits/ParacusiaSystem.cs
+++ b/Content.Client/Traits/ParacusiaSystem.cs
@@ -30,7 +30,7 @@ public override void Update(float frameTime)
         if (!_timing.IsFirstTimePredicted)
             return;
 
-        if (_player.LocalPlayer?.ControlledEntity is not EntityUid localPlayer)
+        if (_player.LocalEntity is not EntityUid localPlayer)
             return;
 
         PlayParacusiaSounds(localPlayer);
diff --git a/Content.Client/UserInterface/Controls/ConfirmButton.cs b/Content.Client/UserInterface/Controls/ConfirmButton.cs
new file mode 100644
index 0000000000..81f11351a5
--- /dev/null
+++ b/Content.Client/UserInterface/Controls/ConfirmButton.cs
@@ -0,0 +1,142 @@
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Timing;
+
+namespace Content.Client.UserInterface.Controls;
+
+/// <summary>
+/// A Button that requires a second click to actually invoke its OnPressed action. <br/>
+/// When clicked once it will change rendering modes to be prefixed by <see cref="ConfirmPrefix"/>
+/// and displays <see cref="ConfirmationText"/> on the button instead of <see cref="Text"/>.<br/>
+/// <br/>
+/// After the first click <see cref="CooldownTime"/> needs to elapse before it can be clicked again to confirm.<br/>
+/// When the button doesn't get clicked a second time before <see cref="ResetTime"/> passes it changes back to its normal state.<br/>
+/// </summary>
+/// <remarks>
+/// Colors for the different states need to be set in the stylesheet
+/// </remarks>
+public sealed class ConfirmButton : Button
+{
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+
+    public const string ConfirmPrefix = "confirm-";
+
+    private TimeSpan? _nextReset;
+    private TimeSpan? _nextCooldown;
+    private string? _confirmationText;
+    private string? _text;
+
+    /// <summary>
+    /// Fired when the button was pressed and confirmed
+    /// </summary>
+    public new event Action<ButtonEventArgs>? OnPressed;
+
+    /// <inheritdoc cref="Button.Text"/>
+    /// <remarks>
+    /// Hides the buttons text property to be able to sanely replace the button text with
+    /// <see cref="_confirmationText"/> when asking for confirmation
+    /// </remarks>
+    public new string? Text
+    {
+        get => _text;
+        set
+        {
+            _text = value;
+            base.Text = IsConfirming ? _confirmationText : value;
+        }
+    }
+
+    /// <summary>
+    /// The text displayed on the button when waiting for a second click
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public string ConfirmationText
+    {
+        get => _confirmationText ?? Loc.GetString("generic-confirm");
+        set => _confirmationText = value;
+    }
+
+    /// <summary>
+    /// The time until the button reverts to normal
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public TimeSpan ResetTime { get; set; } = TimeSpan.FromSeconds(2);
+
+    /// <summary>
+    /// The time until the button accepts a second click. This is to prevent accidentally confirming the button
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    public TimeSpan CooldownTime { get; set; } = TimeSpan.FromSeconds(.5);
+
+    [ViewVariables]
+    public bool IsConfirming = false;
+
+    public ConfirmButton()
+    {
+        IoCManager.InjectDependencies(this);
+
+        base.OnPressed += HandleOnPressed;
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        if (IsConfirming && _gameTiming.CurTime > _nextReset)
+        {
+            IsConfirming = false;
+            base.Text = Text;
+            DrawModeChanged();
+        }
+
+        if (Disabled && _gameTiming.CurTime > _nextCooldown)
+            Disabled = false;
+    }
+
+    protected override void DrawModeChanged()
+    {
+        if (IsConfirming)
+        {
+            switch (DrawMode)
+            {
+                case DrawModeEnum.Normal:
+                    SetOnlyStylePseudoClass(ConfirmPrefix + StylePseudoClassNormal);
+                    break;
+                case DrawModeEnum.Pressed:
+                    SetOnlyStylePseudoClass(ConfirmPrefix + StylePseudoClassPressed);
+                    break;
+                case DrawModeEnum.Hover:
+                    SetOnlyStylePseudoClass(ConfirmPrefix + StylePseudoClassHover);
+                    break;
+                case DrawModeEnum.Disabled:
+                    SetOnlyStylePseudoClass(ConfirmPrefix + StylePseudoClassDisabled);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+            return;
+        }
+
+        base.DrawModeChanged();
+    }
+
+    private void HandleOnPressed(ButtonEventArgs buttonEvent)
+    {
+        //Prevent accidental confirmations from double clicking
+        if (IsConfirming && _nextCooldown > _gameTiming.CurTime)
+            return;
+
+        switch (IsConfirming)
+        {
+            case false:
+                _nextCooldown  = _gameTiming.CurTime + CooldownTime;
+                _nextReset = _gameTiming.CurTime + ResetTime;
+                Disabled = true;
+                break;
+            case true:
+                OnPressed?.Invoke(buttonEvent);
+                break;
+        }
+
+        base.Text = IsConfirming ? Text : ConfirmationText;
+
+        IsConfirming = !IsConfirming;
+    }
+}
diff --git a/Content.Client/UserInterface/Controls/MapGridControl.cs b/Content.Client/UserInterface/Controls/MapGridControl.cs
deleted file mode 100644
index d56790431f..0000000000
--- a/Content.Client/UserInterface/Controls/MapGridControl.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System.Numerics;
-using Robust.Client.Graphics;
-using Robust.Client.UserInterface;
-using Robust.Shared.Timing;
-
-namespace Content.Client.UserInterface.Controls;
-
-/// <summary>
-/// Handles generic grid-drawing data, with zoom and dragging.
-/// </summary>
-public abstract class MapGridControl : Control
-{
-    [Dependency] protected readonly IGameTiming Timing = default!;
-
-    protected const float ScrollSensitivity = 8f;
-
-    /// <summary>
-    /// UI pixel radius.
-    /// </summary>
-    public const int UIDisplayRadius = 320;
-    protected const int MinimapMargin = 4;
-
-    protected float WorldMinRange;
-    protected float WorldMaxRange;
-    public float WorldRange;
-
-    /// <summary>
-    /// We'll lerp between the radarrange and actual range
-    /// </summary>
-    protected float ActualRadarRange;
-
-    /// <summary>
-    /// Controls the maximum distance that will display.
-    /// </summary>
-    public float MaxRadarRange { get; private set; } = 256f * 10f;
-
-    public Vector2 MaxRadarRangeVector => new Vector2(MaxRadarRange, MaxRadarRange);
-
-    protected Vector2 MidpointVector => new Vector2(MidPoint, MidPoint);
-
-    protected int MidPoint => SizeFull / 2;
-    protected int SizeFull => (int) ((UIDisplayRadius + MinimapMargin) * 2 * UIScale);
-    protected int ScaledMinimapRadius => (int) (UIDisplayRadius * UIScale);
-    protected float MinimapScale => WorldRange != 0 ? ScaledMinimapRadius / WorldRange : 0f;
-
-    public event Action<float>? WorldRangeChanged;
-
-    public MapGridControl(float minRange, float maxRange, float range)
-    {
-        IoCManager.InjectDependencies(this);
-        SetSize = new Vector2(SizeFull, SizeFull);
-        RectClipContent = true;
-        MouseFilter = MouseFilterMode.Stop;
-        ActualRadarRange = WorldRange;
-        WorldMinRange = minRange;
-        WorldMaxRange = maxRange;
-        WorldRange = range;
-        ActualRadarRange = range;
-    }
-
-    protected override void MouseWheel(GUIMouseWheelEventArgs args)
-    {
-        base.MouseWheel(args);
-        AddRadarRange(-args.Delta.Y * 1f / ScrollSensitivity * ActualRadarRange);
-    }
-
-    public void AddRadarRange(float value)
-    {
-        ActualRadarRange = Math.Clamp(ActualRadarRange + value, WorldMinRange, WorldMaxRange);
-    }
-
-    protected override void Draw(DrawingHandleScreen handle)
-    {
-        base.Draw(handle);
-        if (!ActualRadarRange.Equals(WorldRange))
-        {
-            var diff = ActualRadarRange - WorldRange;
-            const float lerpRate = 10f;
-
-            WorldRange += (float) Math.Clamp(diff, -lerpRate * MathF.Abs(diff) * Timing.FrameTime.TotalSeconds, lerpRate * MathF.Abs(diff) * Timing.FrameTime.TotalSeconds);
-            WorldRangeChanged?.Invoke(WorldRange);
-        }
-    }
-}
diff --git a/Content.Client/UserInterface/Controls/MapGridControl.xaml b/Content.Client/UserInterface/Controls/MapGridControl.xaml
new file mode 100644
index 0000000000..7003afa526
--- /dev/null
+++ b/Content.Client/UserInterface/Controls/MapGridControl.xaml
@@ -0,0 +1 @@
+<controls:LayoutContainer xmlns:controls="https://spacestation14.io"/>
diff --git a/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs b/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs
new file mode 100644
index 0000000000..f6b0929f3b
--- /dev/null
+++ b/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs
@@ -0,0 +1,243 @@
+using System.Numerics;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Input;
+using Robust.Shared.Timing;
+
+namespace Content.Client.UserInterface.Controls;
+
+/// <summary>
+/// Handles generic grid-drawing data, with zoom and dragging.
+/// </summary>
+[GenerateTypedNameReferences]
+[Virtual]
+public partial class MapGridControl : LayoutContainer
+{
+    [Dependency] protected readonly IEntityManager EntManager = default!;
+    [Dependency] protected readonly IGameTiming Timing = default!;
+
+    protected static readonly Color BackingColor = new Color(0.08f, 0.08f, 0.08f);
+
+    private Font _largerFont;
+
+    /* Dragging */
+    protected virtual bool Draggable { get; } = false;
+
+    /// <summary>
+    /// Control offset from whatever is being tracked.
+    /// </summary>
+    public Vector2 Offset;
+
+    /// <summary>
+    /// If the control is being recentered what is the target offset to reach.
+    /// </summary>
+    public Vector2 TargetOffset;
+
+    private bool _draggin;
+    protected Vector2 StartDragPosition;
+    protected bool Recentering;
+
+    protected const float ScrollSensitivity = 8f;
+
+    protected float RecenterMinimum = 0.05f;
+
+    /// <summary>
+    /// UI pixel radius.
+    /// </summary>
+    public const int UIDisplayRadius = 320;
+    protected const int MinimapMargin = 4;
+
+    protected float WorldMinRange;
+    protected float WorldMaxRange;
+    public float WorldRange;
+    public Vector2 WorldRangeVector => new Vector2(WorldRange, WorldRange);
+
+    /// <summary>
+    /// We'll lerp between the radarrange and actual range
+    /// </summary>
+    protected float ActualRadarRange;
+
+    protected float CornerRadarRange => MathF.Sqrt(ActualRadarRange * ActualRadarRange + ActualRadarRange * ActualRadarRange) * 1.1f;
+
+    /// <summary>
+    /// Controls the maximum distance that will display.
+    /// </summary>
+    public float MaxRadarRange { get; private set; } = 256f * 10f;
+
+    public Vector2 MaxRadarRangeVector => new Vector2(MaxRadarRange, MaxRadarRange);
+
+    protected Vector2 MidPointVector => new Vector2(MidPoint, MidPoint);
+
+    protected int MidPoint => SizeFull / 2;
+    protected int SizeFull => (int) ((UIDisplayRadius + MinimapMargin) * 2 * UIScale);
+    protected int ScaledMinimapRadius => (int) (UIDisplayRadius * UIScale);
+    protected float MinimapScale => WorldRange != 0 ? ScaledMinimapRadius / WorldRange : 0f;
+
+    public event Action<float>? WorldRangeChanged;
+
+    public MapGridControl() : this(32f, 32f, 32f) {}
+
+    public MapGridControl(float minRange, float maxRange, float range)
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+        SetSize = new Vector2(SizeFull, SizeFull);
+        RectClipContent = true;
+        MouseFilter = MouseFilterMode.Stop;
+        ActualRadarRange = WorldRange;
+        WorldMinRange = minRange;
+        WorldMaxRange = maxRange;
+        WorldRange = range;
+        ActualRadarRange = range;
+
+        var cache = IoCManager.Resolve<IResourceCache>();
+        _largerFont = new VectorFont(cache.GetResource<FontResource>("/EngineFonts/NotoSans/NotoSans-Regular.ttf"), 16);
+    }
+
+    public void ForceRecenter()
+    {
+        Recentering = true;
+    }
+
+    protected override void KeyBindDown(GUIBoundKeyEventArgs args)
+    {
+        base.KeyBindDown(args);
+
+        if (!Draggable)
+            return;
+
+        if (args.Function == EngineKeyFunctions.Use)
+        {
+            StartDragPosition = args.PointerLocation.Position;
+            _draggin = true;
+        }
+    }
+
+    protected override void KeyBindUp(GUIBoundKeyEventArgs args)
+    {
+        if (!Draggable)
+            return;
+
+        if (args.Function == EngineKeyFunctions.Use)
+            _draggin = false;
+    }
+
+    protected override void MouseMove(GUIMouseMoveEventArgs args)
+    {
+        base.MouseMove(args);
+
+        if (!_draggin)
+            return;
+
+        Recentering = false;
+        Offset -= new Vector2(args.Relative.X, -args.Relative.Y) / MidPoint * WorldRange;
+    }
+
+    protected override void MouseWheel(GUIMouseWheelEventArgs args)
+    {
+        base.MouseWheel(args);
+        AddRadarRange(-args.Delta.Y * 1f / ScrollSensitivity * ActualRadarRange);
+    }
+
+    public void AddRadarRange(float value)
+    {
+        ActualRadarRange = Math.Clamp(ActualRadarRange + value, WorldMinRange, WorldMaxRange);
+    }
+
+    /// <summary>
+    /// Converts map coordinates to the local control.
+    /// </summary>
+    protected Vector2 ScalePosition(Vector2 value)
+    {
+        return ScalePosition(value, MinimapScale, MidPointVector);
+    }
+
+    protected static Vector2 ScalePosition(Vector2 value, float minimapScale, Vector2 midpointVector)
+    {
+        return value * minimapScale + midpointVector;
+    }
+
+    /// <summary>
+    /// Converts local coordinates on the control to map coordinates.
+    /// </summary>
+    protected Vector2 InverseMapPosition(Vector2 value)
+    {
+        var inversePos = (value - MidPointVector) / MinimapScale;
+
+        inversePos = inversePos with { Y = -inversePos.Y };
+        inversePos = Matrix3.CreateTransform(Offset, Angle.Zero).Transform(inversePos);
+        return inversePos;
+    }
+
+    /// <summary>
+    /// Handles re-centering the control's offset.
+    /// </summary>
+    /// <returns></returns>
+    public bool DrawRecenter()
+    {
+        // Map re-centering
+        if (Recentering)
+        {
+            var frameTime = Timing.FrameTime;
+            var diff = (TargetOffset - Offset) * (float) frameTime.TotalSeconds;
+
+            if (Offset.LengthSquared() < RecenterMinimum)
+            {
+                Offset = TargetOffset;
+                Recentering = false;
+            }
+            else
+            {
+                Offset += diff * 5f;
+                return false;
+            }
+        }
+
+        return Offset == TargetOffset;
+    }
+
+    protected void DrawBacking(DrawingHandleScreen handle)
+    {
+        var backing = BackingColor;
+        handle.DrawRect(PixelSizeBox, backing);
+    }
+
+    protected void DrawNoSignal(DrawingHandleScreen handle)
+    {
+        var greyColor = Color.FromHex("#474F52");
+
+        // Draw funny lines
+        var lineCount = 4f;
+
+        for (var i = 0; i < lineCount; i++)
+        {
+            var angle = Angle.FromDegrees(45 + i * 360f / lineCount);
+            var distance = Width / 2f;
+            var start = MidPointVector + angle.RotateVec(new Vector2(0f, 2.5f * distance / 4f));
+            var end = MidPointVector + angle.RotateVec(new Vector2(0f, 4f * distance / 4f));
+            handle.DrawLine(start, end, greyColor);
+        }
+
+        var signalText = Loc.GetString("shuttle-console-no-signal");
+        var dimensions = handle.GetDimensions(_largerFont, signalText, 1f);
+        var position = MidPointVector - dimensions / 2f;
+        handle.DrawString(_largerFont, position, Loc.GetString("shuttle-console-no-signal"), greyColor);
+    }
+
+    protected override void Draw(DrawingHandleScreen handle)
+    {
+        base.Draw(handle);
+        if (!ActualRadarRange.Equals(WorldRange))
+        {
+            var diff = ActualRadarRange - WorldRange;
+            const float lerpRate = 10f;
+
+            WorldRange += (float) Math.Clamp(diff, -lerpRate * MathF.Abs(diff) * Timing.FrameTime.TotalSeconds, lerpRate * MathF.Abs(diff) * Timing.FrameTime.TotalSeconds);
+            WorldRangeChanged?.Invoke(WorldRange);
+        }
+    }
+}
diff --git a/Content.Client/UserInterface/Controls/SplitBar.xaml.cs b/Content.Client/UserInterface/Controls/SplitBar.xaml.cs
index 7273f327bf..2c0b716448 100644
--- a/Content.Client/UserInterface/Controls/SplitBar.xaml.cs
+++ b/Content.Client/UserInterface/Controls/SplitBar.xaml.cs
@@ -7,6 +7,7 @@
 namespace Content.Client.UserInterface.Controls
 {
     [GenerateTypedNameReferences]
+    [Virtual]
     public partial class SplitBar : BoxContainer
     {
         public Vector2 MinBarSize = new(24, 0);
diff --git a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
index 52dcc7e51d..189de50407 100644
--- a/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
@@ -92,7 +92,8 @@ private void SyncUpdateControls(AlertsSystem alertsSystem, AlertOrderPrototype?
             {
                 // key is the same, simply update the existing control severity / cooldown
                 existingAlertControl.SetSeverity(alertState.Severity);
-                existingAlertControl.Cooldown = alertState.Cooldown;
+                if (alertState.ShowCooldown)
+                    existingAlertControl.Cooldown = alertState.Cooldown;
             }
             else
             {
@@ -133,9 +134,13 @@ private void SyncUpdateControls(AlertsSystem alertsSystem, AlertOrderPrototype?
 
     private AlertControl CreateAlertControl(AlertPrototype alert, AlertState alertState)
     {
+        (TimeSpan, TimeSpan)? cooldown = null;
+        if (alertState.ShowCooldown)
+            cooldown = alertState.Cooldown;
+
         var alertControl = new AlertControl(alert, alertState.Severity)
         {
-            Cooldown = alertState.Cooldown
+            Cooldown = cooldown
         };
         alertControl.OnPressed += AlertControlPressed;
         return alertControl;
diff --git a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
index a8c4a2b1b4..2c913a2d58 100644
--- a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
+++ b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
@@ -133,7 +133,7 @@ private void ReceivedBwoink(object? sender, SharedBwoinkSystem.BwoinkTextMessage
         {
             return;
         }
-        if (localPlayer.UserId != message.TrueSender)
+        if (message.PlaySound && localPlayer.UserId != message.TrueSender)
         {
             if (_aHelpSound != null)
                 _audio.PlayGlobal(_aHelpSound, Filter.Local(), false);
@@ -169,11 +169,11 @@ public void EnsureUIHelper()
             return;
 
         UIHelper?.Dispose();
-        var ownerUserId = _playerManager.LocalPlayer!.UserId;
+        var ownerUserId = _playerManager.LocalUser!.Value;
         UIHelper = isAdmin ? new AdminAHelpUIHandler(ownerUserId) : new UserAHelpUIHandler(ownerUserId);
         UIHelper.DiscordRelayChanged(_discordRelayActive);
 
-        UIHelper.SendMessageAction = (userId, textMessage) => _bwoinkSystem?.Send(userId, textMessage);
+        UIHelper.SendMessageAction = (userId, textMessage, playSound) => _bwoinkSystem?.Send(userId, textMessage, playSound);
         UIHelper.InputTextChanged += (channel, text) => _bwoinkSystem?.SendInputTextUpdated(channel, text.Length > 0);
         UIHelper.OnClose += () => { SetAHelpPressed(false); };
         UIHelper.OnOpen +=  () => { SetAHelpPressed(true); };
@@ -182,15 +182,15 @@ public void EnsureUIHelper()
 
     public void Open()
     {
-        var localPlayer = _playerManager.LocalPlayer;
-        if (localPlayer == null)
+        var localUser = _playerManager.LocalUser;
+        if (localUser == null)
         {
             return;
         }
         EnsureUIHelper();
         if (UIHelper!.IsOpen)
             return;
-        UIHelper!.Open(localPlayer.UserId, _discordRelayActive);
+        UIHelper!.Open(localUser.Value, _discordRelayActive);
     }
 
     public void Open(NetUserId userId)
@@ -322,7 +322,7 @@ public interface IAHelpUIHandler : IDisposable
     public void PeopleTypingUpdated(BwoinkPlayerTypingUpdated args);
     public event Action OnClose;
     public event Action OnOpen;
-    public Action<NetUserId, string>? SendMessageAction { get; set; }
+    public Action<NetUserId, string, bool>? SendMessageAction { get; set; }
     public event Action<NetUserId, string>? InputTextChanged;
 }
 public sealed class AdminAHelpUIHandler : IAHelpUIHandler
@@ -406,7 +406,7 @@ public void PeopleTypingUpdated(BwoinkPlayerTypingUpdated args)
 
     public event Action? OnClose;
     public event Action? OnOpen;
-    public Action<NetUserId, string>? SendMessageAction { get; set; }
+    public Action<NetUserId, string, bool>? SendMessageAction { get; set; }
     public event Action<NetUserId, string>? InputTextChanged;
 
     public void Open(NetUserId channelId, bool relayActive)
@@ -460,7 +460,7 @@ public BwoinkPanel EnsurePanel(NetUserId channelId)
         if (_activePanelMap.TryGetValue(channelId, out var existingPanel))
             return existingPanel;
 
-        _activePanelMap[channelId] = existingPanel = new BwoinkPanel(text => SendMessageAction?.Invoke(channelId, text));
+        _activePanelMap[channelId] = existingPanel = new BwoinkPanel(text => SendMessageAction?.Invoke(channelId, text, Window?.Bwoink.PlaySound.Pressed ?? true));
         existingPanel.InputTextChanged += text => InputTextChanged?.Invoke(channelId, text);
         existingPanel.Visible = false;
         if (!Control!.BwoinkArea.Children.Contains(existingPanel))
@@ -546,7 +546,7 @@ public void PeopleTypingUpdated(BwoinkPlayerTypingUpdated args)
 
     public event Action? OnClose;
     public event Action? OnOpen;
-    public Action<NetUserId, string>? SendMessageAction { get; set; }
+    public Action<NetUserId, string, bool>? SendMessageAction { get; set; }
     public event Action<NetUserId, string>? InputTextChanged;
 
     public void Open(NetUserId channelId, bool relayActive)
@@ -559,7 +559,7 @@ private void EnsureInit(bool relayActive)
     {
         if (_window is { Disposed: false })
             return;
-        _chatPanel = new BwoinkPanel(text => SendMessageAction?.Invoke(_ownerId, text));
+        _chatPanel = new BwoinkPanel(text => SendMessageAction?.Invoke(_ownerId, text, true));
         _chatPanel.InputTextChanged += text => InputTextChanged?.Invoke(_ownerId, text);
         _chatPanel.RelayedToDiscordLabel.Visible = relayActive;
         _window = new DefaultWindow()
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index 69cac8ff31..ff4972d9d0 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -15,10 +15,12 @@
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
+using Content.Shared.Decals;
 using Content.Shared.Damage.ForceSay;
 using Content.Shared.Examine;
 using Content.Shared.Input;
 using Content.Shared.Radio;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Player;
@@ -27,9 +29,11 @@
 using Robust.Client.UserInterface.Controllers;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Configuration;
+using Robust.Shared.GameObjects.Components.Localization;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Map;
 using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Replays;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
@@ -43,9 +47,11 @@ public sealed class ChatUIController : UIController
     [Dependency] private readonly IChatManager _manager = default!;
     [Dependency] private readonly IConfigurationManager _config = default!;
     [Dependency] private readonly IEyeManager _eye = default!;
+    [Dependency] private readonly IEntityManager _ent = default!;
     [Dependency] private readonly IInputManager _input = default!;
     [Dependency] private readonly IClientNetManager _net = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IStateManager _state = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
@@ -57,6 +63,11 @@ public sealed class ChatUIController : UIController
     [UISystemDependency] private readonly ChatSystem? _chatSys = default;
     [UISystemDependency] private readonly PsionicChatUpdateSystem? _psionic = default!; //Nyano - Summary: makes the psionic chat available.
 
+    [ValidatePrototypeId<ColorPalettePrototype>]
+    private const string ChatNamePalette = "ChatNames";
+    private string[] _chatNameColors = default!;
+    private bool _chatNameColorsEnabled;
+
     private ISawmill _sawmill = default!;
 
     public static readonly Dictionary<char, ChatSelectChannel> PrefixToChannel = new()
@@ -173,6 +184,8 @@ public override void Initialize()
         _net.RegisterNetMessage<MsgChatMessage>(OnChatMessage);
         _net.RegisterNetMessage<MsgDeleteChatMessagesBy>(OnDeleteChatMessagesBy);
         SubscribeNetworkEvent<DamageForceSayEvent>(OnDamageForceSay);
+        _cfg.OnValueChanged(CCVars.ChatEnableColorName, (value) => { _chatNameColorsEnabled = value; });
+        _chatNameColorsEnabled = _cfg.GetCVar(CCVars.ChatEnableColorName);
 
         _speechBubbleRoot = new LayoutContainer();
 
@@ -217,6 +230,13 @@ public override void Initialize()
         var gameplayStateLoad = UIManager.GetUIController<GameplayStateLoadController>();
         gameplayStateLoad.OnScreenLoad += OnScreenLoad;
         gameplayStateLoad.OnScreenUnload += OnScreenUnload;
+
+        var nameColors = _prototypeManager.Index<ColorPalettePrototype>(ChatNamePalette).Colors.Values.ToArray();
+        _chatNameColors = new string[nameColors.Length];
+        for (var i = 0; i < nameColors.Length; i++)
+        {
+            _chatNameColors[i] = nameColors[i].ToHex();
+        }
     }
 
     public void OnScreenLoad()
@@ -472,11 +492,12 @@ private void UpdateChannelPermissions()
 
         if (_state.CurrentState is GameplayStateBase)
         {
-            // can always hear local / radio / emote when in the game
+            // can always hear local / radio / emote / notifications when in the game
             FilterableChannels |= ChatChannel.Local;
             FilterableChannels |= ChatChannel.Whisper;
             FilterableChannels |= ChatChannel.Radio;
             FilterableChannels |= ChatChannel.Emotes;
+            FilterableChannels |= ChatChannel.Notifications;
 
             // Can only send local / radio / emote when attached to a non-ghost entity.
             // TODO: this logic is iffy (checking if controlling something that's NOT a ghost), is there a better way to check this?
@@ -581,7 +602,7 @@ private void UpdateQueuedSpeechBubbles(FrameEventArgs delta)
             CreateSpeechBubble(entity, msg);
         }
 
-        var player = _player.LocalPlayer?.ControlledEntity;
+        var player = _player.LocalEntity;
         var predicate = static (EntityUid uid, (EntityUid compOwner, EntityUid? attachedEntity) data)
             => uid == data.compOwner || uid == data.attachedEntity;
         var playerPos = player != null
@@ -638,7 +659,7 @@ public ChatSelectChannel MapLocalIfGhost(ChatSelectChannel channel)
     private bool TryGetRadioChannel(string text, out RadioChannelPrototype? radioChannel)
     {
         radioChannel = null;
-        return _player.LocalPlayer?.ControlledEntity is EntityUid { Valid: true } uid
+        return _player.LocalEntity is EntityUid { Valid: true } uid
            && _chatSys != null
            && _chatSys.TryProccessRadioMessage(uid, text, out _, out radioChannel, quiet: true);
     }
@@ -771,6 +792,14 @@ private void OnChatMessage(MsgChatMessage message)
 
     public void ProcessChatMessage(ChatMessage msg, bool speechBubble = true)
     {
+        // color the name unless it's something like "the old man"
+        if ((msg.Channel == ChatChannel.Local || msg.Channel == ChatChannel.Whisper) && _chatNameColorsEnabled)
+        {
+            var grammar = _ent.GetComponentOrNull<GrammarComponent>(_ent.GetEntity(msg.SenderEntity));
+            if (grammar != null && grammar.ProperNoun == true)
+                msg.WrappedMessage = SharedChatSystem.InjectTagInsideTag(msg, "Name", "color", GetNameColor(SharedChatSystem.GetStringInsideTag(msg, "Name")));
+        }
+
         // Log all incoming chat to repopulate when filter is un-toggled
         if (!msg.HideChat)
         {
@@ -859,6 +888,17 @@ public void Repopulate()
         }
     }
 
+    /// <summary>
+    /// Returns the chat name color for a mob
+    /// </summary>
+    /// <param name="name">Name of the mob</param>
+    /// <returns>Hex value of the color</returns>
+    public string GetNameColor(string name)
+    {
+        var colorIdx = Math.Abs(name.GetHashCode() % _chatNameColors.Length);
+        return _chatNameColors[colorIdx];
+    }
+
     private readonly record struct SpeechBubbleData(ChatMessage Message, SpeechBubble.SpeechType Type);
 
     private sealed class SpeechBubbleQueueData
diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterPopup.xaml.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterPopup.xaml.cs
index daf124306c..1d2a431446 100644
--- a/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterPopup.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterPopup.xaml.cs
@@ -17,6 +17,7 @@ public sealed partial class ChannelFilterPopup : Popup
         ChatChannel.Emotes,
         ChatChannel.Radio,
         ChatChannel.Telepathic, //Nyano - Summary: adds telepathic chat to where it belongs in order in the chat.
+        ChatChannel.Notifications,
         ChatChannel.LOOC,
         ChatChannel.OOC,
         ChatChannel.Dead,
diff --git a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
index 936e7cdecd..a33bee20f9 100644
--- a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
@@ -33,7 +33,7 @@ public ChatBox()
         _entManager = IoCManager.Resolve<IEntityManager>();
 
         ChatInput.Input.OnTextEntered += OnTextEntered;
-        ChatInput.Input.OnKeyBindDown += OnKeyBindDown;
+        ChatInput.Input.OnKeyBindDown += OnInputKeyBindDown;
         ChatInput.Input.OnTextChanged += OnTextChanged;
         ChatInput.ChannelSelector.OnChannelSelect += OnChannelSelect;
         ChatInput.FilterButton.Popup.OnChannelFilter += OnChannelFilter;
@@ -142,7 +142,7 @@ public void SafelySelectChannel(ChatSelectChannel toSelect)
         ChatInput.ChannelSelector.Select(toSelect);
     }
 
-    private void OnKeyBindDown(GUIBoundKeyEventArgs args)
+    private void OnInputKeyBindDown(GUIBoundKeyEventArgs args)
     {
         if (args.Function == EngineKeyFunctions.TextReleaseFocus)
         {
@@ -182,7 +182,7 @@ protected override void Dispose(bool disposing)
         if (!disposing) return;
         _controller.UnregisterChat(this);
         ChatInput.Input.OnTextEntered -= OnTextEntered;
-        ChatInput.Input.OnKeyBindDown -= OnKeyBindDown;
+        ChatInput.Input.OnKeyBindDown -= OnInputKeyBindDown;
         ChatInput.Input.OnTextChanged -= OnTextChanged;
         ChatInput.ChannelSelector.OnChannelSelect -= OnChannelSelect;
     }
diff --git a/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs b/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs
index 0485ea5dff..c10c33a990 100644
--- a/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs
+++ b/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs
@@ -48,7 +48,7 @@ private void OnPlayerDetached(LocalPlayerDetachedEvent args)
 
     private void OnMobStateChanged(MobStateChangedEvent args)
     {
-        if (args.Target != _playerManager.LocalPlayer?.ControlledEntity)
+        if (args.Target != _playerManager.LocalEntity)
             return;
 
         UpdateOverlays(args.Target, args.Component);
@@ -57,7 +57,7 @@ private void OnMobStateChanged(MobStateChangedEvent args)
     private void OnThresholdCheck(ref MobThresholdChecked args)
     {
 
-        if (args.Target != _playerManager.LocalPlayer?.ControlledEntity)
+        if (args.Target != _playerManager.LocalEntity)
             return;
         UpdateOverlays(args.Target, args.MobState, args.Damageable, args.Threshold);
     }
diff --git a/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs b/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs
index 03d7a865f7..fd74815316 100644
--- a/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs
+++ b/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs
@@ -56,7 +56,7 @@ public DamageOverlay()
 
     protected override void Draw(in OverlayDrawArgs args)
     {
-        if (!_entityManager.TryGetComponent(_playerManager.LocalPlayer?.ControlledEntity, out EyeComponent? eyeComp))
+        if (!_entityManager.TryGetComponent(_playerManager.LocalEntity, out EyeComponent? eyeComp))
             return;
 
         if (args.Viewport.Eye != eyeComp.Eye)
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs
index 926a830e71..5c5e31de03 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs
@@ -43,8 +43,8 @@ public override void Opened()
 
     private void OnMake(NetEntity entity, string name, string description, string rules, bool makeSentient)
     {
-        var player = _playerManager.LocalPlayer;
-        if (player == null)
+        var session = _playerManager.LocalSession;
+        if (session == null)
         {
             return;
         }
@@ -56,12 +56,12 @@ private void OnMake(NetEntity entity, string name, string description, string ru
             $"\"{CommandParsing.Escape(description)}\" " +
             $"\"{CommandParsing.Escape(rules)}\"";
 
-        _consoleHost.ExecuteCommand(player.Session, makeGhostRoleCommand);
+        _consoleHost.ExecuteCommand(session, makeGhostRoleCommand);
 
         if (makeSentient)
         {
             var makeSentientCommand = $"makesentient \"{CommandParsing.Escape(entity.ToString())}\"";
-            _consoleHost.ExecuteCommand(player.Session, makeSentientCommand);
+            _consoleHost.ExecuteCommand(session, makeSentientCommand);
         }
 
         _window.Close();
diff --git a/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs b/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
index 3ab36a9166..752c89ca97 100644
--- a/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
+++ b/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs
@@ -30,6 +30,7 @@ public sealed class SandboxUIController : UIController, IOnStateChanged<Gameplay
     [Dependency] private readonly IEyeManager _eye = default!;
     [Dependency] private readonly IInputManager _input = default!;
     [Dependency] private readonly ILightManager _light = default!;
+    [Dependency] private readonly IClientAdminManager _admin = default!;
 
     [UISystemDependency] private readonly DebugPhysicsSystem _debugPhysics = default!;
     [UISystemDependency] private readonly MarkerSystem _marker = default!;
@@ -53,13 +54,28 @@ public void OnStateEntered(GameplayState state)
         CheckSandboxVisibility();
 
         _input.SetInputCommand(ContentKeyFunctions.OpenEntitySpawnWindow,
-            InputCmdHandler.FromDelegate(_ => EntitySpawningController.ToggleWindow()));
+            InputCmdHandler.FromDelegate(_ =>
+            {
+                if (!_admin.CanAdminPlace())
+                    return;
+                EntitySpawningController.ToggleWindow();
+            }));
         _input.SetInputCommand(ContentKeyFunctions.OpenSandboxWindow,
             InputCmdHandler.FromDelegate(_ => ToggleWindow()));
         _input.SetInputCommand(ContentKeyFunctions.OpenTileSpawnWindow,
-            InputCmdHandler.FromDelegate(_ => TileSpawningController.ToggleWindow()));
+            InputCmdHandler.FromDelegate(_ =>
+            {
+                if (!_admin.CanAdminPlace())
+                    return;
+                TileSpawningController.ToggleWindow();
+            }));
         _input.SetInputCommand(ContentKeyFunctions.OpenDecalSpawnWindow,
-            InputCmdHandler.FromDelegate(_ => DecalPlacerController.ToggleWindow()));
+            InputCmdHandler.FromDelegate(_ =>
+            {
+                if (!_admin.CanAdminPlace())
+                    return;
+                DecalPlacerController.ToggleWindow();
+            }));
 
         CommandBinds.Builder
             .Bind(ContentKeyFunctions.EditorCopyObject, new PointerInputCmdHandler(Copy))
diff --git a/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs b/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
index 8b51a3f219..f436cc8c39 100644
--- a/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
+++ b/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
@@ -18,7 +18,7 @@ public sealed class ItemGridPiece : Control
 
     public readonly EntityUid Entity;
     public ItemStorageLocation Location;
-    public bool Marked = false;
+    public ItemGridPieceMarks? Marked;
 
     public event Action<GUIBoundKeyEventArgs, ItemGridPiece>? OnPiecePressed;
     public event Action<GUIBoundKeyEventArgs, ItemGridPiece>? OnPieceUnpressed;
@@ -42,8 +42,10 @@ public sealed class ItemGridPiece : Control
     private Texture? _bottomLeftTexture;
     private readonly string _bottomRightTexturePath = "Storage/piece_bottomRight";
     private Texture? _bottomRightTexture;
-    private readonly string _markedTexturePath = "Storage/marked";
-    private Texture? _markedTexture;
+    private readonly string _markedFirstTexturePath = "Storage/marked_first";
+    private Texture? _markedFirstTexture;
+    private readonly string _markedSecondTexturePath = "Storage/marked_second";
+    private Texture? _markedSecondTexture;
     #endregion
 
     public ItemGridPiece(Entity<ItemComponent> entity, ItemStorageLocation location,  IEntityManager entityManager)
@@ -88,7 +90,8 @@ protected override void OnThemeUpdated()
         _topRightTexture = Theme.ResolveTextureOrNull(_topRightTexturePath)?.Texture;
         _bottomLeftTexture = Theme.ResolveTextureOrNull(_bottomLeftTexturePath)?.Texture;
         _bottomRightTexture = Theme.ResolveTextureOrNull(_bottomRightTexturePath)?.Texture;
-        _markedTexture = Theme.ResolveTextureOrNull(_markedTexturePath)?.Texture;
+        _markedFirstTexture = Theme.ResolveTextureOrNull(_markedFirstTexturePath)?.Texture;
+        _markedSecondTexture = Theme.ResolveTextureOrNull(_markedSecondTexturePath)?.Texture;
     }
 
     protected override void Draw(DrawingHandleScreen handle)
@@ -113,7 +116,7 @@ protected override void Draw(DrawingHandleScreen handle)
         //yeah, this coloring is kinda hardcoded. deal with it. B)
         Color? colorModulate = hovering  ? null : Color.FromHex("#a8a8a8");
 
-        var marked = Marked;
+        var marked = Marked != null;
         Vector2i? maybeMarkedPos = null;
 
         _texturesPositions.Clear();
@@ -189,9 +192,19 @@ protected override void Draw(DrawingHandleScreen handle)
                 overrideDirection: Direction.South);
         }
 
-        if (maybeMarkedPos is {} markedPos && _markedTexture != null)
+        if (maybeMarkedPos is {} markedPos)
         {
-            handle.DrawTextureRect(_markedTexture, new UIBox2(markedPos, markedPos + size));
+            var markedTexture = Marked switch
+            {
+                ItemGridPieceMarks.First => _markedFirstTexture,
+                ItemGridPieceMarks.Second => _markedSecondTexture,
+                _ => null,
+            };
+
+            if (markedTexture != null)
+            {
+                handle.DrawTextureRect(markedTexture, new UIBox2(markedPos, markedPos + size));
+            }
         }
     }
 
@@ -275,3 +288,9 @@ public static Vector2 GetCenterOffset(Entity<ItemComponent?> entity, ItemStorage
         return actualSize * new Vector2i(8, 8);
     }
 }
+
+public enum ItemGridPieceMarks
+{
+    First,
+    Second,
+}
diff --git a/Content.Client/UserInterface/Systems/Storage/Controls/StorageContainer.cs b/Content.Client/UserInterface/Systems/Storage/Controls/StorageContainer.cs
index 53a820edaa..bd952fe957 100644
--- a/Content.Client/UserInterface/Systems/Storage/Controls/StorageContainer.cs
+++ b/Content.Client/UserInterface/Systems/Storage/Controls/StorageContainer.cs
@@ -249,7 +249,7 @@ public void BuildItemPieces()
 
         var boundingGrid = storageComp.Grid.GetBoundingBox();
         var size = _emptyTexture!.Size * 2;
-        var lastEntity = storageComp.Container.ContainedEntities.LastOrDefault();
+        var containedEntities = storageComp.Container.ContainedEntities.Reverse().ToArray();
 
         //todo. at some point, we may want to only rebuild the pieces that have actually received new data.
 
@@ -277,7 +277,12 @@ public void BuildItemPieces()
                         var gridPiece = new ItemGridPiece((itemEnt, itemEntComponent), itemPos, _entity)
                         {
                             MinSize = size,
-                            Marked = itemEnt == lastEntity
+                            Marked = Array.IndexOf(containedEntities, itemEnt) switch
+                            {
+                                0 => ItemGridPieceMarks.First,
+                                1 => ItemGridPieceMarks.Second,
+                                _ => null,
+                            }
                         };
                         gridPiece.OnPiecePressed += OnPiecePressed;
                         gridPiece.OnPieceUnpressed += OnPieceUnpressed;
diff --git a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
index c83a80b4a5..5f3ae3a2da 100644
--- a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
+++ b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
@@ -233,6 +233,8 @@ private void OnPiecePressed(GUIBoundKeyEventArgs args, ItemGridPiece control)
 
         if (args.Function == ContentKeyFunctions.MoveStoredItem)
         {
+            DraggingRotation = control.Location.Rotation;
+
             _menuDragHelper.MouseDown(control);
             _menuDragHelper.Update(0f);
 
diff --git a/Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs b/Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs
index 668c8f2d59..d117043f42 100644
--- a/Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs
+++ b/Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs
@@ -80,7 +80,7 @@ public override void FrameUpdate(FrameEventArgs e)
 
         // verify that the current eye is not "null". Fuck IEyeManager.
 
-        var ent = _playerMan.LocalPlayer?.ControlledEntity;
+        var ent = _playerMan.LocalEntity;
         if (_eyeManager.CurrentEye.Position != default || ent == null)
             return;
 
diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml
index a990c4eff6..1fcb1a7898 100644
--- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml
+++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml
@@ -1,10 +1,28 @@
-<DefaultWindow xmlns="https://spacestation14.io">
+<controls:FancyWindow
+    xmlns="https://spacestation14.io"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+    xmlns:style="clr-namespace:Content.Client.Stylesheets">
     <BoxContainer Orientation="Vertical">
-        <LineEdit Name="SearchBar" PlaceHolder="{Loc 'vending-machine-component-search-filter'}" HorizontalExpand="True"  Margin ="0 4" Access="Public"/>
+        <LineEdit Name="SearchBar" PlaceHolder="{Loc 'vending-machine-component-search-filter'}" HorizontalExpand="True"  Margin ="4 4" Access="Public"/>
         <ItemList Name="VendingContents"
                   SizeFlagsStretchRatio="8"
                   VerticalExpand="True"
-                  SelectMode="Button">
+                  ItemSeparation="2"
+                  Margin="4 0"
+                  SelectMode="Button"
+                  StyleClasses="transparentBackgroundItemList">
         </ItemList>
+         <!-- Footer -->
+        <BoxContainer Orientation="Vertical">
+            <PanelContainer StyleClasses="LowDivider" />
+            <BoxContainer Orientation="Horizontal" Margin="10 2 5 0" VerticalAlignment="Bottom">
+                <Label Text="{Loc 'vending-machine-flavor-left'}" StyleClasses="WindowFooterText" />
+                <Label Text="{Loc 'vending-machine-flavor-right'}" StyleClasses="WindowFooterText"
+                        HorizontalAlignment="Right" HorizontalExpand="True"  Margin="0 0 5 0" />
+                <TextureRect StyleClasses="NTLogoDark" Stretch="KeepAspectCentered"
+                        VerticalAlignment="Center" HorizontalAlignment="Right" SetSize="19 19"/>
+            </BoxContainer>
+        </BoxContainer>
     </BoxContainer>
-</DefaultWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
index a2741cc17a..8b53290f7f 100644
--- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
+++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
@@ -4,14 +4,15 @@
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
+using Content.Client.Stylesheets;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
+using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow;
 
 namespace Content.Client.VendingMachines.UI
 {
     [GenerateTypedNameReferences]
-    public sealed partial class VendingMachineMenu : DefaultWindow
+    public sealed partial class VendingMachineMenu : FancyWindow
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs
index 34634482c6..329a8977a6 100644
--- a/Content.Client/Verbs/VerbSystem.cs
+++ b/Content.Client/Verbs/VerbSystem.cs
@@ -57,7 +57,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true
             if (_stateManager.CurrentState is not GameplayStateBase gameScreenBase)
                 return false;
 
-            var player = _playerManager.LocalPlayer?.ControlledEntity;
+            var player = _playerManager.LocalEntity;
             if (player == null)
                 return false;
 
diff --git a/Content.Client/Weapons/Melee/MeleeArcOverlay.cs b/Content.Client/Weapons/Melee/MeleeArcOverlay.cs
index 29bfa09565..dbd68c15e2 100644
--- a/Content.Client/Weapons/Melee/MeleeArcOverlay.cs
+++ b/Content.Client/Weapons/Melee/MeleeArcOverlay.cs
@@ -35,7 +35,7 @@ public MeleeArcOverlay(IEntityManager entManager, IEyeManager eyeManager, IInput
 
     protected override void Draw(in OverlayDrawArgs args)
     {
-        var player = _playerManager.LocalPlayer?.ControlledEntity;
+        var player = _playerManager.LocalEntity;
 
         if (!_entManager.TryGetComponent<TransformComponent>(player, out var xform) ||
             !_combatMode.IsInCombatMode(player))
diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
index 2676a7ea6a..641d56d3d1 100644
--- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
@@ -50,7 +50,7 @@ public override void Update(float frameTime)
         if (!Timing.IsFirstTimePredicted)
             return;
 
-        var entityNull = _player.LocalPlayer?.ControlledEntity;
+        var entityNull = _player.LocalEntity;
 
         if (entityNull == null)
             return;
diff --git a/Content.Client/Weapons/Misc/GrapplingGunSystem.cs b/Content.Client/Weapons/Misc/GrapplingGunSystem.cs
index b54b11ee09..df20042b4b 100644
--- a/Content.Client/Weapons/Misc/GrapplingGunSystem.cs
+++ b/Content.Client/Weapons/Misc/GrapplingGunSystem.cs
@@ -26,7 +26,7 @@ public override void Update(float frameTime)
         if (!Timing.IsFirstTimePredicted)
             return;
 
-        var local = _player.LocalPlayer?.ControlledEntity;
+        var local = _player.LocalEntity;
         var handUid = _hands.GetActiveHandEntity();
 
         if (!TryComp<GrapplingGunComponent>(handUid, out var grappling))
diff --git a/Content.Client/Weapons/Misc/TetherGunSystem.cs b/Content.Client/Weapons/Misc/TetherGunSystem.cs
index dd8f283cbf..634dbd24e7 100644
--- a/Content.Client/Weapons/Misc/TetherGunSystem.cs
+++ b/Content.Client/Weapons/Misc/TetherGunSystem.cs
@@ -54,7 +54,7 @@ public override void Update(float frameTime)
         if (!_timing.IsFirstTimePredicted)
             return;
 
-        var player = _player.LocalPlayer?.ControlledEntity;
+        var player = _player.LocalEntity;
 
         if (player == null ||
             !TryGetTetherGun(player.Value, out var gunUid, out var gun) ||
diff --git a/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs b/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs
index 665ebf7145..622a168fbf 100644
--- a/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs
+++ b/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs
@@ -17,4 +17,5 @@ public sealed partial class SpentAmmoVisualsComponent : Component
 public enum AmmoVisualLayers : byte
 {
     Base,
+    Tip,
 }
diff --git a/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs b/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs
index 84b6ce4048..62df764ae5 100644
--- a/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs
+++ b/Content.Client/Weapons/Ranged/GunSpreadOverlay.cs
@@ -33,7 +33,7 @@ protected override void Draw(in OverlayDrawArgs args)
     {
         var worldHandle = args.WorldHandle;
 
-        var player = _player.LocalPlayer?.ControlledEntity;
+        var player = _player.LocalEntity;
 
         if (player == null ||
             !_entManager.TryGetComponent<TransformComponent>(player, out var xform))
diff --git a/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs b/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs
index 565672ad38..401b7cdfaf 100644
--- a/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs
@@ -24,7 +24,7 @@ public override void Initialize()
 
     private void OnCollide(EntityUid uid, FlyBySoundComponent component, ref StartCollideEvent args)
     {
-        var attachedEnt = _player.LocalPlayer?.ControlledEntity;
+        var attachedEnt = _player.LocalEntity;
 
         // If it's not our ent or we shot it.
         if (attachedEnt == null ||
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs
index 7227f333c0..adfdc89b89 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs
@@ -30,5 +30,8 @@ private void OnSpentAmmoAppearance(EntityUid uid, SpentAmmoVisualsComponent comp
             state = component.State;
 
         sprite.LayerSetState(AmmoVisualLayers.Base, state);
+        if (sprite.LayerExists(AmmoVisualLayers.Tip)){
+            sprite.RemoveLayer(AmmoVisualLayers.Tip);
+        }
     }
 }
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
index ce43057d63..9e50cab3e1 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs
@@ -132,7 +132,7 @@ public override void Update(float frameTime)
         if (!Timing.IsFirstTimePredicted)
             return;
 
-        var entityNull = _player.LocalPlayer?.ControlledEntity;
+        var entityNull = _player.LocalEntity;
 
         if (entityNull == null || !TryComp<CombatModeComponent>(entityNull, out var combat) || !combat.IsInCombatMode)
         {
diff --git a/Content.Client/Weather/WeatherSystem.cs b/Content.Client/Weather/WeatherSystem.cs
index a9c29f96c9..24de0bc8c4 100644
--- a/Content.Client/Weather/WeatherSystem.cs
+++ b/Content.Client/Weather/WeatherSystem.cs
@@ -22,7 +22,6 @@ public sealed class WeatherSystem : SharedWeatherSystem
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly MapSystem _mapSystem = default!;
-    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     public override void Initialize()
diff --git a/Content.IntegrationTests/Content.IntegrationTests.csproj b/Content.IntegrationTests/Content.IntegrationTests.csproj
index ec93a47041..2e922d2509 100644
--- a/Content.IntegrationTests/Content.IntegrationTests.csproj
+++ b/Content.IntegrationTests/Content.IntegrationTests.csproj
@@ -5,7 +5,7 @@
     <OutputPath>..\bin\Content.IntegrationTests\</OutputPath>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <LangVersion>11</LangVersion>
+    <LangVersion>12</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NUnit" />
diff --git a/Content.IntegrationTests/Pair/TestPair.Recycle.cs b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
index 872af8334f..52fdf600bb 100644
--- a/Content.IntegrationTests/Pair/TestPair.Recycle.cs
+++ b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
@@ -189,7 +189,7 @@ public void ValidateSettings(PoolSettings settings)
         var sPlayer = Server.ResolveDependency<IPlayerManager>();
         Assert.That(sPlayer.Sessions.Count(), Is.EqualTo(1));
         var session = sPlayer.Sessions.Single();
-        Assert.That(cPlayer.LocalPlayer?.Session.UserId, Is.EqualTo(session.UserId));
+        Assert.That(cPlayer.LocalSession?.UserId, Is.EqualTo(session.UserId));
 
         if (ticker.DummyTicker)
             return;
diff --git a/Content.IntegrationTests/Pair/TestPair.cs b/Content.IntegrationTests/Pair/TestPair.cs
index ba2faacb7e..916a94c9c4 100644
--- a/Content.IntegrationTests/Pair/TestPair.cs
+++ b/Content.IntegrationTests/Pair/TestPair.cs
@@ -70,9 +70,11 @@ public async Task Initialize(PoolSettings settings, TextWriter testOut, List<str
         if (settings.ShouldBeConnected)
         {
             Client.SetConnectTarget(Server);
+            await Client.WaitIdleAsync();
+            var netMgr = Client.ResolveDependency<IClientNetManager>();
+
             await Client.WaitPost(() =>
             {
-                var netMgr = IoCManager.Resolve<IClientNetManager>();
                 if (!netMgr.IsConnected)
                 {
                     netMgr.ClientConnect(null!, 0, null!);
diff --git a/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs b/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs
new file mode 100644
index 0000000000..420a90a50b
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs
@@ -0,0 +1,59 @@
+using System.Linq;
+using Content.Shared.Actions;
+using Content.Shared.Eye;
+using Robust.Server.GameObjects;
+using Robust.Shared.GameObjects;
+
+namespace Content.IntegrationTests.Tests.Actions;
+
+[TestFixture]
+public sealed class ActionPvsDetachTest
+{
+    [Test]
+    public async Task TestActionDetach()
+    {
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true });
+        var (server, client) = pair;
+        var sys = server.System<SharedActionsSystem>();
+        var cSys = client.System<SharedActionsSystem>();
+
+        // Spawn mob that has some actions
+        EntityUid ent = default;
+        var map = await pair.CreateTestMap();
+        await server.WaitPost(() => ent = server.EntMan.SpawnAtPosition("MobHuman", map.GridCoords));
+        await pair.RunTicksSync(5);
+        var cEnt = pair.ToClientUid(ent);
+
+        // Verify that both the client & server agree on the number of actions
+        var initActions = sys.GetActions(ent).Count();
+        Assert.That(initActions, Is.GreaterThan(0));
+        Assert.That(initActions, Is.EqualTo(cSys.GetActions(cEnt).Count()));
+
+        // PVS-detach action entities
+        // We do this by just giving them the ghost layer
+        var visSys = server.System<VisibilitySystem>();
+        var enumerator = server.Transform(ent).ChildEnumerator;
+        while (enumerator.MoveNext(out var child))
+        {
+            visSys.AddLayer(child, (int) VisibilityFlags.Ghost);
+        }
+        await pair.RunTicksSync(5);
+
+        // Client's actions have left been detached / are out of view, but action comp state has not changed
+        Assert.That(sys.GetActions(ent).Count(), Is.EqualTo(initActions));
+        Assert.That(cSys.GetActions(cEnt).Count(), Is.EqualTo(initActions));
+
+        // Re-enter PVS view
+        enumerator = server.Transform(ent).ChildEnumerator;
+        while (enumerator.MoveNext(out var child))
+        {
+            visSys.RemoveLayer(child, (int) VisibilityFlags.Ghost);
+        }
+        await pair.RunTicksSync(5);
+        Assert.That(sys.GetActions(ent).Count(), Is.EqualTo(initActions));
+        Assert.That(cSys.GetActions(cEnt).Count(), Is.EqualTo(initActions));
+
+        await server.WaitPost(() => server.EntMan.DeleteEntity(map.MapUid));
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Actions/ActionsAddedTest.cs b/Content.IntegrationTests/Tests/Actions/ActionsAddedTest.cs
index 913dcf4a40..32b1525226 100644
--- a/Content.IntegrationTests/Tests/Actions/ActionsAddedTest.cs
+++ b/Content.IntegrationTests/Tests/Actions/ActionsAddedTest.cs
@@ -23,7 +23,7 @@ public async Task TestCombatActionsAdded()
         var client = pair.Client;
         var sEntMan = server.ResolveDependency<IEntityManager>();
         var cEntMan = client.ResolveDependency<IEntityManager>();
-        var clientSession = client.ResolveDependency<Robust.Client.Player.IPlayerManager>().LocalPlayer?.Session;
+        var clientSession = client.Session;
         var serverSession = server.ResolveDependency<IPlayerManager>().Sessions.Single();
         var sActionSystem = server.System<SharedActionsSystem>();
         var cActionSystem = client.System<SharedActionsSystem>();
diff --git a/Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs b/Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs
new file mode 100644
index 0000000000..4d19a96d9e
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs
@@ -0,0 +1,122 @@
+using Content.Server.Chemistry.Containers.EntitySystems;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameObjects;
+
+namespace Content.IntegrationTests.Tests.Chemistry;
+
+[TestFixture]
+[TestOf(typeof(ChemicalReactionSystem))]
+public sealed class SolutionRoundingTest
+{
+    // This test tests two things:
+    // * A rounding error in reaction code while I was making chloral hydrate
+    // * An assert with solution heat capacity calculations that I found a repro for while testing the above.
+
+    [TestPrototypes]
+    private const string Prototypes = @"
+- type: entity
+  id: SolutionRoundingTestContainer
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      beaker:
+        maxVol: 100
+
+# This is the Chloral Hydrate recipe fyi.
+- type: reagent
+  id: SolutionRoundingTestReagentA
+  name: reagent-name-nothing
+  desc: reagent-desc-nothing
+  physicalDesc: reagent-physical-desc-nothing
+
+- type: reagent
+  id: SolutionRoundingTestReagentB
+  name: reagent-name-nothing
+  desc: reagent-desc-nothing
+  physicalDesc: reagent-physical-desc-nothing
+
+- type: reagent
+  id: SolutionRoundingTestReagentC
+  name: reagent-name-nothing
+  desc: reagent-desc-nothing
+  physicalDesc: reagent-physical-desc-nothing
+
+- type: reagent
+  id: SolutionRoundingTestReagentD
+  name: reagent-name-nothing
+  desc: reagent-desc-nothing
+  physicalDesc: reagent-physical-desc-nothing
+
+- type: reaction
+  id: SolutionRoundingTestReaction
+  impact: Medium
+  reactants:
+    SolutionRoundingTestReagentA:
+      amount: 3
+    SolutionRoundingTestReagentB:
+      amount: 1
+    SolutionRoundingTestReagentC:
+      amount: 1
+  products:
+    SolutionRoundingTestReagentD: 1
+";
+
+    [Test]
+    public async Task Test()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+        var testMap = await pair.CreateTestMap();
+
+        Solution solution = default;
+        Entity<SolutionComponent> solutionEnt = default;
+
+        await server.WaitPost(() =>
+        {
+            var system = server.System<SolutionContainerSystem>();
+            var beaker = server.EntMan.SpawnEntity("SolutionRoundingTestContainer", testMap.GridCoords);
+
+            system.TryGetSolution(beaker, "beaker", out var newSolutionEnt, out var newSolution);
+
+            solutionEnt = newSolutionEnt!.Value;
+            solution = newSolution!;
+
+            system.TryAddSolution(solutionEnt, new Solution("SolutionRoundingTestReagentC", 50));
+            system.TryAddSolution(solutionEnt, new Solution("SolutionRoundingTestReagentB", 30));
+
+            for (var i = 0; i < 9; i++)
+            {
+                system.TryAddSolution(solutionEnt, new Solution("SolutionRoundingTestReagentA", 10));
+            }
+        });
+
+        await server.WaitAssertion(() =>
+        {
+            Assert.Multiple(() =>
+            {
+                Assert.That(
+                    solution.ContainsReagent("SolutionRoundingTestReagentA", null),
+                    Is.False,
+                    "Solution should not contain reagent A");
+
+                Assert.That(
+                    solution.ContainsReagent("SolutionRoundingTestReagentB", null),
+                    Is.False,
+                    "Solution should not contain reagent B");
+
+                Assert.That(
+                    solution![new ReagentId("SolutionRoundingTestReagentC", null)].Quantity,
+                    Is.EqualTo((FixedPoint2) 20));
+
+                Assert.That(
+                    solution![new ReagentId("SolutionRoundingTestReagentD", null)].Quantity,
+                    Is.EqualTo((FixedPoint2) 30));
+            });
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/Construction/ConstructionActionValid.cs b/Content.IntegrationTests/Tests/Construction/ConstructionActionValid.cs
index 408b0e0bd0..c59b42d638 100644
--- a/Content.IntegrationTests/Tests/Construction/ConstructionActionValid.cs
+++ b/Content.IntegrationTests/Tests/Construction/ConstructionActionValid.cs
@@ -55,33 +55,36 @@ public async Task ConstructionGraphSpawnPrototypeValid()
             var valid = true;
             var message = new StringBuilder();
 
-            foreach (var graph in protoMan.EnumeratePrototypes<ConstructionGraphPrototype>())
+            await server.WaitPost(() =>
             {
-                foreach (var node in graph.Nodes.Values)
+                foreach (var graph in protoMan.EnumeratePrototypes<ConstructionGraphPrototype>())
                 {
-                    foreach (var action in node.Actions)
+                    foreach (var node in graph.Nodes.Values)
                     {
-                        if (IsValid(action, protoMan, out var prototype)) continue;
-
-                        valid = false;
-                        message.Append($"Invalid entity prototype \"{prototype}\" on graph action in node \"{node.Name}\" of graph \"{graph.ID}\"\n");
-                    }
-
-                    foreach (var edge in node.Edges)
-                    {
-                        foreach (var action in edge.Completed)
+                        foreach (var action in node.Actions)
                         {
                             if (IsValid(action, protoMan, out var prototype)) continue;
 
                             valid = false;
-                            message.Append($"Invalid entity prototype \"{prototype}\" on graph action in edge \"{edge.Target}\" of node \"{node.Name}\" of graph \"{graph.ID}\"\n");
+                            message.Append($"Invalid entity prototype \"{prototype}\" on graph action in node \"{node.Name}\" of graph \"{graph.ID}\"\n");
+                        }
+
+                        foreach (var edge in node.Edges)
+                        {
+                            foreach (var action in edge.Completed)
+                            {
+                                if (IsValid(action, protoMan, out var prototype)) continue;
+
+                                valid = false;
+                                message.Append($"Invalid entity prototype \"{prototype}\" on graph action in edge \"{edge.Target}\" of node \"{node.Name}\" of graph \"{graph.ID}\"\n");
+                            }
                         }
                     }
                 }
-            }
-            await pair.CleanReturnAsync();
+            });
 
             Assert.That(valid, Is.True, $"One or more SpawnPrototype actions specified invalid entity prototypes!\n{message}");
+            await pair.CleanReturnAsync();
         }
 
         [Test]
@@ -95,19 +98,24 @@ public async Task ConstructionGraphEdgeValid()
             var valid = true;
             var message = new StringBuilder();
 
-            foreach (var graph in protoMan.EnumeratePrototypes<ConstructionGraphPrototype>())
+            await server.WaitPost(() =>
             {
-                foreach (var node in graph.Nodes.Values)
+                foreach (var graph in protoMan.EnumeratePrototypes<ConstructionGraphPrototype>())
                 {
-                    foreach (var edge in node.Edges)
+                    foreach (var node in graph.Nodes.Values)
                     {
-                        if (graph.Nodes.ContainsKey(edge.Target)) continue;
+                        foreach (var edge in node.Edges)
+                        {
+                            if (graph.Nodes.ContainsKey(edge.Target))
+                                continue;
 
-                        valid = false;
-                        message.Append($"Invalid target \"{edge.Target}\" in edge on node \"{node.Name}\" of graph \"{graph.ID}\"\n");
+                            valid = false;
+                            message.Append(
+                                $"Invalid target \"{edge.Target}\" in edge on node \"{node.Name}\" of graph \"{graph.ID}\"\n");
+                        }
                     }
                 }
-            }
+            });
 
             Assert.That(valid, Is.True, $"One or more edges specified invalid node targets!\n{message}");
             await pair.CleanReturnAsync();
diff --git a/Content.IntegrationTests/Tests/Construction/ConstructionPrototypeTest.cs b/Content.IntegrationTests/Tests/Construction/ConstructionPrototypeTest.cs
index 01173c9660..d3a10dcfaf 100644
--- a/Content.IntegrationTests/Tests/Construction/ConstructionPrototypeTest.cs
+++ b/Content.IntegrationTests/Tests/Construction/ConstructionPrototypeTest.cs
@@ -58,13 +58,17 @@ public async Task TestStartIsValid()
 
             var protoMan = server.ResolveDependency<IPrototypeManager>();
 
-            foreach (var proto in protoMan.EnumeratePrototypes<ConstructionPrototype>())
+            await server.WaitAssertion(() =>
             {
-                var start = proto.StartNode;
-                var graph = protoMan.Index<ConstructionGraphPrototype>(proto.Graph);
+                foreach (var proto in protoMan.EnumeratePrototypes<ConstructionPrototype>())
+                {
+                    var start = proto.StartNode;
+                    var graph = protoMan.Index<ConstructionGraphPrototype>(proto.Graph);
 
-                Assert.That(graph.Nodes.ContainsKey(start), $"Found no startNode \"{start}\" on graph \"{graph.ID}\" for construction prototype \"{proto.ID}\"!");
-            }
+                    Assert.That(graph.Nodes.ContainsKey(start),
+                        $"Found no startNode \"{start}\" on graph \"{graph.ID}\" for construction prototype \"{proto.ID}\"!");
+                }
+            });
             await pair.CleanReturnAsync();
         }
 
@@ -76,13 +80,17 @@ public async Task TestTargetIsValid()
 
             var protoMan = server.ResolveDependency<IPrototypeManager>();
 
-            foreach (var proto in protoMan.EnumeratePrototypes<ConstructionPrototype>())
+            await server.WaitAssertion(() =>
             {
-                var target = proto.TargetNode;
-                var graph = protoMan.Index<ConstructionGraphPrototype>(proto.Graph);
+                foreach (var proto in protoMan.EnumeratePrototypes<ConstructionPrototype>())
+                {
+                    var target = proto.TargetNode;
+                    var graph = protoMan.Index<ConstructionGraphPrototype>(proto.Graph);
 
-                Assert.That(graph.Nodes.ContainsKey(target), $"Found no targetNode \"{target}\" on graph \"{graph.ID}\" for construction prototype \"{proto.ID}\"!");
-            }
+                    Assert.That(graph.Nodes.ContainsKey(target),
+                        $"Found no targetNode \"{target}\" on graph \"{graph.ID}\" for construction prototype \"{proto.ID}\"!");
+                }
+            });
             await pair.CleanReturnAsync();
         }
 
@@ -92,7 +100,6 @@ public async Task DeconstructionIsValid()
             await using var pair = await PoolManager.GetServerClient();
             var server = pair.Server;
 
-            var entMan = server.ResolveDependency<IEntityManager>();
             var protoMan = server.ResolveDependency<IPrototypeManager>();
             var compFact = server.ResolveDependency<IComponentFactory>();
 
@@ -126,22 +133,31 @@ public async Task TestStartReachesValidTarget()
             var protoMan = server.ResolveDependency<IPrototypeManager>();
             var entMan = server.ResolveDependency<IEntityManager>();
 
-            foreach (var proto in protoMan.EnumeratePrototypes<ConstructionPrototype>())
+            await server.WaitAssertion(() =>
             {
-                var start = proto.StartNode;
-                var target = proto.TargetNode;
-                var graph = protoMan.Index<ConstructionGraphPrototype>(proto.Graph);
+                foreach (var proto in protoMan.EnumeratePrototypes<ConstructionPrototype>())
+                {
+                    var start = proto.StartNode;
+                    var target = proto.TargetNode;
+                    var graph = protoMan.Index<ConstructionGraphPrototype>(proto.Graph);
 
 #pragma warning disable NUnit2045 // Interdependent assertions.
-                Assert.That(graph.TryPath(start, target, out var path), $"Unable to find path from \"{start}\" to \"{target}\" on graph \"{graph.ID}\"");
-                Assert.That(path, Has.Length.GreaterThanOrEqualTo(1), $"Unable to find path from \"{start}\" to \"{target}\" on graph \"{graph.ID}\".");
-                var next = path[0];
-                var nextId = next.Entity.GetId(null, null, new(entMan));
-                Assert.That(nextId, Is.Not.Null, $"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) must specify an entity! Graph: {graph.ID}");
-                Assert.That(protoMan.TryIndex(nextId, out EntityPrototype entity), $"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) specified an invalid entity prototype ({nextId} [{next.Entity}])");
-                Assert.That(entity.Components.ContainsKey("Construction"), $"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) specified an entity prototype ({next.Entity}) without a ConstructionComponent.");
+                    Assert.That(graph.TryPath(start, target, out var path),
+                        $"Unable to find path from \"{start}\" to \"{target}\" on graph \"{graph.ID}\"");
+                    Assert.That(path, Has.Length.GreaterThanOrEqualTo(1),
+                        $"Unable to find path from \"{start}\" to \"{target}\" on graph \"{graph.ID}\".");
+                    var next = path[0];
+                    var nextId = next.Entity.GetId(null, null, new(entMan));
+                    Assert.That(nextId, Is.Not.Null,
+                        $"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) must specify an entity! Graph: {graph.ID}");
+                    Assert.That(protoMan.TryIndex(nextId, out EntityPrototype entity),
+                        $"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) specified an invalid entity prototype ({nextId} [{next.Entity}])");
+                    Assert.That(entity.Components.ContainsKey("Construction"),
+                        $"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) specified an entity prototype ({next.Entity}) without a ConstructionComponent.");
 #pragma warning restore NUnit2045
-            }
+                }
+            });
+
             await pair.CleanReturnAsync();
         }
     }
diff --git a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
index 3ab90b07eb..16744d83dc 100644
--- a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
+++ b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
@@ -170,19 +170,19 @@ await server.WaitAssertion(() =>
 
                 // Check that damage works properly if it is NOT perfectly divisible among group members
                 types = group3.DamageTypes;
-                damageToDeal = FixedPoint2.New(types.Count * 5 - 1);
-                damage = new DamageSpecifier(group3, damageToDeal);
+
+                Assert.That(types, Has.Count.EqualTo(3));
+
+                damage = new DamageSpecifier(group3, 14);
                 sDamageableSystem.TryChangeDamage(uid, damage, true);
 
                 Assert.Multiple(() =>
                 {
-                    Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(damageToDeal));
-                    Assert.That(sDamageableComponent.DamagePerGroup[group3.ID], Is.EqualTo(damageToDeal));
-                    Assert.That(sDamageableComponent.Damage.DamageDict[type3a.ID], Is.EqualTo(damageToDeal / types.Count));
-                    Assert.That(sDamageableComponent.Damage.DamageDict[type3b.ID], Is.EqualTo(damageToDeal / types.Count));
-
-                    // last one will get 0.01 less, since its not perfectly divisble by 3
-                    Assert.That(sDamageableComponent.Damage.DamageDict[type3c.ID], Is.EqualTo(damageToDeal / types.Count - 0.01));
+                    Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.New(14)));
+                    Assert.That(sDamageableComponent.DamagePerGroup[group3.ID], Is.EqualTo(FixedPoint2.New(14)));
+                    Assert.That(sDamageableComponent.Damage.DamageDict[type3a.ID], Is.EqualTo(FixedPoint2.New(4.66f)));
+                    Assert.That(sDamageableComponent.Damage.DamageDict[type3b.ID], Is.EqualTo(FixedPoint2.New(4.67f)));
+                    Assert.That(sDamageableComponent.Damage.DamageDict[type3c.ID], Is.EqualTo(FixedPoint2.New(4.67f)));
                 });
 
                 // Heal
@@ -224,7 +224,7 @@ await server.WaitAssertion(() =>
 
                 Assert.Multiple(() =>
                 {
-                    Assert.That(sDamageableComponent.Damage.DamageDict[type3a.ID], Is.EqualTo(FixedPoint2.New(1.33)));
+                    Assert.That(sDamageableComponent.Damage.DamageDict[type3a.ID], Is.EqualTo(FixedPoint2.New(1.34)));
                     Assert.That(sDamageableComponent.Damage.DamageDict[type3b.ID], Is.EqualTo(FixedPoint2.New(3.33)));
                     Assert.That(sDamageableComponent.Damage.DamageDict[type3c.ID], Is.EqualTo(FixedPoint2.New(0)));
                 });
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
index 0255afa50e..e14a826467 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
@@ -67,7 +67,7 @@ await server.WaitAssertion(() =>
                     Assert.That(spawnEntitiesBehavior.Spawn.Values.Single(), Is.EqualTo(new MinMax { Min = 1, Max = 1 }));
                 });
 
-                var entitiesInRange = sEntityManager.System<EntityLookupSystem>().GetEntitiesInRange(coordinates, 2);
+                var entitiesInRange = sEntityManager.System<EntityLookupSystem>().GetEntitiesInRange(coordinates, 3, LookupFlags.All | LookupFlags.Approximate);
                 var found = false;
 
                 foreach (var entity in entitiesInRange)
@@ -86,7 +86,7 @@ await server.WaitAssertion(() =>
                     break;
                 }
 
-                Assert.That(found, Is.True);
+                Assert.That(found, Is.True, $"Unable to find {SpawnedEntityId} nearby for destructible test; found {entitiesInRange.Count} entities.");
             });
             await pair.CleanReturnAsync();
         }
diff --git a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs
index 1d994624a6..26ea726211 100644
--- a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs
+++ b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs
@@ -2,6 +2,7 @@
 using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
+using Content.Shared.DeviceNetwork;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
diff --git a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTestSystem.cs b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTestSystem.cs
index 6e3db25404..400d85f2cc 100644
--- a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTestSystem.cs
+++ b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTestSystem.cs
@@ -1,7 +1,6 @@
-
-using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
+using Content.Shared.DeviceNetwork;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Reflection;
 
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
index bbcd24b415..1da77ac558 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
@@ -24,7 +24,6 @@ public async Task AlertsTest()
             var server = pair.Server;
             var client = pair.Client;
 
-            var clientPlayerMgr = client.ResolveDependency<Robust.Client.Player.IPlayerManager>();
             var clientUIMgr = client.ResolveDependency<IUserInterfaceManager>();
             var clientEntManager = client.ResolveDependency<IEntityManager>();
 
@@ -57,9 +56,9 @@ await server.WaitAssertion(() =>
             AlertsUI clientAlertsUI = default;
             await client.WaitAssertion(() =>
             {
-                var local = clientPlayerMgr.LocalPlayer;
+                var local = client.Session;
                 Assert.That(local, Is.Not.Null);
-                var controlled = local.ControlledEntity;
+                var controlled = local.AttachedEntity;
 #pragma warning disable NUnit2045 // Interdependent assertions.
                 Assert.That(controlled, Is.Not.Null);
                 // Making sure it exists
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
index 45a880fe86..bed27ba6ef 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
@@ -189,10 +189,10 @@ public virtual async Task Setup()
         // Get player data
         var sPlayerMan = Server.ResolveDependency<Robust.Server.Player.IPlayerManager>();
         var cPlayerMan = Client.ResolveDependency<Robust.Client.Player.IPlayerManager>();
-        if (cPlayerMan.LocalPlayer?.Session == null)
+        if (Client.Session == null)
             Assert.Fail("No player");
-        ClientSession = cPlayerMan.LocalPlayer!.Session!;
-        ServerSession = sPlayerMan.GetSessionByUserId(ClientSession.UserId);
+        ClientSession = Client.Session!;
+        ServerSession = sPlayerMan.GetSessionById(ClientSession.UserId);
 
         // Spawn player entity & attach
         EntityUid? old = default;
@@ -240,7 +240,7 @@ await Server.WaitPost(() =>
         Assert.Multiple(() =>
         {
             Assert.That(CEntMan.GetNetEntity(cPlayerMan.LocalEntity), Is.EqualTo(Player));
-            Assert.That(sPlayerMan.GetSessionByUserId(ClientSession.UserId).AttachedEntity, Is.EqualTo(SEntMan.GetEntity(Player)));
+            Assert.That(sPlayerMan.GetSessionById(ClientSession.UserId).AttachedEntity, Is.EqualTo(SEntMan.GetEntity(Player)));
         });
     }
 
diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.cs b/Content.IntegrationTests/Tests/Minds/MindTests.cs
index c9788b80a6..3b7ecf0135 100644
--- a/Content.IntegrationTests/Tests/Minds/MindTests.cs
+++ b/Content.IntegrationTests/Tests/Minds/MindTests.cs
@@ -341,7 +341,6 @@ public async Task TestPlayerCanGhost()
         var playerMan = server.ResolveDependency<IPlayerManager>();
 
         var mindSystem = entMan.EntitySysManager.GetEntitySystem<SharedMindSystem>();
-        var ghostSystem = entMan.EntitySysManager.GetEntitySystem<GhostSystem>();
 
         EntityUid entity = default!;
         EntityUid mindId = default!;
@@ -381,7 +380,7 @@ await server.WaitAssertion(() =>
 
             mob = entMan.SpawnEntity(null, new MapCoordinates());
 
-            MakeSentientCommand.MakeSentient(mob, IoCManager.Resolve<IEntityManager>());
+            MakeSentientCommand.MakeSentient(mob, entMan);
             mobMindId = mindSystem.CreateMind(player.UserId, "Mindy McThinker the Second");
             mobMind = entMan.GetComponent<MindComponent>(mobMindId);
 
diff --git a/Content.IntegrationTests/Tests/Nyanotrasen/Metempsychosis/MetempsychosisTest.cs b/Content.IntegrationTests/Tests/Nyanotrasen/Metempsychosis/MetempsychosisTest.cs
new file mode 100644
index 0000000000..cd6a4b4c2b
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Nyanotrasen/Metempsychosis/MetempsychosisTest.cs
@@ -0,0 +1,53 @@
+using Content.Server.Nyanotrasen.Cloning;
+using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.Random;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests.DeltaV;
+
+[TestFixture]
+[TestOf(typeof(MetempsychoticMachineSystem))]
+public sealed class MetempsychosisTest
+{
+    [Test]
+    public async Task AllHumanoidPoolSpeciesExist()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var server = pair.Server;
+        // Per RobustIntegrationTest.cs, wait until state is settled to access it.
+        await server.WaitIdleAsync();
+
+        var prototypeManager = server.ResolveDependency<IPrototypeManager>();
+
+        var metemComponent = new MetempsychoticMachineComponent();
+
+        await server.WaitAssertion(() =>
+        {
+            prototypeManager.TryIndex<WeightedRandomPrototype>(metemComponent.MetempsychoticHumanoidPool,
+                out var humanoidPool);
+            prototypeManager.TryIndex<WeightedRandomPrototype>(metemComponent.MetempsychoticNonHumanoidPool,
+                out var nonHumanoidPool);
+
+            Assert.That(humanoidPool, Is.Not.Null, "MetempsychoticHumanoidPool is null!");
+            Assert.That(nonHumanoidPool, Is.Not.Null, "MetempsychoticNonHumanoidPool is null!");
+
+            Assert.That(humanoidPool.Weights, Is.Not.Empty,
+                "MetempsychoticHumanoidPool has no valid prototypes!");
+            Assert.That(nonHumanoidPool.Weights, Is.Not.Empty,
+                "MetempsychoticNonHumanoidPool has no valid prototypes!");
+
+            foreach (var key in humanoidPool.Weights.Keys)
+            {
+                Assert.That(prototypeManager.TryIndex<SpeciesPrototype>(key, out _),
+                    $"MetempsychoticHumanoidPool has invalid prototype {key}!");
+            }
+
+            foreach (var key in nonHumanoidPool.Weights.Keys)
+            {
+                Assert.That(prototypeManager.TryIndex<EntityPrototype>(key, out _),
+                    $"MetempsychoticNonHumanoidPool has invalid prototype {key}!");
+            }
+        });
+        await pair.CleanReturnAsync();
+    }
+}
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index 8ed53492c7..a4097728d7 100644
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -31,6 +31,7 @@ public sealed class PostMapInitTest
         {
             "CentComm",
             "Dart",
+            "NukieOutpost"
         };
 
         private static readonly string[] Grids =
@@ -38,39 +39,16 @@ public sealed class PostMapInitTest
             "/Maps/centcomm.yml",
             "/Maps/Shuttles/cargo.yml",
             "/Maps/Shuttles/emergency.yml",
-            "/Maps/infiltrator.yml",
+            "/Maps/Shuttles/infiltrator.yml",
         };
 
         private static readonly string[] GameMaps =
         {
             "Dev",
             "TestTeg",
-            //"Fland",
-            //"Meta",
-            //"Packed",
-            //"Aspid",
-            //"Cluster",
-            //"Omega",
-            //"Bagel",
-            //"Origin",
             "CentComm",
-            //"Box",
-            //"Europa",
-            //"Barratry",
-            //"Saltern",
-            //"Core",
-            //"Marathon",
-            //"Kettle",
             "MeteorArena",
-            // "Pebble", //DeltaV
-            // "Edge", //DeltaV
-            // "Shoukou", //DeltaV
-            // "Tortuga", //DeltaV
-            // "Arena", //DeltaV
-            // "Asterisk", //DeltaV
-            // "TheHive", //DeltaV
-            // "Hammurabi", //DeltaV
-			// "Submarine" //DeltaV
+            "NukieOutpost",
         };
 
         /// <summary>
@@ -235,25 +213,13 @@ await server.WaitPost(() =>
 
                 if (entManager.HasComponent<StationJobsComponent>(station))
                 {
-                    // Test that the map has valid latejoin spawn points
+                    // Test that the map has valid latejoin spawn points or container spawn points
                     if (!NoSpawnMaps.Contains(mapProto))
                     {
                         var lateSpawns = 0;
 
-                        var query = entManager.AllEntityQueryEnumerator<SpawnPointComponent>();
-                        while (query.MoveNext(out var uid, out var comp))
-                        {
-                            if (comp.SpawnType != SpawnPointType.LateJoin
-                            || !xformQuery.TryGetComponent(uid, out var xform)
-                            || xform.GridUid == null
-                            || !gridUids.Contains(xform.GridUid.Value))
-                            {
-                                continue;
-                            }
-
-                            lateSpawns++;
-                            break;
-                        }
+                        lateSpawns += GetCountLateSpawn<SpawnPointComponent>(gridUids, entManager);
+                        lateSpawns += GetCountLateSpawn<ContainerSpawnPointComponent>(gridUids, entManager);
 
                         Assert.That(lateSpawns, Is.GreaterThan(0), $"Found no latejoin spawn points on {mapProto}");
                     }
@@ -292,6 +258,32 @@ await server.WaitPost(() =>
             await pair.CleanReturnAsync();
         }
 
+
+
+        private static int GetCountLateSpawn<T>(List<EntityUid> gridUids, IEntityManager entManager)
+            where T : ISpawnPoint, IComponent
+        {
+            var resultCount = 0;
+            var queryPoint = entManager.AllEntityQueryEnumerator<T, TransformComponent>();
+#nullable enable
+            while (queryPoint.MoveNext(out T? comp, out var xform))
+            {
+                var spawner = (ISpawnPoint) comp;
+
+                if (spawner.SpawnType is not SpawnPointType.LateJoin
+                || xform.GridUid == null
+                || !gridUids.Contains(xform.GridUid.Value))
+                {
+                    continue;
+                }
+#nullable disable
+                resultCount++;
+                break;
+            }
+
+            return resultCount;
+        }
+
         [Test]
         public async Task AllMapsTested()
         {
diff --git a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
index 6520072220..c57504764d 100644
--- a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
+++ b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
@@ -11,7 +11,6 @@
 using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Network;
-using Robust.Shared.Prototypes;
 using Robust.UnitTesting;
 
 namespace Content.IntegrationTests.Tests.Preferences
@@ -119,6 +118,17 @@ public async Task TestDeleteCharacter()
             await pair.CleanReturnAsync();
         }
 
+        [Test]
+        public async Task TestNoPendingDatabaseChanges()
+        {
+            var pair = await PoolManager.GetServerClient();
+            var server = pair.Server;
+            var db = GetDb(server);
+            Assert.That(async () => await db.HasPendingModelChanges(), Is.False,
+                "The database has pending model changes. Add a new migration to apply them. See https://learn.microsoft.com/en-us/ef/core/managing-schemas/migrations");
+            await pair.CleanReturnAsync();
+        }
+
         private static NetUserId NewUserId()
         {
             return new(Guid.NewGuid());
diff --git a/Content.MapRenderer/Painters/GridPainter.cs b/Content.MapRenderer/Painters/GridPainter.cs
index 3079db436b..416ec05199 100644
--- a/Content.MapRenderer/Painters/GridPainter.cs
+++ b/Content.MapRenderer/Painters/GridPainter.cs
@@ -85,7 +85,7 @@ private ConcurrentDictionary<EntityUid, List<EntityData>> GetEntities()
                 }
 
                 var transform = _sEntityManager.GetComponent<TransformComponent>(serverEntity);
-                if (_sMapManager.TryGetGrid(transform.GridUid, out var grid))
+                if (_sEntityManager.TryGetComponent(transform.GridUid, out MapGridComponent? grid))
                 {
                     var position = transform.LocalPosition;
 
diff --git a/Content.MapRenderer/Painters/TilePainter.cs b/Content.MapRenderer/Painters/TilePainter.cs
index cac0f960c4..7084d2caf4 100644
--- a/Content.MapRenderer/Painters/TilePainter.cs
+++ b/Content.MapRenderer/Painters/TilePainter.cs
@@ -20,12 +20,15 @@ public sealed class TilePainter
         public const int TileImageSize = EyeManager.PixelsPerMeter;
 
         private readonly ITileDefinitionManager _sTileDefinitionManager;
+        private readonly SharedMapSystem _sMapSystem;
         private readonly IResourceManager _resManager;
 
         public TilePainter(ClientIntegrationInstance client, ServerIntegrationInstance server)
         {
             _sTileDefinitionManager = server.ResolveDependency<ITileDefinitionManager>();
             _resManager = client.ResolveDependency<IResourceManager>();
+            var esm = server.ResolveDependency<IEntitySystemManager>();
+            _sMapSystem = esm.GetEntitySystem<SharedMapSystem>();
         }
 
         public void Run(Image gridCanvas, EntityUid gridUid, MapGridComponent grid)
@@ -41,7 +44,7 @@ public void Run(Image gridCanvas, EntityUid gridUid, MapGridComponent grid)
             var images = GetTileImages(_sTileDefinitionManager, _resManager, tileSize);
             var i = 0;
 
-            grid.GetAllTiles().AsParallel().ForAll(tile =>
+            _sMapSystem.GetAllTiles(gridUid, grid).AsParallel().ForAll(tile =>
             {
                 var path = _sTileDefinitionManager[tile.Tile.TypeId].Sprite.ToString();
 
diff --git a/Content.Replay/Content.Replay.csproj b/Content.Replay/Content.Replay.csproj
index 4b3c85345c..9785870143 100644
--- a/Content.Replay/Content.Replay.csproj
+++ b/Content.Replay/Content.Replay.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>10</LangVersion>
+    <LangVersion>12</LangVersion>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Replay\</OutputPath>
diff --git a/Content.Server.Database/Content.Server.Database.csproj b/Content.Server.Database/Content.Server.Database.csproj
index 31ab785c18..d98d0642db 100644
--- a/Content.Server.Database/Content.Server.Database.csproj
+++ b/Content.Server.Database/Content.Server.Database.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>11</LangVersion>
+    <LangVersion>12</LangVersion>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Server.Database\</OutputPath>
diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index d6dec1dc3e..f9ec7811f5 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -874,33 +874,8 @@ public sealed class UploadedResourceLog
         public byte[] Data { get; set; } = default!;
     }
 
-    public interface IAdminRemarksCommon
-    {
-        public int Id { get; }
-
-        public int? RoundId { get; }
-        public Round? Round { get; }
-
-        public Guid? PlayerUserId { get; }
-        public Player? Player { get; }
-        public TimeSpan PlaytimeAtNote { get; }
-
-        public string Message { get; }
-
-        public Player? CreatedBy { get; }
-
-        public DateTime CreatedAt { get; }
-
-        public Player? LastEditedBy { get; }
-
-        public DateTime? LastEditedAt { get; }
-        public DateTime? ExpirationTime { get; }
-
-        public bool Deleted { get; }
-    }
-
     [Index(nameof(PlayerUserId))]
-    public class AdminNote : IAdminRemarksCommon
+    public class AdminNote
     {
         [Required, Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int Id { get; set; }
 
@@ -934,7 +909,7 @@ public class AdminNote : IAdminRemarksCommon
     }
 
     [Index(nameof(PlayerUserId))]
-    public class AdminWatchlist : IAdminRemarksCommon
+    public class AdminWatchlist
     {
         [Required, Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int Id { get; set; }
 
@@ -965,7 +940,7 @@ public class AdminWatchlist : IAdminRemarksCommon
     }
 
     [Index(nameof(PlayerUserId))]
-    public class AdminMessage : IAdminRemarksCommon
+    public class AdminMessage
     {
         [Required, Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int Id { get; set; }
 
diff --git a/Content.Server.Database/ModelPostgres.cs b/Content.Server.Database/ModelPostgres.cs
index a6b1856ab1..7499d0b0f5 100644
--- a/Content.Server.Database/ModelPostgres.cs
+++ b/Content.Server.Database/ModelPostgres.cs
@@ -10,11 +10,6 @@ namespace Content.Server.Database
 {
     public sealed class PostgresServerDbContext : ServerDbContext
     {
-        static PostgresServerDbContext()
-        {
-            AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
-        }
-
         public PostgresServerDbContext(DbContextOptions<PostgresServerDbContext> options) : base(options)
         {
         }
diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs
index cb0206d64f..c1d2643d6f 100644
--- a/Content.Server/Abilities/Mime/MimePowersSystem.cs
+++ b/Content.Server/Abilities/Mime/MimePowersSystem.cs
@@ -10,7 +10,8 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
-using Content.Shared.Abilities.Psionics; //Nyano - Summary: Makes Mime psionic. 
+using Content.Shared.Abilities.Psionics; //Nyano - Summary: Makes Mime psionic.
+using Content.Shared.Speech.Muting;
 
 namespace Content.Server.Abilities.Mime
 {
@@ -57,7 +58,7 @@ private void OnComponentInit(EntityUid uid, MimePowersComponent component, Compo
             EnsureComp<MutedComponent>(uid);
             _alertsSystem.ShowAlert(uid, AlertType.VowOfSilence);
             _actionsSystem.AddAction(uid, ref component.InvisibleWallActionEntity, component.InvisibleWallAction, uid);
-            //Nyano - Summary: Add Psionic Ability to Mime. 
+            //Nyano - Summary: Add Psionic Ability to Mime.
             if (TryComp<PsionicComponent>(uid, out var psionic) && psionic.PsionicAbility == null)
                 psionic.PsionicAbility = component.InvisibleWallActionEntity;
         }
diff --git a/Content.Server/Access/AccessWireAction.cs b/Content.Server/Access/AccessWireAction.cs
index 4ed9871c40..7676ce489f 100644
--- a/Content.Server/Access/AccessWireAction.cs
+++ b/Content.Server/Access/AccessWireAction.cs
@@ -25,7 +25,7 @@ public override bool Cut(EntityUid user, Wire wire, AccessReaderComponent comp)
     {
         WiresSystem.TryCancelWireAction(wire.Owner, PulseTimeoutKey.Key);
         comp.Enabled = false;
-        EntityManager.Dirty(comp);
+        EntityManager.Dirty(wire.Owner, comp);
         return true;
     }
 
@@ -34,7 +34,7 @@ public override bool Mend(EntityUid user, Wire wire, AccessReaderComponent comp)
         if (!EntityManager.HasComponent<EmaggedComponent>(wire.Owner))
         {
             comp.Enabled = true;
-            EntityManager.Dirty(comp);
+            EntityManager.Dirty(wire.Owner, comp);
         }
         return true;
     }
@@ -42,7 +42,7 @@ public override bool Mend(EntityUid user, Wire wire, AccessReaderComponent comp)
     public override void Pulse(EntityUid user, Wire wire, AccessReaderComponent comp)
     {
         comp.Enabled = false;
-        EntityManager.Dirty(comp);
+        EntityManager.Dirty(wire.Owner, comp);
         WiresSystem.StartWireAction(wire.Owner, _pulseTimeout, PulseTimeoutKey.Key, new TimedWireEvent(AwaitPulseCancel, wire));
     }
 
@@ -61,7 +61,7 @@ private void AwaitPulseCancel(Wire wire)
             if (EntityManager.TryGetComponent<AccessReaderComponent>(wire.Owner, out var access) && !EntityManager.HasComponent<EmaggedComponent>(wire.Owner))
             {
                 access.Enabled = true;
-                EntityManager.Dirty(access);
+                EntityManager.Dirty(wire.Owner, access);
             }
         }
     }
diff --git a/Content.Server/Access/Systems/AccessOverriderSystem.cs b/Content.Server/Access/Systems/AccessOverriderSystem.cs
index 2aa2257578..10d7fd0f7a 100644
--- a/Content.Server/Access/Systems/AccessOverriderSystem.cs
+++ b/Content.Server/Access/Systems/AccessOverriderSystem.cs
@@ -249,7 +249,7 @@ private void TryWriteToTargetAccessReaderId(EntityUid uid,
             $"{ToPrettyString(player):player} has modified {ToPrettyString(component.TargetAccessReaderId):entity} with the following allowed access level holders: [{string.Join(", ", addedTags.Union(removedTags))}] [{string.Join(", ", newAccessList)}]");
 
         accessReader.AccessLists = ConvertAccessListToHashSet(newAccessList);
-        Dirty(accessReader);
+        Dirty(component.TargetAccessReaderId, accessReader);
     }
 
     /// <summary>
diff --git a/Content.Server/Access/Systems/AgentIDCardSystem.cs b/Content.Server/Access/Systems/AgentIDCardSystem.cs
index 4d242e8f81..bd4d3b3f23 100644
--- a/Content.Server/Access/Systems/AgentIDCardSystem.cs
+++ b/Content.Server/Access/Systems/AgentIDCardSystem.cs
@@ -7,6 +7,8 @@
 using Content.Shared.StatusIcon;
 using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
+using Content.Shared.Roles;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Content.Server.Access.Systems
 {
@@ -46,7 +48,7 @@ private void OnAfterInteract(EntityUid uid, AgentIDCardComponent component, Afte
                 return;
             }
 
-            Dirty(access);
+            Dirty(uid, access);
 
             if (addedLength == 1)
             {
@@ -98,6 +100,24 @@ private void OnJobIconChanged(EntityUid uid, AgentIDCardComponent comp, AgentIDC
             }
 
             _cardSystem.TryChangeJobIcon(uid, jobIcon, idCard);
+
+            if (TryFindJobProtoFromIcon(jobIcon, out var job))
+                _cardSystem.TryChangeJobDepartment(uid, job, idCard);
+        }
+
+        private bool TryFindJobProtoFromIcon(StatusIconPrototype jobIcon, [NotNullWhen(true)] out JobPrototype? job)
+        {
+            foreach (var jobPrototype in _prototypeManager.EnumeratePrototypes<JobPrototype>())
+            {
+                if(jobPrototype.Icon == jobIcon.ID)
+                {
+                    job = jobPrototype;
+                    return true;
+                }
+            }
+
+            job = null;
+            return false;
         }
     }
 }
diff --git a/Content.Server/Access/Systems/IdCardConsoleSystem.cs b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
index b3b2baf28e..791159f972 100644
--- a/Content.Server/Access/Systems/IdCardConsoleSystem.cs
+++ b/Content.Server/Access/Systems/IdCardConsoleSystem.cs
@@ -131,6 +131,7 @@ private void TryWriteToTargetId(EntityUid uid,
             && _prototype.TryIndex<StatusIconPrototype>(job.Icon, out var jobIcon))
         {
             _idCard.TryChangeJobIcon(targetId, jobIcon, player: player);
+            _idCard.TryChangeJobDepartment(targetId, job);
         }
 
         if (!newAccessList.TrueForAll(x => component.AccessLevels.Contains(x)))
diff --git a/Content.Server/Access/Systems/IdCardSystem.cs b/Content.Server/Access/Systems/IdCardSystem.cs
index 1c1e687417..6b3d8db595 100644
--- a/Content.Server/Access/Systems/IdCardSystem.cs
+++ b/Content.Server/Access/Systems/IdCardSystem.cs
@@ -61,7 +61,7 @@ private void OnMicrowaved(EntityUid uid, IdCardComponent component, BeingMicrowa
                 _popupSystem.PopupEntity(Loc.GetString("id-card-component-microwave-bricked", ("id", uid)), uid);
 
                 access.Tags.Clear();
-                Dirty(access);
+                Dirty(uid, access);
 
                 _adminLogger.Add(LogType.Action, LogImpact.Medium,
                     $"{ToPrettyString(args.Microwave)} cleared access on {ToPrettyString(uid):entity}");
@@ -75,7 +75,7 @@ private void OnMicrowaved(EntityUid uid, IdCardComponent component, BeingMicrowa
             var random = _random.Pick(_prototypeManager.EnumeratePrototypes<AccessLevelPrototype>().ToArray());
 
             access.Tags.Add(random.ID);
-            Dirty(access);
+            Dirty(uid, access);
 
             _adminLogger.Add(LogType.Action, LogImpact.Medium,
                     $"{ToPrettyString(args.Microwave)} added {random.ID} access to {ToPrettyString(uid):entity}");
@@ -109,7 +109,7 @@ public bool TryChangeJobTitle(EntityUid uid, string? jobTitle, IdCardComponent?
         if (id.JobTitle == jobTitle)
             return true;
         id.JobTitle = jobTitle;
-        Dirty(id);
+        Dirty(uid, id);
         UpdateEntityName(uid, id);
 
         if (player != null)
@@ -149,6 +149,7 @@ public bool TryChangeJobDepartment(EntityUid uid, JobPrototype job, IdCardCompon
         if (!Resolve(uid, ref id))
             return false;
 
+        id.JobDepartments.Clear();
         foreach (var department in _prototypeManager.EnumeratePrototypes<DepartmentPrototype>())
         {
             if (department.Roles.Contains(job.ID))
@@ -186,7 +187,7 @@ public bool TryChangeFullName(EntityUid uid, string? fullName, IdCardComponent?
         if (id.FullName == fullName)
             return true;
         id.FullName = fullName;
-        Dirty(id);
+        Dirty(uid, id);
         UpdateEntityName(uid, id);
 
         if (player != null)
diff --git a/Content.Server/Administration/Commands/BanCommand.cs b/Content.Server/Administration/Commands/BanCommand.cs
index 156fdf496a..f76cfded81 100644
--- a/Content.Server/Administration/Commands/BanCommand.cs
+++ b/Content.Server/Administration/Commands/BanCommand.cs
@@ -18,6 +18,7 @@ public sealed class BanCommand : LocalizedCommands
     [Dependency] private readonly IBanManager _bans = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly ILogManager _logManager = default!;
 
     public override string Command => "ban";
 
@@ -28,7 +29,8 @@ public override async void Execute(IConsoleShell shell, string argStr, string[]
         uint minutes;
         if (!Enum.TryParse(_cfg.GetCVar(CCVars.ServerBanDefaultSeverity), out NoteSeverity severity))
         {
-            Logger.WarningS("admin.server_ban", "Server ban severity could not be parsed from config! Defaulting to high.");
+            _logManager.GetSawmill("admin.server_ban")
+                .Warning("Server ban severity could not be parsed from config! Defaulting to high.");
             severity = NoteSeverity.High;
         }
 
diff --git a/Content.Server/Administration/Commands/FollowCommand.cs b/Content.Server/Administration/Commands/FollowCommand.cs
index 1ced6cf8dd..9f94f83b4d 100644
--- a/Content.Server/Administration/Commands/FollowCommand.cs
+++ b/Content.Server/Administration/Commands/FollowCommand.cs
@@ -11,8 +11,8 @@ public sealed class FollowCommand : IConsoleCommand
     [Dependency] private readonly IEntityManager _entManager = default!;
 
     public string Command => "follow";
-    public string Description => Loc.GetString("add-uplink-command-description");
-    public string Help => Loc.GetString("add-uplink-command-help");
+    public string Description => Loc.GetString("follow-command-description");
+    public string Help => Loc.GetString("follow-command-help");
 
     public void Execute(IConsoleShell shell, string argStr, string[] args)
     {
diff --git a/Content.Server/Administration/Notes/AdminMessageEui.cs b/Content.Server/Administration/Notes/AdminMessageEui.cs
index ddb91aca7c..c5e0b60172 100644
--- a/Content.Server/Administration/Notes/AdminMessageEui.cs
+++ b/Content.Server/Administration/Notes/AdminMessageEui.cs
@@ -13,7 +13,7 @@ public sealed class AdminMessageEui : BaseEui
     [Dependency] private readonly IAdminNotesManager _notesMan = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     private readonly float _closeWait;
-    private AdminMessage? _message;
+    private AdminMessageRecord? _message;
     private DateTime _startTime;
 
     public AdminMessageEui()
@@ -22,7 +22,7 @@ public AdminMessageEui()
         _closeWait = _cfg.GetCVar(CCVars.MessageWaitTime);
     }
 
-    public void SetMessage(AdminMessage message)
+    public void SetMessage(AdminMessageRecord message)
     {
         _message = message;
         _startTime = DateTime.UtcNow;
@@ -37,7 +37,7 @@ public override EuiStateBase GetNewState()
             _closeWait,
             _message.Message,
             _message.CreatedBy?.LastSeenUserName ?? "[System]",
-            _message.CreatedAt
+            _message.CreatedAt.UtcDateTime
         );
     }
 
diff --git a/Content.Server/Administration/Notes/AdminNotesExtensions.cs b/Content.Server/Administration/Notes/AdminNotesExtensions.cs
index 44ad20eec6..349c7ff3bd 100644
--- a/Content.Server/Administration/Notes/AdminNotesExtensions.cs
+++ b/Content.Server/Administration/Notes/AdminNotesExtensions.cs
@@ -1,4 +1,3 @@
-using System.Diagnostics;
 using Content.Server.Database;
 using Content.Shared.Administration.Notes;
 using Content.Shared.Database;
@@ -7,7 +6,7 @@ namespace Content.Server.Administration.Notes;
 
 public static class AdminNotesExtensions
 {
-    public static SharedAdminNote ToShared(this IAdminRemarksCommon note)
+    public static SharedAdminNote ToShared(this IAdminRemarksRecord note)
     {
         NoteSeverity? severity = null;
         var secret = false;
@@ -18,26 +17,26 @@ public static SharedAdminNote ToShared(this IAdminRemarksCommon note)
         bool? seen = null;
         switch (note)
         {
-            case AdminNote adminNote:
+            case AdminNoteRecord adminNote:
                 type = NoteType.Note;
                 severity = adminNote.Severity;
                 secret = adminNote.Secret;
                 break;
-            case AdminWatchlist:
+            case AdminWatchlistRecord:
                 type = NoteType.Watchlist;
                 secret = true;
                 break;
-            case AdminMessage adminMessage:
+            case AdminMessageRecord adminMessage:
                 type = NoteType.Message;
                 seen = adminMessage.Seen;
                 break;
-            case ServerBanNote ban:
+            case ServerBanNoteRecord ban:
                 type = NoteType.ServerBan;
                 severity = ban.Severity;
                 unbannedTime = ban.UnbanTime;
                 unbannedByName = ban.UnbanningAdmin?.LastSeenUserName ?? Loc.GetString("system-user");
                 break;
-            case ServerRoleBanNote roleBan:
+            case ServerRoleBanNoteRecord roleBan:
                 type = NoteType.RoleBan;
                 severity = roleBan.Severity;
                 bannedRoles = roleBan.Roles;
@@ -49,12 +48,13 @@ public static SharedAdminNote ToShared(this IAdminRemarksCommon note)
         }
 
         // There may be bans without a user, but why would we ever be converting them to shared notes?
-        if (note.PlayerUserId is null)
-            throw new ArgumentNullException(nameof(note.PlayerUserId), "Player user ID cannot be null for a note");
+        if (note.Player is null)
+            throw new ArgumentNullException(nameof(note), "Player user ID cannot be null for a note");
+
         return new SharedAdminNote(
             note.Id,
-            note.PlayerUserId.Value,
-            note.RoundId,
+            note.Player!.UserId,
+            note.Round?.Id,
             note.Round?.Server.Name,
             note.PlaytimeAtNote,
             type,
@@ -63,9 +63,9 @@ public static SharedAdminNote ToShared(this IAdminRemarksCommon note)
             secret,
             note.CreatedBy?.LastSeenUserName ?? Loc.GetString("system-user"),
             note.LastEditedBy?.LastSeenUserName ?? string.Empty,
-            note.CreatedAt,
-            note.LastEditedAt,
-            note.ExpirationTime,
+            note.CreatedAt.UtcDateTime,
+            note.LastEditedAt?.UtcDateTime,
+            note.ExpirationTime?.UtcDateTime,
             bannedRoles,
             unbannedTime,
             unbannedByName,
diff --git a/Content.Server/Administration/Notes/AdminNotesManager.cs b/Content.Server/Administration/Notes/AdminNotesManager.cs
index 0c1e7f3daa..e09e190648 100644
--- a/Content.Server/Administration/Notes/AdminNotesManager.cs
+++ b/Content.Server/Administration/Notes/AdminNotesManager.cs
@@ -144,7 +144,7 @@ public async Task AddAdminRemark(ICommonSession createdBy, Guid player, NoteType
 
         var note = new SharedAdminNote(
             noteId,
-            player,
+            (NetUserId) player,
             roundId,
             serverName,
             playtime,
@@ -306,27 +306,27 @@ public async Task ModifyAdminRemark(int noteId, NoteType type, ICommonSession ed
         NoteModified?.Invoke(newNote);
     }
 
-    public async Task<List<IAdminRemarksCommon>> GetAllAdminRemarks(Guid player)
+    public async Task<List<IAdminRemarksRecord>> GetAllAdminRemarks(Guid player)
     {
         return await _db.GetAllAdminRemarks(player);
     }
 
-    public async Task<List<IAdminRemarksCommon>> GetVisibleRemarks(Guid player)
+    public async Task<List<IAdminRemarksRecord>> GetVisibleRemarks(Guid player)
     {
         if (_config.GetCVar(CCVars.SeeOwnNotes))
         {
             return await _db.GetVisibleAdminNotes(player);
         }
         _sawmill.Warning($"Someone tried to call GetVisibleNotes for {player} when see_own_notes was false");
-        return new List<IAdminRemarksCommon>();
+        return new List<IAdminRemarksRecord>();
     }
 
-    public async Task<List<AdminWatchlist>> GetActiveWatchlists(Guid player)
+    public async Task<List<AdminWatchlistRecord>> GetActiveWatchlists(Guid player)
     {
         return await _db.GetActiveWatchlists(player);
     }
 
-    public async Task<List<AdminMessage>> GetNewMessages(Guid player)
+    public async Task<List<AdminMessageRecord>> GetNewMessages(Guid player)
     {
         return await _db.GetMessages(player);
     }
diff --git a/Content.Server/Administration/Notes/AdminNotesSystem.cs b/Content.Server/Administration/Notes/AdminNotesSystem.cs
index 8fc7a8ebaa..069b8603ce 100644
--- a/Content.Server/Administration/Notes/AdminNotesSystem.cs
+++ b/Content.Server/Administration/Notes/AdminNotesSystem.cs
@@ -3,7 +3,6 @@
 using Content.Server.EUI;
 using Content.Shared.Database;
 using Content.Shared.Verbs;
-using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
@@ -12,18 +11,14 @@
 
 namespace Content.Server.Administration.Notes;
 
-public sealed class AdminNotesSystem : EntitySystem, IPostInjectInit
+public sealed class AdminNotesSystem : EntitySystem
 {
     [Dependency] private readonly IConsoleHost _console = default!;
     [Dependency] private readonly IAdminNotesManager _notes = default!;
-    [Dependency] private readonly ILogManager _logManager = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IChatManager _chat = default!;
     [Dependency] private readonly EuiManager _euis = default!;
 
-    public const string SawmillId = "admin.notes_system";
-    private ISawmill _sawmill = default!;
-
     public override void Initialize()
     {
         SubscribeLocalEvent<GetVerbsEvent<Verb>>(AddVerbs);
@@ -65,7 +60,7 @@ private async void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs
 
         if (!_playerManager.TryGetPlayerData(e.Session.UserId, out var playerData))
         {
-            _sawmill.Error($"Could not get player data for ID {e.Session.UserId}");
+            Log.Error($"Could not get player data for ID {e.Session.UserId}");
         }
 
         var username = playerData?.UserName ?? e.Session.UserId.ToString();
@@ -83,15 +78,10 @@ private async void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs
                 var ui = new AdminMessageEui();
                 _euis.OpenEui(ui, e.Session);
                 ui.SetMessage(message);
-				
+
 				// Only send the message if they haven't seen it yet
 				_chat.DispatchServerMessage(e.Session, messageString);
             }
         }
     }
-
-    public void PostInject()
-    {
-        _sawmill = _logManager.GetSawmill(SawmillId);
-    }
 }
diff --git a/Content.Server/Administration/Notes/IAdminNotesManager.cs b/Content.Server/Administration/Notes/IAdminNotesManager.cs
index a726bd11c8..81ebd3e716 100644
--- a/Content.Server/Administration/Notes/IAdminNotesManager.cs
+++ b/Content.Server/Administration/Notes/IAdminNotesManager.cs
@@ -26,24 +26,24 @@ public interface IAdminNotesManager
     /// </summary>
     /// <param name="player">Desired player's <see cref="Guid"/></param>
     /// <returns>ALL non-deleted notes, secret or not</returns>
-    Task<List<IAdminRemarksCommon>> GetAllAdminRemarks(Guid player);
+    Task<List<IAdminRemarksRecord>> GetAllAdminRemarks(Guid player);
     /// <summary>
     /// Queries the database and retrieves the notes a player should see
     /// </summary>
     /// <param name="player">Desired player's <see cref="Guid"/></param>
     /// <returns>All player-visible notes</returns>
-    Task<List<IAdminRemarksCommon>> GetVisibleRemarks(Guid player);
+    Task<List<IAdminRemarksRecord>> GetVisibleRemarks(Guid player);
     /// <summary>
     /// Queries the database and retrieves watchlists that may have been placed on the player
     /// </summary>
     /// <param name="player">Desired player's <see cref="Guid"/></param>
     /// <returns>Active watchlists</returns>
-    Task<List<AdminWatchlist>> GetActiveWatchlists(Guid player);
+    Task<List<AdminWatchlistRecord>> GetActiveWatchlists(Guid player);
     /// <summary>
     /// Queries the database and retrieves new messages a player has gotten
     /// </summary>
     /// <param name="player">Desired player's <see cref="Guid"/></param>
     /// <returns>All unread messages</returns>
-    Task<List<AdminMessage>> GetNewMessages(Guid player);
+    Task<List<AdminMessageRecord>> GetNewMessages(Guid player);
     Task MarkMessageAsSeen(int id);
 }
diff --git a/Content.Server/Administration/PlayerLocator.cs b/Content.Server/Administration/PlayerLocator.cs
index e2f48c9f7f..64a85f19ad 100644
--- a/Content.Server/Administration/PlayerLocator.cs
+++ b/Content.Server/Administration/PlayerLocator.cs
@@ -44,13 +44,15 @@ public interface IPlayerLocator
         Task<LocatedPlayerData?> LookupIdAsync(NetUserId userId, CancellationToken cancel = default);
     }
 
-    internal sealed class PlayerLocator : IPlayerLocator, IDisposable
+    internal sealed class PlayerLocator : IPlayerLocator, IDisposable, IPostInjectInit
     {
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IConfigurationManager _configurationManager = default!;
         [Dependency] private readonly IServerDbManager _db = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
 
         private readonly HttpClient _httpClient = new();
+        private ISawmill _sawmill = default!;
 
         public PlayerLocator()
         {
@@ -87,7 +89,7 @@ public PlayerLocator()
 
             if (!resp.IsSuccessStatusCode)
             {
-                Logger.ErrorS("PlayerLocate", "Auth server returned bad response {StatusCode}!", resp.StatusCode);
+                _sawmill.Error("Auth server returned bad response {StatusCode}!", resp.StatusCode);
                 return null;
             }
 
@@ -95,7 +97,7 @@ public PlayerLocator()
 
             if (responseData == null)
             {
-                Logger.ErrorS("PlayerLocate", "Auth server returned null response!");
+                _sawmill.Error("Auth server returned null response!");
                 return null;
             }
 
@@ -127,7 +129,7 @@ public PlayerLocator()
 
             if (!resp.IsSuccessStatusCode)
             {
-                Logger.ErrorS("PlayerLocate", "Auth server returned bad response {StatusCode}!", resp.StatusCode);
+                _sawmill.Error("Auth server returned bad response {StatusCode}!", resp.StatusCode);
                 return null;
             }
 
@@ -135,7 +137,7 @@ public PlayerLocator()
 
             if (responseData == null)
             {
-                Logger.ErrorS("PlayerLocate", "Auth server returned null response!");
+                _sawmill.Error("Auth server returned null response!");
                 return null;
             }
 
@@ -163,5 +165,10 @@ void IDisposable.Dispose()
         {
             _httpClient.Dispose();
         }
+
+        void IPostInjectInit.PostInject()
+        {
+            _sawmill = _logManager.GetSawmill("PlayerLocate");
+        }
     }
 }
diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs
index d21f6438cc..5760f83001 100644
--- a/Content.Server/Administration/Systems/AdminSystem.cs
+++ b/Content.Server/Administration/Systems/AdminSystem.cs
@@ -70,13 +70,13 @@ public override void Initialize()
             _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
             _adminManager.OnPermsChanged += OnAdminPermsChanged;
 
-            _config.OnValueChanged(CCVars.PanicBunkerEnabled, OnPanicBunkerChanged, true);
-            _config.OnValueChanged(CCVars.PanicBunkerDisableWithAdmins, OnPanicBunkerDisableWithAdminsChanged, true);
-            _config.OnValueChanged(CCVars.PanicBunkerEnableWithoutAdmins, OnPanicBunkerEnableWithoutAdminsChanged, true);
-            _config.OnValueChanged(CCVars.PanicBunkerCountDeadminnedAdmins, OnPanicBunkerCountDeadminnedAdminsChanged, true);
-            _config.OnValueChanged(CCVars.PanicBunkerShowReason, OnShowReasonChanged, true);
-            _config.OnValueChanged(CCVars.PanicBunkerMinAccountAge, OnPanicBunkerMinAccountAgeChanged, true);
-            _config.OnValueChanged(CCVars.PanicBunkerMinOverallHours, OnPanicBunkerMinOverallHoursChanged, true);
+            Subs.CVar(_config, CCVars.PanicBunkerEnabled, OnPanicBunkerChanged, true);
+            Subs.CVar(_config, CCVars.PanicBunkerDisableWithAdmins, OnPanicBunkerDisableWithAdminsChanged, true);
+            Subs.CVar(_config, CCVars.PanicBunkerEnableWithoutAdmins, OnPanicBunkerEnableWithoutAdminsChanged, true);
+            Subs.CVar(_config, CCVars.PanicBunkerCountDeadminnedAdmins, OnPanicBunkerCountDeadminnedAdminsChanged, true);
+            Subs.CVar(_config, CCVars.PanicBunkerShowReason, OnShowReasonChanged, true);
+            Subs.CVar(_config, CCVars.PanicBunkerMinAccountAge, OnPanicBunkerMinAccountAgeChanged, true);
+            Subs.CVar(_config, CCVars.PanicBunkerMinOverallHours, OnPanicBunkerMinOverallHoursChanged, true);
 
             SubscribeLocalEvent<IdentityChangedEvent>(OnIdentityChanged);
             SubscribeLocalEvent<PlayerAttachedEvent>(OnPlayerAttached);
@@ -188,14 +188,6 @@ public override void Shutdown()
             base.Shutdown();
             _playerManager.PlayerStatusChanged -= OnPlayerStatusChanged;
             _adminManager.OnPermsChanged -= OnAdminPermsChanged;
-
-            _config.UnsubValueChanged(CCVars.PanicBunkerEnabled, OnPanicBunkerChanged);
-            _config.UnsubValueChanged(CCVars.PanicBunkerDisableWithAdmins, OnPanicBunkerDisableWithAdminsChanged);
-            _config.UnsubValueChanged(CCVars.PanicBunkerEnableWithoutAdmins, OnPanicBunkerEnableWithoutAdminsChanged);
-            _config.UnsubValueChanged(CCVars.PanicBunkerCountDeadminnedAdmins, OnPanicBunkerCountDeadminnedAdminsChanged);
-            _config.UnsubValueChanged(CCVars.PanicBunkerShowReason, OnShowReasonChanged);
-            _config.UnsubValueChanged(CCVars.PanicBunkerMinAccountAge, OnPanicBunkerMinAccountAgeChanged);
-            _config.UnsubValueChanged(CCVars.PanicBunkerMinOverallHours, OnPanicBunkerMinOverallHoursChanged);
         }
 
         private void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
index dc48377e13..9849d2df79 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
@@ -1,15 +1,12 @@
-using Content.Server.GameTicking;
 using Content.Server.GameTicking.Rules;
-using Content.Server.StationEvents.Events;
 using Content.Server.Zombies;
 using Content.Shared.Administration;
 using Content.Shared.Database;
 using Content.Shared.Humanoid;
-using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Verbs;
-using Robust.Shared.Utility;
 using Robust.Shared.Player;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Administration.Systems;
 
@@ -21,7 +18,6 @@ public sealed partial class AdminVerbSystem
     [Dependency] private readonly NukeopsRuleSystem _nukeopsRule = default!;
     [Dependency] private readonly PiratesRuleSystem _piratesRule = default!;
     [Dependency] private readonly RevolutionaryRuleSystem _revolutionaryRule = default!;
-    [Dependency] private readonly SharedMindSystem _minds = default!;
 
     // All antag verbs have names so invokeverb works.
     private void AddAntagVerbs(GetVerbsEvent<Verb> args)
@@ -34,7 +30,7 @@ private void AddAntagVerbs(GetVerbsEvent<Verb> args)
         if (!_adminManager.HasAdminFlag(player, AdminFlags.Fun))
             return;
 
-        if (!TryComp<MindContainerComponent>(args.Target, out var targetMindComp))
+        if (!HasComp<MindContainerComponent>(args.Target))
             return;
 
         Verb traitor = new()
@@ -44,12 +40,9 @@ private void AddAntagVerbs(GetVerbsEvent<Verb> args)
             Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Structures/Wallmounts/posters.rsi"), "poster5_contraband"),
             Act = () =>
             {
-                if (!_minds.TryGetSession(targetMindComp.Mind, out var session))
-                    return;
-
                 // if its a monkey or mouse or something dont give uplink or objectives
                 var isHuman = HasComp<HumanoidAppearanceComponent>(args.Target);
-                _traitorRule.MakeTraitor(session, giveUplink: isHuman, giveObjectives: isHuman);
+                _traitorRule.MakeTraitorAdmin(args.Target, giveUplink: isHuman, giveObjectives: isHuman);
             },
             Impact = LogImpact.High,
             Message = Loc.GetString("admin-verb-make-traitor"),
@@ -78,10 +71,7 @@ private void AddAntagVerbs(GetVerbsEvent<Verb> args)
             Icon = new SpriteSpecifier.Rsi(new("/Textures/Structures/Wallmounts/signs.rsi"), "radiation"),
             Act = () =>
             {
-                if (!_minds.TryGetMind(args.Target, out var mindId, out var mind))
-                    return;
-
-                _nukeopsRule.MakeLoneNukie(mindId, mind);
+                _nukeopsRule.MakeLoneNukie(args.Target);
             },
             Impact = LogImpact.High,
             Message = Loc.GetString("admin-verb-make-nuclear-operative"),
@@ -95,10 +85,7 @@ private void AddAntagVerbs(GetVerbsEvent<Verb> args)
             Icon = new SpriteSpecifier.Rsi(new("/Textures/Clothing/Head/Hats/pirate.rsi"), "icon"),
             Act = () =>
             {
-                if (!_minds.TryGetMind(args.Target, out var mindId, out var mind))
-                    return;
-
-                _piratesRule.MakePirate(mindId, mind);
+                _piratesRule.MakePirate(args.Target);
             },
             Impact = LogImpact.High,
             Message = Loc.GetString("admin-verb-make-pirate"),
@@ -113,9 +100,7 @@ private void AddAntagVerbs(GetVerbsEvent<Verb> args)
             Icon = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/job_icons.rsi"), "HeadRevolutionary"),
             Act = () =>
             {
-                if (!_minds.TryGetMind(args.Target, out var mindId, out var mind))
-                    return;
-                _revolutionaryRule.OnHeadRevAdmin(mindId, mind);
+                _revolutionaryRule.OnHeadRevAdmin(args.Target);
             },
             Impact = LogImpact.High,
             Message = Loc.GetString("admin-verb-make-head-rev"),
@@ -129,10 +114,7 @@ private void AddAntagVerbs(GetVerbsEvent<Verb> args)
             Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Clothing/Hands/Gloves/ihscombat.rsi"), "icon"),
             Act = () =>
             {
-                if (!_minds.TryGetSession(targetMindComp.Mind, out var session))
-                    return;
-
-                _thief.AdminMakeThief(session, false); //Midround add pacific is bad
+                _thief.AdminMakeThief(args.Target, false); //Midround add pacified is bad
             },
             Impact = LogImpact.High,
             Message = Loc.GetString("admin-verb-make-thief"),
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index 296e48274c..c68336deab 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -41,7 +41,7 @@ namespace Content.Server.Administration.Systems;
 
 public sealed partial class AdminVerbSystem
 {
-    [Dependency] private readonly DoorBoltSystem _boltsSystem = default!;
+    [Dependency] private readonly DoorSystem _door = default!;
     [Dependency] private readonly AirlockSystem _airlockSystem = default!;
     [Dependency] private readonly StackSystem _stackSystem = default!;
     [Dependency] private readonly SharedAccessSystem _accessSystem = default!;
@@ -78,7 +78,7 @@ private void AddTricksVerbs(GetVerbsEvent<Verb> args)
                         : new SpriteSpecifier.Texture(new("/Textures/Interface/AdminActions/bolt.png")),
                     Act = () =>
                     {
-                        _boltsSystem.SetBoltsWithAudio(args.Target, bolts, !bolts.BoltsDown);
+                        _door.SetBoltsDown((args.Target, bolts), !bolts.BoltsDown);
                     },
                     Impact = LogImpact.Medium,
                     Message = Loc.GetString(bolts.BoltsDown
diff --git a/Content.Server/Administration/Systems/BwoinkSystem.cs b/Content.Server/Administration/Systems/BwoinkSystem.cs
index 5439b27f42..2e236688ac 100644
--- a/Content.Server/Administration/Systems/BwoinkSystem.cs
+++ b/Content.Server/Administration/Systems/BwoinkSystem.cs
@@ -66,13 +66,13 @@ public sealed class BwoinkSystem : SharedBwoinkSystem
         public override void Initialize()
         {
             base.Initialize();
-            _config.OnValueChanged(CCVars.DiscordAHelpWebhook, OnWebhookChanged, true);
-            _config.OnValueChanged(CCVars.DiscordAHelpFooterIcon, OnFooterIconChanged, true);
-            _config.OnValueChanged(CCVars.DiscordAHelpAvatar, OnAvatarChanged, true);
-            _config.OnValueChanged(CVars.GameHostName, OnServerNameChanged, true);
-            _config.OnValueChanged(CCVars.AdminAhelpOverrideClientName, OnOverrideChanged, true);
+            Subs.CVar(_config, CCVars.DiscordAHelpWebhook, OnWebhookChanged, true);
+            Subs.CVar(_config, CCVars.DiscordAHelpFooterIcon, OnFooterIconChanged, true);
+            Subs.CVar(_config, CCVars.DiscordAHelpAvatar, OnAvatarChanged, true);
+            Subs.CVar(_config, CVars.GameHostName, OnServerNameChanged, true);
+            Subs.CVar(_config, CCVars.AdminAhelpOverrideClientName, OnOverrideChanged, true);
             _sawmill = IoCManager.Resolve<ILogManager>().GetSawmill("AHELP");
-            _maxAdditionalChars = GenerateAHelpMessage("", "", true, _gameTicker.RoundDuration().ToString("hh\\:mm\\:ss"), _gameTicker.RunLevel).Length;
+            _maxAdditionalChars = GenerateAHelpMessage("", "", true, _gameTicker.RoundDuration().ToString("hh\\:mm\\:ss"), _gameTicker.RunLevel, playedSound: false).Length;
             _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
 
             SubscribeLocalEvent<GameRunLevelChangedEvent>(OnGameRunLevelChanged);
@@ -147,15 +147,6 @@ private void OnServerNameChanged(string obj)
             _serverName = obj;
         }
 
-        public override void Shutdown()
-        {
-            base.Shutdown();
-            _config.UnsubValueChanged(CCVars.DiscordAHelpWebhook, OnWebhookChanged);
-            _config.UnsubValueChanged(CCVars.DiscordAHelpFooterIcon, OnFooterIconChanged);
-            _config.UnsubValueChanged(CVars.GameHostName, OnServerNameChanged);
-            _config.UnsubValueChanged(CCVars.AdminAhelpOverrideClientName, OnOverrideChanged);
-        }
-
         private async void OnWebhookChanged(string url)
         {
             _webhookUrl = url;
@@ -407,18 +398,22 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
 
             if (senderAdmin is not null && senderAdmin.Flags == AdminFlags.Adminhelp) // Mentor. Not full admin. That's why it's colored differently.
             {
-                bwoinkText = $"[color=purple]{senderSession.Name}[/color]: {escapedText}";
+                bwoinkText = $"[color=purple]{senderSession.Name}[/color]";
             }
             else if (senderAdmin is not null && senderAdmin.HasFlag(AdminFlags.Adminhelp))
             {
-                bwoinkText = $"[color=red]{senderSession.Name}[/color]: {escapedText}";
+                bwoinkText = $"[color=red]{senderSession.Name}[/color]";
             }
             else
             {
-                bwoinkText = $"{senderSession.Name}: {escapedText}";
+                bwoinkText = $"{senderSession.Name}";
             }
 
-            var msg = new BwoinkTextMessage(message.UserId, senderSession.UserId, bwoinkText);
+            bwoinkText = $"{(message.PlaySound ? "" : "(S) ")}{bwoinkText}: {escapedText}";
+
+            // If it's not an admin / admin chooses to keep the sound then play it.
+            var playSound = !senderAHelpAdmin || message.PlaySound;
+            var msg = new BwoinkTextMessage(message.UserId, senderSession.UserId, bwoinkText, playSound: playSound);
 
             LogBwoink(msg);
 
@@ -442,18 +437,20 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
                         // Doing the same thing as above, but with the override name. Theres probably a better way to do this.
                         if (senderAdmin is not null && senderAdmin.Flags == AdminFlags.Adminhelp) // Mentor. Not full admin. That's why it's colored differently.
                         {
-                            overrideMsgText = $"[color=purple]{_overrideClientName}[/color]: {escapedText}";
+                            overrideMsgText = $"[color=purple]{_overrideClientName}[/color]";
                         }
                         else if (senderAdmin is not null && senderAdmin.HasFlag(AdminFlags.Adminhelp))
                         {
-                            overrideMsgText = $"[color=red]{_overrideClientName}[/color]: {escapedText}";
+                            overrideMsgText = $"[color=red]{_overrideClientName}[/color]";
                         }
                         else
                         {
-                            overrideMsgText = $"{senderSession.Name}: {escapedText}"; // Not an admin, name is not overridden.
+                            overrideMsgText = $"{senderSession.Name}"; // Not an admin, name is not overridden.
                         }
 
-                        RaiseNetworkEvent(new BwoinkTextMessage(message.UserId, senderSession.UserId, overrideMsgText), session.Channel);
+                        overrideMsgText = $"{(message.PlaySound ? "" : "(S) ")}{overrideMsgText}: {escapedText}";
+
+                        RaiseNetworkEvent(new BwoinkTextMessage(message.UserId, senderSession.UserId, overrideMsgText, playSound: playSound), session.Channel);
                     }
                     else
                         RaiseNetworkEvent(msg, session.Channel);
@@ -474,7 +471,7 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
                     str = str[..(DescriptionMax - _maxAdditionalChars - unameLength)];
                 }
                 var nonAfkAdmins = GetNonAfkAdmins();
-                _messageQueues[msg.UserId].Enqueue(GenerateAHelpMessage(senderSession.Name, str, !personalChannel, _gameTicker.RoundDuration().ToString("hh\\:mm\\:ss"), _gameTicker.RunLevel, nonAfkAdmins.Count == 0));
+                _messageQueues[msg.UserId].Enqueue(GenerateAHelpMessage(senderSession.Name, str, !personalChannel, _gameTicker.RoundDuration().ToString("hh\\:mm\\:ss"), _gameTicker.RunLevel, playedSound: playSound, noReceivers: nonAfkAdmins.Count == 0));
             }
 
             if (admins.Count != 0 || sendsWebhook)
@@ -502,7 +499,7 @@ private IList<INetChannel> GetTargetAdmins()
                 .ToList();
         }
 
-        private static string GenerateAHelpMessage(string username, string message, bool admin, string roundTime, GameRunLevel roundState, bool noReceivers = false)
+        private static string GenerateAHelpMessage(string username, string message, bool admin, string roundTime, GameRunLevel roundState, bool playedSound, bool noReceivers = false)
         {
             var stringbuilder = new StringBuilder();
 
@@ -515,6 +512,8 @@ private static string GenerateAHelpMessage(string username, string message, bool
 
             if(roundTime != string.Empty && roundState == GameRunLevel.InRound)
                 stringbuilder.Append($" **{roundTime}**");
+            if (!playedSound)
+                stringbuilder.Append(" **(S)**");
             stringbuilder.Append($" **{username}:** ");
             stringbuilder.Append(message);
             return stringbuilder.ToString();
diff --git a/Content.Server/Administration/UI/PermissionsEui.cs b/Content.Server/Administration/UI/PermissionsEui.cs
index 82ec10577d..7c2d2cbaf2 100644
--- a/Content.Server/Administration/UI/PermissionsEui.cs
+++ b/Content.Server/Administration/UI/PermissionsEui.cs
@@ -18,7 +18,9 @@ public sealed class PermissionsEui : BaseEui
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IServerDbManager _db = default!;
         [Dependency] private readonly IAdminManager _adminManager = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
 
+        private readonly ISawmill _sawmill;
         private bool _isLoading;
 
         private readonly List<(Admin a, string? lastUserName)> _admins = new List<(Admin, string? lastUserName)>();
@@ -27,6 +29,7 @@ public sealed class PermissionsEui : BaseEui
         public PermissionsEui()
         {
             IoCManager.InjectDependencies(this);
+            _sawmill = _logManager.GetSawmill("admin.perms");
         }
 
         public override void Opened()
@@ -143,7 +146,7 @@ private async Task HandleRemoveAdminRank(RemoveAdminRank rr)
 
             if (!CanTouchRank(rank))
             {
-                Logger.WarningS("admin.perms", $"{Player} tried to remove higher-ranked admin rank {rank.Name}");
+                _sawmill.Warning($"{Player} tried to remove higher-ranked admin rank {rank.Name}");
                 return;
             }
 
@@ -162,13 +165,13 @@ private async Task HandleUpdateAdminRank(UpdateAdminRank ur)
 
             if (!CanTouchRank(rank))
             {
-                Logger.WarningS("admin.perms", $"{Player} tried to update higher-ranked admin rank {rank.Name}");
+                _sawmill.Warning($"{Player} tried to update higher-ranked admin rank {rank.Name}");
                 return;
             }
 
             if (!UserAdminFlagCheck(ur.Flags))
             {
-                Logger.WarningS("admin.perms", $"{Player} tried to give a rank permissions above their authorization.");
+                _sawmill.Warning($"{Player} tried to give a rank permissions above their authorization.");
                 return;
             }
 
@@ -178,7 +181,7 @@ private async Task HandleUpdateAdminRank(UpdateAdminRank ur)
             await _db.UpdateAdminRankAsync(rank);
 
             var flagText = string.Join(' ', AdminFlagsHelper.FlagsToNames(ur.Flags).Select(f => $"+{f}"));
-            Logger.InfoS("admin.perms", $"{Player} updated admin rank {rank.Name}/{flagText}.");
+            _sawmill.Info($"{Player} updated admin rank {rank.Name}/{flagText}.");
 
             _adminManager.ReloadAdminsWithRank(ur.Id);
         }
@@ -187,7 +190,7 @@ private async Task HandleAddAdminRank(AddAdminRank ar)
         {
             if (!UserAdminFlagCheck(ar.Flags))
             {
-                Logger.WarningS("admin.perms", $"{Player} tried to give a rank permissions above their authorization.");
+                _sawmill.Warning($"{Player} tried to give a rank permissions above their authorization.");
                 return;
             }
 
@@ -200,7 +203,7 @@ private async Task HandleAddAdminRank(AddAdminRank ar)
             await _db.AddAdminRankAsync(rank);
 
             var flagText = string.Join(' ', AdminFlagsHelper.FlagsToNames(ar.Flags).Select(f => $"+{f}"));
-            Logger.InfoS("admin.perms", $"{Player} added admin rank {rank.Name}/{flagText}.");
+            _sawmill.Info($"{Player} added admin rank {rank.Name}/{flagText}.");
         }
 
         private async Task HandleRemoveAdmin(RemoveAdmin ra)
@@ -214,14 +217,14 @@ private async Task HandleRemoveAdmin(RemoveAdmin ra)
 
             if (!CanTouchAdmin(admin))
             {
-                Logger.WarningS("admin.perms", $"{Player} tried to remove higher-ranked admin {ra.UserId.ToString()}");
+                _sawmill.Warning($"{Player} tried to remove higher-ranked admin {ra.UserId.ToString()}");
                 return;
             }
 
             await _db.RemoveAdminAsync(ra.UserId);
 
             var record = await _db.GetPlayerRecordByUserId(ra.UserId);
-            Logger.InfoS("admin.perms", $"{Player} removed admin {record?.LastSeenUserName ?? ra.UserId.ToString()}");
+            _sawmill.Info($"{Player} removed admin {record?.LastSeenUserName ?? ra.UserId.ToString()}");
 
             if (_playerManager.TryGetSessionById(ra.UserId, out var player))
             {
@@ -245,7 +248,7 @@ private async Task HandleUpdateAdmin(UpdateAdmin ua)
 
             if (!CanTouchAdmin(admin))
             {
-                Logger.WarningS("admin.perms", $"{Player} tried to modify higher-ranked admin {ua.UserId.ToString()}");
+                _sawmill.Warning($"{Player} tried to modify higher-ranked admin {ua.UserId.ToString()}");
                 return;
             }
 
@@ -266,7 +269,7 @@ private async Task HandleUpdateAdmin(UpdateAdmin ua)
             var title = ua.Title ?? "<no title>";
             var flags = AdminFlagsHelper.PosNegFlagsText(ua.PosFlags, ua.NegFlags);
 
-            Logger.InfoS("admin.perms", $"{Player} updated admin {name} to {title}/{rankName}/{flags}");
+            _sawmill.Info($"{Player} updated admin {name} to {title}/{rankName}/{flags}");
 
             if (_playerManager.TryGetSessionById(ua.UserId, out var player))
             {
@@ -304,8 +307,7 @@ private async Task HandleCreateAdmin(AddAdmin ca)
                 {
                     // username not in DB.
                     // TODO: Notify user.
-                    Logger.WarningS("admin.perms",
-                        $"{Player} tried to add admin with unknown username {ca.UserNameOrId}.");
+                    _sawmill.Warning($"{Player} tried to add admin with unknown username {ca.UserNameOrId}.");
                     return;
                 }
 
@@ -341,7 +343,7 @@ private async Task HandleCreateAdmin(AddAdmin ca)
             var title = ca.Title ?? "<no title>";
             var flags = AdminFlagsHelper.PosNegFlagsText(ca.PosFlags, ca.NegFlags);
 
-            Logger.InfoS("admin.perms", $"{Player} added admin {name} as {title}/{rankName}/{flags}");
+            _sawmill.Info($"{Player} added admin {name} as {title}/{rankName}/{flags}");
 
             if (_playerManager.TryGetSessionById(userId, out var player))
             {
@@ -362,7 +364,7 @@ private bool CheckCreatePerms(AdminFlags posFlags, AdminFlags negFlags)
             if (!UserAdminFlagCheck(posFlags))
             {
                 // Can't create an admin with higher perms than yourself, obviously.
-                Logger.WarningS("admin.perms", $"{Player} tried to grant admin powers above their authorization.");
+                _sawmill.Warning($"{Player} tried to grant admin powers above their authorization.");
                 return false;
             }
 
@@ -378,7 +380,7 @@ private bool CheckCreatePerms(AdminFlags posFlags, AdminFlags negFlags)
                 if (rank == null)
                 {
                     // Tried to set to nonexistent rank.
-                    Logger.WarningS("admin.perms", $"{Player} tried to assign nonexistent admin rank.");
+                    _sawmill.Warning($"{Player} tried to assign nonexistent admin rank.");
                     return (true, null);
                 }
 
@@ -388,7 +390,7 @@ private bool CheckCreatePerms(AdminFlags posFlags, AdminFlags negFlags)
                 if (!UserAdminFlagCheck(rankFlags))
                 {
                     // Can't assign a rank with flags you don't have yourself.
-                    Logger.WarningS("admin.perms", $"{Player} tried to assign admin rank above their authorization.");
+                    _sawmill.Warning($"{Player} tried to assign admin rank above their authorization.");
                     return (true, null);
                 }
             }
diff --git a/Content.Server/Administration/UI/SpawnExplosionEui.cs b/Content.Server/Administration/UI/SpawnExplosionEui.cs
index 98dc307278..a3729b1454 100644
--- a/Content.Server/Administration/UI/SpawnExplosionEui.cs
+++ b/Content.Server/Administration/UI/SpawnExplosionEui.cs
@@ -12,6 +12,15 @@ namespace Content.Server.Administration.UI;
 [UsedImplicitly]
 public sealed class SpawnExplosionEui : BaseEui
 {
+    private readonly ExplosionSystem _explosionSystem;
+    private readonly ISawmill _sawmill;
+
+    public SpawnExplosionEui()
+    {
+        _explosionSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ExplosionSystem>();
+        _sawmill = IoCManager.Resolve<ILogManager>().GetSawmill("explosion");
+    }
+
     public override void HandleMessage(EuiMessageBase msg)
     {
         base.HandleMessage(msg);
@@ -26,7 +35,7 @@ public override void HandleMessage(EuiMessageBase msg)
 
         if (explosion == null)
         {
-            Logger.Error("Failed to generate explosion preview.");
+            _sawmill.Error("Failed to generate explosion preview.");
             return;
         }
 
diff --git a/Content.Server/Afk/AFKSystem.cs b/Content.Server/Afk/AFKSystem.cs
index b8cfdfe6b3..39d1e266d7 100644
--- a/Content.Server/Afk/AFKSystem.cs
+++ b/Content.Server/Afk/AFKSystem.cs
@@ -30,7 +30,7 @@ public override void Initialize()
     {
         base.Initialize();
         _playerManager.PlayerStatusChanged += OnPlayerChange;
-        _configManager.OnValueChanged(CCVars.AfkTime, SetAfkDelay, true);
+        Subs.CVar(_configManager, CCVars.AfkTime, SetAfkDelay, true);
 
         SubscribeNetworkEvent<FullInputCmdMessage>(HandleInputCmd);
     }
@@ -60,7 +60,6 @@ public override void Shutdown()
         base.Shutdown();
         _afkPlayers.Clear();
         _playerManager.PlayerStatusChanged -= OnPlayerChange;
-        _configManager.UnsubValueChanged(CCVars.AfkTime, SetAfkDelay);
     }
 
     public override void Update(float frameTime)
diff --git a/Content.Server/AlertLevel/AlertLevelSystem.cs b/Content.Server/AlertLevel/AlertLevelSystem.cs
index 04e274ceeb..848170ba9d 100644
--- a/Content.Server/AlertLevel/AlertLevelSystem.cs
+++ b/Content.Server/AlertLevel/AlertLevelSystem.cs
@@ -168,7 +168,7 @@ public void SetLevel(EntityUid station, string level, bool playSound, bool annou
             if (detail.Sound != null)
             {
                 var filter = _stationSystem.GetInOwningStation(station);
-                _audio.PlayGlobal(detail.Sound.GetSound(), filter, true, detail.Sound.Params);
+                _audio.PlayGlobal(detail.Sound, filter, true, detail.Sound.Params);
             }
             else
             {
diff --git a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
index 2c432a2419..f52fc2b718 100644
--- a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
+++ b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
@@ -9,19 +9,19 @@ namespace Content.Server.AlertLevel.Commands
 {
     [UsedImplicitly]
     [AdminCommand(AdminFlags.Admin)]
-    public sealed class SetAlertLevelCommand : IConsoleCommand
+    public sealed class SetAlertLevelCommand : LocalizedCommands
     {
-        public string Command => "setalertlevel";
-        public string Description => Loc.GetString("cmd-setalertlevel-desc");
-        public string Help => Loc.GetString("cmd-setalertlevel-help");
+        [Dependency] private readonly IEntitySystemManager _entitySystems = default!;
 
-        public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
+        public override string Command => "setalertlevel";
+
+        public override CompletionResult GetCompletion(IConsoleShell shell, string[] args)
         {
             var levelNames = new string[] {};
             var player = shell.Player;
             if (player?.AttachedEntity != null)
             {
-                var stationUid = EntitySystem.Get<StationSystem>().GetOwningStation(player.AttachedEntity.Value);
+                var stationUid = _entitySystems.GetEntitySystem<StationSystem>().GetOwningStation(player.AttachedEntity.Value);
                 if (stationUid != null)
                 {
                     levelNames = GetStationLevelNames(stationUid.Value);
@@ -31,39 +31,39 @@ public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
             return args.Length switch
             {
                 1 => CompletionResult.FromHintOptions(levelNames,
-                    Loc.GetString("cmd-setalertlevel-hint-1")),
+                    LocalizationManager.GetString("cmd-setalertlevel-hint-1")),
                 2 => CompletionResult.FromHintOptions(CompletionHelper.Booleans,
-                    Loc.GetString("cmd-setalertlevel-hint-2")),
+                    LocalizationManager.GetString("cmd-setalertlevel-hint-2")),
                 _ => CompletionResult.Empty,
             };
         }
 
-        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(Loc.GetString("shell-wrong-arguments-number"));
+                shell.WriteError(LocalizationManager.GetString("shell-wrong-arguments-number"));
                 return;
             }
 
             var locked = false;
             if (args.Length > 1 && !bool.TryParse(args[1], out locked))
             {
-                shell.WriteLine(Loc.GetString("shell-argument-must-be-boolean"));
+                shell.WriteLine(LocalizationManager.GetString("shell-argument-must-be-boolean"));
                 return;
             }
 
             var player = shell.Player;
             if (player?.AttachedEntity == null)
             {
-                shell.WriteLine(Loc.GetString("shell-only-players-can-run-this-command"));
+                shell.WriteLine(LocalizationManager.GetString("shell-only-players-can-run-this-command"));
                 return;
             }
 
-            var stationUid = EntitySystem.Get<StationSystem>().GetOwningStation(player.AttachedEntity.Value);
+            var stationUid = _entitySystems.GetEntitySystem<StationSystem>().GetOwningStation(player.AttachedEntity.Value);
             if (stationUid == null)
             {
-                shell.WriteLine(Loc.GetString("cmd-setalertlevel-invalid-grid"));
+                shell.WriteLine(LocalizationManager.GetString("cmd-setalertlevel-invalid-grid"));
                 return;
             }
 
@@ -71,11 +71,11 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
             var levelNames = GetStationLevelNames(stationUid.Value);
             if (!levelNames.Contains(level))
             {
-                shell.WriteLine(Loc.GetString("cmd-setalertlevel-invalid-level"));
+                shell.WriteLine(LocalizationManager.GetString("cmd-setalertlevel-invalid-level"));
                 return;
             }
 
-            EntitySystem.Get<AlertLevelSystem>().SetLevel(stationUid.Value, level, true, true, true, locked);
+            _entitySystems.GetEntitySystem<AlertLevelSystem>().SetLevel(stationUid.Value, level, true, true, true, locked);
         }
 
         private string[] GetStationLevelNames(EntityUid station)
diff --git a/Content.Server/Ame/AmeNodeGroup.cs b/Content.Server/Ame/AmeNodeGroup.cs
index 25d98bf994..608356f760 100644
--- a/Content.Server/Ame/AmeNodeGroup.cs
+++ b/Content.Server/Ame/AmeNodeGroup.cs
@@ -5,7 +5,8 @@
 using Content.Server.Explosion.EntitySystems;
 using Content.Server.NodeContainer.NodeGroups;
 using Content.Server.NodeContainer.Nodes;
-using Robust.Shared.Map;
+using Robust.Server.GameObjects;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Random;
 
 namespace Content.Server.Ame;
@@ -18,7 +19,6 @@ public sealed class AmeNodeGroup : BaseNodeGroup
 {
     [Dependency] private readonly IChatManager _chat = default!;
     [Dependency] private readonly IEntityManager _entMan = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
 
     /// <summary>
@@ -46,6 +46,7 @@ public override void LoadNodes(List<Node> groupNodes)
 
         var ameControllerSystem = _entMan.System<AmeControllerSystem>();
         var ameShieldingSystem = _entMan.System<AmeShieldingSystem>();
+        var mapSystem = _entMan.System<MapSystem>();
 
         var shieldQuery = _entMan.GetEntityQuery<AmeShieldComponent>();
         var controllerQuery = _entMan.GetEntityQuery<AmeControllerComponent>();
@@ -57,7 +58,7 @@ public override void LoadNodes(List<Node> groupNodes)
                 continue;
             if (!xformQuery.TryGetComponent(nodeOwner, out var xform))
                 continue;
-            if (!_mapManager.TryGetGrid(xform.GridUid, out var grid))
+            if (!_entMan.TryGetComponent(xform.GridUid, out MapGridComponent? grid))
                 continue;
 
             if (gridEnt == null)
@@ -65,7 +66,7 @@ public override void LoadNodes(List<Node> groupNodes)
             else if (gridEnt != xform.GridUid)
                 continue;
 
-            var nodeNeighbors = grid.GetCellsInSquareArea(xform.Coordinates, 1)
+            var nodeNeighbors = mapSystem.GetCellsInSquareArea(xform.GridUid.Value, grid, xform.Coordinates, 1)
                 .Where(entity => entity != nodeOwner && shieldQuery.HasComponent(entity));
 
             if (nodeNeighbors.Count() >= 8)
diff --git a/Content.Server/Ame/Components/AmeControllerComponent.cs b/Content.Server/Ame/Components/AmeControllerComponent.cs
index 2b7a46e947..fae3d86633 100644
--- a/Content.Server/Ame/Components/AmeControllerComponent.cs
+++ b/Content.Server/Ame/Components/AmeControllerComponent.cs
@@ -1,7 +1,7 @@
 using Content.Server.Ame.EntitySystems;
-using Content.Shared.Ame;
+using Content.Shared.Ame.Components;
+using Content.Shared.Containers.ItemSlots;
 using Robust.Shared.Audio;
-using Robust.Shared.Containers;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.Ame.Components;
@@ -15,15 +15,11 @@ namespace Content.Server.Ame.Components;
 public sealed partial class AmeControllerComponent : SharedAmeControllerComponent
 {
     /// <summary>
-    /// The id of the container used to store the current fuel container for the AME.
+    /// Antimatter fuel slot.
     /// </summary>
-    public const string FuelContainerId = "AmeFuel";
-
-    /// <summary>
-    /// The container for the fuel canisters used by the AME.
-    /// </summary>
-    [ViewVariables]
-    public ContainerSlot JarSlot = default!;
+    [DataField("fuelSlot")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public ItemSlot FuelSlot = new();
 
     /// <summary>
     /// Whether or not the AME controller is currently injecting animatter into the reactor.
diff --git a/Content.Server/Ame/Components/AmeFuelContainerComponent.cs b/Content.Server/Ame/Components/AmeFuelContainerComponent.cs
deleted file mode 100644
index b69f1d452f..0000000000
--- a/Content.Server/Ame/Components/AmeFuelContainerComponent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Content.Server.Ame.Components;
-
-/// <summary>
-/// An antimatter containment cell used to handle the fuel for the AME.
-/// TODO: network and put in shared
-/// </summary>
-[RegisterComponent]
-public sealed partial class AmeFuelContainerComponent : Component
-{
-    /// <summary>
-    /// The amount of fuel in the jar.
-    /// </summary>
-    [DataField("fuelAmount")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public int FuelAmount = 1000;
-
-    /// <summary>
-    /// The maximum fuel capacity of the jar.
-    /// </summary>
-    [DataField("fuelCapacity")]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public int FuelCapacity = 1000;
-}
diff --git a/Content.Server/Ame/Components/AmeShieldComponent.cs b/Content.Server/Ame/Components/AmeShieldComponent.cs
index 322c5218dd..8ebcfdc88b 100644
--- a/Content.Server/Ame/Components/AmeShieldComponent.cs
+++ b/Content.Server/Ame/Components/AmeShieldComponent.cs
@@ -1,5 +1,5 @@
-using Content.Server.Ame.EntitySystems;
-using Content.Shared.Ame;
+using Content.Server.Ame.EntitySystems;
+using Content.Shared.Ame.Components;
 
 namespace Content.Server.Ame.Components;
 
diff --git a/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs b/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs
index 93b2a29a76..5bf78bde85 100644
--- a/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs
+++ b/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs
@@ -6,14 +6,10 @@
 using Content.Server.Chat.Managers;
 using Content.Server.NodeContainer;
 using Content.Server.Power.Components;
-using Content.Shared.Ame;
+using Content.Shared.Ame.Components;
+using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
-using Content.Shared.Hands.Components;
-using Content.Shared.Hands.EntitySystems;
-using Content.Shared.Interaction;
 using Content.Shared.Mind.Components;
-using Content.Shared.Popups;
-using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
@@ -30,22 +26,29 @@ public sealed class AmeControllerSystem : EntitySystem
     [Dependency] private readonly IChatManager _chatManager = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly AppearanceSystem _appearanceSystem = default!;
-    [Dependency] private readonly ContainerSystem _containerSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
-    [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
-    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
+    [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<AmeControllerComponent, ComponentStartup>(OnComponentStartup);
-        SubscribeLocalEvent<AmeControllerComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<AmeControllerComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<AmeControllerComponent, ComponentRemove>(OnRemove);
+        SubscribeLocalEvent<AmeControllerComponent, EntInsertedIntoContainerMessage>(OnItemSlotChanged);
+        SubscribeLocalEvent<AmeControllerComponent, EntRemovedFromContainerMessage>(OnItemSlotChanged);
         SubscribeLocalEvent<AmeControllerComponent, PowerChangedEvent>(OnPowerChanged);
         SubscribeLocalEvent<AmeControllerComponent, UiButtonPressedMessage>(OnUiButtonPressed);
     }
 
+    private void OnInit(EntityUid uid, AmeControllerComponent component, ComponentInit args)
+    {
+        _itemSlots.AddItemSlot(uid, SharedAmeControllerComponent.FuelSlotId, component.FuelSlot);
+
+        UpdateUi(uid, component);
+    }
+
     public override void Update(float frameTime)
     {
         var curTime = _gameTiming.CurTime;
@@ -59,6 +62,22 @@ public override void Update(float frameTime)
         }
     }
 
+    private void OnRemove(EntityUid uid, AmeControllerComponent component, ComponentRemove args)
+    {
+        _itemSlots.RemoveItemSlot(uid, component.FuelSlot);
+    }
+
+    private void OnItemSlotChanged(EntityUid uid, AmeControllerComponent component, ContainerModifiedMessage args)
+    {
+        if (!component.Initialized)
+            return;
+
+        if (args.Container.ID != component.FuelSlot.ID)
+            return;
+
+        UpdateUi(uid, component);
+    }
+
     private void UpdateController(EntityUid uid, TimeSpan curTime, AmeControllerComponent? controller = null, NodeContainerComponent? nodes = null)
     {
         if (!Resolve(uid, ref controller))
@@ -71,23 +90,24 @@ private void UpdateController(EntityUid uid, TimeSpan curTime, AmeControllerComp
 
         if (!controller.Injecting)
             return;
+
         if (!TryGetAMENodeGroup(uid, out var group, nodes))
             return;
 
-        if (TryComp<AmeFuelContainerComponent>(controller.JarSlot.ContainedEntity, out var fuelJar))
+        if (TryComp<AmeFuelContainerComponent>(controller.FuelSlot.Item, out var fuelContainer))
         {
             // if the jar is empty shut down the AME
-            if (fuelJar.FuelAmount <= 0)
+            if (fuelContainer.FuelAmount <= 0)
             {
                 SetInjecting(uid, false, null, controller);
             }
             else
             {
-                var availableInject = Math.Min(controller.InjectionAmount, fuelJar.FuelAmount);
+                var availableInject = Math.Min(controller.InjectionAmount, fuelContainer.FuelAmount);
                 var powerOutput = group.InjectFuel(availableInject, out var overloading);
                 if (TryComp<PowerSupplierComponent>(uid, out var powerOutlet))
                     powerOutlet.MaxSupply = powerOutput;
-                fuelJar.FuelAmount -= availableInject;
+                fuelContainer.FuelAmount -= availableInject;
                 // only play audio if we actually had an injection
                 if (availableInject > 0)
                     _audioSystem.PlayPvs(controller.InjectSound, uid, AudioParams.Default.WithVolume(overloading ? 10f : 0f));
@@ -138,11 +158,28 @@ private AmeControllerBoundUserInterfaceState GetUiState(EntityUid uid, AmeContro
             currentPowerSupply = powerOutlet.CurrentSupply / 1000;
         }
 
-        var hasJar = Exists(controller.JarSlot.ContainedEntity);
-        if (!hasJar || !TryComp<AmeFuelContainerComponent>(controller.JarSlot.ContainedEntity, out var jar))
-            return new AmeControllerBoundUserInterfaceState(powered, IsMasterController(uid), false, hasJar, 0, controller.InjectionAmount, coreCount, currentPowerSupply, targetedPowerSupply);
-
-        return new AmeControllerBoundUserInterfaceState(powered, IsMasterController(uid), controller.Injecting, hasJar, jar.FuelAmount, controller.InjectionAmount, coreCount, currentPowerSupply, targetedPowerSupply);
+        var fuelContainerInSlot = controller.FuelSlot.Item;
+        var hasFuelContainerInSlot = Exists(fuelContainerInSlot);
+        if (!hasFuelContainerInSlot || !TryComp<AmeFuelContainerComponent>(fuelContainerInSlot, out var fuelContainer))
+            return new AmeControllerBoundUserInterfaceState(powered,
+                                                            IsMasterController(uid),
+                                                            false,
+                                                            hasFuelContainerInSlot,
+                                                            0,
+                                                            controller.InjectionAmount,
+                                                            coreCount,
+                                                            currentPowerSupply,
+                                                            targetedPowerSupply);
+
+        return new AmeControllerBoundUserInterfaceState(powered,
+                                                        IsMasterController(uid),
+                                                        controller.Injecting,
+                                                        hasFuelContainerInSlot,
+                                                        fuelContainer.FuelAmount,
+                                                        controller.InjectionAmount,
+                                                        coreCount,
+                                                        currentPowerSupply,
+                                                        targetedPowerSupply);
     }
 
     private bool IsMasterController(EntityUid uid)
@@ -170,23 +207,23 @@ public void TryEject(EntityUid uid, EntityUid? user = null, AmeControllerCompone
     {
         if (!Resolve(uid, ref controller))
             return;
+
         if (controller.Injecting)
             return;
 
-        var jar = controller.JarSlot.ContainedEntity;
-        if (!Exists(jar))
+        if (!Exists(controller.FuelSlot.Item))
             return;
 
-        _containerSystem.Remove(jar!.Value, controller.JarSlot);
+        _itemSlots.TryEjectToHands(uid, controller.FuelSlot, user);
+
         UpdateUi(uid, controller);
-        if (Exists(user))
-            _handsSystem.PickupOrDrop(user, jar!.Value);
     }
 
     public void SetInjecting(EntityUid uid, bool value, EntityUid? user = null, AmeControllerComponent? controller = null)
     {
         if (!Resolve(uid, ref controller))
             return;
+
         if (controller.Injecting == value)
             return;
 
@@ -197,6 +234,8 @@ public void SetInjecting(EntityUid uid, bool value, EntityUid? user = null, AmeC
 
         UpdateUi(uid, controller);
 
+        _itemSlots.SetLock(uid, controller.FuelSlot, value);
+
         // Logging
         if (!HasComp<MindContainerComponent>(user))
             return;
@@ -278,38 +317,6 @@ private void UpdateDisplay(EntityUid uid, int stability, AmeControllerComponent?
         );
     }
 
-    private void OnComponentStartup(EntityUid uid, AmeControllerComponent comp, ComponentStartup args)
-    {
-        // TODO: Fix this bad name. I'd update maps but then people get mad.
-        comp.JarSlot = _containerSystem.EnsureContainer<ContainerSlot>(uid, AmeControllerComponent.FuelContainerId);
-    }
-
-    private void OnInteractUsing(EntityUid uid, AmeControllerComponent comp, InteractUsingEvent args)
-    {
-        if (!HasComp<HandsComponent>(args.User))
-        {
-            _popupSystem.PopupEntity(Loc.GetString("ame-controller-component-interact-using-no-hands-text"), uid, args.User);
-            return;
-        }
-
-        if (!HasComp<AmeFuelContainerComponent>(args.Used))
-        {
-            _popupSystem.PopupEntity(Loc.GetString("ame-controller-component-interact-using-fail"), uid, args.User);
-            return;
-        }
-
-        if (Exists(comp.JarSlot.ContainedEntity))
-        {
-            _popupSystem.PopupEntity(Loc.GetString("ame-controller-component-interact-using-already-has-jar"), uid, args.User);
-            return;
-        }
-
-        _containerSystem.Insert(args.Used, comp.JarSlot);
-        _popupSystem.PopupEntity(Loc.GetString("ame-controller-component-interact-using-success"), uid, args.User, PopupType.Medium);
-
-        UpdateUi(uid, comp);
-    }
-
     private void OnPowerChanged(EntityUid uid, AmeControllerComponent comp, ref PowerChangedEvent args)
     {
         UpdateUi(uid, comp);
diff --git a/Content.Server/Ame/EntitySystems/AmeFuelSystem.cs b/Content.Server/Ame/EntitySystems/AmeFuelSystem.cs
deleted file mode 100644
index a7971b449e..0000000000
--- a/Content.Server/Ame/EntitySystems/AmeFuelSystem.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Content.Server.Ame.Components;
-using Content.Shared.Examine;
-
-namespace Content.Server.Ame.EntitySystems;
-
-/// <summary>
-/// Adds fuel level info to examine on fuel jars and handles network state.
-/// </summary>
-public sealed class AmeFuelSystem : EntitySystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<AmeFuelContainerComponent, ExaminedEvent>(OnFuelExamined);
-    }
-
-    private void OnFuelExamined(EntityUid uid, AmeFuelContainerComponent comp, ExaminedEvent args)
-    {
-        if (!args.IsInDetailsRange)
-            return;
-
-        // less than 25%: amount < capacity / 4 = amount * 4 < capacity
-        var low = comp.FuelAmount * 4 < comp.FuelCapacity;
-        args.PushMarkup(Loc.GetString("ame-fuel-container-component-on-examine-detailed-message",
-            ("colorName", low ? "darkorange" : "orange"),
-            ("amount", comp.FuelAmount),
-            ("capacity", comp.FuelCapacity)));
-    }
-}
diff --git a/Content.Server/Ame/EntitySystems/AmeShieldingSystem.cs b/Content.Server/Ame/EntitySystems/AmeShieldingSystem.cs
index c8ebaf53e8..542ae8035e 100644
--- a/Content.Server/Ame/EntitySystems/AmeShieldingSystem.cs
+++ b/Content.Server/Ame/EntitySystems/AmeShieldingSystem.cs
@@ -1,5 +1,5 @@
 using Content.Server.Ame.Components;
-using Content.Shared.Ame;
+using Content.Shared.Ame.Components;
 using Robust.Server.GameObjects;
 
 namespace Content.Server.Ame.EntitySystems;
diff --git a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
index 7b42b9d890..434a3fef66 100644
--- a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
+++ b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs
@@ -25,8 +25,6 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly PowerReceiverSystem _power = default!;
 
-    private const float AttachRange = 0.15f; // The radius of one tile. It must not be set higher, otherwise the anomaly can be moved from tile to tile.
-
     public override void Initialize()
     {
         base.Initialize();
@@ -55,9 +53,9 @@ public bool TryAttachNearbyAnomaly(Entity<AnomalySynchronizerComponent> ent, Ent
         }
 
         var coords = _transform.GetMapCoordinates(ent);
-        var anomaly = _entityLookup.GetEntitiesInRange<AnomalyComponent>(coords, AttachRange).FirstOrDefault();
+        var anomaly = _entityLookup.GetEntitiesInRange<AnomalyComponent>(coords, ent.Comp.AttachRange).FirstOrDefault();
 
-        if (anomaly.Owner is {Valid: false}) // no anomaly in range
+        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);
@@ -77,7 +75,6 @@ private void OnPowerChanged(Entity<AnomalySynchronizerComponent> ent, ref PowerC
         if (!TryComp<AnomalyComponent>(ent.Comp.ConnectedAnomaly, out var anomaly))
             return;
 
-        _anomaly.DoAnomalyPulse(ent.Comp.ConnectedAnomaly.Value, anomaly);
         DisconneсtFromAnomaly(ent, anomaly);
     }
 
@@ -92,7 +89,8 @@ private void OnGetInteractionVerbs(Entity<AnomalySynchronizerComponent> ent, ref
             return;
 
         var user = args.User;
-        args.Verbs.Add(new() {
+        args.Verbs.Add(new()
+        {
             Act = () =>
             {
                 TryAttachNearbyAnomaly(ent, user);
@@ -117,7 +115,9 @@ private void ConnectToAnomaly(Entity<AnomalySynchronizerComponent> ent, Entity<A
         var targetXform = _transform.GetWorldPosition(ent);
         _transform.SetWorldPosition(anomaly, targetXform);
 
-        _anomaly.DoAnomalyPulse(anomaly, anomaly);
+        if (ent.Comp.PulseOnConnect)
+            _anomaly.DoAnomalyPulse(anomaly, anomaly);
+
         _popup.PopupEntity(Loc.GetString("anomaly-sync-connected"), ent, PopupType.Medium);
         _audio.PlayPvs(ent.Comp.ConnectedSound, ent);
     }
@@ -129,7 +129,9 @@ private void DisconneсtFromAnomaly(Entity<AnomalySynchronizerComponent> ent, An
         if (ent.Comp.ConnectedAnomaly == null)
             return;
 
-        _anomaly.DoAnomalyPulse(ent.Comp.ConnectedAnomaly.Value, anomaly);
+        if (ent.Comp.PulseOnDisconnect)
+            _anomaly.DoAnomalyPulse(ent.Comp.ConnectedAnomaly.Value, anomaly);
+
         _popup.PopupEntity(Loc.GetString("anomaly-sync-disconnected"), ent, PopupType.Large);
         _audio.PlayPvs(ent.Comp.ConnectedSound, ent);
 
diff --git a/Content.Server/Anomaly/AnomalySystem.Generator.cs b/Content.Server/Anomaly/AnomalySystem.Generator.cs
index d07740e2f6..2053a7bbbe 100644
--- a/Content.Server/Anomaly/AnomalySystem.Generator.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Generator.cs
@@ -33,9 +33,7 @@ private void InitializeGenerator()
         SubscribeLocalEvent<AnomalyGeneratorComponent, MaterialAmountChangedEvent>(OnGeneratorMaterialAmountChanged);
         SubscribeLocalEvent<AnomalyGeneratorComponent, AnomalyGeneratorGenerateButtonPressedEvent>(OnGenerateButtonPressed);
         SubscribeLocalEvent<AnomalyGeneratorComponent, PowerChangedEvent>(OnGeneratorPowerChanged);
-        SubscribeLocalEvent<AnomalyGeneratorComponent, EntityUnpausedEvent>(OnGeneratorUnpaused);
         SubscribeLocalEvent<GeneratingAnomalyGeneratorComponent, ComponentStartup>(OnGeneratingStartup);
-        SubscribeLocalEvent<GeneratingAnomalyGeneratorComponent, EntityUnpausedEvent>(OnGeneratingUnpaused);
     }
 
     private void OnGeneratorPowerChanged(EntityUid uid, AnomalyGeneratorComponent component, ref PowerChangedEvent args)
@@ -58,11 +56,6 @@ private void OnGenerateButtonPressed(EntityUid uid, AnomalyGeneratorComponent co
         TryGeneratorCreateAnomaly(uid, component);
     }
 
-    private void OnGeneratorUnpaused(EntityUid uid, AnomalyGeneratorComponent component, ref EntityUnpausedEvent args)
-    {
-        component.CooldownEndTime += args.PausedTime;
-    }
-
     public void UpdateGeneratorUi(EntityUid uid, AnomalyGeneratorComponent component)
     {
         var materialAmount = _material.GetMaterialAmount(uid, component.RequiredMaterial);
@@ -169,11 +162,6 @@ private void OnGeneratingStartup(EntityUid uid, GeneratingAnomalyGeneratorCompon
         Appearance.SetData(uid, AnomalyGeneratorVisuals.Generating, true);
     }
 
-    private void OnGeneratingUnpaused(EntityUid uid, GeneratingAnomalyGeneratorComponent component, ref EntityUnpausedEvent args)
-    {
-        component.EndTime += args.PausedTime;
-    }
-
     private void OnGeneratingFinished(EntityUid uid, AnomalyGeneratorComponent component)
     {
         var xform = Transform(uid);
diff --git a/Content.Server/Anomaly/AnomalySystem.Vessel.cs b/Content.Server/Anomaly/AnomalySystem.Vessel.cs
index b3051a2642..35de5c1a64 100644
--- a/Content.Server/Anomaly/AnomalySystem.Vessel.cs
+++ b/Content.Server/Anomaly/AnomalySystem.Vessel.cs
@@ -23,7 +23,6 @@ private void InitializeVessel()
         SubscribeLocalEvent<AnomalyVesselComponent, InteractUsingEvent>(OnVesselInteractUsing);
         SubscribeLocalEvent<AnomalyVesselComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<AnomalyVesselComponent, ResearchServerGetPointsPerSecondEvent>(OnVesselGetPointsPerSecond);
-        SubscribeLocalEvent<AnomalyVesselComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<AnomalyShutdownEvent>(OnShutdown);
         SubscribeLocalEvent<AnomalyStabilityChangedEvent>(OnStabilityChanged);
     }
@@ -101,11 +100,6 @@ private void OnVesselGetPointsPerSecond(EntityUid uid, AnomalyVesselComponent co
         args.Points += (int) (GetAnomalyPointValue(anomaly) * component.PointMultiplier);
     }
 
-    private void OnUnpaused(EntityUid uid, AnomalyVesselComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextBeep += args.PausedTime;
-    }
-
     private void OnVesselAnomalyShutdown(ref AnomalyShutdownEvent args)
     {
         var query = EntityQueryEnumerator<AnomalyVesselComponent>();
diff --git a/Content.Server/Anomaly/Components/AnomalyGeneratorComponent.cs b/Content.Server/Anomaly/Components/AnomalyGeneratorComponent.cs
index 1ff0290fc9..d4acfc6150 100644
--- a/Content.Server/Anomaly/Components/AnomalyGeneratorComponent.cs
+++ b/Content.Server/Anomaly/Components/AnomalyGeneratorComponent.cs
@@ -12,13 +12,14 @@ namespace Content.Server.Anomaly.Components;
 /// This is used for a machine that is able to generate
 /// anomalies randomly on the station.
 /// </summary>
-[RegisterComponent, Access(typeof(SharedAnomalySystem))]
+[RegisterComponent, Access(typeof(SharedAnomalySystem)), AutoGenerateComponentPause]
 public sealed partial class AnomalyGeneratorComponent : Component
 {
     /// <summary>
     /// The time at which the cooldown for generating another anomaly will be over
     /// </summary>
     [DataField("cooldownEndTime", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    [AutoPausedField]
     public TimeSpan CooldownEndTime = TimeSpan.Zero;
 
     /// <summary>
diff --git a/Content.Server/Anomaly/Components/AnomalySynchronizerComponent.cs b/Content.Server/Anomaly/Components/AnomalySynchronizerComponent.cs
index 295ce885c2..235e740cf3 100644
--- a/Content.Server/Anomaly/Components/AnomalySynchronizerComponent.cs
+++ b/Content.Server/Anomaly/Components/AnomalySynchronizerComponent.cs
@@ -1,5 +1,3 @@
-using Content.Shared.Anomaly;
-using Content.Shared.Anomaly.Components;
 using Content.Shared.DeviceLinking;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
@@ -18,6 +16,23 @@ public sealed partial class AnomalySynchronizerComponent : Component
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public EntityUid? ConnectedAnomaly;
 
+    /// <summary>
+    /// Should the anomaly pulse when connected to the synchronizer?
+    /// </summary>
+    [DataField]
+    public bool PulseOnConnect = true;
+
+    /// <summary>
+    /// Should the anomaly pulse when disconnected from synchronizer?
+    /// </summary>
+    [DataField]
+    public bool PulseOnDisconnect = false;
+
+    /// <summary>
+    /// minimum distance from the synchronizer to the anomaly to be attached
+    /// </summary>
+    [DataField]
+    public float AttachRange = 0.4f;
 
     [DataField]
     public ProtoId<SourcePortPrototype> DecayingPort = "Decaying";
diff --git a/Content.Server/Anomaly/Components/AnomalyVesselComponent.cs b/Content.Server/Anomaly/Components/AnomalyVesselComponent.cs
index 74c5e3e9ed..1225cbf116 100644
--- a/Content.Server/Anomaly/Components/AnomalyVesselComponent.cs
+++ b/Content.Server/Anomaly/Components/AnomalyVesselComponent.cs
@@ -10,7 +10,7 @@ namespace Content.Server.Anomaly.Components;
 /// they generate points for the selected server based on
 /// the anomaly's stability and severity.
 /// </summary>
-[RegisterComponent, Access(typeof(SharedAnomalySystem))]
+[RegisterComponent, Access(typeof(SharedAnomalySystem)), AutoGenerateComponentPause]
 public sealed partial class AnomalyVesselComponent : Component
 {
     /// <summary>
@@ -42,6 +42,7 @@ public sealed partial class AnomalyVesselComponent : Component
     /// When the next beep sound will play
     /// </summary>
     [DataField("nextBeep", customTypeSerializer:typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan NextBeep = TimeSpan.Zero;
 
     /// <summary>
diff --git a/Content.Server/Anomaly/Components/GeneratingAnomalyGeneratorComponent.cs b/Content.Server/Anomaly/Components/GeneratingAnomalyGeneratorComponent.cs
index 4233bfd7e1..ef93e8c699 100644
--- a/Content.Server/Anomaly/Components/GeneratingAnomalyGeneratorComponent.cs
+++ b/Content.Server/Anomaly/Components/GeneratingAnomalyGeneratorComponent.cs
@@ -4,13 +4,14 @@
 
 namespace Content.Server.Anomaly.Components;
 
-[RegisterComponent, Access(typeof(SharedAnomalySystem))]
+[RegisterComponent, Access(typeof(SharedAnomalySystem)), AutoGenerateComponentPause]
 public sealed partial class GeneratingAnomalyGeneratorComponent : Component
 {
     /// <summary>
     /// When the generating period will end.
     /// </summary>
     [DataField("endTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan EndTime = TimeSpan.Zero;
 
     public EntityUid? AudioStream;
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index 51f260f32a..b11c562df5 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -1,305 +1,347 @@
 using Content.Server.GameTicking.Rules;
 using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Roles.Jobs;
+using Content.Server.Mind;
 using Content.Server.Preferences.Managers;
+using Content.Server.Roles.Jobs;
+using Content.Server.Shuttles.Components;
+using Content.Shared.Antag;
 using Content.Shared.Humanoid;
+using Content.Shared.Players;
 using Content.Shared.Preferences;
-using Robust.Server.Player;
-using System.Linq;
-using Content.Server.Mind;
-using Robust.Shared.Random;
-using Robust.Shared.Map;
-using System.Numerics;
-using Content.Shared.Inventory;
-using Content.Server.Storage.EntitySystems;
-using Robust.Shared.Audio;
-using Robust.Server.GameObjects;
-using Content.Server.Chat.Managers;
-using Content.Server.GameTicking;
-using Robust.Shared.Containers;
-using Content.Shared.Mobs.Components;
-using Content.Server.Station.Systems;
-using Content.Server.Shuttles.Systems;
-using Content.Shared.Mobs;
+using Content.Shared.Roles;
 using Robust.Server.Audio;
-using Robust.Server.Containers;
+using Robust.Shared.Audio;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Content.Server.Shuttles.Components;
+using Robust.Shared.Random;
+using System.Linq;
+using Content.Shared.Chat;
+using Robust.Shared.Enums;
 
 namespace Content.Server.Antag;
 
 public sealed class AntagSelectionSystem : GameRuleSystem<GameRuleComponent>
 {
-    [Dependency] private readonly IChatManager _chatManager = default!;
     [Dependency] private readonly IServerPreferencesManager _prefs = default!;
-    [Dependency] private readonly IPlayerManager _playerSystem = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly AudioSystem _audioSystem = default!;
-    [Dependency] private readonly ContainerSystem _containerSystem = default!;
     [Dependency] private readonly JobSystem _jobs = default!;
     [Dependency] private readonly MindSystem _mindSystem = default!;
-    [Dependency] private readonly InventorySystem _inventory = default!;
-    [Dependency] private readonly StorageSystem _storageSystem = default!;
-    [Dependency] private readonly StationSystem _stationSystem = default!;
-    [Dependency] private readonly EmergencyShuttleSystem _emergencyShuttle = default!;
+    [Dependency] private readonly SharedRoleSystem _roleSystem = default!;
 
+    #region Eligible Player Selection
     /// <summary>
-    /// Attempts to start the game rule by checking if there are enough players in lobby and readied.
+    /// Get all players that are eligible for an antag role
     /// </summary>
-    /// <param name="ev">The roundstart attempt event</param>
-    /// <param name="uid">The entity the gamerule you are using is on</param>
-    /// <param name="minPlayers">The minimum amount of players needed for you gamerule to start.</param>
-    /// <param name="gameRule">The gamerule component.</param>
-
-    public void AttemptStartGameRule(RoundStartAttemptEvent ev, EntityUid uid, int minPlayers, GameRuleComponent gameRule)
+    /// <param name="playerSessions">All sessions from which to select eligible players</param>
+    /// <param name="antagPrototype">The prototype to get eligible players for</param>
+    /// <param name="includeAllJobs">Should jobs that prohibit antag roles (ie Heads, Sec, Interns) be included</param>
+    /// <param name="acceptableAntags">Should players already selected as antags be eligible</param>
+    /// <param name="ignorePreferences">Should we ignore if the player has enabled this specific role</param>
+    /// <param name="customExcludeCondition">A custom condition that each player is tested against, if it returns true the player is excluded from eligibility</param>
+    /// <returns>List of all player entities that match the requirements</returns>
+    public List<EntityUid> GetEligiblePlayers(IEnumerable<ICommonSession> playerSessions,
+        ProtoId<AntagPrototype> antagPrototype,
+        bool includeAllJobs = false,
+        AntagAcceptability acceptableAntags = AntagAcceptability.NotExclusive,
+        bool ignorePreferences = false,
+        bool allowNonHumanoids = false,
+        Func<EntityUid?, bool>? customExcludeCondition = null)
     {
-        if (GameTicker.IsGameRuleAdded(uid, gameRule))
+        var eligiblePlayers = new List<EntityUid>();
+
+        foreach (var player in playerSessions)
         {
-            if (!ev.Forced && ev.Players.Length < minPlayers)
-            {
-                _chatManager.SendAdminAnnouncement(Loc.GetString("rev-not-enough-ready-players",
-                    ("readyPlayersCount", ev.Players.Length),
-                    ("minimumPlayers", minPlayers)));
-                ev.Cancel();
-            }
-            else if (ev.Players.Length == 0)
-            {
-                _chatManager.DispatchServerAnnouncement(Loc.GetString("rev-no-one-ready"));
-                ev.Cancel();
-            }
+            if (IsPlayerEligible(player, antagPrototype, includeAllJobs, acceptableAntags, ignorePreferences, allowNonHumanoids, customExcludeCondition))
+                eligiblePlayers.Add(player.AttachedEntity!.Value);
         }
+
+        return eligiblePlayers;
     }
 
     /// <summary>
-    /// Will check which players are eligible to be chosen for antagonist and give them the given antag.
+    /// Get all sessions that are eligible for an antag role, can be run prior to sessions being attached to an entity
+    /// This does not exclude sessions that have already been chosen as antags - that must be handled manually
     /// </summary>
-    /// <param name="antagPrototype">The antag prototype from your rule component.</param>
-    /// <param name="maxAntags">How many antags can be present in any given round.</param>
-    /// <param name="antagsPerPlayer">How many players you need to spawn an additional antag.</param>
-    /// <param name="antagSound">The intro sound that plays when the antag is chosen.</param>
-    /// <param name="antagGreeting">The antag message you want shown when the antag is chosen.</param>
-    /// <param name="greetingColor">The color of the message for the antag greeting in hex.</param>
-    /// <param name="chosen">A list of all the antags chosen in case you need to add stuff after.</param>
-    /// <param name="includeHeads">Whether or not heads can be chosen as antags for this gamemode.</param>
-    public void EligiblePlayers(string antagPrototype,
-        int maxAntags,
-        int antagsPerPlayer,
-        SoundSpecifier? antagSound,
-        string antagGreeting,
-        string greetingColor,
-        out List<EntityUid> chosen,
-        bool includeHeads = false)
+    /// <param name="playerSessions">All sessions from which to select eligible players</param>
+    /// <param name="antagPrototype">The prototype to get eligible players for</param>
+    /// <param name="ignorePreferences">Should we ignore if the player has enabled this specific role</param>
+    /// <returns>List of all player sessions that match the requirements</returns>
+    public List<ICommonSession> GetEligibleSessions(IEnumerable<ICommonSession> playerSessions, ProtoId<AntagPrototype> antagPrototype, bool ignorePreferences = false)
     {
-        var allPlayers = _playerSystem.Sessions.ToList();
-        var playerList = new List<ICommonSession>();
-        var prefList = new List<ICommonSession>();
-        chosen = new List<EntityUid>();
-        foreach (var player in allPlayers)
+        var eligibleSessions = new List<ICommonSession>();
+
+        foreach (var session in playerSessions)
         {
-            if (includeHeads == false)
-            {
-                if (!_jobs.CanBeAntag(player))
-                    continue;
-            }
+            if (IsSessionEligible(session, antagPrototype, ignorePreferences))
+                eligibleSessions.Add(session);
+        }
 
-            if (player.AttachedEntity == null || HasComp<HumanoidAppearanceComponent>(player.AttachedEntity))
-                playerList.Add(player);
-            else
-                continue;
+        return eligibleSessions;
+    }
 
-            var pref = (HumanoidCharacterProfile) _prefs.GetPreferences(player.UserId).SelectedCharacter;
-            if (pref.AntagPreferences.Contains(antagPrototype))
-                prefList.Add(player);
-        }
+    /// <summary>
+    /// Test eligibility of the player for a specific antag role
+    /// </summary>
+    /// <param name="session">The player session to test</param>
+    /// <param name="antagPrototype">The prototype to get eligible players for</param>
+    /// <param name="includeAllJobs">Should jobs that prohibit antag roles (ie Heads, Sec, Interns) be included</param>
+    /// <param name="acceptableAntags">Should players already selected as antags be eligible</param>
+    /// <param name="ignorePreferences">Should we ignore if the player has enabled this specific role</param>
+    /// <param name="customExcludeCondition">A function, accepting an EntityUid and returning bool. Each player is tested against this, returning truw will exclude the player from eligibility</param>
+    /// <returns>True if the player session matches the requirements, false otherwise</returns>
+    public bool IsPlayerEligible(ICommonSession session,
+        ProtoId<AntagPrototype> antagPrototype,
+        bool includeAllJobs = false,
+        AntagAcceptability acceptableAntags = AntagAcceptability.NotExclusive,
+        bool ignorePreferences = false,
+        bool allowNonHumanoids = false,
+        Func<EntityUid?, bool>? customExcludeCondition = null)
+    {
+        if (!IsSessionEligible(session, antagPrototype, ignorePreferences))
+            return false;
 
-        if (playerList.Count == 0)
-            return;
+        //Ensure the player has a mind
+        if (session.GetMind() is not { } playerMind)
+            return false;
+
+        //Ensure the player has an attached entity
+        if (session.AttachedEntity is not { } playerEntity)
+            return false;
+
+        //Ignore latejoined players, ie those on the arrivals station
+        if (HasComp<PendingClockInComponent>(playerEntity))
+            return false;
+
+        //Exclude jobs that cannot be antag, unless explicitly allowed
+        if (!includeAllJobs && !_jobs.CanBeAntag(session))
+            return false;
 
-        var antags = Math.Clamp(allPlayers.Count / antagsPerPlayer, 1, maxAntags);
-        for (var antag = 0; antag < antags; antag++)
+        //Check if the entity is already an antag
+        switch (acceptableAntags)
         {
-            ICommonSession? chosenPlayer = null;
-            if (prefList.Count == 0)
-            {
-                if (playerList.Count == 0)
+            //If we dont want to select any antag roles
+            case AntagAcceptability.None:
                 {
+                    if (_roleSystem.MindIsAntagonist(playerMind))
+                        return false;
                     break;
                 }
-            }
-            else
-            {
-                chosenPlayer = _random.PickAndTake(prefList);
-                playerList.Remove(chosenPlayer);
-            }
+            //If we dont want to select exclusive antag roles
+            case AntagAcceptability.NotExclusive:
+                {
+                    if (_roleSystem.MindIsExclusiveAntagonist(playerMind))
+                        return false;
+                    break;
+                }
+        }
 
-            if (!_mindSystem.TryGetMind(chosenPlayer, out _, out var mind) ||
-               mind.OwnedEntity is not { } ownedEntity)
-            {
-                continue;
-            }
+        //Unless explictly allowed, ignore non humanoids (eg pets)
+        if (!allowNonHumanoids && !HasComp<HumanoidAppearanceComponent>(playerEntity))
+            return false;
 
-            chosen.Add(ownedEntity);
-            _audioSystem.PlayGlobal(antagSound, ownedEntity);
-            if (mind.Session != null)
-            {
-                var message = Loc.GetString(antagGreeting);
-                var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", message));
-                _chatManager.ChatMessageToOne(Shared.Chat.ChatChannel.Server, message, wrappedMessage, default, false, mind.Session.Channel, Color.FromHex(greetingColor));
-            }
-        }
+        //If a custom condition was provided, test it and exclude the player if it returns true
+        if (customExcludeCondition != null && customExcludeCondition(playerEntity))
+            return false;
+
+
+        return true;
     }
 
     /// <summary>
-    /// The function walks through all players, checking their role and preferences to generate a list of players who can become antagonists.
+    /// Check if the session is eligible for a role, can be run prior to the session being attached to an entity
     /// </summary>
-    /// <param name="candidates">a list of players to check out</param>
-    /// <param name="antagPreferenceId">antagonist's code id</param>
-    /// <returns></returns>
-    public List<ICommonSession> FindPotentialAntags(in Dictionary<ICommonSession, HumanoidCharacterProfile> candidates, string antagPreferenceId)
+    /// <param name="session">Player session to check</param>
+    /// <param name="antagPrototype">Which antag prototype to check for</param>
+    /// <param name="ignorePreferences">Ignore if the player has enabled this antag</param>
+    /// <returns>True if the session matches the requirements, false otherwise</returns>
+    public bool IsSessionEligible(ICommonSession session, ProtoId<AntagPrototype> antagPrototype, bool ignorePreferences = false)
     {
-        var list = new List<ICommonSession>();
-        var pendingQuery = GetEntityQuery<PendingClockInComponent>();
+        //Exclude disconnected or zombie sessions
+        //No point giving antag roles to them
+        if (session.Status == SessionStatus.Disconnected ||
+            session.Status == SessionStatus.Zombie)
+            return false;
 
-        foreach (var player in candidates.Keys)
-        {
-            // Role prevents antag.
-            if (!_jobs.CanBeAntag(player))
-                continue;
-
-            // Latejoin
-            if (player.AttachedEntity != null && pendingQuery.HasComponent(player.AttachedEntity.Value))
-                continue;
+        //Check the player has this antag preference selected
+        //Unless we are ignoring preferences, in which case add them anyway
+        var pref = (HumanoidCharacterProfile) _prefs.GetPreferences(session.UserId).SelectedCharacter;
+        if (!pref.AntagPreferences.Contains(antagPrototype.Id) && !ignorePreferences)
+            return false;
 
-            list.Add(player);
-        }
+        return true;
+    }
+    #endregion
 
-        var prefList = new List<ICommonSession>();
+    /// <summary>
+    /// Helper method to calculate the number of antags to select based upon the number of players
+    /// </summary>
+    /// <param name="playerCount">How many players there are on the server</param>
+    /// <param name="playersPerAntag">How many players should there be for an additional antag</param>
+    /// <param name="maxAntags">Maximum number of antags allowed</param>
+    /// <returns>The number of antags that should be chosen</returns>
+    public int CalculateAntagCount(int playerCount, int playersPerAntag, int maxAntags)
+    {
+        return Math.Clamp(playerCount / playersPerAntag, 1, maxAntags);
+    }
 
-        foreach (var player in list)
+    #region Antag Selection
+    /// <summary>
+    /// Selects a set number of entities from several lists, prioritising the first list till its empty, then second list etc
+    /// </summary>
+    /// <param name="eligiblePlayerLists">Array of lists, which are chosen from in order until the correct number of items are selected</param>
+    /// <param name="count">How many items to select</param>
+    /// <returns>Up to the specified count of elements from all provided lists</returns>
+    public List<EntityUid> ChooseAntags(int count, params List<EntityUid>[] eligiblePlayerLists)
+    {
+        var chosenPlayers = new List<EntityUid>();
+        foreach (var playerList in eligiblePlayerLists)
         {
-            //player preferences to play as this antag
-            var profile = candidates[player];
-            if (profile.AntagPreferences.Contains(antagPreferenceId))
+            //Remove all chosen players from this list, to prevent duplicates
+            foreach (var chosenPlayer in chosenPlayers)
             {
-                prefList.Add(player);
+                playerList.Remove(chosenPlayer);
             }
+
+            //If we have reached the desired number of players, skip
+            if (chosenPlayers.Count >= count)
+                continue;
+
+            //Pick and choose a random number of players from this list
+            chosenPlayers.AddRange(ChooseAntags(count - chosenPlayers.Count, playerList));
         }
-        if (prefList.Count == 0)
-        {
-            Log.Info($"Insufficient preferred antag:{antagPreferenceId}, picking at random.");
-            prefList = list;
-        }
-        return prefList;
+        return chosenPlayers;
     }
-
     /// <summary>
-    /// selects the specified number of players from the list
+    /// Helper method to choose antags from a list
     /// </summary>
-    /// <param name="antagCount">how many players to take</param>
-    /// <param name="prefList">a list of players from which to draw</param>
-    /// <returns></returns>
-    public List<ICommonSession> PickAntag(int antagCount, List<ICommonSession> prefList)
+    /// <param name="eligiblePlayers">List of eligible players</param>
+    /// <param name="count">How many to choose</param>
+    /// <returns>Up to the specified count of elements from the provided list</returns>
+    public List<EntityUid> ChooseAntags(int count, List<EntityUid> eligiblePlayers)
     {
-        var results = new List<ICommonSession>(antagCount);
-        if (prefList.Count == 0)
-        {
-            Log.Info("Insufficient ready players to fill up with antags, stopping the selection.");
-            return results;
-        }
+        var chosenPlayers = new List<EntityUid>();
 
-        for (var i = 0; i < antagCount; i++)
+        for (var i = 0; i < count; i++)
         {
-            results.Add(_random.PickAndTake(prefList));
-            Log.Info("Selected a preferred antag.");
+            if (eligiblePlayers.Count == 0)
+                break;
+
+            chosenPlayers.Add(RobustRandom.PickAndTake(eligiblePlayers));
         }
-        return results;
+
+        return chosenPlayers;
     }
 
     /// <summary>
-    /// Will take a group of entities and check if they are all alive or dead
+    /// Selects a set number of sessions from several lists, prioritising the first list till its empty, then second list etc
     /// </summary>
-    /// <param name="list">The list of the entities</param>
-    /// <param name="checkOffStation">Bool for if you want to check if someone is in space and consider them dead. (Won't check when emergency shuttle arrives just in case)</param>
-    /// <returns></returns>
-    public bool IsGroupDead(List<EntityUid> list, bool checkOffStation)
+    /// <param name="eligiblePlayerLists">Array of lists, which are chosen from in order until the correct number of items are selected</param>
+    /// <param name="count">How many items to select</param>
+    /// <returns>Up to the specified count of elements from all provided lists</returns>
+    public List<ICommonSession> ChooseAntags(int count, params List<ICommonSession>[] eligiblePlayerLists)
     {
-        var dead = 0;
-        foreach (var entity in list)
+        var chosenPlayers = new List<ICommonSession>();
+        foreach (var playerList in eligiblePlayerLists)
         {
-            if (TryComp<MobStateComponent>(entity, out var state))
-            {
-                if (state.CurrentState == MobState.Dead || state.CurrentState == MobState.Invalid)
-                {
-                    dead++;
-                }
-                else if (checkOffStation && _stationSystem.GetOwningStation(entity) == null && !_emergencyShuttle.EmergencyShuttleArrived)
-                {
-                    dead++;
-                }
-            }
-            //If they don't have the MobStateComponent they might as well be dead.
-            else
+            //Remove all chosen players from this list, to prevent duplicates
+            foreach (var chosenPlayer in chosenPlayers)
             {
-                dead++;
+                playerList.Remove(chosenPlayer);
             }
+
+            //If we have reached the desired number of players, skip
+            if (chosenPlayers.Count >= count)
+                continue;
+
+            //Pick and choose a random number of players from this list
+            chosenPlayers.AddRange(ChooseAntags(count - chosenPlayers.Count, playerList));
         }
+        return chosenPlayers;
+    }
+    /// <summary>
+    /// Helper method to choose sessions from a list
+    /// </summary>
+    /// <param name="eligiblePlayers">List of eligible sessions</param>
+    /// <param name="count">How many to choose</param>
+    /// <returns>Up to the specified count of elements from the provided list</returns>
+    public List<ICommonSession> ChooseAntags(int count, List<ICommonSession> eligiblePlayers)
+    {
+        var chosenPlayers = new List<ICommonSession>();
+
+        for (int i = 0; i < count; i++)
+        {
+            if (eligiblePlayers.Count == 0)
+                break;
 
-        return dead == list.Count || list.Count == 0;
+            chosenPlayers.Add(RobustRandom.PickAndTake(eligiblePlayers));
+        }
+
+        return chosenPlayers;
     }
+    #endregion
 
+    #region Briefings
     /// <summary>
-    /// Will attempt to spawn an item inside of a persons bag and then pockets.
+    /// Helper method to send the briefing text and sound to a list of entities
     /// </summary>
-    /// <param name="antag">The entity that you want to spawn an item on</param>
-    /// <param name="items">A list of prototype IDs that you want to spawn in the bag.</param>
-    public void GiveAntagBagGear(EntityUid antag, List<EntProtoId> items)
+    /// <param name="entities">The players chosen to be antags</param>
+    /// <param name="briefing">The briefing text to send</param>
+    /// <param name="briefingColor">The color the briefing should be, null for default</param>
+    /// <param name="briefingSound">The sound to briefing/greeting sound to play</param>
+    public void SendBriefing(List<EntityUid> entities, string briefing, Color? briefingColor, SoundSpecifier? briefingSound)
     {
-        foreach (var item in items)
+        foreach (var entity in entities)
         {
-            GiveAntagBagGear(antag, item);
+            SendBriefing(entity, briefing, briefingColor, briefingSound);
         }
     }
 
     /// <summary>
-    /// Will attempt to spawn an item inside of a persons bag and then pockets.
+    /// Helper method to send the briefing text and sound to a player entity
     /// </summary>
-    /// <param name="antag">The entity that you want to spawn an item on</param>
-    /// <param name="item">The prototype ID that you want to spawn in the bag.</param>
-    public void GiveAntagBagGear(EntityUid antag, string item)
+    /// <param name="entity">The entity chosen to be antag</param>
+    /// <param name="briefing">The briefing text to send</param>
+    /// <param name="briefingColor">The color the briefing should be, null for default</param>
+    /// <param name="briefingSound">The sound to briefing/greeting sound to play</param>
+    public void SendBriefing(EntityUid entity, string briefing, Color? briefingColor, SoundSpecifier? briefingSound)
     {
-        var itemToSpawn = Spawn(item, new EntityCoordinates(antag, Vector2.Zero));
-        if (!_inventory.TryGetSlotContainer(antag, "back", out var backSlot, out _))
+        if (!_mindSystem.TryGetMind(entity, out _, out var mindComponent))
             return;
 
-        var bag = backSlot.ContainedEntity;
-        if (bag != null && HasComp<ContainerManagerComponent>(bag) && _storageSystem.CanInsert(bag.Value, itemToSpawn, out _))
-        {
-            _storageSystem.Insert(bag.Value, itemToSpawn, out _);
-        }
-        else if (_inventory.TryGetSlotContainer(antag, "jumpsuit", out var jumpsuit, out _) && jumpsuit.ContainedEntity != null)
+        if (mindComponent.Session == null)
+            return;
+
+        SendBriefing(mindComponent.Session, briefing, briefingColor, briefingSound);
+    }
+
+    /// <summary>
+    /// Helper method to send the briefing text and sound to a list of sessions
+    /// </summary>
+    /// <param name="sessions"></param>
+    /// <param name="briefing"></param>
+    /// <param name="briefingColor"></param>
+    /// <param name="briefingSound"></param>
+
+    public void SendBriefing(List<ICommonSession> sessions, string briefing, Color? briefingColor, SoundSpecifier? briefingSound)
+    {
+        foreach (var session in sessions)
         {
-            if (_inventory.TryGetSlotContainer(antag, "pocket1", out var pocket1Slot, out _))
-            {
-                if (pocket1Slot.ContainedEntity == null)
-                {
-                    if (_containerSystem.CanInsert(itemToSpawn, pocket1Slot))
-                    {
-                        _containerSystem.Insert(itemToSpawn, pocket1Slot);
-                    }
-                }
-                else if (_inventory.TryGetSlotContainer(antag, "pocket2", out var pocket2Slot, out _))
-                {
-                    if (pocket2Slot.ContainedEntity == null)
-                    {
-                        if (_containerSystem.CanInsert(itemToSpawn, pocket2Slot))
-                        {
-                            _containerSystem.Insert(itemToSpawn, pocket2Slot);
-                        }
-                    }
-                }
-            }
+            SendBriefing(session, briefing, briefingColor, briefingSound);
         }
     }
-}
+    /// <summary>
+    /// Helper method to send the briefing text and sound to a session
+    /// </summary>
+    /// <param name="session">The player chosen to be an antag</param>
+    /// <param name="briefing">The briefing text to send</param>
+    /// <param name="briefingColor">The color the briefing should be, null for default</param>
+    /// <param name="briefingSound">The sound to briefing/greeting sound to play</param>
 
+    public void SendBriefing(ICommonSession session, string briefing, Color? briefingColor, SoundSpecifier? briefingSound)
+    {
+        _audioSystem.PlayGlobal(briefingSound, session);
+        var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", briefing));
+        ChatManager.ChatMessageToOne(ChatChannel.Server, briefing, wrappedMessage, default, false, session.Channel, briefingColor);
+    }
+    #endregion
+}
diff --git a/Content.Server/Atmos/Components/PressureProtectionComponent.cs b/Content.Server/Atmos/Components/PressureProtectionComponent.cs
index a3a2842159..e1f13bca79 100644
--- a/Content.Server/Atmos/Components/PressureProtectionComponent.cs
+++ b/Content.Server/Atmos/Components/PressureProtectionComponent.cs
@@ -1,18 +1,33 @@
-namespace Content.Server.Atmos.Components
+using Content.Server.Atmos.EntitySystems;
+
+namespace Content.Server.Atmos.Components;
+
+[RegisterComponent]
+[Access(typeof(BarotraumaSystem))]
+public sealed partial class PressureProtectionComponent : Component
 {
-    [RegisterComponent]
-    public sealed partial class PressureProtectionComponent : Component
-    {
-        [DataField("highPressureMultiplier")]
-        public float HighPressureMultiplier { get; private set; } = 1f;
+    [DataField]
+    public float HighPressureMultiplier = 1f;
+
+    [DataField]
+    public float HighPressureModifier;
 
-        [DataField("highPressureModifier")]
-        public float HighPressureModifier { get; private set; } = 0f;
+    [DataField]
+    public float LowPressureMultiplier = 1f;
 
-        [DataField("lowPressureMultiplier")]
-        public float LowPressureMultiplier { get; private set; } = 1f;
+    [DataField]
+    public float LowPressureModifier;
+}
 
-        [DataField("lowPressureModifier")]
-        public float LowPressureModifier { get; private set; } = 0f;
-    }
+/// <summary>
+/// Event raised on an entity with <see cref="PressureProtectionComponent"/> in order to adjust its default values.
+/// </summary>
+[ByRefEvent]
+public record struct GetPressureProtectionValuesEvent
+{
+    public float HighPressureMultiplier;
+    public float HighPressureModifier;
+    public float LowPressureMultiplier;
+    public float LowPressureModifier;
 }
+
diff --git a/Content.Server/Atmos/Components/TemperatureProtectionComponent.cs b/Content.Server/Atmos/Components/TemperatureProtectionComponent.cs
index 3f9d7bc771..bdee5ff514 100644
--- a/Content.Server/Atmos/Components/TemperatureProtectionComponent.cs
+++ b/Content.Server/Atmos/Components/TemperatureProtectionComponent.cs
@@ -1,11 +1,20 @@
-namespace Content.Server.Atmos.Components;
+using Content.Server.Temperature.Systems;
+
+namespace Content.Server.Atmos.Components;
 
 [RegisterComponent]
+[Access(typeof(TemperatureSystem))]
 public sealed partial class TemperatureProtectionComponent : Component
 {
     /// <summary>
     ///     How much to multiply temperature deltas by.
     /// </summary>
-    [DataField("coefficient")]
+    [DataField]
     public float Coefficient = 1.0f;
 }
+
+/// <summary>
+/// Event raised on an entity with <see cref="TemperatureProtectionComponent"/> to determine the actual value of the coefficient.
+/// </summary>
+[ByRefEvent]
+public record struct GetTemperatureProtectionEvent(float Coefficient);
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs
index 7f82e6fb57..3aaa5429fb 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs
@@ -36,25 +36,25 @@ public sealed partial class AtmosphereSystem
 
         private void InitializeCVars()
         {
-            _cfg.OnValueChanged(CCVars.SpaceWind, value => SpaceWind = value, true);
-            _cfg.OnValueChanged(CCVars.SpaceWindPressureForceDivisorThrow, value => SpaceWindPressureForceDivisorThrow = value, true);
-            _cfg.OnValueChanged(CCVars.SpaceWindPressureForceDivisorPush, value => SpaceWindPressureForceDivisorPush = value, true);
-            _cfg.OnValueChanged(CCVars.SpaceWindMaxVelocity, value => SpaceWindMaxVelocity = value, true);
-            _cfg.OnValueChanged(CCVars.SpaceWindMaxPushForce, value => SpaceWindMaxPushForce = value, true);
-            _cfg.OnValueChanged(CCVars.MonstermosEqualization, value => MonstermosEqualization = value, true);
-            _cfg.OnValueChanged(CCVars.MonstermosDepressurization, value => MonstermosDepressurization = value, true);
-            _cfg.OnValueChanged(CCVars.MonstermosRipTiles, value => MonstermosRipTiles = value, true);
-            _cfg.OnValueChanged(CCVars.AtmosGridImpulse, value => GridImpulse = value, true);
-            _cfg.OnValueChanged(CCVars.AtmosSpacingEscapeRatio, value => SpacingEscapeRatio = value, true);
-            _cfg.OnValueChanged(CCVars.AtmosSpacingMinGas, value => SpacingMinGas = value, true);
-            _cfg.OnValueChanged(CCVars.AtmosSpacingMaxWind, value => SpacingMaxWind = value, true);
-            _cfg.OnValueChanged(CCVars.Superconduction, value => Superconduction = value, true);
-            _cfg.OnValueChanged(CCVars.AtmosMaxProcessTime, value => AtmosMaxProcessTime = value, true);
-            _cfg.OnValueChanged(CCVars.AtmosTickRate, value => AtmosTickRate = value, true);
-            _cfg.OnValueChanged(CCVars.AtmosSpeedup, value => Speedup = value, true);
-            _cfg.OnValueChanged(CCVars.AtmosHeatScale, value => { HeatScale = value; InitializeGases(); }, true);
-            _cfg.OnValueChanged(CCVars.ExcitedGroups, value => ExcitedGroups = value, true);
-            _cfg.OnValueChanged(CCVars.ExcitedGroupsSpaceIsAllConsuming, value => ExcitedGroupsSpaceIsAllConsuming = value, true);
+            Subs.CVar(_cfg, CCVars.SpaceWind, value => SpaceWind = value, true);
+            Subs.CVar(_cfg, CCVars.SpaceWindPressureForceDivisorThrow, value => SpaceWindPressureForceDivisorThrow = value, true);
+            Subs.CVar(_cfg, CCVars.SpaceWindPressureForceDivisorPush, value => SpaceWindPressureForceDivisorPush = value, true);
+            Subs.CVar(_cfg, CCVars.SpaceWindMaxVelocity, value => SpaceWindMaxVelocity = value, true);
+            Subs.CVar(_cfg, CCVars.SpaceWindMaxPushForce, value => SpaceWindMaxPushForce = value, true);
+            Subs.CVar(_cfg, CCVars.MonstermosEqualization, value => MonstermosEqualization = value, true);
+            Subs.CVar(_cfg, CCVars.MonstermosDepressurization, value => MonstermosDepressurization = value, true);
+            Subs.CVar(_cfg, CCVars.MonstermosRipTiles, value => MonstermosRipTiles = value, true);
+            Subs.CVar(_cfg, CCVars.AtmosGridImpulse, value => GridImpulse = value, true);
+            Subs.CVar(_cfg, CCVars.AtmosSpacingEscapeRatio, value => SpacingEscapeRatio = value, true);
+            Subs.CVar(_cfg, CCVars.AtmosSpacingMinGas, value => SpacingMinGas = value, true);
+            Subs.CVar(_cfg, CCVars.AtmosSpacingMaxWind, value => SpacingMaxWind = value, true);
+            Subs.CVar(_cfg, CCVars.Superconduction, value => Superconduction = value, true);
+            Subs.CVar(_cfg, CCVars.AtmosMaxProcessTime, value => AtmosMaxProcessTime = value, true);
+            Subs.CVar(_cfg, CCVars.AtmosTickRate, value => AtmosTickRate = value, true);
+            Subs.CVar(_cfg, CCVars.AtmosSpeedup, value => Speedup = value, true);
+            Subs.CVar(_cfg, CCVars.AtmosHeatScale, value => { HeatScale = value; InitializeGases(); }, true);
+            Subs.CVar(_cfg, CCVars.ExcitedGroups, value => ExcitedGroups = value, true);
+            Subs.CVar(_cfg, CCVars.ExcitedGroupsSpaceIsAllConsuming, value => ExcitedGroupsSpaceIsAllConsuming = value, true);
         }
     }
 }
diff --git a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
index 1b3e1b07a6..023ac28763 100644
--- a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using Content.Server.Administration.Logs;
 using Content.Server.Atmos.Components;
 using Content.Shared.Alert;
@@ -97,7 +98,11 @@ private void UpdateCachedResistances(EntityUid uid, BarotraumaComponent barotrau
                 foreach (var slot in barotrauma.ProtectionSlots)
                 {
                     if (!_inventorySystem.TryGetSlotEntity(uid, slot, out var equipment, inv, contMan)
-                        || !TryComp(equipment, out PressureProtectionComponent? protection))
+                        || !TryGetPressureProtectionValues(equipment.Value,
+                            out var itemHighMultiplier,
+                            out var itemHighModifier,
+                            out var itemLowMultiplier,
+                            out var itemLowModifier))
                     {
                         // Missing protection, skin is exposed.
                         hPModifier = 0f;
@@ -108,10 +113,10 @@ private void UpdateCachedResistances(EntityUid uid, BarotraumaComponent barotrau
                     }
 
                     // The entity is as protected as its weakest part protection
-                    hPModifier = Math.Max(hPModifier, protection.HighPressureModifier);
-                    hPMultiplier = Math.Max(hPMultiplier, protection.HighPressureMultiplier);
-                    lPModifier = Math.Min(lPModifier, protection.LowPressureModifier);
-                    lPMultiplier = Math.Min(lPMultiplier, protection.LowPressureMultiplier);
+                    hPModifier = Math.Max(hPModifier, itemHighModifier.Value);
+                    hPMultiplier = Math.Max(hPMultiplier, itemHighMultiplier.Value);
+                    lPModifier = Math.Min(lPModifier, itemLowModifier.Value);
+                    lPMultiplier = Math.Min(lPMultiplier, itemLowMultiplier.Value);
                 }
 
                 barotrauma.HighPressureModifier = hPModifier;
@@ -121,12 +126,16 @@ private void UpdateCachedResistances(EntityUid uid, BarotraumaComponent barotrau
             }
 
             // any innate pressure resistance ?
-            if (TryComp<PressureProtectionComponent>(uid, out var innatePressureProtection))
+            if (TryGetPressureProtectionValues(uid,
+                    out var highMultiplier,
+                    out var highModifier,
+                    out var lowMultiplier,
+                    out var lowModifier))
             {
-                barotrauma.HighPressureModifier += innatePressureProtection.HighPressureModifier;
-                barotrauma.HighPressureMultiplier *= innatePressureProtection.HighPressureMultiplier;
-                barotrauma.LowPressureModifier += innatePressureProtection.LowPressureModifier;
-                barotrauma.LowPressureMultiplier *= innatePressureProtection.LowPressureMultiplier;
+                barotrauma.HighPressureModifier += highModifier.Value;
+                barotrauma.HighPressureMultiplier *= highMultiplier.Value;
+                barotrauma.LowPressureModifier += lowModifier.Value;
+                barotrauma.LowPressureMultiplier *= lowMultiplier.Value;
             }
         }
 
@@ -156,6 +165,36 @@ public float GetFeltHighPressure(EntityUid uid, BarotraumaComponent barotrauma,
             return (environmentPressure + barotrauma.HighPressureModifier) * (barotrauma.HighPressureMultiplier);
         }
 
+        public bool TryGetPressureProtectionValues(
+            Entity<PressureProtectionComponent?> ent,
+            [NotNullWhen(true)] out float? highMultiplier,
+            [NotNullWhen(true)] out float? highModifier,
+            [NotNullWhen(true)] out float? lowMultiplier,
+            [NotNullWhen(true)] out float? lowModifier)
+        {
+            highMultiplier = null;
+            highModifier = null;
+            lowMultiplier = null;
+            lowModifier = null;
+            if (!Resolve(ent, ref ent.Comp, false))
+                return false;
+
+            var comp = ent.Comp;
+            var ev = new GetPressureProtectionValuesEvent
+            {
+                HighPressureMultiplier = comp.HighPressureMultiplier,
+                HighPressureModifier = comp.HighPressureModifier,
+                LowPressureMultiplier = comp.LowPressureMultiplier,
+                LowPressureModifier = comp.LowPressureModifier
+            };
+            RaiseLocalEvent(ent, ref ev);
+            highMultiplier = ev.HighPressureMultiplier;
+            highModifier = ev.HighPressureModifier;
+            lowMultiplier = ev.LowPressureMultiplier;
+            lowModifier = ev.LowPressureModifier;
+            return true;
+        }
+
         public override void Update(float frameTime)
         {
             _timer += frameTime;
diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index cb1cb9bc15..53fcb72076 100644
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -4,6 +4,7 @@
 using Content.Server.Stunnable;
 using Content.Server.Temperature.Components;
 using Content.Server.Temperature.Systems;
+using Content.Server.Damage.Components;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
@@ -20,6 +21,7 @@
 using Content.Shared.Timing;
 using Content.Shared.Toggleable;
 using Content.Shared.Weapons.Melee.Events;
+using Content.Shared.FixedPoint;
 using Robust.Server.Audio;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
@@ -73,6 +75,8 @@ public override void Initialize()
             SubscribeLocalEvent<IgniteOnMeleeHitComponent, MeleeHitEvent>(OnMeleeHit);
 
             SubscribeLocalEvent<ExtinguishOnInteractComponent, ActivateInWorldEvent>(OnExtinguishActivateInWorld);
+
+            SubscribeLocalEvent<IgniteOnHeatDamageComponent, DamageChangedEvent>(OnDamageChanged);
         }
 
         private void OnMeleeHit(EntityUid uid, IgniteOnMeleeHitComponent component, MeleeHitEvent args)
@@ -318,6 +322,31 @@ public void Ignite(EntityUid uid, EntityUid ignitionSource, FlammableComponent?
             UpdateAppearance(uid, flammable);
         }
 
+        private void OnDamageChanged(EntityUid uid, IgniteOnHeatDamageComponent component, DamageChangedEvent args)
+        {
+            // Make sure the entity is flammable
+            if (!TryComp<FlammableComponent>(uid, out var flammable))
+                return;
+
+            // Make sure the damage delta isn't null
+            if (args.DamageDelta == null)
+                return;
+
+            // Check if its' taken any heat damage, and give the value
+            if (args.DamageDelta.DamageDict.TryGetValue("Heat", out FixedPoint2 value))
+            {
+                // Make sure the value is greater than the threshold
+                if(value <= component.Threshold)
+                    return;
+
+                // Ignite that sucker
+                flammable.FireStacks += component.FireStacks;
+                Ignite(uid, uid, flammable);
+            }
+
+
+        }
+
         public void Resist(EntityUid uid,
             FlammableComponent? flammable = null)
         {
diff --git a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
index c0fc1896e3..8ae9517379 100644
--- a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
@@ -76,9 +76,9 @@ public override void Initialize()
             };
 
             _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
-            _confMan.OnValueChanged(CCVars.NetGasOverlayTickRate, UpdateTickRate, true);
-            _confMan.OnValueChanged(CCVars.GasOverlayThresholds, UpdateThresholds, true);
-            _confMan.OnValueChanged(CVars.NetPVS, OnPvsToggle, true);
+            Subs.CVar(_confMan, CCVars.NetGasOverlayTickRate, UpdateTickRate, true);
+            Subs.CVar(_confMan, CCVars.GasOverlayThresholds, UpdateThresholds, true);
+            Subs.CVar(_confMan, CVars.NetPVS, OnPvsToggle, true);
 
             SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
             SubscribeLocalEvent<GasTileOverlayComponent, ComponentStartup>(OnStartup);
@@ -95,9 +95,6 @@ public override void Shutdown()
         {
             base.Shutdown();
             _playerManager.PlayerStatusChanged -= OnPlayerStatusChanged;
-            _confMan.UnsubValueChanged(CCVars.NetGasOverlayTickRate, UpdateTickRate);
-            _confMan.UnsubValueChanged(CCVars.GasOverlayThresholds, UpdateThresholds);
-            _confMan.UnsubValueChanged(CVars.NetPVS, OnPvsToggle);
         }
 
         private void OnPvsToggle(bool value)
diff --git a/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs b/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs
index af73bcd7f9..286b154e96 100644
--- a/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs
@@ -30,13 +30,7 @@ public override void Initialize()
         SubscribeLocalEvent<HeatExchangerComponent, AtmosDeviceUpdateEvent>(OnAtmosUpdate);
 
         // Getting CVars is expensive, don't do it every tick
-        _cfg.OnValueChanged(CCVars.SuperconductionTileLoss, CacheTileLoss, true);
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        _cfg.UnsubValueChanged(CCVars.SuperconductionTileLoss, CacheTileLoss);
+        Subs.CVar(_cfg, CCVars.SuperconductionTileLoss, CacheTileLoss, true);
     }
 
     private void CacheTileLoss(float val)
diff --git a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
index b346fd63b0..2922d0796a 100644
--- a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
@@ -15,6 +15,7 @@
 using Content.Shared.Atmos.Monitor.Components;
 using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.DeviceLinking;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Systems;
 using Content.Shared.Interaction;
 using Content.Shared.Wires;
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
index 27e64a9956..2875d4a3d5 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs
@@ -6,6 +6,7 @@
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Power.Components;
 using Content.Shared.Atmos.Monitor;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Tag;
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosDeviceNetwork.cs b/Content.Server/Atmos/Monitor/Systems/AtmosDeviceNetwork.cs
index 0b73ea5f35..33e4eafc74 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosDeviceNetwork.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosDeviceNetwork.cs
@@ -1,6 +1,7 @@
 using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Shared.Atmos.Monitor.Components;
+using Content.Shared.DeviceNetwork;
 
 namespace Content.Server.Atmos.Monitor.Systems;
 
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
index 1fcb7734d8..28a0a01c99 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
@@ -8,6 +8,7 @@
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Monitor;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Tag;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
index 4ae0d70f5e..10b9cccc09 100644
--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
@@ -13,6 +13,7 @@
 using Content.Shared.Atmos.Visuals;
 using Content.Shared.Audio;
 using Content.Shared.Database;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs
index 93d973d123..5da4ec9fdf 100644
--- a/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs
+++ b/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs
@@ -64,5 +64,11 @@ public sealed partial class GasThermoMachineComponent : Component
         /// </summary>
         [DataField, ViewVariables(VVAccess.ReadWrite)]
         public float EnergyLeakPercentage;
+
+        /// <summary>
+        /// If true, heat is exclusively exchanged with the local atmosphere instead of the inlet pipe air
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        public bool Atmospheric = false;
     }
 }
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
index e1e7b2a701..64d02d793b 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
@@ -17,7 +17,6 @@
 using Content.Shared.Interaction;
 using Content.Shared.Lock;
 using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
@@ -54,7 +53,6 @@ public override void Initialize()
         SubscribeLocalEvent<GasCanisterComponent, GasCanisterHoldingTankEjectMessage>(OnHoldingTankEjectMessage);
         SubscribeLocalEvent<GasCanisterComponent, GasCanisterChangeReleasePressureMessage>(OnCanisterChangeReleasePressure);
         SubscribeLocalEvent<GasCanisterComponent, GasCanisterChangeReleaseValveMessage>(OnCanisterChangeReleaseValve);
-        SubscribeLocalEvent<GasCanisterComponent, LockToggledEvent>(OnLockToggled);
     }
 
     /// <summary>
@@ -78,11 +76,6 @@ private void OnCanisterStartup(EntityUid uid, GasCanisterComponent comp, Compone
     {
         // Ensure container
         _slots.AddItemSlot(uid, comp.ContainerName, comp.GasTankSlot);
-
-        if (TryComp<LockComponent>(uid, out var lockComp))
-        {
-            _appearance.SetData(uid, GasCanisterVisuals.Locked, lockComp.Locked);
-        }
     }
 
     private void DirtyUI(EntityUid uid,
@@ -309,11 +302,6 @@ private void OnAnalyzed(EntityUid uid, GasCanisterComponent component, GasAnalyz
         args.GasMixtures = new Dictionary<string, GasMixture?> { {Name(uid), component.Air} };
     }
 
-    private void OnLockToggled(EntityUid uid, GasCanisterComponent component, ref LockToggledEvent args)
-    {
-        _appearance.SetData(uid, GasCanisterVisuals.Locked, args.Locked);
-    }
-
     /// <summary>
     /// Check if the canister is locked, playing its sound and popup if so.
     /// </summary>
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
index ee0dca0fb0..d376c6d9d6 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
@@ -17,6 +17,7 @@
 using Content.Shared.UserInterface;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Examine;
 
 namespace Content.Server.Atmos.Piping.Unary.EntitySystems
@@ -54,17 +55,18 @@ private void OnBeforeOpened(Entity<GasThermoMachineComponent> ent, ref BeforeAct
 
         private void OnThermoMachineUpdated(EntityUid uid, GasThermoMachineComponent thermoMachine, ref AtmosDeviceUpdateEvent args)
         {
-            if (!(_power.IsPowered(uid) && TryComp<ApcPowerReceiverComponent>(uid, out var receiver))
-                || !TryComp<NodeContainerComponent>(uid, out var nodeContainer)
-                || !_nodeContainer.TryGetNode(nodeContainer, thermoMachine.InletName, out PipeNode? inlet))
-            {
+            thermoMachine.LastEnergyDelta = 0f;
+            if (!(_power.IsPowered(uid) && TryComp<ApcPowerReceiverComponent>(uid, out var receiver)))
+                return;
+
+            GetHeatExchangeGasMixture(uid, thermoMachine, out var heatExchangeGasMixture);
+            if (heatExchangeGasMixture == null)
                 return;
-            }
 
             float sign = Math.Sign(thermoMachine.Cp); // 1 if heater, -1 if freezer
             float targetTemp = thermoMachine.TargetTemperature;
             float highTemp = targetTemp + sign * thermoMachine.TemperatureTolerance;
-            float temp = inlet.Air.Temperature;
+            float temp = heatExchangeGasMixture.Temperature;
 
             if (sign * temp >= sign * highTemp) // upper bound
                 thermoMachine.HysteresisState = false; // turn off
@@ -73,8 +75,7 @@ private void OnThermoMachineUpdated(EntityUid uid, GasThermoMachineComponent the
 
             if (thermoMachine.HysteresisState)
                 targetTemp = highTemp; // when on, target upper hysteresis bound
-
-            if (!thermoMachine.HysteresisState) // Hysteresis is the same as "Should this be on?"
+            else // Hysteresis is the same as "Should this be on?"
             {
                 // Turn dynamic load back on when power has been adjusted to not cause lights to
                 // blink every time this heater comes on.
@@ -86,7 +87,7 @@ private void OnThermoMachineUpdated(EntityUid uid, GasThermoMachineComponent the
             float dQ = thermoMachine.HeatCapacity * thermoMachine.Cp * args.dt;
 
             // Clamps the heat transferred to not overshoot
-            float Cin = _atmosphereSystem.GetHeatCapacity(inlet.Air, true);
+            float Cin = _atmosphereSystem.GetHeatCapacity(heatExchangeGasMixture, true);
             float dT = targetTemp - temp;
             float dQLim = dT * Cin;
             float scale = 1f;
@@ -95,17 +96,47 @@ private void OnThermoMachineUpdated(EntityUid uid, GasThermoMachineComponent the
                 scale = dQLim / dQ; // reduce power consumption
                 thermoMachine.HysteresisState = false; // turn off
             }
+
             float dQActual = dQ * scale;
-            float dQLeak = dQActual * thermoMachine.EnergyLeakPercentage;
-            float dQPipe = dQActual - dQLeak;
-            _atmosphereSystem.AddHeat(inlet.Air, dQPipe);
+            if (thermoMachine.Atmospheric)
+            {
+                _atmosphereSystem.AddHeat(heatExchangeGasMixture, dQActual);
+                thermoMachine.LastEnergyDelta = dQActual;
+            }
+            else
+            {
+                float dQLeak = dQActual * thermoMachine.EnergyLeakPercentage;
+                float dQPipe = dQActual - dQLeak;
+                _atmosphereSystem.AddHeat(heatExchangeGasMixture, dQPipe);
+                thermoMachine.LastEnergyDelta = dQPipe;
 
-            if (_atmosphereSystem.GetContainingMixture(uid) is { } containingMixture)
-                _atmosphereSystem.AddHeat(containingMixture, dQLeak);
+                if (dQLeak != 0f && _atmosphereSystem.GetContainingMixture(uid) is { } containingMixture)
+                    _atmosphereSystem.AddHeat(containingMixture, dQLeak);
+            }
 
             receiver.Load = thermoMachine.HeatCapacity;// * scale; // we're not ready for dynamic load yet, see note above
         }
 
+        /// <summary>
+        /// Returns the gas mixture with which the thermomachine will exchange heat (the local atmosphere if atmospheric or the inlet pipe
+        /// air if not). Returns null if no gas mixture is found.
+        /// </summary>
+        private void GetHeatExchangeGasMixture(EntityUid uid, GasThermoMachineComponent thermoMachine, out GasMixture? heatExchangeGasMixture)
+        {
+            heatExchangeGasMixture = null;
+            if (thermoMachine.Atmospheric)
+            {
+                heatExchangeGasMixture = _atmosphereSystem.GetContainingMixture(uid);
+            }
+            else
+            {
+                if (!TryComp<NodeContainerComponent>(uid, out var nodeContainer)
+                    || !_nodeContainer.TryGetNode(nodeContainer, thermoMachine.InletName, out PipeNode? inlet))
+                    return;
+                heatExchangeGasMixture = inlet.Air;
+            }
+        }
+
         private bool IsHeater(GasThermoMachineComponent comp)
         {
             return comp.Cp >= 0;
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
index a35c6b1aa6..3a3ccf7523 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs
@@ -16,6 +16,7 @@
 using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.Atmos.Visuals;
 using Content.Shared.Audio;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Examine;
 using Content.Shared.Tools.Systems;
 using JetBrains.Annotations;
diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
index ecf7d1d0b4..32591e9c54 100644
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs
@@ -15,6 +15,7 @@
 using Content.Shared.Atmos.Monitor;
 using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.Audio;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Tools.Systems;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Atmos/Portable/SpaceHeaterComponent.cs b/Content.Server/Atmos/Portable/SpaceHeaterComponent.cs
new file mode 100644
index 0000000000..e490ab3ea0
--- /dev/null
+++ b/Content.Server/Atmos/Portable/SpaceHeaterComponent.cs
@@ -0,0 +1,58 @@
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Piping.Portable.Components;
+using Content.Shared.Atmos.Visuals;
+
+namespace Content.Server.Atmos.Portable;
+
+[RegisterComponent]
+public sealed partial class SpaceHeaterComponent : Component
+{
+    /// <summary>
+    ///     Current mode the space heater is in. Possible values : Auto, Heat and Cool
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public SpaceHeaterMode Mode = SpaceHeaterMode.Auto;
+
+    /// <summary>
+    ///     The power level the space heater is currently set to. Possible values : Low, Medium, High
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public SpaceHeaterPowerLevel PowerLevel = SpaceHeaterPowerLevel.Medium;
+
+    /// <summary>
+    ///     Maximum target temperature the device can be set to
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float MaxTemperature = Atmospherics.T20C + 20;
+
+    /// <summary>
+    ///     Minimal target temperature the device can be set to
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float MinTemperature = Atmospherics.T0C - 10;
+
+    /// <summary>
+    ///     Coefficient of performance. Output power / input power.
+    ///     Positive for heaters, negative for freezers.
+    /// </summary>
+    [DataField("heatingCoefficientOfPerformance")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float HeatingCp = 1f;
+
+    [DataField("coolingCoefficientOfPerformance")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float CoolingCp = -0.9f;
+
+    /// <summary>
+    ///     The delta from the target temperature after which the space heater switch mode while in Auto. Value should account for the thermomachine temperature tolerance.
+    /// </summary>
+    [DataField]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public float AutoModeSwitchThreshold = 0.8f;
+
+    /// <summary>
+    ///     Current electrical power consumption, in watts, of the space heater at medium power level. Passed to the thermomachine component.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float PowerConsumption = 3500f;
+}
diff --git a/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs b/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs
new file mode 100644
index 0000000000..1631132821
--- /dev/null
+++ b/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs
@@ -0,0 +1,191 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.Piping.Components;
+using Content.Server.Atmos.Piping.Unary.Components;
+using Content.Server.Popups;
+using Content.Server.Power.Components;
+using Content.Server.Power.EntitySystems;
+using Content.Shared.Atmos.Piping.Portable.Components;
+using Content.Shared.Atmos.Visuals;
+using Content.Shared.UserInterface;
+using Robust.Server.GameObjects;
+
+namespace Content.Server.Atmos.Portable;
+
+public sealed class SpaceHeaterSystem : EntitySystem
+{
+    [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly PowerReceiverSystem _power = default!;
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SpaceHeaterComponent, ActivatableUIOpenAttemptEvent>(OnUIActivationAttempt);
+        SubscribeLocalEvent<SpaceHeaterComponent, BeforeActivatableUIOpenEvent>(OnBeforeOpened);
+
+        SubscribeLocalEvent<SpaceHeaterComponent, AtmosDeviceUpdateEvent>(OnDeviceUpdated);
+        SubscribeLocalEvent<SpaceHeaterComponent, MapInitEvent>(OnInit);
+        SubscribeLocalEvent<SpaceHeaterComponent, PowerChangedEvent>(OnPowerChanged);
+
+        SubscribeLocalEvent<SpaceHeaterComponent, SpaceHeaterChangeModeMessage>(OnModeChanged);
+        SubscribeLocalEvent<SpaceHeaterComponent, SpaceHeaterChangePowerLevelMessage>(OnPowerLevelChanged);
+        SubscribeLocalEvent<SpaceHeaterComponent, SpaceHeaterChangeTemperatureMessage>(OnTemperatureChanged);
+        SubscribeLocalEvent<SpaceHeaterComponent, SpaceHeaterToggleMessage>(OnToggle);
+    }
+
+    private void OnInit(EntityUid uid, SpaceHeaterComponent spaceHeater, MapInitEvent args)
+    {
+        if (!TryComp<GasThermoMachineComponent>(uid, out var thermoMachine))
+            return;
+        thermoMachine.Cp = spaceHeater.HeatingCp;
+        thermoMachine.HeatCapacity = spaceHeater.PowerConsumption;
+    }
+
+    private void OnBeforeOpened(EntityUid uid, SpaceHeaterComponent spaceHeater, BeforeActivatableUIOpenEvent args)
+    {
+        DirtyUI(uid, spaceHeater);
+    }
+
+    private void OnUIActivationAttempt(EntityUid uid, SpaceHeaterComponent spaceHeater, ActivatableUIOpenAttemptEvent args)
+    {
+        if (!Comp<TransformComponent>(uid).Anchored)
+        {
+            _popup.PopupEntity(Loc.GetString("comp-space-heater-unanchored", ("device", Loc.GetString("comp-space-heater-device-name"))), uid, args.User);
+            args.Cancel();
+        }
+    }
+
+    private void OnDeviceUpdated(EntityUid uid, SpaceHeaterComponent spaceHeater, ref AtmosDeviceUpdateEvent args)
+    {
+        if (!_power.IsPowered(uid)
+            || !TryComp<GasThermoMachineComponent>(uid, out var thermoMachine))
+        {
+            return;
+        }
+
+        UpdateAppearance(uid);
+
+        // If in automatic temperature mode, check if we need to adjust the heat exchange direction
+        if (spaceHeater.Mode == SpaceHeaterMode.Auto)
+        {
+            var environment = _atmosphereSystem.GetContainingMixture(uid);
+            if (environment == null)
+                return;
+
+            if (environment.Temperature <= thermoMachine.TargetTemperature - (thermoMachine.TemperatureTolerance + spaceHeater.AutoModeSwitchThreshold))
+            {
+                thermoMachine.Cp = spaceHeater.HeatingCp;
+            }
+            else if (environment.Temperature >= thermoMachine.TargetTemperature + (thermoMachine.TemperatureTolerance + spaceHeater.AutoModeSwitchThreshold))
+            {
+                thermoMachine.Cp = spaceHeater.CoolingCp;
+            }
+        }
+    }
+
+    private void OnPowerChanged(EntityUid uid, SpaceHeaterComponent spaceHeater, ref PowerChangedEvent args)
+    {
+        UpdateAppearance(uid);
+        DirtyUI(uid, spaceHeater);
+    }
+
+    private void OnToggle(EntityUid uid, SpaceHeaterComponent spaceHeater, SpaceHeaterToggleMessage args)
+    {
+        ApcPowerReceiverComponent? powerReceiver = null;
+        if (!Resolve(uid, ref powerReceiver))
+            return;
+
+        _power.TogglePower(uid);
+
+        UpdateAppearance(uid);
+        DirtyUI(uid, spaceHeater);
+    }
+
+    private void OnTemperatureChanged(EntityUid uid, SpaceHeaterComponent spaceHeater, SpaceHeaterChangeTemperatureMessage args)
+    {
+        if (!TryComp<GasThermoMachineComponent>(uid, out var thermoMachine))
+            return;
+
+        thermoMachine.TargetTemperature = float.Clamp(thermoMachine.TargetTemperature + args.Temperature, thermoMachine.MinTemperature, thermoMachine.MaxTemperature);
+
+        UpdateAppearance(uid);
+        DirtyUI(uid, spaceHeater);
+    }
+
+    private void OnModeChanged(EntityUid uid, SpaceHeaterComponent spaceHeater, SpaceHeaterChangeModeMessage args)
+    {
+        if (!TryComp<GasThermoMachineComponent>(uid, out var thermoMachine))
+            return;
+
+        spaceHeater.Mode = args.Mode;
+
+        if (spaceHeater.Mode == SpaceHeaterMode.Heat)
+            thermoMachine.Cp = spaceHeater.HeatingCp;
+        else if (spaceHeater.Mode == SpaceHeaterMode.Cool)
+            thermoMachine.Cp = spaceHeater.CoolingCp;
+
+        DirtyUI(uid, spaceHeater);
+    }
+
+    private void OnPowerLevelChanged(EntityUid uid, SpaceHeaterComponent spaceHeater, SpaceHeaterChangePowerLevelMessage args)
+    {
+        if (!TryComp<GasThermoMachineComponent>(uid, out var thermoMachine))
+            return;
+
+        spaceHeater.PowerLevel = args.PowerLevel;
+
+        switch (spaceHeater.PowerLevel)
+        {
+            case SpaceHeaterPowerLevel.Low:
+                thermoMachine.HeatCapacity = spaceHeater.PowerConsumption / 2;
+                break;
+
+            case SpaceHeaterPowerLevel.Medium:
+                thermoMachine.HeatCapacity = spaceHeater.PowerConsumption;
+                break;
+
+            case SpaceHeaterPowerLevel.High:
+                thermoMachine.HeatCapacity = spaceHeater.PowerConsumption * 2;
+                break;
+        }
+
+        DirtyUI(uid, spaceHeater);
+    }
+
+    private void DirtyUI(EntityUid uid, SpaceHeaterComponent? spaceHeater)
+    {
+        if (!Resolve(uid, ref spaceHeater)
+            || !TryComp<GasThermoMachineComponent>(uid, out var thermoMachine)
+            || !TryComp<ApcPowerReceiverComponent>(uid, out var powerReceiver))
+        {
+            return;
+        }
+        _userInterfaceSystem.TrySetUiState(uid, SpaceHeaterUiKey.Key,
+            new SpaceHeaterBoundUserInterfaceState(spaceHeater.MinTemperature, spaceHeater.MaxTemperature, thermoMachine.TargetTemperature, !powerReceiver.PowerDisabled, spaceHeater.Mode, spaceHeater.PowerLevel));
+    }
+
+    private void UpdateAppearance(EntityUid uid)
+    {
+        if (!_power.IsPowered(uid) || !TryComp<GasThermoMachineComponent>(uid, out var thermoMachine))
+        {
+            _appearance.SetData(uid, SpaceHeaterVisuals.State, SpaceHeaterState.Off);
+            return;
+        }
+
+        if (thermoMachine.LastEnergyDelta > 0)
+        {
+            _appearance.SetData(uid, SpaceHeaterVisuals.State, SpaceHeaterState.Heating);
+        }
+        else if (thermoMachine.LastEnergyDelta < 0)
+        {
+            _appearance.SetData(uid, SpaceHeaterVisuals.State, SpaceHeaterState.Cooling);
+        }
+        else
+        {
+            _appearance.SetData(uid, SpaceHeaterVisuals.State, SpaceHeaterState.StandBy);
+        }
+    }
+}
diff --git a/Content.Server/Atmos/Rotting/RottingSystem.cs b/Content.Server/Atmos/Rotting/RottingSystem.cs
index e3389def66..47bac84e0c 100644
--- a/Content.Server/Atmos/Rotting/RottingSystem.cs
+++ b/Content.Server/Atmos/Rotting/RottingSystem.cs
@@ -29,11 +29,9 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<PerishableComponent, MapInitEvent>(OnPerishableMapInit);
-        SubscribeLocalEvent<PerishableComponent, EntityUnpausedEvent>(OnPerishableUnpaused);
         SubscribeLocalEvent<PerishableComponent, MobStateChangedEvent>(OnMobStateChanged);
         SubscribeLocalEvent<PerishableComponent, ExaminedEvent>(OnPerishableExamined);
 
-        SubscribeLocalEvent<RottingComponent, EntityUnpausedEvent>(OnRottingUnpaused);
         SubscribeLocalEvent<RottingComponent, ComponentShutdown>(OnShutdown);
         SubscribeLocalEvent<RottingComponent, MobStateChangedEvent>(OnRottingMobStateChanged);
         SubscribeLocalEvent<RottingComponent, BeingGibbedEvent>(OnGibbed);
@@ -47,11 +45,6 @@ private void OnPerishableMapInit(EntityUid uid, PerishableComponent component, M
         component.RotNextUpdate = _timing.CurTime + component.PerishUpdateRate;
     }
 
-    private void OnPerishableUnpaused(EntityUid uid, PerishableComponent component, ref EntityUnpausedEvent args)
-    {
-        component.RotNextUpdate += args.PausedTime;
-    }
-
     private void OnMobStateChanged(EntityUid uid, PerishableComponent component, MobStateChangedEvent args)
     {
         if (args.NewMobState != MobState.Dead && args.OldMobState != MobState.Dead)
@@ -64,11 +57,6 @@ private void OnMobStateChanged(EntityUid uid, PerishableComponent component, Mob
         component.RotNextUpdate = _timing.CurTime + component.PerishUpdateRate;
     }
 
-    private void OnRottingUnpaused(EntityUid uid, RottingComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextRotUpdate += args.PausedTime;
-    }
-
     private void OnShutdown(EntityUid uid, RottingComponent component, ComponentShutdown args)
     {
         if (TryComp<PerishableComponent>(uid, out var perishable))
diff --git a/Content.Server/Audio/ContentAudioSystem.cs b/Content.Server/Audio/ContentAudioSystem.cs
index b1db01141b..f36d14cbaf 100644
--- a/Content.Server/Audio/ContentAudioSystem.cs
+++ b/Content.Server/Audio/ContentAudioSystem.cs
@@ -1,19 +1,37 @@
+using System.Linq;
+using Content.Server.GameTicking;
 using Content.Server.GameTicking.Events;
 using Content.Shared.Audio;
+using Content.Shared.Audio.Events;
 using Content.Shared.GameTicking;
 using Robust.Server.Audio;
 using Robust.Shared.Audio;
 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!;
+
+    private SoundCollectionPrototype _lobbyMusicCollection = default!;
+    private string[]? _lobbyPlaylist;
 
     public override void Initialize()
     {
         base.Initialize();
+
+        _lobbyMusicCollection = _prototypeManager.Index<SoundCollectionPrototype>(LobbyMusicCollection);
+        _lobbyPlaylist = ShuffleLobbyPlaylist();
+
+        SubscribeLocalEvent<RoundEndMessageEvent>(OnRoundEnd);
+        SubscribeLocalEvent<PlayerJoinedLobbyEvent>(OnPlayerJoinedLobby);
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundCleanup);
         SubscribeLocalEvent<RoundStartingEvent>(OnRoundStart);
         SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnProtoReload);
@@ -36,4 +54,33 @@ private void OnRoundStart(RoundStartingEvent ev)
         // yeah it's whacky af.
         _serverAudio.ReloadPresets();
     }
+
+    private void OnPlayerJoinedLobby(PlayerJoinedLobbyEvent ev)
+    {
+        if (_lobbyPlaylist != null)
+        {
+            var session = ev.PlayerSession;
+            RaiseNetworkEvent(new LobbyPlaylistChangedEvent(_lobbyPlaylist), session);
+        }
+    }
+
+    private void OnRoundEnd(RoundEndMessageEvent ev)
+    {
+        // The lobby song is set here instead of in RestartRound,
+        // because ShowRoundEndScoreboard triggers the start of the music playing
+        // at the end of a round, and this needs to be set before RestartRound
+        // in order for the lobby song status display to be accurate.
+        _lobbyPlaylist = ShuffleLobbyPlaylist();
+        RaiseNetworkEvent(new LobbyPlaylistChangedEvent(_lobbyPlaylist));
+    }
+
+    private string[] ShuffleLobbyPlaylist()
+    {
+        var playlist = _lobbyMusicCollection.PickFiles
+                                            .Select(x => x.ToString())
+                                            .ToArray();
+         _robustRandom.Shuffle(playlist);
+
+         return playlist;
+    }
 }
diff --git a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
index 11184bee0a..a3b7fb8d67 100644
--- a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
+++ b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs
@@ -197,7 +197,8 @@ public void HandleEnterCryostorage(Entity<CryostorageContainedComponent> ent, Ne
 
         if (!CryoSleepRejoiningEnabled || !comp.AllowReEnteringBody)
         {
-            if (userId != null && Mind.TryGetMind(userId.Value, out var mind))
+            if (userId != null && Mind.TryGetMind(userId.Value, out var mind) &&
+                HasComp<CryostorageContainedComponent>(mind.Value.Comp.CurrentEntity))
             {
                 _gameTicker.OnGhostAttempt(mind.Value, false);
             }
diff --git a/Content.Server/Body/Components/BloodstreamComponent.cs b/Content.Server/Body/Components/BloodstreamComponent.cs
index 3ee8fe4d17..7041df4448 100644
--- a/Content.Server/Body/Components/BloodstreamComponent.cs
+++ b/Content.Server/Body/Components/BloodstreamComponent.cs
@@ -35,7 +35,7 @@ public sealed partial class BloodstreamComponent : Component
         ///     How much should bleeding should be reduced every update interval?
         /// </summary>
         [DataField]
-        public float BleedReductionAmount = 1.0f;
+        public float BleedReductionAmount = 0.33f;
 
         /// <summary>
         ///     How high can <see cref="BleedAmount"/> go?
diff --git a/Content.Server/Body/Systems/BodySystem.cs b/Content.Server/Body/Systems/BodySystem.cs
index 1630d4cb10..18119909ab 100644
--- a/Content.Server/Body/Systems/BodySystem.cs
+++ b/Content.Server/Body/Systems/BodySystem.cs
@@ -15,6 +15,7 @@
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using System.Numerics;
+using Content.Shared.Gibbing.Components;
 using Content.Shared.Movement.Systems;
 using Robust.Shared.Audio.Systems;
 
@@ -106,7 +107,16 @@ protected override void RemovePart(
         _humanoidSystem.SetLayersVisibility(bodyUid, layers, false, true, humanoid);
     }
 
-    public override HashSet<EntityUid> GibBody(EntityUid bodyId, bool gibOrgans = false, BodyComponent? body = null, bool deleteItems = false, bool deleteBrain = false)
+    public override HashSet<EntityUid> GibBody(
+        EntityUid bodyId,
+        bool gibOrgans = false,
+        BodyComponent? body = null ,
+        bool launchGibs = true,
+        Vector2? splatDirection = null,
+        float splatModifier = 1,
+        Angle splatCone = default,
+        SoundSpecifier? gibSoundOverride = null
+    )
     {
         if (!Resolve(bodyId, ref body, false))
             return new HashSet<EntityUid>();
@@ -118,28 +128,8 @@ public override HashSet<EntityUid> GibBody(EntityUid bodyId, bool gibOrgans = fa
         if (xform.MapUid == null)
             return new HashSet<EntityUid>();
 
-        var gibs = base.GibBody(bodyId, gibOrgans, body, deleteItems, deleteBrain);
-
-        var coordinates = xform.Coordinates;
-        var filter = Filter.Pvs(bodyId, entityManager: EntityManager);
-        var audio = AudioParams.Default.WithVariation(0.025f);
-
-        _audio.PlayStatic(body.GibSound, filter, coordinates, true, audio);
-
-        foreach (var entity in gibs)
-        {
-            if (deleteItems)
-            {
-                if (!HasComp<BrainComponent>(entity) || deleteBrain)
-                {
-                    QueueDel(entity);
-                }
-            }
-            else
-            {
-                SharedTransform.SetCoordinates(entity, coordinates.Offset(_random.NextVector2(.3f)));
-            }
-        }
+        var gibs = base.GibBody(bodyId, gibOrgans, body, launchGibs: launchGibs,
+            splatDirection: splatDirection, splatModifier: splatModifier, splatCone:splatCone);
         RaiseLocalEvent(bodyId, new BeingGibbedEvent(gibs));
         QueueDel(bodyId);
 
diff --git a/Content.Server/Body/Systems/InternalsSystem.cs b/Content.Server/Body/Systems/InternalsSystem.cs
index b96e108968..007cbdf084 100644
--- a/Content.Server/Body/Systems/InternalsSystem.cs
+++ b/Content.Server/Body/Systems/InternalsSystem.cs
@@ -104,9 +104,8 @@ public void ToggleInternals(EntityUid uid, EntityUid user, bool force, Internals
     private void StartToggleInternalsDoAfter(EntityUid user, EntityUid target, InternalsComponent internals)
     {
         // Is the target not you? If yes, use a do-after to give them time to respond.
-        // If not, do a short delay. There's no reason it should be beyond 1 second.
         var isUser = user == target;
-        var delay = !isUser ? internals.Delay : 1.0f;
+        var delay = !isUser ? internals.Delay : 0f;
 
         _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, delay, new InternalsDoAfterEvent(), target, target: target)
         {
diff --git a/Content.Server/Botany/Components/SeedComponent.cs b/Content.Server/Botany/Components/SeedComponent.cs
index 3e729dc906..f475ec3cfc 100644
--- a/Content.Server/Botany/Components/SeedComponent.cs
+++ b/Content.Server/Botany/Components/SeedComponent.cs
@@ -15,6 +15,12 @@ public sealed partial class SeedComponent : SharedSeedComponent
         [DataField("seed")]
         public SeedData? Seed;
 
+        /// <summary>
+        ///     If not null, overrides the plant's initial health. Otherwise, the plant's initial health is set to the Endurance value.
+        /// </summary>
+        [DataField]
+        public float? HealthOverride = null;
+
         /// <summary>
         ///     Name of a base seed prototype that is used if <see cref="Seed"/> is null.
         /// </summary>
diff --git a/Content.Server/Botany/Systems/BotanySystem.Produce.cs b/Content.Server/Botany/Systems/BotanySystem.Produce.cs
index 788c09821b..e309fb4772 100644
--- a/Content.Server/Botany/Systems/BotanySystem.Produce.cs
+++ b/Content.Server/Botany/Systems/BotanySystem.Produce.cs
@@ -18,7 +18,7 @@ public void ProduceGrown(EntityUid uid, ProduceComponent produce)
             var amount = FixedPoint2.New(quantity.Min);
             if (quantity.PotencyDivisor > 0 && seed.Potency > 0)
                 amount += FixedPoint2.New(seed.Potency / quantity.PotencyDivisor);
-            amount = FixedPoint2.New((int) MathHelper.Clamp(amount.Float(), quantity.Min, quantity.Max));
+            amount = FixedPoint2.New(MathHelper.Clamp(amount.Float(), quantity.Min, quantity.Max));
             solutionContainer.MaxVolume += amount;
             solutionContainer.AddReagent(chem, amount);
         }
diff --git a/Content.Server/Botany/Systems/BotanySystem.Seed.cs b/Content.Server/Botany/Systems/BotanySystem.Seed.cs
index c9389f832e..f64fcb3c43 100644
--- a/Content.Server/Botany/Systems/BotanySystem.Seed.cs
+++ b/Content.Server/Botany/Systems/BotanySystem.Seed.cs
@@ -104,11 +104,12 @@ private void OnExamined(EntityUid uid, SeedComponent component, ExaminedEvent ar
     /// <summary>
     /// Spawns a new seed packet on the floor at a position, then tries to put it in the user's hands if possible.
     /// </summary>
-    public EntityUid SpawnSeedPacket(SeedData proto, EntityCoordinates coords, EntityUid user)
+    public EntityUid SpawnSeedPacket(SeedData proto, EntityCoordinates coords, EntityUid user, float? healthOverride = null)
     {
         var seed = Spawn(proto.PacketPrototype, coords);
         var seedComp = EnsureComp<SeedComponent>(seed);
         seedComp.Seed = proto;
+        seedComp.HealthOverride = healthOverride;
 
         var name = Loc.GetString(proto.Name);
         var noun = Loc.GetString(proto.Noun);
diff --git a/Content.Server/Botany/Systems/MutationSystem.cs b/Content.Server/Botany/Systems/MutationSystem.cs
index cfa944a221..c7ce5d47ef 100644
--- a/Content.Server/Botany/Systems/MutationSystem.cs
+++ b/Content.Server/Botany/Systems/MutationSystem.cs
@@ -131,7 +131,7 @@ public SeedData Cross(SeedData a, SeedData b)
 
         // Hybrids have a high chance of being seedless. Balances very
         // effective hybrid crossings.
-        if (a.Name == result.Name && Random(0.7f))
+        if (a.Name != result.Name && Random(0.7f))
         {
             result.Seedless = true;
         }
diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs
index 6bf0b9692c..0f54fd0da5 100644
--- a/Content.Server/Botany/Systems/PlantHolderSystem.cs
+++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs
@@ -71,6 +71,17 @@ public override void Update(float frameTime)
         }
     }
 
+    private int GetCurrentGrowthStage(Entity<PlantHolderComponent> entity)
+    {
+        var (uid, component) = entity;
+
+        if (component.Seed == null)
+            return 0;
+
+        var result = Math.Max(1, (int) (component.Age * component.Seed.GrowthStages / component.Seed.Maturation));
+        return result;
+    }
+
     private void OnExamine(Entity<PlantHolderComponent> entity, ref ExaminedEvent args)
     {
         if (!args.IsInDetailsRange)
@@ -148,6 +159,7 @@ private void OnInteractUsing(Entity<PlantHolderComponent> entity, ref InteractUs
                 if (!_botany.TryGetSeed(seeds, out var seed))
                     return;
 
+                float? seedHealth = seeds.HealthOverride;
                 var name = Loc.GetString(seed.Name);
                 var noun = Loc.GetString(seed.Noun);
                 _popup.PopupCursor(Loc.GetString("plant-holder-component-plant-success-message",
@@ -157,7 +169,14 @@ private void OnInteractUsing(Entity<PlantHolderComponent> entity, ref InteractUs
                 component.Seed = seed;
                 component.Dead = false;
                 component.Age = 1;
-                component.Health = component.Seed.Endurance;
+                if (seedHealth is float realSeedHealth)
+                {
+                    component.Health = realSeedHealth;
+                }
+                else
+                {
+                    component.Health = component.Seed.Endurance;
+                }
                 component.LastCycle = _gameTiming.CurTime;
 
                 QueueDel(args.Used);
@@ -262,13 +281,19 @@ private void OnInteractUsing(Entity<PlantHolderComponent> entity, ref InteractUs
                 return;
             }
 
+            if (GetCurrentGrowthStage(entity) <= 1)
+            {
+                _popup.PopupCursor(Loc.GetString("plant-holder-component-early-sample-message"), args.User);
+                return;
+            }
+
+            component.Health -= (_random.Next(3, 5) * 10);
             component.Seed.Unique = false;
-            var seed = _botany.SpawnSeedPacket(component.Seed, Transform(args.User).Coordinates, args.User);
+            var seed = _botany.SpawnSeedPacket(component.Seed, Transform(args.User).Coordinates, args.User, component.Health);
             _randomHelper.RandomOffset(seed, 0.25f);
             var displayName = Loc.GetString(component.Seed.DisplayName);
             _popup.PopupCursor(Loc.GetString("plant-holder-component-take-sample-message",
                 ("seedName", displayName)), args.User);
-            component.Health -= (_random.Next(3, 5) * 10);
 
             if (component.Seed != null && component.Seed.CanScream)
             {
@@ -596,6 +621,7 @@ public void Update(EntityUid uid, PlantHolderComponent? component = null)
             RemovePlant(uid, component);
             component.ForceUpdate = true;
             Update(uid, component);
+            return;
         }
 
         CheckHealth(uid, component);
@@ -897,7 +923,7 @@ public void UpdateSprite(EntityUid uid, PlantHolderComponent? component = null)
             }
             else if (component.Age < component.Seed.Maturation)
             {
-                var growthStage = Math.Max(1, (int) (component.Age * component.Seed.GrowthStages / component.Seed.Maturation));
+                var growthStage = GetCurrentGrowthStage((uid, component));
 
                 _appearance.SetData(uid, PlantHolderVisuals.PlantRsi, component.Seed.PlantRsi.ToString(), app);
                 _appearance.SetData(uid, PlantHolderVisuals.PlantState, $"stage-{growthStage}", app);
diff --git a/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs b/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs
index 6c19dbc4a2..c30db08bbe 100644
--- a/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs
+++ b/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.Cargo.Components;
@@ -30,4 +31,10 @@ public sealed partial class StationCargoOrderDatabaseComponent : Component
     /// </summary>
     [DataField("shuttle")]
     public EntityUid? Shuttle;
+
+    /// <summary>
+    ///     The paper-type prototype to spawn with the order information.
+    /// </summary>
+    [DataField]
+    public EntProtoId PrinterOutput = "PaperCargoInvoice";
 }
diff --git a/Content.Server/Cargo/Components/TradeStationComponent.cs b/Content.Server/Cargo/Components/TradeStationComponent.cs
new file mode 100644
index 0000000000..0422470cc9
--- /dev/null
+++ b/Content.Server/Cargo/Components/TradeStationComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Server.Cargo.Components;
+
+/// <summary>
+/// Target for approved orders to spawn at.
+/// </summary>
+[RegisterComponent]
+public sealed partial class TradeStationComponent : Component
+{
+
+}
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
index 3a062bae0a..ebe66ff029 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -2,6 +2,7 @@
 using Content.Server.Cargo.Components;
 using Content.Server.Labels.Components;
 using Content.Server.Paper;
+using Content.Server.Station.Components;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.BUI;
 using Content.Shared.Cargo.Components;
@@ -12,6 +13,7 @@
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Cargo.Systems
@@ -110,10 +112,12 @@ private void OnApproveOrderMessage(EntityUid uid, CargoOrderConsoleComponent com
                 return;
             }
 
-            var bankAccount = GetBankAccount(uid, component);
+            var station = _station.GetOwningStation(uid);
 
             // No station to deduct from.
-            if (!TryGetOrderDatabase(uid, out var dbUid, out var orderDatabase, component) || bankAccount == null)
+            if (!TryComp(station, out StationBankAccountComponent? bank) ||
+                !TryComp(station, out StationDataComponent? stationData) ||
+                !TryGetOrderDatabase(station, out var orderDatabase))
             {
                 ConsolePopup(args.Session, Loc.GetString("cargo-console-station-not-found"));
                 PlayDenySound(uid, component);
@@ -159,32 +163,96 @@ private void OnApproveOrderMessage(EntityUid uid, CargoOrderConsoleComponent com
             var cost = order.Price * order.OrderQuantity;
 
             // Not enough balance
-            if (cost > bankAccount.Balance)
+            if (cost > bank.Balance)
             {
                 ConsolePopup(args.Session, Loc.GetString("cargo-console-insufficient-funds", ("cost", cost)));
                 PlayDenySound(uid, component);
                 return;
             }
 
+            var tradeDestination = TryFulfillOrder(stationData, order, orderDatabase);
+
+            if (tradeDestination == null)
+            {
+                ConsolePopup(args.Session, Loc.GetString("cargo-console-unfulfilled"));
+                PlayDenySound(uid, component);
+                return;
+            }
+
             _idCardSystem.TryFindIdCard(player, out var idCard);
             // ReSharper disable once ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
             order.SetApproverData(idCard.Comp?.FullName, idCard.Comp?.JobTitle);
-            _audio.PlayPvs(_audio.GetSound(component.ConfirmSound), uid);
+            _audio.PlayPvs(component.ConfirmSound, uid);
+
+            ConsolePopup(args.Session, Loc.GetString("cargo-console-trade-station", ("destination", MetaData(tradeDestination.Value).EntityName)));
 
             // Log order approval
             _adminLogger.Add(LogType.Action, LogImpact.Low,
-                $"{ToPrettyString(player):user} approved order [orderId:{order.OrderId}, quantity:{order.OrderQuantity}, product:{order.ProductId}, requester:{order.Requester}, reason:{order.Reason}] with balance at {bankAccount.Balance}");
+                $"{ToPrettyString(player):user} approved order [orderId:{order.OrderId}, quantity:{order.OrderQuantity}, product:{order.ProductId}, requester:{order.Requester}, reason:{order.Reason}] with balance at {bank.Balance}");
+
+            orderDatabase.Orders.Remove(order);
+            DeductFunds(bank, cost);
+            UpdateOrders(station.Value, orderDatabase);
+        }
+
+        private EntityUid? TryFulfillOrder(StationDataComponent stationData, CargoOrderData order, StationCargoOrderDatabaseComponent orderDatabase)
+        {
+            // No slots at the trade station
+            _listEnts.Clear();
+            GetTradeStations(stationData, ref _listEnts);
+            EntityUid? tradeDestination = null;
+
+            // Try to fulfill from any station where possible, if the pad is not occupied.
+            foreach (var trade in _listEnts)
+            {
+                var tradePads = GetCargoPallets(trade);
+                _random.Shuffle(tradePads);
+
+                var freePads = GetFreeCargoPallets(trade, tradePads);
+                if (freePads.Count >= order.OrderQuantity) //check if the station has enough free pallets
+                {
+                    foreach (var pad in freePads)
+                    {
+                        var coordinates = new EntityCoordinates(trade, pad.Transform.LocalPosition);
+
+                        if (FulfillOrder(order, coordinates, orderDatabase.PrinterOutput))
+                        {
+                            tradeDestination = trade;
+                            order.NumDispatched++;
+                            if (order.OrderQuantity <= order.NumDispatched) //Spawn a crate on free pellets until the order is fulfilled.
+                                break;
+                        }
+                    }
+                }
+
+                if (tradeDestination != null)
+                    break;
+            }
+
+            return tradeDestination;
+        }
+
+        private void GetTradeStations(StationDataComponent data, ref List<EntityUid> ents)
+        {
+            var tradeStationQuery = AllEntityQuery<TradeStationComponent>(); // We *could* cache this, but I don't know where it'd go
+
+            while (tradeStationQuery.MoveNext(out var uid, out _))
+            {
+                //if (!_tradeQuery.HasComponent(uid))
+                //    continue;
 
-            DeductFunds(bankAccount, cost);
-            UpdateOrders(dbUid!.Value, orderDatabase);
+                ents.Add(uid);
+            }
         }
 
         private void OnRemoveOrderMessage(EntityUid uid, CargoOrderConsoleComponent component, CargoConsoleRemoveOrderMessage args)
         {
-            if (!TryGetOrderDatabase(uid, out var dbUid, out var orderDatabase, component))
+            var station = _station.GetOwningStation(uid);
+
+            if (!TryGetOrderDatabase(station, out var orderDatabase))
                 return;
 
-            RemoveOrder(dbUid!.Value, args.OrderId, orderDatabase);
+            RemoveOrder(station.Value, args.OrderId, orderDatabase);
         }
 
         private void OnAddOrderMessage(EntityUid uid, CargoOrderConsoleComponent component, CargoConsoleAddOrderMessage args)
@@ -195,11 +263,9 @@ private void OnAddOrderMessage(EntityUid uid, CargoOrderConsoleComponent compone
             if (args.Amount <= 0)
                 return;
 
-            var bank = GetBankAccount(uid, component);
-            if (bank == null)
-                return;
+            var stationUid = _station.GetOwningStation(uid);
 
-            if (!TryGetOrderDatabase(uid, out var dbUid, out var orderDatabase, component))
+            if (!TryGetOrderDatabase(stationUid, out var orderDatabase))
                 return;
 
             if (!_protoMan.TryIndex<CargoProductPrototype>(args.CargoProductId, out var product))
@@ -213,7 +279,7 @@ private void OnAddOrderMessage(EntityUid uid, CargoOrderConsoleComponent compone
 
             var data = GetOrderData(args, product, GenerateOrderId(orderDatabase));
 
-            if (!TryAddOrder(dbUid!.Value, data, orderDatabase))
+            if (!TryAddOrder(stationUid.Value, data, orderDatabase))
             {
                 PlayDenySound(uid, component);
                 return;
@@ -317,7 +383,8 @@ public bool AddAndApproveOrder(
             string sender,
             string description,
             string dest,
-            StationCargoOrderDatabaseComponent component
+            StationCargoOrderDatabaseComponent component,
+            StationDataComponent stationData
         )
         {
             DebugTools.Assert(_protoMan.HasIndex<EntityPrototype>(spawnId));
@@ -333,7 +400,7 @@ StationCargoOrderDatabaseComponent component
                 $"AddAndApproveOrder {description} added order [orderId:{order.OrderId}, quantity:{order.OrderQuantity}, product:{order.ProductId}, requester:{order.Requester}, reason:{order.Reason}]");
 
             // Add it to the list
-            return TryAddOrder(dbUid, order, component);
+            return TryAddOrder(dbUid, order, component) && TryFulfillOrder(stationData, order, component).HasValue;
         }
 
         private bool TryAddOrder(EntityUid dbUid, CargoOrderData data, StationCargoOrderDatabaseComponent component)
@@ -362,10 +429,10 @@ public void RemoveOrder(EntityUid dbUid, int index, StationCargoOrderDatabaseCom
 
         public void ClearOrders(StationCargoOrderDatabaseComponent component)
         {
-            if (component.Orders.Count == 0) return;
+            if (component.Orders.Count == 0)
+                return;
 
             component.Orders.Clear();
-            Dirty(component);
         }
 
         private static bool PopFrontOrder(StationCargoOrderDatabaseComponent orderDB, [NotNullWhen(true)] out CargoOrderData? orderOut)
@@ -388,64 +455,63 @@ private static bool PopFrontOrder(StationCargoOrderDatabaseComponent orderDB, [N
             return true;
         }
 
-        private bool FulfillOrder(StationCargoOrderDatabaseComponent orderDB, EntityCoordinates whereToPutIt,
-                string? paperPrototypeToPrint)
+        /// <summary>
+        /// Tries to fulfill the next outstanding order.
+        /// </summary>
+        private bool FulfillNextOrder(StationCargoOrderDatabaseComponent orderDB, EntityCoordinates spawn, string? paperProto)
         {
-            if (PopFrontOrder(orderDB, out var order))
-            {
-                // Create the item itself
-                var item = Spawn(order.ProductId, whereToPutIt);
+            if (!PopFrontOrder(orderDB, out var order))
+                return false;
 
-                // Create a sheet of paper to write the order details on
-                var printed = EntityManager.SpawnEntity(paperPrototypeToPrint, whereToPutIt);
-                if (TryComp<PaperComponent>(printed, out var paper))
+            return FulfillOrder(order, spawn, paperProto);
+        }
+
+        /// <summary>
+        /// Fulfills the specified cargo order and spawns paper attached to it.
+        /// </summary>
+        private bool FulfillOrder(CargoOrderData order, EntityCoordinates spawn, string? paperProto)
+        {
+            // Create the item itself
+            var item = Spawn(order.ProductId, spawn);
+
+            // Create a sheet of paper to write the order details on
+            var printed = EntityManager.SpawnEntity(paperProto, spawn);
+            if (TryComp<PaperComponent>(printed, out var paper))
+            {
+                // fill in the order data
+                var val = Loc.GetString("cargo-console-paper-print-name", ("orderNumber", order.OrderId));
+                _metaSystem.SetEntityName(printed, val);
+
+                _paperSystem.SetContent(printed, Loc.GetString(
+                        "cargo-console-paper-print-text",
+                        ("orderNumber", order.OrderId),
+                        ("itemName", MetaData(item).EntityName),
+                        ("requester", order.Requester),
+                        ("reason", order.Reason),
+                        ("approver", order.Approver ?? string.Empty)),
+                    paper);
+
+                // attempt to attach the label to the item
+                if (TryComp<PaperLabelComponent>(item, out var label))
                 {
-                    // fill in the order data
-                    var val = Loc.GetString("cargo-console-paper-print-name", ("orderNumber", order.OrderId));
-                    _metaSystem.SetEntityName(printed, val);
-
-                    _paperSystem.SetContent(printed, Loc.GetString(
-                                "cargo-console-paper-print-text",
-                                ("orderNumber", order.OrderId),
-                                ("itemName", MetaData(item).EntityName),
-                                ("requester", order.Requester),
-                                ("reason", order.Reason),
-                                ("approver", order.Approver ?? string.Empty)),
-                            paper);
-
-                    // attempt to attach the label to the item
-                    if (TryComp<PaperLabelComponent>(item, out var label))
-                    {
-                        _slots.TryInsert(item, label.LabelSlot, printed, null);
-                    }
+                    _slots.TryInsert(item, label.LabelSlot, printed, null);
                 }
-
-                return true;
             }
 
-            return false;
+            return true;
+
         }
 
         private void DeductFunds(StationBankAccountComponent component, int amount)
         {
             component.Balance = Math.Max(0, component.Balance - amount);
-            Dirty(component);
         }
 
         #region Station
 
-        private StationBankAccountComponent? GetBankAccount(EntityUid uid, CargoOrderConsoleComponent _)
-        {
-            var station = _station.GetOwningStation(uid);
-
-            TryComp<StationBankAccountComponent>(station, out var bankComponent);
-            return bankComponent;
-        }
-
-        private bool TryGetOrderDatabase(EntityUid uid, [MaybeNullWhen(false)] out EntityUid? dbUid, [MaybeNullWhen(false)] out StationCargoOrderDatabaseComponent dbComp, CargoOrderConsoleComponent _)
+        private bool TryGetOrderDatabase([NotNullWhen(true)] EntityUid? stationUid, [MaybeNullWhen(false)] out StationCargoOrderDatabaseComponent dbComp)
         {
-            dbUid = _station.GetOwningStation(uid);
-            return TryComp(dbUid, out dbComp);
+            return TryComp(stationUid, out dbComp);
         }
 
         #endregion
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
index eb7d80e476..44e2b2c7d0 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
@@ -2,7 +2,7 @@
 using Content.Server.Cargo.Components;
 using Content.Server.GameTicking.Events;
 using Content.Server.Shuttles.Components;
-using Content.Server.Shuttles.Events;
+using Content.Server.Station.Systems;
 using Content.Shared.Stacks;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.BUI;
@@ -10,30 +10,31 @@
 using Content.Shared.Cargo.Events;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
+using Content.Shared.Shuttles.Components;
+using Content.Shared.Tiles;
 using Content.Shared.Whitelist;
-using Robust.Server.GameObjects;
+using Robust.Server.Maps;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
+using Robust.Shared.Audio;
+using Robust.Shared.Physics.Components;
 using Robust.Shared.Utility;
-using Content.Shared.Coordinates;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
 
 namespace Content.Server.Cargo.Systems;
 
 public sealed partial class CargoSystem
 {
     /*
-     * Handles cargo shuttle mechanics.
+     * Handles cargo shuttle / trade mechanics.
      */
 
     public MapId? CargoMap { get; private set; }
 
+    private static readonly SoundPathSpecifier ApproveSound = new("/Audio/Effects/Cargo/ping.ogg");
+
     private void InitializeShuttle()
     {
-        SubscribeLocalEvent<CargoShuttleComponent, FTLStartedEvent>(OnCargoFTLStarted);
-        SubscribeLocalEvent<CargoShuttleComponent, FTLCompletedEvent>(OnCargoFTLCompleted);
-        SubscribeLocalEvent<CargoShuttleComponent, FTLTagEvent>(OnCargoFTLTag);
+        SubscribeLocalEvent<TradeStationComponent, GridSplitEvent>(OnTradeSplit);
 
         SubscribeLocalEvent<CargoShuttleConsoleComponent, ComponentStartup>(OnCargoShuttleConsoleStartup);
 
@@ -42,34 +43,19 @@ private void InitializeShuttle()
         SubscribeLocalEvent<CargoPalletConsoleComponent, BoundUIOpenedEvent>(OnPalletUIOpen);
 
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
-        SubscribeLocalEvent<RoundStartingEvent>(OnRoundStart);
-
-        _cfgManager.OnValueChanged(CCVars.GridFill, SetGridFill);
-    }
+        SubscribeLocalEvent<StationInitializedEvent>(OnStationInitialize);
 
-    private void ShutdownShuttle()
-    {
-        _cfgManager.UnsubValueChanged(CCVars.GridFill, SetGridFill);
+        Subs.CVar(_cfgManager, CCVars.GridFill, SetGridFill);
     }
 
     private void SetGridFill(bool obj)
     {
         if (obj)
         {
-            SetupCargoShuttle();
+            SetupTradePost();
         }
     }
 
-    private void OnCargoFTLTag(EntityUid uid, CargoShuttleComponent component, ref FTLTagEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        // Just saves mappers forgetting.
-        args.Handled = true;
-        args.Tag = "DockCargo";
-    }
-
     #region Console
 
     private void UpdateCargoShuttleConsoles(EntityUid shuttleUid, CargoShuttleComponent _)
@@ -156,6 +142,15 @@ private void UpdateShuttleState(EntityUid uid, EntityUid? station = null)
 
     #endregion
 
+    private void OnTradeSplit(EntityUid uid, TradeStationComponent component, ref GridSplitEvent args)
+    {
+        // If the trade station gets bombed it's still a trade station.
+        foreach (var gridUid in args.NewGrids)
+        {
+            EnsureComp<TradeStationComponent>(gridUid);
+        }
+    }
+
     #region Shuttle
 
     /// <summary>
@@ -206,9 +201,9 @@ private int GetCargoSpace(EntityUid gridUid)
         return space;
     }
 
-    private List<(EntityUid Entity, CargoPalletComponent Component)> GetCargoPallets(EntityUid gridUid)
+    private List<(EntityUid Entity, CargoPalletComponent Component, TransformComponent PalletXform)> GetCargoPallets(EntityUid gridUid)
     {
-        var pads = new List<(EntityUid, CargoPalletComponent)>();
+        _pads.Clear();
         var query = AllEntityQuery<CargoPalletComponent, TransformComponent>();
 
         while (query.MoveNext(out var uid, out var comp, out var compXform))
@@ -219,23 +214,47 @@ private int GetCargoSpace(EntityUid gridUid)
                 continue;
             }
 
-            pads.Add((uid, comp));
+            _pads.Add((uid, comp, compXform));
         }
 
-        return pads;
+        return _pads;
+    }
+
+    private List<(EntityUid Entity, CargoPalletComponent Component, TransformComponent Transform)>
+        GetFreeCargoPallets(EntityUid gridUid,
+            List<(EntityUid Entity, CargoPalletComponent Component, TransformComponent Transform)> pallets)
+    {
+        _setEnts.Clear();
+
+        List<(EntityUid Entity, CargoPalletComponent Component, TransformComponent Transform)> outList = new();
+
+        foreach (var pallet in pallets)
+        {
+            var aabb = _lookup.GetAABBNoContainer(pallet.Entity, pallet.Transform.LocalPosition, pallet.Transform.LocalRotation);
+
+            if (_lookup.AnyLocalEntitiesIntersecting(gridUid, aabb, LookupFlags.Dynamic))
+                continue;
+
+            outList.Add(pallet);
+        }
+
+        return outList;
     }
 
     #endregion
 
     #region Station
 
-    private void SellPallets(EntityUid gridUid, EntityUid? station, out double amount)
+    private bool SellPallets(EntityUid gridUid, EntityUid? station, out double amount)
     {
         station ??= _station.GetOwningStation(gridUid);
         GetPalletGoods(gridUid, out var toSell, out amount);
 
         Log.Debug($"Cargo sold {toSell.Count} entities for {amount}");
 
+        if (toSell.Count == 0)
+            return false;
+
         if (station != null)
         {
             var ev = new EntitySoldEvent(station.Value, toSell);
@@ -246,6 +265,8 @@ private void SellPallets(EntityUid gridUid, EntityUid? station, out double amoun
         {
             Del(ent);
         }
+
+        return true;
     }
 
     private void GetPalletGoods(EntityUid gridUid, out HashSet<EntityUid> toSell, out double amount)
@@ -253,10 +274,15 @@ private void GetPalletGoods(EntityUid gridUid, out HashSet<EntityUid> toSell, ou
         amount = 0;
         toSell = new HashSet<EntityUid>();
 
-        foreach (var (palletUid, _) in GetCargoPallets(gridUid))
+        foreach (var (palletUid, _, _) in GetCargoPallets(gridUid))
         {
             // Containers should already get the sell price of their children so can skip those.
-            foreach (var ent in _lookup.GetEntitiesIntersecting(palletUid, LookupFlags.Dynamic | LookupFlags.Sundries | LookupFlags.Approximate))
+            _setEnts.Clear();
+
+            _lookup.GetEntitiesIntersecting(palletUid, _setEnts,
+                LookupFlags.Dynamic | LookupFlags.Sundries);
+
+            foreach (var ent in _setEnts)
             {
                 // Dont sell:
                 // - anything already being sold
@@ -304,21 +330,6 @@ private bool CanSell(EntityUid uid, TransformComponent xform)
         return true;
     }
 
-    private void AddCargoContents(EntityUid shuttleUid, CargoShuttleComponent shuttle, StationCargoOrderDatabaseComponent orderDatabase)
-    {
-        var xformQuery = GetEntityQuery<TransformComponent>();
-
-        var pads = GetCargoPallets(shuttleUid);
-        while (pads.Count > 0)
-        {
-            var coordinates = new EntityCoordinates(shuttleUid, xformQuery.GetComponent(_random.PickAndTake(pads).Entity).LocalPosition);
-            if (!FulfillOrder(orderDatabase, coordinates, shuttle.PrinterOutput))
-            {
-                break;
-            }
-        }
-    }
-
     private void OnPalletSale(EntityUid uid, CargoPalletConsoleComponent component, CargoPalletSellMessage args)
     {
         var player = args.Session.AttachedEntity;
@@ -327,57 +338,22 @@ private void OnPalletSale(EntityUid uid, CargoPalletConsoleComponent component,
             return;
 
         var bui = _uiSystem.GetUi(uid, CargoPalletConsoleUiKey.Sale);
-        if (Transform(uid).GridUid is not EntityUid gridUid)
+        var xform = Transform(uid);
+
+        if (xform.GridUid is not EntityUid gridUid)
         {
             _uiSystem.SetUiState(bui,
             new CargoPalletConsoleInterfaceState(0, 0, false));
             return;
         }
 
-        // Delta-V change, on sale, add cash to the stations bank account instead of throwing it on the floor
-        var stationUid = _station.GetOwningStation(uid);
-
-        if (TryComp<StationBankAccountComponent>(stationUid, out var bank))
-        {
-            SellPallets(gridUid, null, out var amount);
-            bank.Balance += (int) amount;
-        }
-        // End of Delta-V change
-
-        UpdatePalletConsoleInterface(uid);
-    }
-
-    private void OnCargoFTLStarted(EntityUid uid, CargoShuttleComponent component, ref FTLStartedEvent args)
-    {
-        var stationUid = _station.GetOwningStation(uid);
-
-        // Called
-        if (CargoMap == null ||
-            args.FromMapUid != _mapManager.GetMapEntityId(CargoMap.Value) ||
-            !TryComp<StationCargoOrderDatabaseComponent>(stationUid, out var orderDatabase))
-        {
+        if (!SellPallets(gridUid, null, out var price))
             return;
-        }
 
-        AddCargoContents(uid, component, orderDatabase);
-        UpdateOrders(stationUid!.Value, orderDatabase);
-        UpdateCargoShuttleConsoles(uid, component);
-    }
-
-    private void OnCargoFTLCompleted(EntityUid uid, CargoShuttleComponent component, ref FTLCompletedEvent args)
-    {
-        var xform = Transform(uid);
-        // Recalled
-        if (xform.MapID != CargoMap)
-            return;
-
-        var stationUid = _station.GetOwningStation(uid);
-
-        if (TryComp<StationBankAccountComponent>(stationUid, out var bank))
-        {
-            SellPallets(uid, stationUid, out var amount);
-            bank.Balance += (int) amount;
-        }
+        var stackPrototype = _protoMan.Index<StackPrototype>(component.CashType);
+        _stack.Spawn((int) price, stackPrototype, xform.Coordinates);
+        _audio.PlayPvs(ApproveSound, uid);
+        UpdatePalletConsoleInterface(uid);
     }
 
     #endregion
@@ -385,16 +361,19 @@ private void OnCargoFTLCompleted(EntityUid uid, CargoShuttleComponent component,
     private void OnRoundRestart(RoundRestartCleanupEvent ev)
     {
         Reset();
-        CleanupCargoShuttle();
+        CleanupTradeStation();
     }
 
-    private void OnRoundStart(RoundStartingEvent ev)
+    private void OnStationInitialize(StationInitializedEvent args)
     {
+        if (!HasComp<StationCargoOrderDatabaseComponent>(args.Station)) // No cargo, L
+            return;
+
         if (_cfgManager.GetCVar(CCVars.GridFill))
-            SetupCargoShuttle();
+            SetupTradePost();
     }
 
-    private void CleanupCargoShuttle()
+    private void CleanupTradeStation()
     {
         if (CargoMap == null || !_mapManager.MapExists(CargoMap.Value))
         {
@@ -405,22 +384,9 @@ private void CleanupCargoShuttle()
 
         _mapManager.DeleteMap(CargoMap.Value);
         CargoMap = null;
-
-        // Shuttle may not have been in the cargo dimension (e.g. on the station map) so need to delete.
-        var query = AllEntityQuery<CargoShuttleComponent>();
-
-        while (query.MoveNext(out var uid, out var _))
-        {
-            if (TryComp<StationCargoOrderDatabaseComponent>(uid, out var station))
-            {
-                station.Shuttle = null;
-            }
-
-            QueueDel(uid);
-        }
     }
 
-    private void SetupCargoShuttle()
+    private void SetupTradePost()
     {
         if (CargoMap != null && _mapManager.MapExists(CargoMap.Value))
         {
@@ -429,17 +395,40 @@ private void SetupCargoShuttle()
 
         // It gets mapinit which is okay... buuutt we still want it paused to avoid power draining.
         CargoMap = _mapManager.CreateMap();
+
+        var options = new MapLoadOptions
+        {
+            LoadMap = true,
+        };
+
+        _mapLoader.TryLoad((MapId) CargoMap, "/Maps/Shuttles/trading_outpost.yml", out var rootUids, options); // Oh boy oh boy, hardcoded paths!
+
+        // If this fails to load for whatever reason, cargo is fucked
+        if (rootUids == null || !rootUids.Any())
+            return;
+
+        foreach (var grid in rootUids)
+        {
+            EnsureComp<ProtectedGridComponent>(grid);
+            EnsureComp<TradeStationComponent>(grid);
+
+            var shuttleComponent = EnsureComp<ShuttleComponent>(grid);
+            shuttleComponent.AngularDamping = 10000;
+            shuttleComponent.LinearDamping = 10000;
+            Dirty(shuttleComponent);
+        }
+
         var mapUid = _mapManager.GetMapEntityId(CargoMap.Value);
         var ftl = EnsureComp<FTLDestinationComponent>(_mapManager.GetMapEntityId(CargoMap.Value));
         ftl.Whitelist = new EntityWhitelist()
         {
-            Components = new[]
-            {
+            Components =
+            [
                 _factory.GetComponentName(typeof(CargoShuttleComponent))
-            }
+            ]
         };
 
-        _metaSystem.SetEntityName(mapUid, $"Trading post {_random.Next(1000):000}");
+        _metaSystem.SetEntityName(mapUid, $"Automated Trade Station {_random.Next(1000):000}");
 
         _console.RefreshShuttleConsoles();
     }
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
index 698d324a80..42aabf2578 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
@@ -61,10 +61,10 @@ private void UpdateTelepad(float frameTime)
             }
 
             var xform = Transform(uid);
-            if (FulfillOrder(orderDatabase, xform.Coordinates, comp.PrinterOutput))
+            if (FulfillNextOrder(orderDatabase, xform.Coordinates, comp.PrinterOutput))
             {
                 _audio.PlayPvs(_audio.GetSound(comp.TeleportSound), uid, AudioParams.Default.WithVolume(-8f));
-                UpdateOrders(station!.Value, orderDatabase);
+                UpdateOrders(station.Value, orderDatabase);
 
                 comp.CurrentState = CargoTelepadState.Teleporting;
                 _appearance.SetData(uid, CargoTelepadVisuals.State, CargoTelepadState.Teleporting, appearance);
diff --git a/Content.Server/Cargo/Systems/CargoSystem.cs b/Content.Server/Cargo/Systems/CargoSystem.cs
index fb6d949e7f..2609d06b55 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.cs
@@ -26,9 +26,6 @@ namespace Content.Server.Cargo.Systems;
 public sealed partial class CargoSystem : SharedCargoSystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IComponentFactory _factory = default!;
-    [Dependency] private readonly IConfigurationManager _cfgManager = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IPrototypeManager _protoMan = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
@@ -42,15 +39,25 @@ public sealed partial class CargoSystem : SharedCargoSystem
     [Dependency] private readonly PricingSystem _pricing = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly SharedTransformSystem _xformSystem = default!;
     [Dependency] private readonly ShuttleConsoleSystem _console = default!;
     [Dependency] private readonly StackSystem _stack = default!;
     [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
     [Dependency] private readonly MetaDataSystem _metaSystem = default!;
+    [Dependency] private readonly IConfigurationManager _cfgManager = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly IComponentFactory _factory = default!;
+    [Dependency] private readonly MapLoaderSystem _mapLoader = default!;
 
     private EntityQuery<TransformComponent> _xformQuery;
     private EntityQuery<CargoSellBlacklistComponent> _blacklistQuery;
     private EntityQuery<MobStateComponent> _mobQuery;
+    private EntityQuery<TradeStationComponent> _tradeQuery;
+
+    private HashSet<EntityUid> _setEnts = new();
+    private List<EntityUid> _listEnts = new();
+    private List<(EntityUid, CargoPalletComponent, TransformComponent)> _pads = new();
 
     public override void Initialize()
     {
@@ -59,6 +66,7 @@ public override void Initialize()
         _xformQuery = GetEntityQuery<TransformComponent>();
         _blacklistQuery = GetEntityQuery<CargoSellBlacklistComponent>();
         _mobQuery = GetEntityQuery<MobStateComponent>();
+        _tradeQuery = GetEntityQuery<TradeStationComponent>();
 
         InitializeConsole();
         InitializeShuttle();
@@ -66,13 +74,6 @@ public override void Initialize()
         InitializeBounty();
     }
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        ShutdownShuttle();
-        CleanupCargoShuttle();
-    }
-
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
diff --git a/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs b/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs
index cb08e19fc2..4a76aef911 100644
--- a/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs
+++ b/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs
@@ -199,9 +199,13 @@ public bool InstallProgram(EntityUid loaderUid, string prototype, bool deinstall
             return false;
 
         var installedProgram = Spawn(prototype, new EntityCoordinates(loaderUid, 0, 0));
+        if (!TryComp(installedProgram, out CartridgeComponent? cartridge))
+            return false;
+
         _containerSystem.Insert(installedProgram, container);
 
-        UpdateCartridgeInstallationStatus(installedProgram, deinstallable ? InstallationStatus.Installed : InstallationStatus.Readonly);
+        UpdateCartridgeInstallationStatus(installedProgram, deinstallable ? InstallationStatus.Installed : InstallationStatus.Readonly, cartridge);
+        cartridge.LoaderUid = loaderUid;
 
         RaiseLocalEvent(installedProgram, new CartridgeAddedEvent(loaderUid));
         UpdateUserInterfaceState(loaderUid, loader);
@@ -223,11 +227,14 @@ public bool UninstallProgram(EntityUid loaderUid, EntityUid programUid, Cartridg
         if (!GetInstalled(loaderUid).Contains(programUid))
             return false;
 
+        if (TryComp(programUid, out CartridgeComponent? cartridge))
+            cartridge.LoaderUid = null;
+
         if (loader.ActiveProgram == programUid)
             loader.ActiveProgram = null;
 
         loader.BackgroundPrograms.Remove(programUid);
-        EntityManager.QueueDeleteEntity(programUid);
+        QueueDel(programUid);
         UpdateUserInterfaceState(loaderUid, loader);
         return true;
     }
@@ -308,6 +315,18 @@ public void UnregisterBackgroundProgram(EntityUid loaderUid, EntityUid cartridge
         loader.BackgroundPrograms.Remove(cartridgeUid);
     }
 
+    public void SendNotification(EntityUid loaderUid, string header, string message, CartridgeLoaderComponent? loader = default!)
+    {
+        if (!Resolve(loaderUid, ref loader))
+            return;
+
+        if (!loader.NotificationsEnabled)
+            return;
+
+        var args = new CartridgeLoaderNotificationSentEvent(header, message);
+        RaiseLocalEvent(loaderUid, ref args);
+    }
+
     protected override void OnItemInserted(EntityUid uid, CartridgeLoaderComponent loader, EntInsertedIntoContainerMessage args)
     {
         if (args.Container.ID != InstalledContainerId && args.Container.ID != loader.CartridgeSlot.ID)
@@ -434,13 +453,10 @@ private void UpdateUserInterfaceState(EntityUid loaderUid, CartridgeLoaderCompon
         UpdateUiState(loaderUid, null, loader);
     }
 
-    private void UpdateCartridgeInstallationStatus(EntityUid cartridgeUid, InstallationStatus installationStatus, CartridgeComponent? cartridgeComponent = default!)
+    private void UpdateCartridgeInstallationStatus(EntityUid cartridgeUid, InstallationStatus installationStatus, CartridgeComponent cartridgeComponent)
     {
-        if (Resolve(cartridgeUid, ref cartridgeComponent))
-        {
-            cartridgeComponent.InstallationStatus = installationStatus;
-            Dirty(cartridgeUid, cartridgeComponent);
-        }
+        cartridgeComponent.InstallationStatus = installationStatus;
+        Dirty(cartridgeUid, cartridgeComponent);
     }
 
     private bool HasProgram(EntityUid loader, EntityUid program, CartridgeLoaderComponent component)
diff --git a/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs
index fca29a4013..5247aafbd5 100644
--- a/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs
+++ b/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs
@@ -31,7 +31,7 @@ public override void Initialize()
         SubscribeLocalEvent<CrewManifestCartridgeComponent, CartridgeMessageEvent>(OnUiMessage);
         SubscribeLocalEvent<CrewManifestCartridgeComponent, CartridgeUiReadyEvent>(OnUiReady);
         SubscribeLocalEvent<ProgramInstallationAttempt>(OnInstallationAttempt);
-        _configManager.OnValueChanged(CCVars.CrewManifestUnsecure, OnCrewManifestUnsecureChanged, true);
+        Subs.CVar(_configManager, CCVars.CrewManifestUnsecure, OnCrewManifestUnsecureChanged, true);
     }
 
     /// <summary>
@@ -92,10 +92,4 @@ private void OnCrewManifestUnsecureChanged(bool unsecureViewersAllowed)
                 _cartridgeLoader.UninstallProgram(loaderUid, program.Value, comp);
         }
     }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        _configManager.UnsubValueChanged(CCVars.CrewManifestUnsecure, OnCrewManifestUnsecureChanged);
-    }
 }
diff --git a/Content.Server/CartridgeLoader/Cartridges/NewsReadCartridgeComponent.cs b/Content.Server/CartridgeLoader/Cartridges/NewsReadCartridgeComponent.cs
deleted file mode 100644
index d4e70fa591..0000000000
--- a/Content.Server/CartridgeLoader/Cartridges/NewsReadCartridgeComponent.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Content.Server.CartridgeLoader.Cartridges;
-
-[RegisterComponent]
-public sealed partial class NewsReadCartridgeComponent : Component
-{
-    [ViewVariables(VVAccess.ReadWrite)]
-    public int ArticleNum;
-
-    [ViewVariables(VVAccess.ReadWrite)]
-    public bool NotificationOn = true;
-}
diff --git a/Content.Server/CartridgeLoader/Cartridges/NewsReaderCartridgeComponent.cs b/Content.Server/CartridgeLoader/Cartridges/NewsReaderCartridgeComponent.cs
new file mode 100644
index 0000000000..525b9fa245
--- /dev/null
+++ b/Content.Server/CartridgeLoader/Cartridges/NewsReaderCartridgeComponent.cs
@@ -0,0 +1,11 @@
+namespace Content.Server.CartridgeLoader.Cartridges;
+
+[RegisterComponent]
+public sealed partial class NewsReaderCartridgeComponent : Component
+{
+    [ViewVariables(VVAccess.ReadWrite)]
+    public int ArticleNumber;
+
+    [ViewVariables(VVAccess.ReadWrite), DataField]
+    public bool NotificationOn = true;
+}
diff --git a/Content.Server/Charges/Components/AutoRechargeComponent.cs b/Content.Server/Charges/Components/AutoRechargeComponent.cs
index e23f0229bb..9dcf555ea9 100644
--- a/Content.Server/Charges/Components/AutoRechargeComponent.cs
+++ b/Content.Server/Charges/Components/AutoRechargeComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Server.Charges.Components;
 /// Something with limited charges that can be recharged automatically.
 /// Requires LimitedChargesComponent to function.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, AutoGenerateComponentPause]
 [Access(typeof(ChargesSystem))]
 public sealed partial class AutoRechargeComponent : Component
 {
@@ -21,5 +21,6 @@ public sealed partial class AutoRechargeComponent : Component
     /// The time when the next charge will be added
     /// </summary>
     [DataField("nextChargeTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan NextChargeTime;
 }
diff --git a/Content.Server/Charges/Systems/ChargesSystem.cs b/Content.Server/Charges/Systems/ChargesSystem.cs
index 82758f4653..03e192e680 100644
--- a/Content.Server/Charges/Systems/ChargesSystem.cs
+++ b/Content.Server/Charges/Systems/ChargesSystem.cs
@@ -10,13 +10,6 @@ public sealed class ChargesSystem : SharedChargesSystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<AutoRechargeComponent, EntityUnpausedEvent>(OnUnpaused);
-    }
-
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -32,11 +25,6 @@ public override void Update(float frameTime)
         }
     }
 
-    private void OnUnpaused(EntityUid uid, AutoRechargeComponent comp, ref EntityUnpausedEvent args)
-    {
-        comp.NextChargeTime += args.PausedTime;
-    }
-
     protected override void OnExamine(EntityUid uid, LimitedChargesComponent comp, ExaminedEvent args)
     {
         base.OnExamine(uid, comp, args);
diff --git a/Content.Server/Chat/EmoteOnDamageComponent.cs b/Content.Server/Chat/EmoteOnDamageComponent.cs
index 91eddef215..8653a4fe55 100644
--- a/Content.Server/Chat/EmoteOnDamageComponent.cs
+++ b/Content.Server/Chat/EmoteOnDamageComponent.cs
@@ -8,7 +8,7 @@ namespace Content.Server.Chat;
 /// <summary>
 /// Causes an entity to automatically emote when taking damage.
 /// </summary>
-[RegisterComponent, Access(typeof(EmoteOnDamageSystem))]
+[RegisterComponent, Access(typeof(EmoteOnDamageSystem)), AutoGenerateComponentPause]
 public sealed partial class EmoteOnDamageComponent : Component
 {
     /// <summary>
@@ -41,6 +41,7 @@ public sealed partial class EmoteOnDamageComponent : Component
     /// The simulation time of the last emote preformed due to taking damage.
     /// </summary>
     [DataField("lastEmoteTime", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    [AutoPausedField]
     public TimeSpan LastEmoteTime = TimeSpan.Zero;
 
     /// <summary>
diff --git a/Content.Server/Chat/Managers/ChatSanitizationManager.cs b/Content.Server/Chat/Managers/ChatSanitizationManager.cs
index 77119eefc0..c956624435 100644
--- a/Content.Server/Chat/Managers/ChatSanitizationManager.cs
+++ b/Content.Server/Chat/Managers/ChatSanitizationManager.cs
@@ -38,6 +38,14 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
         { ":>", "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" },
@@ -47,6 +55,7 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
         { ":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" },
@@ -72,6 +81,18 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
         { ";_;7", "chatsan-tearfully-salutes"},
         { "idk", "chatsan-shrugs" },
         { "idk.", "chatsan-shrugs" },
+        { ";)", "chatsan-winks" },
+        { ";]", "chatsan-winks" },
+        { "(;", "chatsan-winks" },
+        { "[;", "chatsan-winks" },
+        { ":')", "chatsan-tearfully-smiles" },
+        { ":']", "chatsan-tearfully-smiles" },
+        { "=')", "chatsan-tearfully-smiles" },
+        { "=']", "chatsan-tearfully-smiles" },
+        { "(':", "chatsan-tearfully-smiles" },
+        { "[':", "chatsan-tearfully-smiles" },
+        { "('=", "chatsan-tearfully-smiles" },
+        { "['=", "chatsan-tearfully-smiles" },
     };
 
     private bool _doSanitize;
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 5f875432b9..be6e8b78fe 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -16,7 +16,6 @@
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Database;
-using Content.Shared.Decals;
 using Content.Shared.Ghost;
 using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement;
@@ -30,7 +29,6 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
-using Robust.Shared.GameObjects.Components.Localization;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
@@ -76,34 +74,15 @@ public sealed partial class ChatSystem : SharedChatSystem
     private bool _critLoocEnabled;
     private readonly bool _adminLoocEnabled = true;
 
-    [ValidatePrototypeId<ColorPalettePrototype>]
-    private const string ChatNamePalette = "ChatNames";
-    private string[] _chatNameColors = default!;
-
     public override void Initialize()
     {
         base.Initialize();
         CacheEmotes();
-        _configurationManager.OnValueChanged(CCVars.LoocEnabled, OnLoocEnabledChanged, true);
-        _configurationManager.OnValueChanged(CCVars.DeadLoocEnabled, OnDeadLoocEnabledChanged, true);
-        _configurationManager.OnValueChanged(CCVars.CritLoocEnabled, OnCritLoocEnabledChanged, true);
+        Subs.CVar(_configurationManager, CCVars.LoocEnabled, OnLoocEnabledChanged, true);
+        Subs.CVar(_configurationManager, CCVars.DeadLoocEnabled, OnDeadLoocEnabledChanged, true);
+        Subs.CVar(_configurationManager, CCVars.CritLoocEnabled, OnCritLoocEnabledChanged, true);
 
         SubscribeLocalEvent<GameRunLevelChangedEvent>(OnGameChange);
-
-        var nameColors = _prototypeManager.Index<ColorPalettePrototype>(ChatNamePalette).Colors.Values.ToArray();
-        _chatNameColors = new string[nameColors.Length];
-        for (var i = 0; i < nameColors.Length; i++)
-        {
-            _chatNameColors[i] = nameColors[i].ToHex();
-        }
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        _configurationManager.UnsubValueChanged(CCVars.LoocEnabled, OnLoocEnabledChanged);
-        _configurationManager.UnsubValueChanged(CCVars.DeadLoocEnabled, OnDeadLoocEnabledChanged);
-        _configurationManager.UnsubValueChanged(CCVars.CritLoocEnabled, OnCritLoocEnabledChanged);
     }
 
     private void OnLoocEnabledChanged(bool val)
@@ -434,13 +413,8 @@ private void SendEntitySpeak(
 
         name = FormattedMessage.EscapeText(name);
 
-        // color the name unless it's something like "the old man"
-        string coloredName = name;
-        if (!TryComp<GrammarComponent>(source, out var grammar) || grammar.ProperNoun == true)
-            coloredName = $"[color={GetNameColor(name)}]{name}[/color]";
-
         var wrappedMessage = Loc.GetString(speech.Bold ? "chat-manager-entity-say-bold-wrap-message" : "chat-manager-entity-say-wrap-message",
-            ("entityName", coloredName),
+            ("entityName", name),
             ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))),
             ("fontType", speech.FontId),
             ("fontSize", speech.FontSize),
@@ -509,10 +483,6 @@ private void SendEntityWhisper(
         }
         name = FormattedMessage.EscapeText(name);
 
-        // color the name unless it's something like "the old man"
-        if (!TryComp<GrammarComponent>(source, out var grammar) || grammar.ProperNoun == true)
-            name = $"[color={GetNameColor(name)}]{name}[/color]";
-
         var wrappedMessage = Loc.GetString("chat-manager-entity-whisper-wrap-message",
             ("entityName", name), ("message", FormattedMessage.EscapeText(message)));
 
@@ -653,17 +623,6 @@ private void SendDeadChat(EntityUid source, ICommonSession player, string messag
 
     #region Utility
 
-    /// <summary>
-    /// Returns the chat name color for a mob
-    /// </summary>
-    /// <param name="name">Name of the mob</param>
-    /// <returns>Hex value of the color</returns>
-    public string GetNameColor(string name)
-    {
-        var colorIdx = Math.Abs(name.GetHashCode() % _chatNameColors.Length);
-        return _chatNameColors[colorIdx];
-    }
-
     private enum MessageRangeCheckResult
     {
         Disallowed,
diff --git a/Content.Server/Chat/Systems/EmoteOnDamageSystem.cs b/Content.Server/Chat/Systems/EmoteOnDamageSystem.cs
index 9a435971f2..878c517d92 100644
--- a/Content.Server/Chat/Systems/EmoteOnDamageSystem.cs
+++ b/Content.Server/Chat/Systems/EmoteOnDamageSystem.cs
@@ -18,15 +18,9 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<EmoteOnDamageComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<EmoteOnDamageComponent, DamageChangedEvent>(OnDamage);
     }
 
-    private void OnUnpaused(EntityUid uid, EmoteOnDamageComponent emoteOnDamage, ref EntityUnpausedEvent args)
-    {
-        emoteOnDamage.LastEmoteTime += args.PausedTime;
-    }
-
     private void OnDamage(EntityUid uid, EmoteOnDamageComponent emoteOnDamage, DamageChangedEvent args)
     {
         if (!args.DamageIncreased)
diff --git a/Content.Server/Chemistry/Components/InjectorComponent.cs b/Content.Server/Chemistry/Components/InjectorComponent.cs
deleted file mode 100644
index d6d149ad0f..0000000000
--- a/Content.Server/Chemistry/Components/InjectorComponent.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using Content.Shared.Chemistry.Components;
-using Content.Shared.FixedPoint;
-
-namespace Content.Server.Chemistry.Components
-{
-    /// <summary>
-    /// Server behavior for reagent injectors and syringes. Can optionally support both
-    /// injection and drawing or just injection. Can inject/draw reagents from solution
-    /// containers, and can directly inject into a mobs bloodstream.
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class InjectorComponent : SharedInjectorComponent
-    {
-        public const string SolutionName = "injector";
-
-        /// <summary>
-        /// Whether or not the injector is able to draw from containers or if it's a single use
-        /// device that can only inject.
-        /// </summary>
-        [DataField("injectOnly")]
-        public bool InjectOnly;
-
-        /// <summary>
-        /// Whether or not the injector is able to draw from or inject from mobs
-        /// </summary>
-        /// <remarks>
-        ///     for example: droppers would ignore mobs
-        /// </remarks>
-        [DataField("ignoreMobs")]
-        public bool IgnoreMobs = false;
-
-        /// <summary>
-        ///     The minimum amount of solution that can be transferred at once from this solution.
-        /// </summary>
-        [DataField("minTransferAmount")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public FixedPoint2 MinimumTransferAmount { get; set; } = FixedPoint2.New(5);
-
-        /// <summary>
-        ///     The maximum amount of solution that can be transferred at once from this solution.
-        /// </summary>
-        [DataField("maxTransferAmount")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public FixedPoint2 MaximumTransferAmount { get; set; } = FixedPoint2.New(50);
-
-        /// <summary>
-        /// Amount to inject or draw on each usage. If the injector is inject only, it will
-        /// attempt to inject it's entire contents upon use.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("transferAmount")]
-        public FixedPoint2 TransferAmount = FixedPoint2.New(5);
-
-        /// <summary>
-        /// Injection delay (seconds) when the target is a mob.
-        /// </summary>
-        /// <remarks>
-        /// The base delay has a minimum of 1 second, but this will still be modified if the target is incapacitated or
-        /// in combat mode.
-        /// </remarks>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("delay")]
-        public float Delay = 5;
-
-        [DataField("toggleState")] private InjectorToggleMode _toggleState;
-
-        /// <summary>
-        /// The state of the injector. Determines it's attack behavior. Containers must have the
-        /// right SolutionCaps to support injection/drawing. For InjectOnly injectors this should
-        /// only ever be set to Inject
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        public InjectorToggleMode ToggleState
-        {
-            get => _toggleState;
-            set
-            {
-                _toggleState = value;
-                Dirty();
-            }
-        }
-    }
-}
diff --git a/Content.Server/Chemistry/Components/RehydratableComponent.cs b/Content.Server/Chemistry/Components/RehydratableComponent.cs
deleted file mode 100644
index 636eba6ca1..0000000000
--- a/Content.Server/Chemistry/Components/RehydratableComponent.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Server.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Chemistry.Components;
-
-/// <summary>
-/// Basically, monkey cubes.
-/// But specifically, this component deletes the entity and spawns in a new entity when the entity is exposed to a certain amount of a given reagent.
-/// </summary>
-[RegisterComponent, Access(typeof(RehydratableSystem))]
-public sealed partial class RehydratableComponent : Component
-{
-    /// <summary>
-    /// The reagent that must be present to count as hydrated.
-    /// </summary>
-    [DataField("catalyst", customTypeSerializer: typeof(PrototypeIdSerializer<ReagentPrototype>)), ViewVariables(VVAccess.ReadWrite)]
-    public string CatalystPrototype = "Water";
-
-    /// <summary>
-    /// The minimum amount of catalyst that must be present to be hydrated.
-    /// </summary>
-    [DataField("catalystMinimum"), ViewVariables(VVAccess.ReadWrite)]
-    public FixedPoint2 CatalystMinimum = FixedPoint2.Zero;
-
-    /// <summary>
-    /// The entity to create when hydrated.
-    /// </summary>
-    [DataField("possibleSpawns"), ViewVariables(VVAccess.ReadWrite)]
-    public List<string> PossibleSpawns = new();
-}
-
-/// <summary>
-/// Raised on the rehydrated entity with target being the new entity it became.
-/// </summary>
-[ByRefEvent]
-public readonly record struct GotRehydratedEvent(EntityUid Target);
diff --git a/Content.Server/Chemistry/Components/SolutionPurgeComponent.cs b/Content.Server/Chemistry/Components/SolutionPurgeComponent.cs
index 0525542b96..9b9294b6f9 100644
--- a/Content.Server/Chemistry/Components/SolutionPurgeComponent.cs
+++ b/Content.Server/Chemistry/Components/SolutionPurgeComponent.cs
@@ -9,7 +9,7 @@ namespace Content.Server.Chemistry.Components;
 /// <summary>
 /// Passively decreases a solution's quantity of reagent(s).
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, AutoGenerateComponentPause]
 [Access(typeof(SolutionPurgeSystem))]
 public sealed partial class SolutionPurgeComponent : Component
 {
@@ -42,5 +42,6 @@ public sealed partial class SolutionPurgeComponent : Component
     /// The time when the next purge will occur.
     /// </summary>
     [DataField("nextPurgeTime", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    [AutoPausedField]
     public TimeSpan NextPurgeTime = TimeSpan.FromSeconds(0);
 }
diff --git a/Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs b/Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs
index 7fe2dacb67..23bf6b2157 100644
--- a/Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs
+++ b/Content.Server/Chemistry/Components/SolutionRegenerationComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Server.Chemistry.Components;
 /// <summary>
 /// Passively increases a solution's quantity of a reagent.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, AutoGenerateComponentPause]
 [Access(typeof(SolutionRegenerationSystem))]
 public sealed partial class SolutionRegenerationComponent : Component
 {
@@ -39,5 +39,6 @@ public sealed partial class SolutionRegenerationComponent : Component
     /// The time when the next regeneration will occur.
     /// </summary>
     [DataField("nextChargeTime", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    [AutoPausedField]
     public TimeSpan NextRegenTime = TimeSpan.FromSeconds(0);
 }
diff --git a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs
deleted file mode 100644
index 4f149db836..0000000000
--- a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs
+++ /dev/null
@@ -1,447 +0,0 @@
-using Content.Server.Body.Components;
-using Content.Server.Chemistry.Components;
-using Content.Server.Chemistry.Containers.EntitySystems;
-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.DoAfter;
-using Content.Shared.FixedPoint;
-using Content.Shared.Forensics;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Stacks;
-using Content.Shared.Verbs;
-using Robust.Shared.GameStates;
-using Robust.Shared.Player;
-
-namespace Content.Server.Chemistry.EntitySystems;
-
-public sealed partial class ChemistrySystem
-{
-
-    /// <summary>
-    ///     Default transfer amounts for the set-transfer verb.
-    /// </summary>
-    public static readonly List<int> TransferAmounts = new() { 1, 5, 10, 15 };
-    private void InitializeInjector()
-    {
-        SubscribeLocalEvent<InjectorComponent, GetVerbsEvent<AlternativeVerb>>(AddSetTransferVerbs);
-        SubscribeLocalEvent<InjectorComponent, SolutionContainerChangedEvent>(OnSolutionChange);
-        SubscribeLocalEvent<InjectorComponent, InjectorDoAfterEvent>(OnInjectDoAfter);
-        SubscribeLocalEvent<InjectorComponent, ComponentStartup>(OnInjectorStartup);
-        SubscribeLocalEvent<InjectorComponent, UseInHandEvent>(OnInjectorUse);
-        SubscribeLocalEvent<InjectorComponent, AfterInteractEvent>(OnInjectorAfterInteract);
-        SubscribeLocalEvent<InjectorComponent, ComponentGetState>(OnInjectorGetState);
-    }
-
-    private void AddSetTransferVerbs(Entity<InjectorComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract || args.Hands == null)
-            return;
-
-        if (!EntityManager.TryGetComponent(args.User, out ActorComponent? actor))
-            return;
-
-        var (uid, component) = entity;
-
-        // Add specific transfer verbs according to the container's size
-        var priority = 0;
-        var user = args.User;
-        foreach (var amount in TransferAmounts)
-        {
-            if (amount < component.MinimumTransferAmount.Int() || amount > component.MaximumTransferAmount.Int())
-                continue;
-
-            AlternativeVerb verb = new();
-            verb.Text = Loc.GetString("comp-solution-transfer-verb-amount", ("amount", amount));
-            verb.Category = VerbCategory.SetTransferAmount;
-            verb.Act = () =>
-            {
-                component.TransferAmount = FixedPoint2.New(amount);
-                _popup.PopupEntity(Loc.GetString("comp-solution-transfer-set-amount", ("amount", amount)), user, user);
-            };
-
-            // we want to sort by size, not alphabetically by the verb text.
-            verb.Priority = priority;
-            priority--;
-
-            args.Verbs.Add(verb);
-        }
-    }
-
-    private void UseInjector(Entity<InjectorComponent> injector, EntityUid target, EntityUid user)
-    {
-        // Handle injecting/drawing for solutions
-        if (injector.Comp.ToggleState == SharedInjectorComponent.InjectorToggleMode.Inject)
-        {
-            if (_solutionContainers.TryGetInjectableSolution(target, out var injectableSolution, out _))
-            {
-                TryInject(injector, target, injectableSolution.Value, user, false);
-            }
-            else if (_solutionContainers.TryGetRefillableSolution(target, out var refillableSolution, out _))
-            {
-                TryInject(injector, target, refillableSolution.Value, user, true);
-            }
-            else if (TryComp<BloodstreamComponent>(target, out var bloodstream))
-            {
-                TryInjectIntoBloodstream(injector, (target, bloodstream), user);
-            }
-            else
-            {
-                _popup.PopupEntity(Loc.GetString("injector-component-cannot-transfer-message",
-                    ("target", Identity.Entity(target, EntityManager))), injector, user);
-            }
-        }
-        else if (injector.Comp.ToggleState == SharedInjectorComponent.InjectorToggleMode.Draw)
-        {
-            // Draw from a bloodstream, if the target has that
-            if (TryComp<BloodstreamComponent>(target, out var stream) &&
-                _solutionContainers.ResolveSolution(target, stream.BloodSolutionName, ref stream.BloodSolution))
-            {
-                TryDraw(injector, (target, stream), stream.BloodSolution.Value, user);
-                return;
-            }
-
-            // Draw from an object (food, beaker, etc)
-            if (_solutionContainers.TryGetDrawableSolution(target, out var drawableSolution, out _))
-            {
-                TryDraw(injector, target, drawableSolution.Value, user);
-            }
-            else
-            {
-                _popup.PopupEntity(Loc.GetString("injector-component-cannot-draw-message",
-                    ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
-            }
-        }
-    }
-
-    private void OnSolutionChange(Entity<InjectorComponent> entity, ref SolutionContainerChangedEvent args)
-    {
-        Dirty(entity);
-    }
-
-    private void OnInjectorGetState(Entity<InjectorComponent> entity, ref ComponentGetState args)
-    {
-        _solutionContainers.TryGetSolution(entity.Owner, InjectorComponent.SolutionName, out _, out var solution);
-
-        var currentVolume = solution?.Volume ?? FixedPoint2.Zero;
-        var maxVolume = solution?.MaxVolume ?? FixedPoint2.Zero;
-
-        args.State = new SharedInjectorComponent.InjectorComponentState(currentVolume, maxVolume, entity.Comp.ToggleState);
-    }
-
-    private void OnInjectDoAfter(Entity<InjectorComponent> entity, ref InjectorDoAfterEvent args)
-    {
-        if (args.Cancelled || args.Handled || args.Args.Target == null)
-            return;
-
-        UseInjector(entity, args.Args.Target.Value, args.Args.User);
-        args.Handled = true;
-    }
-
-    private void OnInjectorAfterInteract(Entity<InjectorComponent> entity, ref AfterInteractEvent args)
-    {
-        if (args.Handled || !args.CanReach)
-            return;
-
-        //Make sure we have the attacking entity
-        if (args.Target is not { Valid: true } target || !HasComp<SolutionContainerManagerComponent>(entity))
-            return;
-
-        // Is the target a mob? If yes, use a do-after to give them time to respond.
-        if (HasComp<MobStateComponent>(target) || HasComp<BloodstreamComponent>(target))
-        {
-            // Are use using an injector capible of targeting a mob?
-            if (entity.Comp.IgnoreMobs)
-                return;
-
-            InjectDoAfter(entity, target, args.User);
-            args.Handled = true;
-            return;
-        }
-
-        UseInjector(entity, target, args.User);
-        args.Handled = true;
-    }
-
-    private void OnInjectorStartup(Entity<InjectorComponent> entity, ref ComponentStartup args)
-    {
-        // ???? why ?????
-        Dirty(entity);
-    }
-
-    private void OnInjectorUse(Entity<InjectorComponent> entity, ref UseInHandEvent args)
-    {
-        if (args.Handled)
-            return;
-
-        Toggle(entity, args.User);
-        args.Handled = true;
-    }
-
-    /// <summary>
-    /// Toggle between draw/inject state if applicable
-    /// </summary>
-    private void Toggle(Entity<InjectorComponent> injector, EntityUid user)
-    {
-        if (injector.Comp.InjectOnly)
-        {
-            return;
-        }
-
-        string msg;
-        switch (injector.Comp.ToggleState)
-        {
-            case SharedInjectorComponent.InjectorToggleMode.Inject:
-                injector.Comp.ToggleState = SharedInjectorComponent.InjectorToggleMode.Draw;
-                msg = "injector-component-drawing-text";
-                break;
-            case SharedInjectorComponent.InjectorToggleMode.Draw:
-                injector.Comp.ToggleState = SharedInjectorComponent.InjectorToggleMode.Inject;
-                msg = "injector-component-injecting-text";
-                break;
-            default:
-                throw new ArgumentOutOfRangeException();
-        }
-
-        _popup.PopupEntity(Loc.GetString(msg), injector, user);
-    }
-
-    /// <summary>
-    /// Send informative pop-up messages and wait for a do-after to complete.
-    /// </summary>
-    private void InjectDoAfter(Entity<InjectorComponent> injector, EntityUid target, EntityUid user)
-    {
-        // Create a pop-up for the user
-        _popup.PopupEntity(Loc.GetString("injector-component-injecting-user"), target, user);
-
-        if (!_solutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out _, out var solution))
-            return;
-
-        var actualDelay = MathF.Max(injector.Comp.Delay, 1f);
-
-        // Injections take 0.5 seconds longer per additional 5u
-        actualDelay += (float) injector.Comp.TransferAmount / injector.Comp.Delay - 0.5f;
-
-        var isTarget = user != target;
-
-        if (isTarget)
-        {
-            // Create a pop-up for the target
-            var userName = Identity.Entity(user, EntityManager);
-            _popup.PopupEntity(Loc.GetString("injector-component-injecting-target",
-                ("user", userName)), user, target);
-
-            // Check if the target is incapacitated or in combat mode and modify time accordingly.
-            if (_mobState.IsIncapacitated(target))
-            {
-                actualDelay /= 2.5f;
-            }
-            else if (_combat.IsInCombatMode(target))
-            {
-                // Slightly increase the delay when the target is in combat mode. Helps prevents cheese injections in
-                // combat with fast syringes & lag.
-                actualDelay += 1;
-            }
-
-            // Add an admin log, using the "force feed" log type. It's not quite feeding, but the effect is the same.
-            if (injector.Comp.ToggleState == SharedInjectorComponent.InjectorToggleMode.Inject)
-            {
-                _adminLogger.Add(LogType.ForceFeed,
-                    $"{EntityManager.ToPrettyString(user):user} is attempting to inject {EntityManager.ToPrettyString(target):target} with a solution {SolutionContainerSystem.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}");
-            }
-        }
-        else
-        {
-            // Self-injections take half as long.
-            actualDelay /= 2;
-
-            if (injector.Comp.ToggleState == SharedInjectorComponent.InjectorToggleMode.Inject)
-            {
-                _adminLogger.Add(LogType.Ingestion,
-                    $"{EntityManager.ToPrettyString(user):user} is attempting to inject themselves with a solution {SolutionContainerSystem.ToPrettyString(solution):solution}.");
-            }
-            else
-            {
-                _adminLogger.Add(LogType.ForceFeed,
-                    $"{EntityManager.ToPrettyString(user):user} is attempting to draw {injector.Comp.TransferAmount.ToString()} units from themselves.");
-            }
-        }
-
-        _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, actualDelay, new InjectorDoAfterEvent(), injector.Owner, target: target, used: injector.Owner)
-        {
-            BreakOnUserMove = true,
-            BreakOnDamage = true,
-            BreakOnTargetMove = true,
-            MovementThreshold = 0.1f,
-        });
-    }
-
-    private void TryInjectIntoBloodstream(Entity<InjectorComponent> injector, Entity<BloodstreamComponent> target, EntityUid user)
-    {
-        // Get transfer amount. May be smaller than _transferAmount if not enough room
-        if (!_solutionContainers.ResolveSolution(target.Owner, target.Comp.ChemicalSolutionName, ref target.Comp.ChemicalSolution, out var chemSolution))
-        {
-            _popup.PopupEntity(Loc.GetString("injector-component-cannot-inject-message", ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
-            return;
-        }
-
-        var realTransferAmount = FixedPoint2.Min(injector.Comp.TransferAmount, chemSolution.AvailableVolume);
-        if (realTransferAmount <= 0)
-        {
-            _popup.PopupEntity(Loc.GetString("injector-component-cannot-inject-message", ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
-            return;
-        }
-
-        // Move units from attackSolution to targetSolution
-        var removedSolution = _solutionContainers.SplitSolution(target.Comp.ChemicalSolution.Value, realTransferAmount);
-
-        _blood.TryAddToChemicals(target, removedSolution, target.Comp);
-
-        _reactiveSystem.DoEntityReaction(target, removedSolution, ReactionMethod.Injection);
-
-        _popup.PopupEntity(Loc.GetString("injector-component-inject-success-message",
-                ("amount", removedSolution.Volume),
-                ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
-
-        Dirty(injector);
-        AfterInject(injector, target);
-    }
-
-    private void TryInject(Entity<InjectorComponent> injector, EntityUid targetEntity, Entity<SolutionComponent> targetSolution, EntityUid user, bool asRefill)
-    {
-        if (!_solutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out var soln, out var solution) || solution.Volume == 0)
-            return;
-
-        // Get transfer amount. May be smaller than _transferAmount if not enough room
-        var realTransferAmount = FixedPoint2.Min(injector.Comp.TransferAmount, targetSolution.Comp.Solution.AvailableVolume);
-
-        if (realTransferAmount <= 0)
-        {
-            _popup.PopupEntity(Loc.GetString("injector-component-target-already-full-message", ("target", Identity.Entity(targetEntity, EntityManager))),
-                injector.Owner, user);
-            return;
-        }
-
-        // Move units from attackSolution to targetSolution
-        Solution removedSolution;
-        if (TryComp<StackComponent>(targetEntity, out var stack))
-            removedSolution = _solutionContainers.SplitStackSolution(soln.Value, realTransferAmount, stack.Count);
-        else
-            removedSolution = _solutionContainers.SplitSolution(soln.Value, realTransferAmount);
-
-        _reactiveSystem.DoEntityReaction(targetEntity, removedSolution, ReactionMethod.Injection);
-
-        if (!asRefill)
-            _solutionContainers.Inject(targetEntity, targetSolution, removedSolution);
-        else
-            _solutionContainers.Refill(targetEntity, targetSolution, removedSolution);
-
-        _popup.PopupEntity(Loc.GetString("injector-component-transfer-success-message",
-                ("amount", removedSolution.Volume),
-                ("target", Identity.Entity(targetEntity, EntityManager))), injector.Owner, user);
-
-        Dirty(injector);
-        AfterInject(injector, targetEntity);
-    }
-
-    private void AfterInject(Entity<InjectorComponent> injector, EntityUid target)
-    {
-        // Automatically set syringe to draw after completely draining it.
-        if (_solutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out _, out var solution) && solution.Volume == 0)
-        {
-            injector.Comp.ToggleState = SharedInjectorComponent.InjectorToggleMode.Draw;
-        }
-
-        // Leave some DNA from the injectee on it
-        var ev = new TransferDnaEvent { Donor = target, Recipient = injector };
-        RaiseLocalEvent(target, ref ev);
-    }
-
-    private void AfterDraw(Entity<InjectorComponent> injector, EntityUid target)
-    {
-        // Automatically set syringe to inject after completely filling it.
-        if (_solutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out _, out var solution) && solution.AvailableVolume == 0)
-        {
-            injector.Comp.ToggleState = SharedInjectorComponent.InjectorToggleMode.Inject;
-        }
-
-        // Leave some DNA from the drawee on it
-        var ev = new TransferDnaEvent { Donor = target, Recipient = injector };
-        RaiseLocalEvent(target, ref ev);
-    }
-
-    private void TryDraw(Entity<InjectorComponent> injector, Entity<BloodstreamComponent?> target, Entity<SolutionComponent> targetSolution, EntityUid user)
-    {
-        if (!_solutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out var soln, out var solution) || solution.AvailableVolume == 0)
-        {
-            return;
-        }
-
-        // Get transfer amount. May be smaller than _transferAmount if not enough room, also make sure there's room in the injector
-        var realTransferAmount = FixedPoint2.Min(injector.Comp.TransferAmount, targetSolution.Comp.Solution.Volume, solution.AvailableVolume);
-
-        if (realTransferAmount <= 0)
-        {
-            _popup.PopupEntity(Loc.GetString("injector-component-target-is-empty-message", ("target", Identity.Entity(target, EntityManager))),
-                injector.Owner, user);
-            return;
-        }
-
-        // We have some snowflaked behavior for streams.
-        if (target.Comp != null)
-        {
-            DrawFromBlood(injector, (target.Owner, target.Comp), soln.Value, realTransferAmount, user);
-            return;
-        }
-
-        // Move units from attackSolution to targetSolution
-        var removedSolution = _solutionContainers.Draw(target.Owner, targetSolution, realTransferAmount);
-
-        if (!_solutionContainers.TryAddSolution(soln.Value, removedSolution))
-        {
-            return;
-        }
-
-        _popup.PopupEntity(Loc.GetString("injector-component-draw-success-message",
-                ("amount", removedSolution.Volume),
-                ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
-
-        Dirty(injector);
-        AfterDraw(injector, target);
-    }
-
-    private void DrawFromBlood(Entity<InjectorComponent> injector, Entity<BloodstreamComponent> target, Entity<SolutionComponent> injectorSolution, FixedPoint2 transferAmount, EntityUid user)
-    {
-        var drawAmount = (float) transferAmount;
-
-        if (_solutionContainers.ResolveSolution(target.Owner, target.Comp.ChemicalSolutionName, ref target.Comp.ChemicalSolution))
-        {
-            var chemTemp = _solutionContainers.SplitSolution(target.Comp.ChemicalSolution.Value, drawAmount * 0.15f);
-            _solutionContainers.TryAddSolution(injectorSolution, chemTemp);
-            drawAmount -= (float) chemTemp.Volume;
-        }
-
-        if (_solutionContainers.ResolveSolution(target.Owner, target.Comp.BloodSolutionName, ref target.Comp.BloodSolution))
-        {
-            var bloodTemp = _solutionContainers.SplitSolution(target.Comp.BloodSolution.Value, drawAmount);
-            _solutionContainers.TryAddSolution(injectorSolution, bloodTemp);
-        }
-
-        _popup.PopupEntity(Loc.GetString("injector-component-draw-success-message",
-                ("amount", transferAmount),
-                ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
-
-        Dirty(injector);
-        AfterDraw(injector, target);
-    }
-}
diff --git a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs
index a2b4f399e2..c4f22dc63a 100644
--- a/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs
@@ -1,12 +1,8 @@
 using Content.Server.Administration.Logs;
-using Content.Server.Body.Systems;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Interaction;
 using Content.Server.Popups;
 using Content.Shared.Chemistry;
-using Content.Shared.CombatMode;
-using Content.Shared.DoAfter;
-using Content.Shared.Mobs.Systems;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.Chemistry.EntitySystems;
@@ -16,20 +12,15 @@ public sealed partial class ChemistrySystem : EntitySystem
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     [Dependency] private readonly IEntityManager _entMan = default!;
     [Dependency] private readonly InteractionSystem _interaction = default!;
-    [Dependency] private readonly BloodstreamSystem _blood = default!;
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly ReactiveSystem _reactiveSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly SharedCombatModeSystem _combat = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionContainers = default!;
 
     public override void Initialize()
     {
         // Why ChemMaster duplicates reagentdispenser nobody knows.
         InitializeHypospray();
-        InitializeInjector();
         InitializeMixing();
     }
 }
diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
new file mode 100644
index 0000000000..0846d35477
--- /dev/null
+++ b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
@@ -0,0 +1,382 @@
+using Content.Server.Body.Components;
+using Content.Server.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.DoAfter;
+using Content.Shared.FixedPoint;
+using Content.Shared.Forensics;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Stacks;
+
+namespace Content.Server.Chemistry.EntitySystems;
+
+public sealed class InjectorSystem : SharedInjectorSystem
+{
+    [Dependency] private readonly BloodstreamSystem _blood = default!;
+    [Dependency] private readonly ReactiveSystem _reactiveSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<InjectorComponent, InjectorDoAfterEvent>(OnInjectDoAfter);
+        SubscribeLocalEvent<InjectorComponent, AfterInteractEvent>(OnInjectorAfterInteract);
+    }
+
+    private void UseInjector(Entity<InjectorComponent> injector, EntityUid target, EntityUid user)
+    {
+        // Handle injecting/drawing for solutions
+        if (injector.Comp.ToggleState == InjectorToggleMode.Inject)
+        {
+            if (SolutionContainers.TryGetInjectableSolution(target, out var injectableSolution, out _))
+            {
+                TryInject(injector, target, injectableSolution.Value, user, false);
+            }
+            else if (SolutionContainers.TryGetRefillableSolution(target, out var refillableSolution, out _))
+            {
+                TryInject(injector, target, refillableSolution.Value, user, true);
+            }
+            else if (TryComp<BloodstreamComponent>(target, out var bloodstream))
+            {
+                TryInjectIntoBloodstream(injector, (target, bloodstream), user);
+            }
+            else
+            {
+                Popup.PopupEntity(Loc.GetString("injector-component-cannot-transfer-message",
+                    ("target", Identity.Entity(target, EntityManager))), injector, user);
+            }
+        }
+        else if (injector.Comp.ToggleState == InjectorToggleMode.Draw)
+        {
+            // Draw from a bloodstream, if the target has that
+            if (TryComp<BloodstreamComponent>(target, out var stream) &&
+                SolutionContainers.ResolveSolution(target, stream.BloodSolutionName, ref stream.BloodSolution))
+            {
+                TryDraw(injector, (target, stream), stream.BloodSolution.Value, user);
+                return;
+            }
+
+            // Draw from an object (food, beaker, etc)
+            if (SolutionContainers.TryGetDrawableSolution(target, out var drawableSolution, out _))
+            {
+                TryDraw(injector, target, drawableSolution.Value, user);
+            }
+            else
+            {
+                Popup.PopupEntity(Loc.GetString("injector-component-cannot-draw-message",
+                    ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+            }
+        }
+    }
+
+    private void OnInjectDoAfter(Entity<InjectorComponent> entity, ref InjectorDoAfterEvent args)
+    {
+        if (args.Cancelled || args.Handled || args.Args.Target == null)
+            return;
+
+        UseInjector(entity, args.Args.Target.Value, args.Args.User);
+        args.Handled = true;
+    }
+
+    private void OnInjectorAfterInteract(Entity<InjectorComponent> entity, ref AfterInteractEvent args)
+    {
+        if (args.Handled || !args.CanReach)
+            return;
+
+        //Make sure we have the attacking entity
+        if (args.Target is not { Valid: true } target || !HasComp<SolutionContainerManagerComponent>(entity))
+            return;
+
+        // Is the target a mob? If yes, use a do-after to give them time to respond.
+        if (HasComp<MobStateComponent>(target) || HasComp<BloodstreamComponent>(target))
+        {
+            // Are use using an injector capible of targeting a mob?
+            if (entity.Comp.IgnoreMobs)
+                return;
+
+            InjectDoAfter(entity, target, args.User);
+            args.Handled = true;
+            return;
+        }
+
+        UseInjector(entity, target, args.User);
+        args.Handled = true;
+    }
+
+    /// <summary>
+    /// Send informative pop-up messages and wait for a do-after to complete.
+    /// </summary>
+    private void InjectDoAfter(Entity<InjectorComponent> injector, EntityUid target, EntityUid user)
+    {
+        // Create a pop-up for the user
+        if (injector.Comp.ToggleState == InjectorToggleMode.Draw)
+        {
+            Popup.PopupEntity(Loc.GetString("injector-component-drawing-user"), target, user);
+        }
+        else
+        {
+            Popup.PopupEntity(Loc.GetString("injector-component-injecting-user"), target, user);
+        }
+
+        if (!SolutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out _, out var solution))
+            return;
+
+        var actualDelay = MathHelper.Max(injector.Comp.Delay, TimeSpan.FromSeconds(1));
+
+        // Injections take 0.5 seconds longer per additional 5u
+        actualDelay += TimeSpan.FromSeconds(injector.Comp.TransferAmount.Float() / injector.Comp.Delay.TotalSeconds - 0.5f);
+
+        var isTarget = user != target;
+
+        if (isTarget)
+        {
+            // Create a pop-up for the target
+            var userName = Identity.Entity(user, EntityManager);
+            if (injector.Comp.ToggleState == InjectorToggleMode.Draw)
+            {
+                Popup.PopupEntity(Loc.GetString("injector-component-drawing-target",
+    ("user", userName)), user, target);
+            }
+            else
+            {
+                Popup.PopupEntity(Loc.GetString("injector-component-injecting-target",
+    ("user", userName)), user, target);
+            }
+
+
+            // Check if the target is incapacitated or in combat mode and modify time accordingly.
+            if (MobState.IsIncapacitated(target))
+            {
+                actualDelay /= 2.5f;
+            }
+            else if (Combat.IsInCombatMode(target))
+            {
+                // Slightly increase the delay when the target is in combat mode. Helps prevents cheese injections in
+                // combat with fast syringes & lag.
+                actualDelay += TimeSpan.FromSeconds(1);
+            }
+
+            // Add an admin log, using the "force feed" log type. It's not quite feeding, but the effect is the same.
+            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}");
+            }
+            else
+            {
+                AdminLogger.Add(LogType.ForceFeed,
+                    $"{EntityManager.ToPrettyString(user):user} is attempting to draw {injector.Comp.TransferAmount.ToString()} units from {EntityManager.ToPrettyString(target):target}");
+            }
+        }
+        else
+        {
+            // Self-injections take half as long.
+            actualDelay /= 2;
+
+            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}.");
+            }
+            else
+            {
+                AdminLogger.Add(LogType.ForceFeed,
+                    $"{EntityManager.ToPrettyString(user):user} is attempting to draw {injector.Comp.TransferAmount.ToString()} units from themselves.");
+            }
+        }
+
+        DoAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, actualDelay, new InjectorDoAfterEvent(), injector.Owner, target: target, used: injector.Owner)
+        {
+            BreakOnUserMove = true,
+            BreakOnDamage = true,
+            BreakOnTargetMove = true,
+            MovementThreshold = 0.1f,
+        });
+    }
+
+    private void TryInjectIntoBloodstream(Entity<InjectorComponent> injector, Entity<BloodstreamComponent> target,
+        EntityUid user)
+    {
+        // Get transfer amount. May be smaller than _transferAmount if not enough room
+        if (!SolutionContainers.ResolveSolution(target.Owner, target.Comp.ChemicalSolutionName,
+                ref target.Comp.ChemicalSolution, out var chemSolution))
+        {
+            Popup.PopupEntity(
+                Loc.GetString("injector-component-cannot-inject-message",
+                    ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+            return;
+        }
+
+        var realTransferAmount = FixedPoint2.Min(injector.Comp.TransferAmount, chemSolution.AvailableVolume);
+        if (realTransferAmount <= 0)
+        {
+            Popup.PopupEntity(
+                Loc.GetString("injector-component-cannot-inject-message",
+                    ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+            return;
+        }
+
+        // Move units from attackSolution to targetSolution
+        var removedSolution = SolutionContainers.SplitSolution(target.Comp.ChemicalSolution.Value, realTransferAmount);
+
+        _blood.TryAddToChemicals(target, removedSolution, target.Comp);
+
+        _reactiveSystem.DoEntityReaction(target, removedSolution, ReactionMethod.Injection);
+
+        Popup.PopupEntity(Loc.GetString("injector-component-inject-success-message",
+            ("amount", removedSolution.Volume),
+            ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+
+        Dirty(injector);
+        AfterInject(injector, target);
+    }
+
+    private void TryInject(Entity<InjectorComponent> injector, EntityUid targetEntity,
+        Entity<SolutionComponent> targetSolution, EntityUid user, bool asRefill)
+    {
+        if (!SolutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out var soln,
+                out var solution) || solution.Volume == 0)
+            return;
+
+        // Get transfer amount. May be smaller than _transferAmount if not enough room
+        var realTransferAmount =
+            FixedPoint2.Min(injector.Comp.TransferAmount, targetSolution.Comp.Solution.AvailableVolume);
+
+        if (realTransferAmount <= 0)
+        {
+            Popup.PopupEntity(
+                Loc.GetString("injector-component-target-already-full-message",
+                    ("target", Identity.Entity(targetEntity, EntityManager))),
+                injector.Owner, user);
+            return;
+        }
+
+        // Move units from attackSolution to targetSolution
+        Solution removedSolution;
+        if (TryComp<StackComponent>(targetEntity, out var stack))
+            removedSolution = SolutionContainers.SplitStackSolution(soln.Value, realTransferAmount, stack.Count);
+        else
+            removedSolution = SolutionContainers.SplitSolution(soln.Value, realTransferAmount);
+
+        _reactiveSystem.DoEntityReaction(targetEntity, removedSolution, ReactionMethod.Injection);
+
+        if (!asRefill)
+            SolutionContainers.Inject(targetEntity, targetSolution, removedSolution);
+        else
+            SolutionContainers.Refill(targetEntity, targetSolution, removedSolution);
+
+        Popup.PopupEntity(Loc.GetString("injector-component-transfer-success-message",
+            ("amount", removedSolution.Volume),
+            ("target", Identity.Entity(targetEntity, EntityManager))), injector.Owner, user);
+
+        Dirty(injector);
+        AfterInject(injector, targetEntity);
+    }
+
+    private void AfterInject(Entity<InjectorComponent> injector, EntityUid target)
+    {
+        // Automatically set syringe to draw after completely draining it.
+        if (SolutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out _,
+                out var solution) && solution.Volume == 0)
+        {
+            SetMode(injector, InjectorToggleMode.Draw);
+        }
+
+        // Leave some DNA from the injectee on it
+        var ev = new TransferDnaEvent { Donor = target, Recipient = injector };
+        RaiseLocalEvent(target, ref ev);
+    }
+
+    private void AfterDraw(Entity<InjectorComponent> injector, EntityUid target)
+    {
+        // Automatically set syringe to inject after completely filling it.
+        if (SolutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out _,
+                out var solution) && solution.AvailableVolume == 0)
+        {
+            SetMode(injector, InjectorToggleMode.Inject);
+        }
+
+        // Leave some DNA from the drawee on it
+        var ev = new TransferDnaEvent { Donor = target, Recipient = injector };
+        RaiseLocalEvent(target, ref ev);
+    }
+
+    private void TryDraw(Entity<InjectorComponent> injector, Entity<BloodstreamComponent?> target,
+        Entity<SolutionComponent> targetSolution, EntityUid user)
+    {
+        if (!SolutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out var soln,
+                out var solution) || solution.AvailableVolume == 0)
+        {
+            return;
+        }
+
+        // Get transfer amount. May be smaller than _transferAmount if not enough room, also make sure there's room in the injector
+        var realTransferAmount = FixedPoint2.Min(injector.Comp.TransferAmount, targetSolution.Comp.Solution.Volume,
+            solution.AvailableVolume);
+
+        if (realTransferAmount <= 0)
+        {
+            Popup.PopupEntity(
+                Loc.GetString("injector-component-target-is-empty-message",
+                    ("target", Identity.Entity(target, EntityManager))),
+                injector.Owner, user);
+            return;
+        }
+
+        // We have some snowflaked behavior for streams.
+        if (target.Comp != null)
+        {
+            DrawFromBlood(injector, (target.Owner, target.Comp), soln.Value, realTransferAmount, user);
+            return;
+        }
+
+        // Move units from attackSolution to targetSolution
+        var removedSolution = SolutionContainers.Draw(target.Owner, targetSolution, realTransferAmount);
+
+        if (!SolutionContainers.TryAddSolution(soln.Value, removedSolution))
+        {
+            return;
+        }
+
+        Popup.PopupEntity(Loc.GetString("injector-component-draw-success-message",
+            ("amount", removedSolution.Volume),
+            ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+
+        Dirty(injector);
+        AfterDraw(injector, target);
+    }
+
+    private void DrawFromBlood(Entity<InjectorComponent> injector, Entity<BloodstreamComponent> target,
+        Entity<SolutionComponent> injectorSolution, FixedPoint2 transferAmount, EntityUid user)
+    {
+        var drawAmount = (float) transferAmount;
+
+        if (SolutionContainers.ResolveSolution(target.Owner, target.Comp.ChemicalSolutionName,
+                ref target.Comp.ChemicalSolution))
+        {
+            var chemTemp = SolutionContainers.SplitSolution(target.Comp.ChemicalSolution.Value, drawAmount * 0.15f);
+            SolutionContainers.TryAddSolution(injectorSolution, chemTemp);
+            drawAmount -= (float) chemTemp.Volume;
+        }
+
+        if (SolutionContainers.ResolveSolution(target.Owner, target.Comp.BloodSolutionName,
+                ref target.Comp.BloodSolution))
+        {
+            var bloodTemp = SolutionContainers.SplitSolution(target.Comp.BloodSolution.Value, drawAmount);
+            SolutionContainers.TryAddSolution(injectorSolution, bloodTemp);
+        }
+
+        Popup.PopupEntity(Loc.GetString("injector-component-draw-success-message",
+            ("amount", transferAmount),
+            ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+
+        Dirty(injector);
+        AfterDraw(injector, target);
+    }
+}
diff --git a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
index d5ec310f87..b93498fe31 100644
--- a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
@@ -1,17 +1,11 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Chemistry.Components;
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Nutrition.Components;
 using Content.Server.Nutrition.EntitySystems;
-using Content.Server.Labels.Components;
-using Content.Server.Chemistry;
 using Content.Shared.Chemistry;
-using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.Chemistry.Dispenser;
 using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Database;
 using Content.Shared.FixedPoint;
 using JetBrains.Annotations;
 using Robust.Server.Audio;
@@ -19,7 +13,7 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
-using System.Linq;
+using Content.Shared.Labels.Components;
 
 namespace Content.Server.Chemistry.EntitySystems
 {
@@ -68,7 +62,7 @@ private void UpdateUiState(Entity<ReagentDispenserComponent> reagentDispenser)
 
             var inventory = GetInventory(reagentDispenser);
 
-            var state = new ReagentDispenserBoundUserInterfaceState(outputContainerInfo, inventory, reagentDispenser.Comp.DispenseAmount);
+            var state = new ReagentDispenserBoundUserInterfaceState(outputContainerInfo, GetNetEntity(outputContainer), inventory, reagentDispenser.Comp.DispenseAmount);
             _userInterfaceSystem.TrySetUiState(reagentDispenser, ReagentDispenserUiKey.Key, state);
         }
 
diff --git a/Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs b/Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs
deleted file mode 100644
index e1cdfd2066..0000000000
--- a/Content.Server/Chemistry/EntitySystems/RehydratableSystem.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Content.Server.Chemistry.Components;
-using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.FixedPoint;
-using Content.Shared.Popups;
-using Robust.Shared.Random;
-
-namespace Content.Server.Chemistry.EntitySystems;
-
-public sealed class RehydratableSystem : EntitySystem
-{
-    [Dependency] private readonly SharedPopupSystem _popups = default!;
-    [Dependency] private readonly SolutionContainerSystem _solutions = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<RehydratableComponent, SolutionContainerChangedEvent>(OnSolutionChange);
-    }
-
-    private void OnSolutionChange(Entity<RehydratableComponent> entity, ref SolutionContainerChangedEvent args)
-    {
-        var quantity = _solutions.GetTotalPrototypeQuantity(entity, entity.Comp.CatalystPrototype);
-        if (quantity != FixedPoint2.Zero && quantity >= entity.Comp.CatalystMinimum)
-        {
-            Expand(entity);
-        }
-    }
-
-    // Try not to make this public if you can help it.
-    private void Expand(Entity<RehydratableComponent> entity)
-    {
-        var (uid, comp) = entity;
-
-        _popups.PopupEntity(Loc.GetString("rehydratable-component-expands-message", ("owner", uid)), uid);
-
-        var randomMob = _random.Pick(comp.PossibleSpawns);
-
-        var target = Spawn(randomMob, Transform(uid).Coordinates);
-
-        Transform(target).AttachToGridOrMap();
-        var ev = new GotRehydratedEvent(target);
-        RaiseLocalEvent(uid, ref ev);
-
-        // prevent double hydration while queued
-        RemComp<RehydratableComponent>(uid);
-        QueueDel(uid);
-    }
-}
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionPurgeSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionPurgeSystem.cs
index e6e003a7f5..42b8ab374a 100644
--- a/Content.Server/Chemistry/EntitySystems/SolutionPurgeSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/SolutionPurgeSystem.cs
@@ -10,13 +10,6 @@ public sealed class SolutionPurgeSystem : EntitySystem
     [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SolutionPurgeComponent, EntityUnpausedEvent>(OnUnpaused);
-    }
-
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -33,9 +26,4 @@ public override void Update(float frameTime)
                 _solutionContainer.SplitSolutionWithout(solution.Value, purge.Quantity, purge.Preserve.ToArray());
         }
     }
-
-    private void OnUnpaused(Entity<SolutionPurgeComponent> entity, ref EntityUnpausedEvent args)
-    {
-        entity.Comp.NextPurgeTime += args.PausedTime;
-    }
 }
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs
index 37458846e3..5af181e4af 100644
--- a/Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/SolutionRegenerationSystem.cs
@@ -12,13 +12,6 @@ public sealed class SolutionRegenerationSystem : EntitySystem
     [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SolutionRegenerationComponent, EntityUnpausedEvent>(OnUnpaused);
-    }
-
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -52,9 +45,4 @@ public override void Update(float frameTime)
             }
         }
     }
-
-    private void OnUnpaused(Entity<SolutionRegenerationComponent> entity, ref EntityUnpausedEvent args)
-    {
-        entity.Comp.NextRegenTime += args.PausedTime;
-    }
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs b/Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs
index cf3d71405b..8d475570ad 100644
--- a/Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs
+++ b/Content.Server/Chemistry/ReagentEffects/AdjustAlert.cs
@@ -7,15 +7,27 @@ namespace Content.Server.Chemistry.ReagentEffects;
 
 public sealed partial class AdjustAlert : ReagentEffect
 {
+    /// <summary>
+    /// The specific Alert that will be adjusted
+    /// </summary>
     [DataField("alertType", required: true)]
     public AlertType Type;
 
+    /// <summary>
+    /// If true, the alert is removed after Time seconds. If Time was not specified the alert is removed immediately.
+    /// </summary>
     [DataField]
     public bool Clear;
 
+    /// <summary>
+    /// Visually display cooldown progress over the alert icon.
+    /// </summary>
     [DataField]
-    public bool Cooldown;
+    public bool ShowCooldown;
 
+    /// <summary>
+    /// The length of the cooldown or delay before removing the alert (in seconds).
+    /// </summary>
     [DataField]
     public float Time;
 
@@ -24,23 +36,24 @@ public sealed partial class AdjustAlert : ReagentEffect
 
     public override void Effect(ReagentEffectArgs args)
     {
-        var alertSys = EntitySystem.Get<AlertsSystem>();
-        if (args.EntityManager.HasComponent<AlertsComponent>(args.SolutionEntity))
+        var alertSys = args.EntityManager.EntitySysManager.GetEntitySystem<AlertsSystem>();
+        if (!args.EntityManager.HasComponent<AlertsComponent>(args.SolutionEntity))
+            return;
+
+        if (Clear && Time <= 0)
         {
-            if (Clear)
-            {
                 alertSys.ClearAlert(args.SolutionEntity, Type);
-            }
-            else
-            {
-                (TimeSpan, TimeSpan)? cooldown = null;
-                if (Cooldown)
-                {
-                    var timing = IoCManager.Resolve<IGameTiming>();
-                    cooldown = (timing.CurTime, timing.CurTime + TimeSpan.FromSeconds(Time));
-                }
-                alertSys.ShowAlert(args.SolutionEntity, Type, cooldown: cooldown);
-            }
         }
+        else
+        {
+            var timing = IoCManager.Resolve<IGameTiming>();
+            (TimeSpan, TimeSpan)? cooldown = null;
+
+            if ((ShowCooldown || Clear) && Time > 0)
+                cooldown = (timing.CurTime, timing.CurTime + TimeSpan.FromSeconds(Time));
+
+            alertSys.ShowAlert(args.SolutionEntity, Type, cooldown: cooldown, autoRemove: Clear, showCooldown: ShowCooldown);
+        }
+
     }
 }
diff --git a/Content.Server/Chunking/ChunkingSystem.cs b/Content.Server/Chunking/ChunkingSystem.cs
index 3919361af1..9bc1ab0a3b 100644
--- a/Content.Server/Chunking/ChunkingSystem.cs
+++ b/Content.Server/Chunking/ChunkingSystem.cs
@@ -8,6 +8,7 @@
 using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
+using ChunkIndicesEnumerator = Robust.Shared.Map.Enumerators.ChunkIndicesEnumerator;
 
 namespace Content.Shared.Chunking;
 
@@ -29,13 +30,7 @@ public override void Initialize()
     {
         base.Initialize();
         _xformQuery = GetEntityQuery<TransformComponent>();
-        _configurationManager.OnValueChanged(CVars.NetMaxUpdateRange, OnPvsRangeChanged, true);
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        _configurationManager.UnsubValueChanged(CVars.NetMaxUpdateRange, OnPvsRangeChanged);
+        Subs.CVar(_configurationManager, CVars.NetMaxUpdateRange, OnPvsRangeChanged, true);
     }
 
     private void OnPvsRangeChanged(float value)
diff --git a/Content.Server/Cloning/CloningConsoleSystem.cs b/Content.Server/Cloning/CloningConsoleSystem.cs
index 4176806639..c95c37312e 100644
--- a/Content.Server/Cloning/CloningConsoleSystem.cs
+++ b/Content.Server/Cloning/CloningConsoleSystem.cs
@@ -32,7 +32,7 @@ public sealed class CloningConsoleSystem : EntitySystem
         [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
         [Dependency] private readonly PowerReceiverSystem _powerReceiverSystem = default!;
         [Dependency] private readonly SharedMindSystem _mindSystem = default!;
-
+        
         public override void Initialize()
         {
             base.Initialize();
@@ -169,8 +169,8 @@ public void TryClone(EntityUid uid, EntityUid cloningPodUid, EntityUid scannerUi
 
             if (mind.UserId.HasValue == false || mind.Session == null)
                 return;
-
-            if (_cloningSystem.TryCloning(cloningPodUid, body.Value, (mindId, mind), cloningPod, scannerComp.CloningFailChanceMultiplier))
+            // Nyano: Adds scannerComp.MetemKarmaBonus
+            if (_cloningSystem.TryCloning(cloningPodUid, body.Value, (mindId, mind), cloningPod, scannerComp.CloningFailChanceMultiplier, scannerComp.MetemKarmaBonus))
                 _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(uid)} successfully cloned {ToPrettyString(body.Value)}.");
         }
 
diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs
index eabf10013d..0061283367 100644
--- a/Content.Server/Cloning/CloningSystem.cs
+++ b/Content.Server/Cloning/CloningSystem.cs
@@ -33,8 +33,22 @@
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Content.Server.Psionics;
 using Content.Server.Traits.Assorted; //Nyano - Summary: allows the potential psionic ability to be written to the character.
+using Content.Server.Psionics; //DeltaV needed for Psionic Systems
+using Content.Shared.Speech; //DeltaV Start Metem Usings
+using Content.Shared.Tag;
+using Content.Shared.Preferences;
+using Content.Shared.Emoting;
+using Content.Server.Speech.Components;
+using Content.Server.StationEvents.Components;
+using Content.Server.Ghost.Roles.Components;
+using Content.Server.Nyanotrasen.Cloning;
+using Content.Shared.Humanoid.Prototypes;
+using Robust.Shared.GameObjects.Components.Localization; //DeltaV End Metem Usings
+using Content.Server.EntityList;
+using Content.Shared.SSDIndicator;
+using Content.Shared.Damage.ForceSay;
+using Content.Server.Polymorph.Components;
 
 namespace Content.Server.Cloning
 {
@@ -62,6 +76,8 @@ public sealed class CloningSystem : EntitySystem
         [Dependency] private readonly SharedMindSystem _mindSystem = default!;
         [Dependency] private readonly MetaDataSystem _metaSystem = default!;
         [Dependency] private readonly SharedJobSystem _jobs = default!;
+        [Dependency] private readonly MetempsychoticMachineSystem _metem = default!; //DeltaV
+        [Dependency] private readonly TagSystem _tag = default!; //DeltaV
 
         public readonly Dictionary<MindComponent, EntityUid> ClonesWaitingForMind = new();
         public const float EasyModeCloningCost = 0.7f;
@@ -136,8 +152,8 @@ private void OnExamined(EntityUid uid, CloningPodComponent component, ExaminedEv
 
             args.PushMarkup(Loc.GetString("cloning-pod-biomass", ("number", _material.GetMaterialAmount(uid, component.RequiredMaterial))));
         }
-
-        public bool TryCloning(EntityUid uid, EntityUid bodyToClone, Entity<MindComponent> mindEnt, CloningPodComponent? clonePod, float failChanceModifier = 1)
+        // Nyano: Adds float karmaBonus
+        public bool TryCloning(EntityUid uid, EntityUid bodyToClone, Entity<MindComponent> mindEnt, CloningPodComponent? clonePod, float failChanceModifier = 1, float karmaBonus = 0.25f)
         {
             if (!Resolve(uid, ref clonePod))
                 return false;
@@ -167,6 +183,12 @@ public bool TryCloning(EntityUid uid, EntityUid bodyToClone, Entity<MindComponen
             if (!TryComp<HumanoidAppearanceComponent>(bodyToClone, out var humanoid))
                 return false; // whatever body was to be cloned, was not a humanoid
 
+            // Begin Nyano-code: allow paradox anomalies to be cloned.
+            var pref = humanoid.LastProfileLoaded;
+
+            if (pref == null)
+                return false;
+            // End Nyano-code
             if (!_prototype.TryIndex(humanoid.Species, out var speciesPrototype))
                 return false;
 
@@ -222,11 +244,11 @@ public bool TryCloning(EntityUid uid, EntityUid bodyToClone, Entity<MindComponen
                     AddComp<ActiveCloningPodComponent>(uid);
                     return true;
                 }
+                // End Nyano-code.
             }
             // end of genetic damage checks
 
-            var mob = Spawn(speciesPrototype.Prototype, Transform(uid).MapPosition);
-            _humanoidSystem.CloneAppearance(bodyToClone, mob);
+            var mob = FetchAndSpawnMob(clonePod, pref, speciesPrototype, humanoid, bodyToClone, karmaBonus); //DeltaV Replaces CloneAppearance with Metem/Clone via FetchAndSpawnMob 
 
             ///Nyano - Summary: adds the potential psionic trait to the reanimated mob.
             EnsureComp<PotentialPsionicComponent>(mob);
@@ -326,7 +348,6 @@ private void EndFailedCloning(EntityUid uid, CloningPodComponent clonePod)
             var transform = Transform(uid);
             var indices = _transformSystem.GetGridTilePositionOrDefault((uid, transform));
             var tileMix = _atmosphereSystem.GetTileMixture(transform.GridUid, null, indices, true);
-
             if (HasComp<EmaggedComponent>(uid))
             {
                 _audio.PlayPvs(clonePod.ScreamSound, uid);
@@ -354,6 +375,84 @@ private void EndFailedCloning(EntityUid uid, CloningPodComponent clonePod)
             RemCompDeferred<ActiveCloningPodComponent>(uid);
         }
 
+        /// <summary>
+        /// Start Nyano Code: Handles fetching the mob and any appearance stuff...
+        /// </summary>
+        private EntityUid FetchAndSpawnMob(CloningPodComponent clonePod, HumanoidCharacterProfile pref, SpeciesPrototype speciesPrototype, HumanoidAppearanceComponent humanoid, EntityUid bodyToClone, float karmaBonus)
+        {
+            List<Sex> sexes = new();
+            bool switchingSpecies = false;
+            bool applyKarma = false;
+            var toSpawn = speciesPrototype.Prototype;
+            TryComp<MetempsychosisKarmaComponent>(bodyToClone, out var oldKarma);
+
+            if (TryComp<MetempsychoticMachineComponent>(clonePod.Owner, out var metem))
+            {
+                toSpawn = _metem.GetSpawnEntity(clonePod.Owner, karmaBonus, metem, speciesPrototype, out var newSpecies, oldKarma?.Score);
+                applyKarma = true;
+
+                if (newSpecies != null)
+                {
+                    sexes = newSpecies.Sexes;
+
+                    if (speciesPrototype.ID != newSpecies.ID)
+                        switchingSpecies = true;
+
+                    speciesPrototype = newSpecies;
+                }
+            }
+
+            var mob = Spawn(toSpawn, Transform(clonePod.Owner).MapPosition);
+            if (TryComp<HumanoidAppearanceComponent>(mob, out var newHumanoid))
+            {
+                if (switchingSpecies || HasComp<MetempsychosisKarmaComponent>(bodyToClone))
+                {
+                    pref = HumanoidCharacterProfile.RandomWithSpecies(newHumanoid.Species);
+                    if (sexes.Contains(humanoid.Sex))
+                        pref = pref.WithSex(humanoid.Sex);
+
+                    pref = pref.WithGender(humanoid.Gender);
+                    pref = pref.WithAge(humanoid.Age);
+
+                }
+                _humanoidSystem.LoadProfile(mob, pref);
+            }
+
+            if (applyKarma)
+            {
+                var karma = EnsureComp<MetempsychosisKarmaComponent>(mob);
+                karma.Score++;
+                if (oldKarma != null)
+                    karma.Score += oldKarma.Score;
+            }
+
+            var ev = new CloningEvent(bodyToClone, mob);
+            RaiseLocalEvent(bodyToClone, ref ev);
+
+            if (!ev.NameHandled)
+                _metaSystem.SetEntityName(mob, MetaData(bodyToClone).EntityName);
+
+            var grammar = EnsureComp<GrammarComponent>(mob);
+            grammar.ProperNoun = true;
+            grammar.Gender = humanoid.Gender;
+            Dirty(grammar);
+
+            EnsureComp<PotentialPsionicComponent>(mob);
+            EnsureComp<SpeechComponent>(mob);
+            EnsureComp<DamageForceSayComponent>(mob);
+            EnsureComp<EmotingComponent>(mob);
+            EnsureComp<MindContainerComponent>(mob);
+            EnsureComp<SSDIndicatorComponent>(mob);
+            RemComp<ReplacementAccentComponent>(mob);
+            RemComp<MonkeyAccentComponent>(mob);
+            RemComp<SentienceTargetComponent>(mob);
+            RemComp<GhostTakeoverAvailableComponent>(mob);
+
+            _tag.AddTag(mob, "DoorBumpOpener");
+
+            return mob;
+        }
+        //End Nyano Code
         public void Reset(RoundRestartCleanupEvent ev)
         {
             ClonesWaitingForMind.Clear();
diff --git a/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs b/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs
index a087ebdd49..6fbfd9f367 100644
--- a/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs
+++ b/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs
@@ -33,7 +33,7 @@ private void OnMapInit(EntityUid uid, ChameleonClothingComponent component, MapI
 
     private void OnVerb(EntityUid uid, ChameleonClothingComponent component, GetVerbsEvent<InteractionVerb> args)
     {
-        if (!args.CanAccess || !args.CanInteract)
+        if (!args.CanAccess || !args.CanInteract || component.User != args.User)
             return;
 
         args.Verbs.Add(new InteractionVerb()
diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs
index 4fa60563bd..6b0b13c410 100644
--- a/Content.Server/Communications/CommunicationsConsoleSystem.cs
+++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs
@@ -19,6 +19,7 @@
 using Content.Shared.Chat;
 using Content.Shared.Communications;
 using Content.Shared.Database;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Emag.Components;
 using Content.Shared.Popups;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index f0dd87e2bd..c1d353d37f 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -31,9 +31,13 @@ public sealed class ConnectionManager : IConnectionManager
         [Dependency] private readonly ILocalizationManager _loc = default!;
         [Dependency] private readonly ServerDbEntryManager _serverDbEntry = default!;
 
+        private List<NetUserId> _connectedWhitelistedPlayers = new(); // DeltaV - Soft whitelist improvements
+
         public void Initialize()
         {
             _netMgr.Connecting += NetMgrOnConnecting;
+            _netMgr.Connected += OnConnected; // DeltaV - Soft whitelist improvements
+            _netMgr.Disconnect += OnDisconnected; // DeltaV - Soft whitelist improvements
             _netMgr.AssignUserIdCallback = AssignUserIdCallback;
             // Approval-based IP bans disabled because they don't play well with Happy Eyeballs.
             // _netMgr.HandleApprovalCallback = HandleApproval;
@@ -106,7 +110,7 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
 
             var adminData = await _dbManager.GetAdminDataForAsync(e.UserId);
 
-            if (_cfg.GetCVar(CCVars.PanicBunkerEnabled))
+            if (_cfg.GetCVar(CCVars.PanicBunkerEnabled) && adminData == null)
             {
                 var showReason = _cfg.GetCVar(CCVars.PanicBunkerShowReason);
                 var customReason = _cfg.GetCVar(CCVars.PanicBunkerCustomReason);
@@ -169,7 +173,8 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                 return (ConnectionDenyReason.Ban, message, bans);
             }
 
-            if (_cfg.GetCVar(CCVars.WhitelistEnabled))
+            // DeltaV - Replace existing softwhitelist implementation
+            if (false) //_cfg.GetCVar(CCVars.WhitelistEnabled))
             {
                 var min = _cfg.GetCVar(CCVars.WhitelistMinPlayers);
                 var max = _cfg.GetCVar(CCVars.WhitelistMaxPlayers);
@@ -186,6 +191,28 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
                 }
             }
 
+            // DeltaV - Soft whitelist improvements
+            if (_cfg.GetCVar(CCVars.WhitelistEnabled))
+            {
+                var connectedPlayers = _plyMgr.PlayerCount;
+                var connectedWhitelist = _connectedWhitelistedPlayers.Count;
+
+                var slots = _cfg.GetCVar(CCVars.WhitelistMinPlayers);
+
+                var noSlotsOpen = slots > 0 && slots < connectedPlayers - connectedWhitelist;
+
+                if (noSlotsOpen && await _db.GetWhitelistStatusAsync(userId) == false
+                                     && adminData is null)
+                {
+                    var msg = Loc.GetString(_cfg.GetCVar(CCVars.WhitelistReason));
+
+                    if (slots > 0)
+                        msg += "\n" + Loc.GetString("whitelist-playercount-invalid", ("min", slots), ("max", _cfg.GetCVar(CCVars.SoftMaxPlayers)));
+
+                    return (ConnectionDenyReason.Whitelist, msg, null);
+                }
+            }
+
             return null;
         }
 
@@ -206,5 +233,31 @@ private async Task NetMgrOnConnecting(NetConnectingArgs e)
             await _db.AssignUserIdAsync(name, assigned);
             return assigned;
         }
+
+        /// <summary>
+        ///     DeltaV - Soft whitelist improvements
+        ///     Handles a completed connection, and stores the player if they're whitelisted and the whitelist is enabled
+        /// </summary>
+        private async void OnConnected(object? sender, NetChannelArgs e)
+        {
+            var userId = e.Channel.UserId;
+
+            if (_cfg.GetCVar(CCVars.WhitelistEnabled) && await _db.GetWhitelistStatusAsync(userId))
+            {
+                _connectedWhitelistedPlayers.Add(userId);
+            }
+        }
+
+        /// <summary>
+        ///     DeltaV - Soft whitelist improvements
+        ///     Handles a disconnection, and removes a stored player from the count if the whitelist is enabled
+        /// </summary>
+        private async void OnDisconnected(object? sender, NetChannelArgs e)
+        {
+            if (_cfg.GetCVar(CCVars.WhitelistEnabled))
+            {
+                _connectedWhitelistedPlayers.Remove(e.Channel.UserId);
+            }
+        }
     }
 }
diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs
index 52cde02d21..e0bdf09629 100644
--- a/Content.Server/Construction/ConstructionSystem.Initial.cs
+++ b/Content.Server/Construction/ConstructionSystem.Initial.cs
@@ -269,7 +269,7 @@ void ShutdownContainers()
 
             if (!TryComp(newEntity, out ConstructionComponent? construction))
             {
-                _sawmill.Error($"Initial construction does not have a valid target entity! It is missing a ConstructionComponent.\nGraph: {graph.ID}, Initial Target: {edge.Target}, Ent. Prototype: {newEntityProto}\nCreated Entity {ToPrettyString(newEntity)} will be deleted.");
+                Log.Error($"Initial construction does not have a valid target entity! It is missing a ConstructionComponent.\nGraph: {graph.ID}, Initial Target: {edge.Target}, Ent. Prototype: {newEntityProto}\nCreated Entity {ToPrettyString(newEntity)} will be deleted.");
                 Del(newEntity); // Screw you, make proper construction graphs.
                 return null;
             }
@@ -321,14 +321,14 @@ public async Task<bool> TryStartItemConstruction(string prototype, EntityUid use
         {
             if (!_prototypeManager.TryIndex(prototype, out ConstructionPrototype? constructionPrototype))
             {
-                _sawmill.Error($"Tried to start construction of invalid recipe '{prototype}'!");
+                Log.Error($"Tried to start construction of invalid recipe '{prototype}'!");
                 return false;
             }
 
             if (!_prototypeManager.TryIndex(constructionPrototype.Graph,
                     out ConstructionGraphPrototype? constructionGraph))
             {
-                _sawmill.Error(
+                Log.Error(
                     $"Invalid construction graph '{constructionPrototype.Graph}' in recipe '{prototype}'!");
                 return false;
             }
@@ -394,21 +394,21 @@ private async void HandleStartStructureConstruction(TryStartStructureConstructio
         {
             if (!_prototypeManager.TryIndex(ev.PrototypeName, out ConstructionPrototype? constructionPrototype))
             {
-                _sawmill.Error($"Tried to start construction of invalid recipe '{ev.PrototypeName}'!");
+                Log.Error($"Tried to start construction of invalid recipe '{ev.PrototypeName}'!");
                 RaiseNetworkEvent(new AckStructureConstructionMessage(ev.Ack));
                 return;
             }
 
             if (!_prototypeManager.TryIndex(constructionPrototype.Graph, out ConstructionGraphPrototype? constructionGraph))
             {
-                _sawmill.Error($"Invalid construction graph '{constructionPrototype.Graph}' in recipe '{ev.PrototypeName}'!");
+                Log.Error($"Invalid construction graph '{constructionPrototype.Graph}' in recipe '{ev.PrototypeName}'!");
                 RaiseNetworkEvent(new AckStructureConstructionMessage(ev.Ack));
                 return;
             }
 
             if (args.SenderSession.AttachedEntity is not {Valid: true} user)
             {
-                _sawmill.Error($"Client sent {nameof(TryStartStructureConstructionMessage)} with no attached entity!");
+                Log.Error($"Client sent {nameof(TryStartStructureConstructionMessage)} with no attached entity!");
                 return;
             }
 
diff --git a/Content.Server/Construction/ConstructionSystem.Interactions.cs b/Content.Server/Construction/ConstructionSystem.Interactions.cs
index a19ee8df6d..946aaa0d3e 100644
--- a/Content.Server/Construction/ConstructionSystem.Interactions.cs
+++ b/Content.Server/Construction/ConstructionSystem.Interactions.cs
@@ -147,7 +147,7 @@ private HandleResult HandleEdge(EntityUid uid, object ev, ConstructionGraphEdge
 
             if (step == null)
             {
-                _sawmill.Warning($"Called {nameof(HandleEdge)} on entity {ToPrettyString(uid)} but the current state is not valid for that!");
+                Log.Warning($"Called {nameof(HandleEdge)} on entity {ToPrettyString(uid)} but the current state is not valid for that!");
                 return HandleResult.False;
             }
 
@@ -513,10 +513,10 @@ private void UpdateInteractions()
                 {
                     if (construction.Deleted)
                     {
-                        _sawmill.Error($"Construction component was deleted while still processing interactions." +
-                            $"Entity {ToPrettyString(uid)}, graph: {construction.Graph}, " +
-                            $"Next: {interaction.GetType().Name}, " +
-                            $"Remaining Queue: {string.Join(", ", construction.InteractionQueue.Select(x => x.GetType().Name))}");
+                        Log.Error($"Construction component was deleted while still processing interactions." +
+                                  $"Entity {ToPrettyString(uid)}, graph: {construction.Graph}, " +
+                                  $"Next: {interaction.GetType().Name}, " +
+                                  $"Remaining Queue: {string.Join(", ", construction.InteractionQueue.Select(x => x.GetType().Name))}");
                         break;
                     }
 
@@ -527,7 +527,7 @@ private void UpdateInteractions()
                 }
                 catch (Exception e)
                 {
-                    _sawmill.Error($"Caught exception while processing construction queue. Entity {ToPrettyString(uid)}, graph: {construction.Graph}");
+                    Log.Error($"Caught exception while processing construction queue. Entity {ToPrettyString(uid)}, graph: {construction.Graph}");
                     _runtimeLog.LogException(e, $"{nameof(ConstructionSystem)}.{nameof(UpdateInteractions)}");
                     Del(uid);
                 }
diff --git a/Content.Server/Construction/ConstructionSystem.cs b/Content.Server/Construction/ConstructionSystem.cs
index 6e40b7b856..44c6318b78 100644
--- a/Content.Server/Construction/ConstructionSystem.cs
+++ b/Content.Server/Construction/ConstructionSystem.cs
@@ -2,7 +2,6 @@
 using Content.Server.Stack;
 using Content.Shared.Construction;
 using Content.Shared.DoAfter;
-using Content.Shared.Tools;
 using JetBrains.Annotations;
 using Robust.Server.Containers;
 using Robust.Shared.Prototypes;
@@ -17,7 +16,6 @@ namespace Content.Server.Construction
     [UsedImplicitly]
     public sealed partial class ConstructionSystem : SharedConstructionSystem
     {
-        [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IRobustRandom _robustRandom = default!;
         [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
@@ -25,15 +23,10 @@ public sealed partial class ConstructionSystem : SharedConstructionSystem
         [Dependency] private readonly StackSystem _stackSystem = default!;
         [Dependency] private readonly SharedToolSystem _toolSystem = default!;
 
-        private const string SawmillName = "Construction";
-        private ISawmill _sawmill = default!;
-
         public override void Initialize()
         {
             base.Initialize();
 
-            _sawmill = _logManager.GetSawmill(SawmillName);
-
             InitializeComputer();
             InitializeGraphs();
             InitializeGuided();
@@ -50,13 +43,13 @@ private void OnConstructionInit(Entity<ConstructionComponent> ent, ref Component
             var construction = ent.Comp;
             if (GetCurrentGraph(ent, construction) is not {} graph)
             {
-                _sawmill.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid graph specified.");
+                Log.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid graph specified.");
                 return;
             }
 
             if (GetNodeFromGraph(graph, construction.Node) is not {} node)
             {
-                _sawmill.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid node specified.");
+                Log.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid node specified.");
                 return;
             }
 
@@ -65,7 +58,7 @@ private void OnConstructionInit(Entity<ConstructionComponent> ent, ref Component
             {
                 if (GetEdgeFromNode(node, edgeIndex) is not {} currentEdge)
                 {
-                    _sawmill.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid edge index specified.");
+                    Log.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid edge index specified.");
                     return;
                 }
 
@@ -76,7 +69,7 @@ private void OnConstructionInit(Entity<ConstructionComponent> ent, ref Component
             {
                 if (GetNodeFromGraph(graph, targetNodeId) is not { } targetNode)
                 {
-                    _sawmill.Warning($"Prototype {EntityManager.GetComponent<MetaDataComponent>(ent).EntityPrototype?.ID}'s construction component has an invalid target node specified.");
+                    Log.Warning($"Prototype {EntityManager.GetComponent<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 96d642e4f2..8782454eac 100644
--- a/Content.Server/Content.Server.csproj
+++ b/Content.Server/Content.Server.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>11</LangVersion>
+    <LangVersion>12</LangVersion>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Server\</OutputPath>
@@ -19,6 +19,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Content.Packaging\Content.Packaging.csproj" />
     <ProjectReference Include="..\Content.Server.Database\Content.Server.Database.csproj" />
+    <ProjectReference Include="..\Content.Shared.Database\Content.Shared.Database.csproj" />
     <ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj" />
     <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
     <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
diff --git a/Content.Server/Contests/ContestsSystem.cs b/Content.Server/Contests/ContestsSystem.cs
deleted file mode 100644
index 3ec696083d..0000000000
--- a/Content.Server/Contests/ContestsSystem.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using Content.Shared.Damage;
-using Content.Shared.Damage.Components;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Systems;
-using Robust.Shared.Physics.Components;
-
-namespace Content.Server.Contests
-{
-    /// <summary>
-    /// Standardized contests.
-    /// A contest is figuring out, based on data in components on two entities,
-    /// which one has an advantage in a situation. The advantage is expressed by a multiplier.
-    /// 1 = No advantage to either party.
-    /// &gt;1 = Advantage to roller
-    /// &lt;1 = Advantage to target
-    /// Roller should be the entity with an advantage from being bigger/healthier/more skilled, etc.
-    /// </summary>
-    ///
-    public sealed class ContestsSystem : EntitySystem
-    {
-        [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!;
-        /// <summary>
-        /// Returns the roller's mass divided by the target's.
-        /// </summary>
-        public float MassContest(EntityUid roller, EntityUid target, PhysicsComponent? rollerPhysics = null, PhysicsComponent? targetPhysics = null)
-        {
-            if (!Resolve(roller, ref rollerPhysics, false) || !Resolve(target, ref targetPhysics, false))
-                return 1f;
-
-            if (targetPhysics.FixturesMass == 0)
-                return 1f;
-
-            return rollerPhysics.FixturesMass / targetPhysics.FixturesMass;
-        }
-
-        /// <summary>
-        /// Tries to compare both entities damage to the damage they will enter crit at.
-        /// After that, it runs the % towards crit through a converter that smooths out and makes
-        /// the the ratios less severe.
-        /// Returns the roller's adjusted damage value divided by the target's. Higher is better for the roller.
-        /// </summary>
-        public float DamageContest(EntityUid roller, EntityUid target, DamageableComponent? rollerDamage = null, DamageableComponent? targetDamage = null)
-        {
-            if (!Resolve(roller, ref rollerDamage, false) || !Resolve(target, ref targetDamage, false))
-                return 1f;
-
-            // First, we'll see what health they go into crit at.
-            //TODO: refactor this entire system.... Why does this exist, this shouldn't be calculated off health
-            var rollerThreshold = 100f;
-            if (!_mobThresholdSystem.TryGetThresholdForState(roller, MobState.Critical, out var rollerCritThreshold))
-            {
-                if (_mobThresholdSystem.TryGetThresholdForState(roller, MobState.Critical,
-                        out var rollerdeadThreshold))
-                {
-                    rollerThreshold = rollerdeadThreshold.Value.Float();
-                }
-            }
-            else
-            {
-                rollerThreshold = rollerCritThreshold.Value.Float();
-            }
-            var targetThreshold = 100f;
-            if (!_mobThresholdSystem.TryGetThresholdForState(roller, MobState.Critical, out var targetCritThreshold))
-            {
-                if (_mobThresholdSystem.TryGetThresholdForState(roller, MobState.Critical,
-                        out var targetdeadThreshold))
-                {
-                    targetThreshold = targetdeadThreshold.Value.Float();
-                }
-            }
-            else
-            {
-                targetThreshold = targetCritThreshold.Value.Float();
-            }
-
-            // Next, we'll see how their damage compares
-            var rollerDamageScore = (float) rollerDamage.TotalDamage / rollerThreshold;
-            var targetDamageScore = (float) targetDamage.TotalDamage / targetThreshold;
-
-            return DamageThresholdConverter(rollerDamageScore) / DamageThresholdConverter(targetDamageScore);
-        }
-
-        /// <summary>
-        /// Finds the % of each entity's stamina damage towards its stam crit threshold.
-        /// It then runs the % towards the converter to smooth/soften it.
-        /// Returns the roller's decimal % divided by the target's. Higher value is better for the roller.
-        /// </summary>
-        public float StaminaContest(EntityUid roller, EntityUid target, StaminaComponent? rollerStamina = null, StaminaComponent? targetStamina = null)
-        {
-            if (!Resolve(roller, ref rollerStamina, false) || !Resolve(target, ref targetStamina, false))
-                return 1f;
-
-            var rollerDamageScore= rollerStamina.StaminaDamage / rollerStamina.CritThreshold;
-            var targetDamageScore = targetStamina.StaminaDamage / targetStamina.CritThreshold;
-
-            return DamageThresholdConverter(rollerDamageScore) / DamageThresholdConverter(targetDamageScore);
-        }
-
-        /// <summary>
-        /// This will compare the roller and target's damage, mass, and stamina. See the functions for what each one does.
-        /// You can change the 'weighting' to make the tests weigh more or less than the other tests.
-        /// Returns a weighted average of all 3 tests.
-        /// </summary>
-        public float OverallStrengthContest(EntityUid roller, EntityUid target, float damageWeight = 1f, float massWeight = 1f, float stamWeight = 1f)
-        {
-            var weightTotal = damageWeight + massWeight + stamWeight;
-            var damageMultiplier = damageWeight / weightTotal;
-            var massMultiplier = massWeight / weightTotal;
-            var stamMultiplier = stamWeight / weightTotal;
-
-            return DamageContest(roller, target) * damageMultiplier +
-                   MassContest(roller, target) * massMultiplier +
-                   StaminaContest(roller, target) * stamMultiplier;
-        }
-
-        /// <summary>
-        /// This softens out the huge advantages that damage contests would lead to otherwise.
-        /// Once you are crit or near crit, we just let the massive advantages roll with what could be a 20x.
-        /// </summary>
-        public float DamageThresholdConverter(float score)
-        {
-            return score switch
-            {
-                // TODO: Should just be a curve
-                <= 0 => 1f,
-                <= 0.25f => 0.9f,
-                <= 0.5f => 0.75f,
-                <= 0.75f => 0.6f,
-                <= 0.95f => 0.45f,
-                _ => 0.05f
-            };
-        }
-    }
-}
diff --git a/Content.Server/Corvax/GameTicking/RoundEndedEvent.cs b/Content.Server/Corvax/GameTicking/RoundEndedEvent.cs
deleted file mode 100644
index dc25631093..0000000000
--- a/Content.Server/Corvax/GameTicking/RoundEndedEvent.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Content.Server.Corvax.GameTicking;
-
-public sealed class RoundEndedEvent : EntityEventArgs
-{
-    public int RoundId { get; }
-    public TimeSpan RoundDuration { get; }
-
-    public RoundEndedEvent(int roundId, TimeSpan roundDuration)
-    {
-        RoundId = roundId;
-        RoundDuration = roundDuration;
-    }
-}
diff --git a/Content.Server/CrewManifest/CrewManifestSystem.cs b/Content.Server/CrewManifest/CrewManifestSystem.cs
index 12b6984b5a..8b4cbac5c1 100644
--- a/Content.Server/CrewManifest/CrewManifestSystem.cs
+++ b/Content.Server/CrewManifest/CrewManifestSystem.cs
@@ -9,10 +9,12 @@
 using Content.Shared.CCVar;
 using Content.Shared.CrewManifest;
 using Content.Shared.GameTicking;
+using Content.Shared.Roles;
 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;
@@ -23,6 +25,7 @@ public sealed class CrewManifestSystem : EntitySystem
     [Dependency] private readonly StationRecordsSystem _recordsSystem = default!;
     [Dependency] private readonly EuiManager _euiManager = default!;
     [Dependency] private readonly IConfigurationManager _configManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
     /// <summary>
     ///     Cached crew manifest entries. The alternative is to outright
@@ -223,15 +226,26 @@ private void BuildCrewManifest(EntityUid station)
 
         var entries = new CrewManifestEntries();
 
+        var entriesSort = new List<(JobPrototype? job, CrewManifestEntry entry)>();
         foreach (var recordObject in iter)
         {
             var record = recordObject.Item2;
             var entry = new CrewManifestEntry(record.Name, record.JobTitle, record.JobIcon, record.JobPrototype);
 
-            entries.Entries.Add(entry);
+            _prototypeManager.TryIndex(record.JobPrototype, out JobPrototype? job);
+            entriesSort.Add((job, entry));
         }
 
-        entries.Entries = entries.Entries.OrderBy(e => e.JobTitle).ThenBy(e => e.Name).ToList();
+        entriesSort.Sort((a, b) =>
+        {
+            var cmp = JobUIComparer.Instance.Compare(a.job, b.job);
+            if (cmp != 0)
+                return cmp;
+
+            return string.Compare(a.entry.Name, b.entry.Name, StringComparison.CurrentCultureIgnoreCase);
+        });
+
+        entries.Entries = entriesSort.Select(x => x.entry).ToArray();
         _cachedEntries[station] = entries;
     }
 }
diff --git a/Content.Server/Damage/Components/IgniteOnHeatDamageComponent.cs b/Content.Server/Damage/Components/IgniteOnHeatDamageComponent.cs
new file mode 100644
index 0000000000..81018f539c
--- /dev/null
+++ b/Content.Server/Damage/Components/IgniteOnHeatDamageComponent.cs
@@ -0,0 +1,15 @@
+using Content.Shared.Damage;
+using Content.Shared.FixedPoint;
+
+namespace Content.Server.Damage.Components;
+
+[RegisterComponent]
+public sealed partial class IgniteOnHeatDamageComponent : Component
+{
+    [DataField("fireStacks")]
+    public float FireStacks = 1f;
+
+    // The minimum amount of damage taken to apply fire stacks
+    [DataField("threshold")]
+    public FixedPoint2 Threshold = 15;
+}
diff --git a/Content.Server/Database/DatabaseRecords.cs b/Content.Server/Database/DatabaseRecords.cs
new file mode 100644
index 0000000000..af740a4d74
--- /dev/null
+++ b/Content.Server/Database/DatabaseRecords.cs
@@ -0,0 +1,127 @@
+using System.Collections.Immutable;
+using System.Net;
+using Content.Shared.Database;
+using Robust.Shared.Network;
+
+namespace Content.Server.Database;
+
+// This file contains copies of records returned from the database.
+// We can't return the raw EF Core entities as they are often unsuited.
+// (e.g. datetime handling of Microsoft.Data.Sqlite)
+
+public interface IAdminRemarksRecord
+{
+    public int Id { get; }
+
+    public RoundRecord? Round { get; }
+
+    public PlayerRecord? Player { get; }
+    public TimeSpan PlaytimeAtNote { get; }
+
+    public string Message { get; }
+
+    public PlayerRecord? CreatedBy { get; }
+
+    public DateTimeOffset CreatedAt { get; }
+
+    public PlayerRecord? LastEditedBy { get; }
+
+    public DateTimeOffset? LastEditedAt { get; }
+    public DateTimeOffset? ExpirationTime { get; }
+
+    public bool Deleted { get; }
+}
+
+public sealed record ServerRoleBanNoteRecord(
+    int Id,
+    RoundRecord? Round,
+    PlayerRecord? Player,
+    TimeSpan PlaytimeAtNote,
+    string Message,
+    NoteSeverity Severity,
+    PlayerRecord? CreatedBy,
+    DateTimeOffset CreatedAt,
+    PlayerRecord? LastEditedBy,
+    DateTimeOffset? LastEditedAt,
+    DateTimeOffset? ExpirationTime,
+    bool Deleted,
+    string[] Roles,
+    PlayerRecord? UnbanningAdmin,
+    DateTime? UnbanTime) : IAdminRemarksRecord;
+
+public sealed record ServerBanNoteRecord(
+    int Id,
+    RoundRecord? Round,
+    PlayerRecord? Player,
+    TimeSpan PlaytimeAtNote,
+    string Message,
+    NoteSeverity Severity,
+    PlayerRecord? CreatedBy,
+    DateTimeOffset CreatedAt,
+    PlayerRecord? LastEditedBy,
+    DateTimeOffset? LastEditedAt,
+    DateTimeOffset? ExpirationTime,
+    bool Deleted,
+    PlayerRecord? UnbanningAdmin,
+    DateTime? UnbanTime) : IAdminRemarksRecord;
+
+public sealed record AdminNoteRecord(
+    int Id,
+    RoundRecord? Round,
+    PlayerRecord? Player,
+    TimeSpan PlaytimeAtNote,
+    string Message,
+    NoteSeverity Severity,
+    PlayerRecord? CreatedBy,
+    DateTimeOffset CreatedAt,
+    PlayerRecord? LastEditedBy,
+    DateTimeOffset? LastEditedAt,
+    DateTimeOffset? ExpirationTime,
+    bool Deleted,
+    PlayerRecord? DeletedBy,
+    DateTimeOffset? DeletedAt,
+    bool Secret) : IAdminRemarksRecord;
+
+public sealed record AdminWatchlistRecord(
+    int Id,
+    RoundRecord? Round,
+    PlayerRecord? Player,
+    TimeSpan PlaytimeAtNote,
+    string Message,
+    PlayerRecord? CreatedBy,
+    DateTimeOffset CreatedAt,
+    PlayerRecord? LastEditedBy,
+    DateTimeOffset? LastEditedAt,
+    DateTimeOffset? ExpirationTime,
+    bool Deleted,
+    PlayerRecord? DeletedBy,
+    DateTimeOffset? DeletedAt) : IAdminRemarksRecord;
+
+public sealed record AdminMessageRecord(
+    int Id,
+    RoundRecord? Round,
+    PlayerRecord? Player,
+    TimeSpan PlaytimeAtNote,
+    string Message,
+    PlayerRecord? CreatedBy,
+    DateTimeOffset CreatedAt,
+    PlayerRecord? LastEditedBy,
+    DateTimeOffset? LastEditedAt,
+    DateTimeOffset? ExpirationTime,
+    bool Deleted,
+    PlayerRecord? DeletedBy,
+    DateTimeOffset? DeletedAt,
+    bool Seen) : IAdminRemarksRecord;
+
+
+public sealed record PlayerRecord(
+    NetUserId UserId,
+    DateTimeOffset FirstSeenTime,
+    string LastSeenUserName,
+    DateTimeOffset LastSeenTime,
+    IPAddress LastSeenAddress,
+    ImmutableArray<byte>? HWId);
+
+public sealed record RoundRecord(int Id, DateTimeOffset StartDate, ServerRecord Server);
+
+public sealed record ServerRecord(int Id, string Name);
diff --git a/Content.Server/Database/PlayerRecord.cs b/Content.Server/Database/PlayerRecord.cs
deleted file mode 100644
index cfcebe1c02..0000000000
--- a/Content.Server/Database/PlayerRecord.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Collections.Immutable;
-using System.Net;
-using Robust.Shared.Network;
-
-namespace Content.Server.Database
-{
-    public sealed class PlayerRecord
-    {
-        public NetUserId UserId { get; }
-        public ImmutableArray<byte>? HWId { get; }
-        public DateTimeOffset FirstSeenTime { get; }
-        public string LastSeenUserName { get; }
-        public DateTimeOffset LastSeenTime { get; }
-        public IPAddress LastSeenAddress { get; }
-
-        public PlayerRecord(
-            NetUserId userId,
-            DateTimeOffset firstSeenTime,
-            string lastSeenUserName,
-            DateTimeOffset lastSeenTime,
-            IPAddress lastSeenAddress,
-            ImmutableArray<byte>? hwId)
-        {
-            UserId = userId;
-            FirstSeenTime = firstSeenTime;
-            LastSeenUserName = lastSeenUserName;
-            LastSeenTime = lastSeenTime;
-            LastSeenAddress = lastSeenAddress;
-            HWId = hwId;
-        }
-    }
-}
diff --git a/Content.Server/Database/ServerBanNote.cs b/Content.Server/Database/ServerBanNote.cs
deleted file mode 100644
index 4e55650090..0000000000
--- a/Content.Server/Database/ServerBanNote.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Content.Shared.Database;
-
-namespace Content.Server.Database
-{
-    public record ServerBanNote(int Id, int? RoundId, Round? Round, Guid? PlayerUserId, Player? Player,
-        TimeSpan PlaytimeAtNote, string Message, NoteSeverity Severity, Player? CreatedBy, DateTime CreatedAt,
-        Player? LastEditedBy, DateTime? LastEditedAt, DateTime? ExpirationTime, bool Deleted, Player? UnbanningAdmin,
-        DateTime? UnbanTime) : IAdminRemarksCommon;
-}
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 5365bfb05b..ed22c66360 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Net;
 using System.Runtime.CompilerServices;
@@ -260,6 +261,7 @@ private static Profile ConvertProfiles(HumanoidCharacterProfile humanoid, int sl
             profile.SkinColor = appearance.SkinColor.ToHex();
             profile.Clothing = humanoid.Clothing.ToString();
             profile.Backpack = humanoid.Backpack.ToString();
+            profile.SpawnPriority = (int) humanoid.SpawnPriority;
             profile.Markings = markings;
             profile.Slot = slot;
             profile.PreferenceUnavailable = (DbPreferenceUnavailableMode) humanoid.PreferenceUnavailable;
@@ -355,7 +357,7 @@ public abstract Task<List<ServerBanDef>> GetServerBansAsync(
         public abstract Task AddServerBanAsync(ServerBanDef serverBan);
         public abstract Task AddServerUnbanAsync(ServerUnbanDef serverUnban);
 
-        public async Task EditServerBan(int id, string reason, NoteSeverity severity, DateTime? expiration, Guid editedBy, DateTime editedAt)
+        public async Task EditServerBan(int id, string reason, NoteSeverity severity, DateTimeOffset? expiration, Guid editedBy, DateTimeOffset editedAt)
         {
             await using var db = await GetDb();
 
@@ -364,9 +366,9 @@ public async Task EditServerBan(int id, string reason, NoteSeverity severity, Da
                 return;
             ban.Severity = severity;
             ban.Reason = reason;
-            ban.ExpirationTime = expiration;
+            ban.ExpirationTime = expiration?.UtcDateTime;
             ban.LastEditedById = editedBy;
-            ban.LastEditedAt = editedAt;
+            ban.LastEditedAt = editedAt.UtcDateTime;
             await db.DbContext.SaveChangesAsync();
         }
 
@@ -447,7 +449,7 @@ public abstract Task<List<ServerRoleBanDef>> GetServerRoleBansAsync(IPAddress? a
         public abstract Task<ServerRoleBanDef> AddServerRoleBanAsync(ServerRoleBanDef serverRoleBan);
         public abstract Task AddServerRoleUnbanAsync(ServerRoleUnbanDef serverRoleUnban);
 
-        public async Task EditServerRoleBan(int id, string reason, NoteSeverity severity, DateTime? expiration, Guid editedBy, DateTime editedAt)
+        public async Task EditServerRoleBan(int id, string reason, NoteSeverity severity, DateTimeOffset? expiration, Guid editedBy, DateTimeOffset editedAt)
         {
             await using var db = await GetDb();
 
@@ -456,9 +458,9 @@ public async Task EditServerRoleBan(int id, string reason, NoteSeverity severity
                 return;
             ban.Severity = severity;
             ban.Reason = reason;
-            ban.ExpirationTime = expiration;
+            ban.ExpirationTime = expiration?.UtcDateTime;
             ban.LastEditedById = editedBy;
-            ban.LastEditedAt = editedAt;
+            ban.LastEditedAt = editedAt.UtcDateTime;
             await db.DbContext.SaveChangesAsync();
         }
         #endregion
@@ -570,7 +572,21 @@ public async Task UpdatePlayerRecord(
             return record == null ? null : MakePlayerRecord(record);
         }
 
-        protected abstract PlayerRecord MakePlayerRecord(Player player);
+        [return: NotNullIfNotNull(nameof(player))]
+        protected PlayerRecord? MakePlayerRecord(Player? player)
+        {
+            if (player == null)
+                return null;
+
+            return new PlayerRecord(
+                new NetUserId(player.UserId),
+                new DateTimeOffset(NormalizeDatabaseTime(player.FirstSeenTime)),
+                player.LastSeenUserName,
+                new DateTimeOffset(NormalizeDatabaseTime(player.LastSeenTime)),
+                player.LastSeenAddress,
+                player.LastSeenHWId?.ToImmutableArray());
+        }
+
         #endregion
 
         #region Connection Logs
@@ -732,6 +748,18 @@ INSERT INTO player_round (players_id, rounds_id) VALUES ({players[player]}, {id}
             await db.DbContext.SaveChangesAsync();
         }
 
+        [return: NotNullIfNotNull(nameof(round))]
+        protected RoundRecord? MakeRoundRecord(Round? round)
+        {
+            if (round == null)
+                return null;
+
+            return new RoundRecord(
+                round.Id,
+                NormalizeDatabaseTime(round.StartDate),
+                MakeServerRecord(round.Server));
+        }
+
         public async Task UpdateAdminRankAsync(AdminRank rank, CancellationToken cancel)
         {
             await using var db = await GetDb();
@@ -771,6 +799,15 @@ public async Task UpdateAdminRankAsync(AdminRank rank, CancellationToken cancel)
             return (server, false);
         }
 
+        [return: NotNullIfNotNull(nameof(server))]
+        protected ServerRecord? MakeServerRecord(Server? server)
+        {
+            if (server == null)
+                return null;
+
+            return new ServerRecord(server.Id, server.Name);
+        }
+
         public async Task AddAdminLogs(List<AdminLog> logs)
         {
             DebugTools.Assert(logs.All(x => x.RoundId > 0), "Adding logs with invalid round ids.");
@@ -942,17 +979,17 @@ public async Task RemoveFromWhitelistAsync(NetUserId player)
             await db.DbContext.SaveChangesAsync();
         }
 
-        public async Task<DateTime?> GetLastReadRules(NetUserId player)
+        public async Task<DateTimeOffset?> GetLastReadRules(NetUserId player)
         {
             await using var db = await GetDb();
 
-            return await db.DbContext.Player
+            return NormalizeDatabaseTime(await db.DbContext.Player
                 .Where(dbPlayer => dbPlayer.UserId == player)
                 .Select(dbPlayer => dbPlayer.LastReadRules)
-                .SingleOrDefaultAsync();
+                .SingleOrDefaultAsync());
         }
 
-        public async Task SetLastReadRules(NetUserId player, DateTime date)
+        public async Task SetLastReadRules(NetUserId player, DateTimeOffset date)
         {
             await using var db = await GetDb();
 
@@ -962,7 +999,7 @@ public async Task SetLastReadRules(NetUserId player, DateTime date)
                 return;
             }
 
-            dbPlayer.LastReadRules = date;
+            dbPlayer.LastReadRules = date.UtcDateTime;
             await db.DbContext.SaveChangesAsync();
         }
 
@@ -970,11 +1007,11 @@ public async Task SetLastReadRules(NetUserId player, DateTime date)
 
         #region Uploaded Resources Logs
 
-        public async Task AddUploadedResourceLogAsync(NetUserId user, DateTime date, string path, byte[] data)
+        public async Task AddUploadedResourceLogAsync(NetUserId user, DateTimeOffset date, string path, byte[] data)
         {
             await using var db = await GetDb();
 
-            db.DbContext.UploadedResourceLog.Add(new UploadedResourceLog() { UserId = user, Date = date, Path = path, Data = data });
+            db.DbContext.UploadedResourceLog.Add(new UploadedResourceLog() { UserId = user, Date = date.UtcDateTime, Path = path, Data = data });
             await db.DbContext.SaveChangesAsync();
         }
 
@@ -982,7 +1019,7 @@ public async Task PurgeUploadedResourceLogAsync(int days)
         {
             await using var db = await GetDb();
 
-            var date = DateTime.Now.Subtract(TimeSpan.FromDays(days));
+            var date = DateTime.UtcNow.Subtract(TimeSpan.FromDays(days));
 
             await foreach (var log in db.DbContext.UploadedResourceLog
                                .Where(l => date > l.Date)
@@ -1022,10 +1059,10 @@ public virtual async Task<int> AddAdminMessage(AdminMessage message)
             return message.Id;
         }
 
-        public async Task<AdminNote?> GetAdminNote(int id)
+        public async Task<AdminNoteRecord?> GetAdminNote(int id)
         {
             await using var db = await GetDb();
-            return await db.DbContext.AdminNotes
+            var entity = await db.DbContext.AdminNotes
                 .Where(note => note.Id == id)
                 .Include(note => note.Round)
                 .ThenInclude(r => r!.Server)
@@ -1034,12 +1071,34 @@ public virtual async Task<int> AddAdminMessage(AdminMessage message)
                 .Include(note => note.DeletedBy)
                 .Include(note => note.Player)
                 .SingleOrDefaultAsync();
+
+            return entity == null ? null : MakeAdminNoteRecord(entity);
+        }
+
+        private AdminNoteRecord MakeAdminNoteRecord(AdminNote entity)
+        {
+            return new AdminNoteRecord(
+                entity.Id,
+                MakeRoundRecord(entity.Round),
+                MakePlayerRecord(entity.Player),
+                entity.PlaytimeAtNote,
+                entity.Message,
+                entity.Severity,
+                MakePlayerRecord(entity.CreatedBy),
+                NormalizeDatabaseTime(entity.CreatedAt),
+                MakePlayerRecord(entity.LastEditedBy),
+                NormalizeDatabaseTime(entity.LastEditedAt),
+                NormalizeDatabaseTime(entity.ExpirationTime),
+                entity.Deleted,
+                MakePlayerRecord(entity.DeletedBy),
+                NormalizeDatabaseTime(entity.DeletedAt),
+                entity.Secret);
         }
 
-        public async Task<AdminWatchlist?> GetAdminWatchlist(int id)
+        public async Task<AdminWatchlistRecord?> GetAdminWatchlist(int id)
         {
             await using var db = await GetDb();
-            return await db.DbContext.AdminWatchlists
+            var entity = await db.DbContext.AdminWatchlists
                 .Where(note => note.Id == id)
                 .Include(note => note.Round)
                 .ThenInclude(r => r!.Server)
@@ -1048,12 +1107,14 @@ public virtual async Task<int> AddAdminMessage(AdminMessage message)
                 .Include(note => note.DeletedBy)
                 .Include(note => note.Player)
                 .SingleOrDefaultAsync();
+
+            return entity == null ? null : MakeAdminWatchlistRecord(entity);
         }
 
-        public async Task<AdminMessage?> GetAdminMessage(int id)
+        public async Task<AdminMessageRecord?> GetAdminMessage(int id)
         {
             await using var db = await GetDb();
-            return await db.DbContext.AdminMessages
+            var entity = await db.DbContext.AdminMessages
                 .Where(note => note.Id == id)
                 .Include(note => note.Round)
                 .ThenInclude(r => r!.Server)
@@ -1062,9 +1123,30 @@ public virtual async Task<int> AddAdminMessage(AdminMessage message)
                 .Include(note => note.DeletedBy)
                 .Include(note => note.Player)
                 .SingleOrDefaultAsync();
+
+            return entity == null ? null : MakeAdminMessageRecord(entity);
         }
 
-        public async Task<ServerBanNote?> GetServerBanAsNoteAsync(int id)
+        private AdminMessageRecord MakeAdminMessageRecord(AdminMessage entity)
+        {
+            return new AdminMessageRecord(
+                entity.Id,
+                MakeRoundRecord(entity.Round),
+                MakePlayerRecord(entity.Player),
+                entity.PlaytimeAtNote,
+                entity.Message,
+                MakePlayerRecord(entity.CreatedBy),
+                NormalizeDatabaseTime(entity.CreatedAt),
+                MakePlayerRecord(entity.LastEditedBy),
+                NormalizeDatabaseTime(entity.LastEditedAt),
+                NormalizeDatabaseTime(entity.ExpirationTime),
+                entity.Deleted,
+                MakePlayerRecord(entity.DeletedBy),
+                NormalizeDatabaseTime(entity.DeletedAt),
+                entity.Seen);
+        }
+
+        public async Task<ServerBanNoteRecord?> GetServerBanAsNoteAsync(int id)
         {
             await using var db = await GetDb();
 
@@ -1081,22 +1163,37 @@ public virtual async Task<int> AddAdminMessage(AdminMessage message)
                 return null;
 
             var player = await db.DbContext.Player.SingleOrDefaultAsync(p => p.UserId == ban.PlayerUserId);
-            return new ServerBanNote(ban.Id, ban.RoundId, ban.Round, ban.PlayerUserId, player,
-                ban.PlaytimeAtNote, ban.Reason, ban.Severity, ban.CreatedBy, ban.BanTime,
-                ban.LastEditedBy, ban.LastEditedAt, ban.ExpirationTime, ban.Hidden,
-                ban.Unban?.UnbanningAdmin == null
+            return new ServerBanNoteRecord(
+                ban.Id,
+                MakeRoundRecord(ban.Round),
+                MakePlayerRecord(player),
+                ban.PlaytimeAtNote,
+                ban.Reason,
+                ban.Severity,
+                MakePlayerRecord(ban.CreatedBy),
+                ban.BanTime,
+                MakePlayerRecord(ban.LastEditedBy),
+                ban.LastEditedAt,
+                ban.ExpirationTime,
+                ban.Hidden,
+                MakePlayerRecord(ban.Unban?.UnbanningAdmin == null
                     ? null
                     : await db.DbContext.Player.SingleOrDefaultAsync(p =>
-                        p.UserId == ban.Unban.UnbanningAdmin.Value),
+                        p.UserId == ban.Unban.UnbanningAdmin.Value)),
                 ban.Unban?.UnbanTime);
         }
 
-        public async Task<ServerRoleBanNote?> GetServerRoleBanAsNoteAsync(int id)
+        public async Task<ServerRoleBanNoteRecord?> GetServerRoleBanAsNoteAsync(int id)
         {
             await using var db = await GetDb();
 
             var ban = await db.DbContext.RoleBan
-                .Include(b => b.Unban)
+                .Include(ban => ban.Unban)
+                .Include(ban => ban.Round)
+                .ThenInclude(r => r!.Server)
+                .Include(ban => ban.CreatedBy)
+                .Include(ban => ban.LastEditedBy)
+                .Include(ban => ban.Unban)
                 .SingleOrDefaultAsync(b => b.Id == id);
 
             if (ban is null)
@@ -1107,36 +1204,48 @@ public virtual async Task<int> AddAdminMessage(AdminMessage message)
                 ban.Unban is null
                 ? null
                 : await db.DbContext.Player.SingleOrDefaultAsync(b => b.UserId == ban.Unban.UnbanningAdmin);
-            return new ServerRoleBanNote(ban.Id, ban.RoundId, ban.Round, ban.PlayerUserId,
-                player, ban.PlaytimeAtNote, ban.Reason, ban.Severity, ban.CreatedBy,
-                ban.BanTime, ban.LastEditedBy, ban.LastEditedAt, ban.ExpirationTime,
-                ban.Hidden, new [] { ban.RoleId.Replace(BanManager.JobPrefix, null) },
-                unbanningAdmin, ban.Unban?.UnbanTime);
+
+            return new ServerRoleBanNoteRecord(
+                ban.Id,
+                MakeRoundRecord(ban.Round),
+                MakePlayerRecord(player),
+                ban.PlaytimeAtNote,
+                ban.Reason,
+                ban.Severity,
+                MakePlayerRecord(ban.CreatedBy),
+                ban.BanTime,
+                MakePlayerRecord(ban.LastEditedBy),
+                ban.LastEditedAt,
+                ban.ExpirationTime,
+                ban.Hidden,
+                new [] { ban.RoleId.Replace(BanManager.JobPrefix, null) },
+                MakePlayerRecord(unbanningAdmin),
+                ban.Unban?.UnbanTime);
         }
 
-        public async Task<List<IAdminRemarksCommon>> GetAllAdminRemarks(Guid player)
+        public async Task<List<IAdminRemarksRecord>> GetAllAdminRemarks(Guid player)
         {
             await using var db = await GetDb();
-            List<IAdminRemarksCommon> notes = new();
+            List<IAdminRemarksRecord> notes = new();
             notes.AddRange(
-                await (from note in db.DbContext.AdminNotes
-                       where note.PlayerUserId == player &&
-                             !note.Deleted &&
-                             (note.ExpirationTime == null || DateTime.UtcNow < note.ExpirationTime)
-                       select note)
-                .Include(note => note.Round)
-                .ThenInclude(r => r!.Server)
-                .Include(note => note.CreatedBy)
-                .Include(note => note.LastEditedBy)
-                .Include(note => note.Player)
-                .ToListAsync());
+                (await (from note in db.DbContext.AdminNotes
+                        where note.PlayerUserId == player &&
+                              !note.Deleted &&
+                              (note.ExpirationTime == null || DateTime.UtcNow < note.ExpirationTime)
+                        select note)
+                    .Include(note => note.Round)
+                    .ThenInclude(r => r!.Server)
+                    .Include(note => note.CreatedBy)
+                    .Include(note => note.LastEditedBy)
+                    .Include(note => note.Player)
+                    .ToListAsync()).Select(MakeAdminNoteRecord));
             notes.AddRange(await GetActiveWatchlistsImpl(db, player));
             notes.AddRange(await GetMessagesImpl(db, player));
             notes.AddRange(await GetServerBansAsNotesForUser(db, player));
             notes.AddRange(await GetGroupedServerRoleBansAsNotesForUser(db, player));
             return notes;
         }
-        public async Task EditAdminNote(int id, string message, NoteSeverity severity, bool secret, Guid editedBy, DateTime editedAt, DateTime? expiryTime)
+        public async Task EditAdminNote(int id, string message, NoteSeverity severity, bool secret, Guid editedBy, DateTimeOffset editedAt, DateTimeOffset? expiryTime)
         {
             await using var db = await GetDb();
 
@@ -1145,39 +1254,39 @@ public async Task EditAdminNote(int id, string message, NoteSeverity severity, b
             note.Severity = severity;
             note.Secret = secret;
             note.LastEditedById = editedBy;
-            note.LastEditedAt = editedAt;
-            note.ExpirationTime = expiryTime;
+            note.LastEditedAt = editedAt.UtcDateTime;
+            note.ExpirationTime = expiryTime?.UtcDateTime;
 
             await db.DbContext.SaveChangesAsync();
         }
 
-        public async Task EditAdminWatchlist(int id, string message, Guid editedBy, DateTime editedAt, DateTime? expiryTime)
+        public async Task EditAdminWatchlist(int id, string message, Guid editedBy, DateTimeOffset editedAt, DateTimeOffset? expiryTime)
         {
             await using var db = await GetDb();
 
             var note = await db.DbContext.AdminWatchlists.Where(note => note.Id == id).SingleAsync();
             note.Message = message;
             note.LastEditedById = editedBy;
-            note.LastEditedAt = editedAt;
-            note.ExpirationTime = expiryTime;
+            note.LastEditedAt = editedAt.UtcDateTime;
+            note.ExpirationTime = expiryTime?.UtcDateTime;
 
             await db.DbContext.SaveChangesAsync();
         }
 
-        public async Task EditAdminMessage(int id, string message, Guid editedBy, DateTime editedAt, DateTime? expiryTime)
+        public async Task EditAdminMessage(int id, string message, Guid editedBy, DateTimeOffset editedAt, DateTimeOffset? expiryTime)
         {
             await using var db = await GetDb();
 
             var note = await db.DbContext.AdminMessages.Where(note => note.Id == id).SingleAsync();
             note.Message = message;
             note.LastEditedById = editedBy;
-            note.LastEditedAt = editedAt;
-            note.ExpirationTime = expiryTime;
+            note.LastEditedAt = editedAt.UtcDateTime;
+            note.ExpirationTime = expiryTime?.UtcDateTime;
 
             await db.DbContext.SaveChangesAsync();
         }
 
-        public async Task DeleteAdminNote(int id, Guid deletedBy, DateTime deletedAt)
+        public async Task DeleteAdminNote(int id, Guid deletedBy, DateTimeOffset deletedAt)
         {
             await using var db = await GetDb();
 
@@ -1185,12 +1294,12 @@ public async Task DeleteAdminNote(int id, Guid deletedBy, DateTime deletedAt)
 
             note.Deleted = true;
             note.DeletedById = deletedBy;
-            note.DeletedAt = deletedAt;
+            note.DeletedAt = deletedAt.UtcDateTime;
 
             await db.DbContext.SaveChangesAsync();
         }
 
-        public async Task DeleteAdminWatchlist(int id, Guid deletedBy, DateTime deletedAt)
+        public async Task DeleteAdminWatchlist(int id, Guid deletedBy, DateTimeOffset deletedAt)
         {
             await using var db = await GetDb();
 
@@ -1198,12 +1307,12 @@ public async Task DeleteAdminWatchlist(int id, Guid deletedBy, DateTime deletedA
 
             watchlist.Deleted = true;
             watchlist.DeletedById = deletedBy;
-            watchlist.DeletedAt = deletedAt;
+            watchlist.DeletedAt = deletedAt.UtcDateTime;
 
             await db.DbContext.SaveChangesAsync();
         }
 
-        public async Task DeleteAdminMessage(int id, Guid deletedBy, DateTime deletedAt)
+        public async Task DeleteAdminMessage(int id, Guid deletedBy, DateTimeOffset deletedAt)
         {
             await using var db = await GetDb();
 
@@ -1211,12 +1320,12 @@ public async Task DeleteAdminMessage(int id, Guid deletedBy, DateTime deletedAt)
 
             message.Deleted = true;
             message.DeletedById = deletedBy;
-            message.DeletedAt = deletedAt;
+            message.DeletedAt = deletedAt.UtcDateTime;
 
             await db.DbContext.SaveChangesAsync();
         }
 
-        public async Task HideServerBanFromNotes(int id, Guid deletedBy, DateTime deletedAt)
+        public async Task HideServerBanFromNotes(int id, Guid deletedBy, DateTimeOffset deletedAt)
         {
             await using var db = await GetDb();
 
@@ -1224,12 +1333,12 @@ public async Task HideServerBanFromNotes(int id, Guid deletedBy, DateTime delete
 
             ban.Hidden = true;
             ban.LastEditedById = deletedBy;
-            ban.LastEditedAt = deletedAt;
+            ban.LastEditedAt = deletedAt.UtcDateTime;
 
             await db.DbContext.SaveChangesAsync();
         }
 
-        public async Task HideServerRoleBanFromNotes(int id, Guid deletedBy, DateTime deletedAt)
+        public async Task HideServerRoleBanFromNotes(int id, Guid deletedBy, DateTimeOffset deletedAt)
         {
             await using var db = await GetDb();
 
@@ -1237,40 +1346,40 @@ public async Task HideServerRoleBanFromNotes(int id, Guid deletedBy, DateTime de
 
             roleBan.Hidden = true;
             roleBan.LastEditedById = deletedBy;
-            roleBan.LastEditedAt = deletedAt;
+            roleBan.LastEditedAt = deletedAt.UtcDateTime;
 
             await db.DbContext.SaveChangesAsync();
         }
 
-        public async Task<List<IAdminRemarksCommon>> GetVisibleAdminRemarks(Guid player)
+        public async Task<List<IAdminRemarksRecord>> GetVisibleAdminRemarks(Guid player)
         {
             await using var db = await GetDb();
-            List<IAdminRemarksCommon> notesCol = new();
+            List<IAdminRemarksRecord> notesCol = new();
             notesCol.AddRange(
-                await (from note in db.DbContext.AdminNotes
-                       where note.PlayerUserId == player &&
-                             !note.Secret &&
-                             !note.Deleted &&
-                             (note.ExpirationTime == null || DateTime.UtcNow < note.ExpirationTime)
-                       select note)
-                .Include(note => note.Round)
-                .ThenInclude(r => r!.Server)
-                .Include(note => note.CreatedBy)
-                .Include(note => note.Player)
-                .ToListAsync());
+                (await (from note in db.DbContext.AdminNotes
+                        where note.PlayerUserId == player &&
+                              !note.Secret &&
+                              !note.Deleted &&
+                              (note.ExpirationTime == null || DateTime.UtcNow < note.ExpirationTime)
+                        select note)
+                    .Include(note => note.Round)
+                    .ThenInclude(r => r!.Server)
+                    .Include(note => note.CreatedBy)
+                    .Include(note => note.Player)
+                    .ToListAsync()).Select(MakeAdminNoteRecord));
             notesCol.AddRange(await GetMessagesImpl(db, player));
             return notesCol;
         }
 
-        public async Task<List<AdminWatchlist>> GetActiveWatchlists(Guid player)
+        public async Task<List<AdminWatchlistRecord>> GetActiveWatchlists(Guid player)
         {
             await using var db = await GetDb();
             return await GetActiveWatchlistsImpl(db, player);
         }
 
-        protected async Task<List<AdminWatchlist>> GetActiveWatchlistsImpl(DbGuard db, Guid player)
+        protected async Task<List<AdminWatchlistRecord>> GetActiveWatchlistsImpl(DbGuard db, Guid player)
         {
-            return await (from watchlist in db.DbContext.AdminWatchlists
+            var entities = await (from watchlist in db.DbContext.AdminWatchlists
                           where watchlist.PlayerUserId == player &&
                                 !watchlist.Deleted &&
                                 (watchlist.ExpirationTime == null || DateTime.UtcNow < watchlist.ExpirationTime)
@@ -1281,27 +1390,34 @@ protected async Task<List<AdminWatchlist>> GetActiveWatchlistsImpl(DbGuard db, G
                 .Include(note => note.LastEditedBy)
                 .Include(note => note.Player)
                 .ToListAsync();
+
+            return entities.Select(MakeAdminWatchlistRecord).ToList();
+        }
+
+        private AdminWatchlistRecord MakeAdminWatchlistRecord(AdminWatchlist entity)
+        {
+            return new AdminWatchlistRecord(entity.Id, MakeRoundRecord(entity.Round), MakePlayerRecord(entity.Player), entity.PlaytimeAtNote, entity.Message, MakePlayerRecord(entity.CreatedBy), NormalizeDatabaseTime(entity.CreatedAt), MakePlayerRecord(entity.LastEditedBy), NormalizeDatabaseTime(entity.LastEditedAt), NormalizeDatabaseTime(entity.ExpirationTime), entity.Deleted, MakePlayerRecord(entity.DeletedBy), NormalizeDatabaseTime(entity.DeletedAt));
         }
 
-        public async Task<List<AdminMessage>> GetMessages(Guid player)
+        public async Task<List<AdminMessageRecord>> GetMessages(Guid player)
         {
             await using var db = await GetDb();
             return await GetMessagesImpl(db, player);
         }
 
-        protected async Task<List<AdminMessage>> GetMessagesImpl(DbGuard db, Guid player)
+        protected async Task<List<AdminMessageRecord>> GetMessagesImpl(DbGuard db, Guid player)
         {
-            return await (from message in db.DbContext.AdminMessages
-                          where message.PlayerUserId == player &&
-                                !message.Deleted &&
-                                (message.ExpirationTime == null || DateTime.UtcNow < message.ExpirationTime)
-                          select message)
-                .Include(note => note.Round)
-                .ThenInclude(r => r!.Server)
-                .Include(note => note.CreatedBy)
-                .Include(note => note.LastEditedBy)
-                .Include(note => note.Player)
-                .ToListAsync();
+            var entities = await (from message in db.DbContext.AdminMessages
+                        where message.PlayerUserId == player && !message.Deleted &&
+                              (message.ExpirationTime == null || DateTime.UtcNow < message.ExpirationTime)
+                        select message).Include(note => note.Round)
+                    .ThenInclude(r => r!.Server)
+                    .Include(note => note.CreatedBy)
+                    .Include(note => note.LastEditedBy)
+                    .Include(note => note.Player)
+                    .ToListAsync();
+
+            return entities.Select(MakeAdminMessageRecord).ToList();
         }
 
         public async Task MarkMessageAsSeen(int id)
@@ -1313,7 +1429,7 @@ public async Task MarkMessageAsSeen(int id)
         }
 
         // These two are here because they get converted into notes later
-        protected async Task<List<ServerBanNote>> GetServerBansAsNotesForUser(DbGuard db, Guid user)
+        protected async Task<List<ServerBanNoteRecord>> GetServerBansAsNotesForUser(DbGuard db, Guid user)
         {
             // You can't group queries, as player will not always exist. When it doesn't, the
             // whole query returns nothing
@@ -1328,17 +1444,27 @@ protected async Task<List<ServerBanNote>> GetServerBansAsNotesForUser(DbGuard db
                 .Include(ban => ban.Unban)
                 .ToArrayAsync();
 
-            var banNotes = new List<ServerBanNote>();
+            var banNotes = new List<ServerBanNoteRecord>();
             foreach (var ban in bans)
             {
-                var banNote = new ServerBanNote(ban.Id, ban.RoundId, ban.Round, ban.PlayerUserId, player,
-                    ban.PlaytimeAtNote, ban.Reason, ban.Severity, ban.CreatedBy, ban.BanTime,
-                    ban.LastEditedBy, ban.LastEditedAt, ban.ExpirationTime, ban.Hidden,
-                    ban.Unban?.UnbanningAdmin == null
+                var banNote = new ServerBanNoteRecord(
+                    ban.Id,
+                    MakeRoundRecord(ban.Round),
+                    MakePlayerRecord(player),
+                    ban.PlaytimeAtNote,
+                    ban.Reason,
+                    ban.Severity,
+                    MakePlayerRecord(ban.CreatedBy),
+                    NormalizeDatabaseTime(ban.BanTime),
+                    MakePlayerRecord(ban.LastEditedBy),
+                    NormalizeDatabaseTime(ban.LastEditedAt),
+                    NormalizeDatabaseTime(ban.ExpirationTime),
+                    ban.Hidden,
+                    MakePlayerRecord(ban.Unban?.UnbanningAdmin == null
                         ? null
                         : await db.DbContext.Player.SingleOrDefaultAsync(
-                            p => p.UserId == ban.Unban.UnbanningAdmin.Value),
-                    ban.Unban?.UnbanTime);
+                            p => p.UserId == ban.Unban.UnbanningAdmin.Value)),
+                    NormalizeDatabaseTime(ban.Unban?.UnbanTime));
 
                 banNotes.Add(banNote);
             }
@@ -1346,7 +1472,7 @@ protected async Task<List<ServerBanNote>> GetServerBansAsNotesForUser(DbGuard db
             return banNotes;
         }
 
-        protected async Task<List<ServerRoleBanNote>> GetGroupedServerRoleBansAsNotesForUser(DbGuard db, Guid user)
+        protected async Task<List<ServerRoleBanNoteRecord>> GetGroupedServerRoleBansAsNotesForUser(DbGuard db, Guid user)
         {
             // Server side query
             var bansQuery = await db.DbContext.RoleBan
@@ -1365,7 +1491,7 @@ protected async Task<List<ServerRoleBanNote>> GetGroupedServerRoleBansAsNotesFor
                     .Select(banGroup => banGroup)
                     .ToArray();
 
-            List<ServerRoleBanNote> bans = new();
+            List<ServerRoleBanNoteRecord> bans = new();
             var player = await db.DbContext.Player.SingleOrDefaultAsync(p => p.UserId == user);
             foreach (var banGroup in bansEnumerable)
             {
@@ -1375,11 +1501,22 @@ protected async Task<List<ServerRoleBanNote>> GetGroupedServerRoleBansAsNotesFor
                 if (firstBan.Unban?.UnbanningAdmin is not null)
                     unbanningAdmin = await db.DbContext.Player.SingleOrDefaultAsync(p => p.UserId == firstBan.Unban.UnbanningAdmin.Value);
 
-                bans.Add(new ServerRoleBanNote(firstBan.Id, firstBan.RoundId, firstBan.Round, firstBan.PlayerUserId,
-                    player, firstBan.PlaytimeAtNote, firstBan.Reason, firstBan.Severity, firstBan.CreatedBy,
-                    firstBan.BanTime, firstBan.LastEditedBy, firstBan.LastEditedAt, firstBan.ExpirationTime,
-                    firstBan.Hidden, banGroup.Select(ban => ban.RoleId.Replace(BanManager.JobPrefix, null)).ToArray(),
-                    unbanningAdmin, firstBan.Unban?.UnbanTime));
+                bans.Add(new ServerRoleBanNoteRecord(
+                    firstBan.Id,
+                    MakeRoundRecord(firstBan.Round),
+                    MakePlayerRecord(player),
+                    firstBan.PlaytimeAtNote,
+                    firstBan.Reason,
+                    firstBan.Severity,
+                    MakePlayerRecord(firstBan.CreatedBy),
+                    NormalizeDatabaseTime(firstBan.BanTime),
+                    MakePlayerRecord(firstBan.LastEditedBy),
+                    NormalizeDatabaseTime(firstBan.LastEditedAt),
+                    NormalizeDatabaseTime(firstBan.ExpirationTime),
+                    firstBan.Hidden,
+                    banGroup.Select(ban => ban.RoleId.Replace(BanManager.JobPrefix, null)).ToArray(),
+                    MakePlayerRecord(unbanningAdmin),
+                    NormalizeDatabaseTime(firstBan.Unban?.UnbanTime)));
             }
 
             return bans;
@@ -1387,6 +1524,22 @@ protected async Task<List<ServerRoleBanNote>> GetGroupedServerRoleBansAsNotesFor
 
         #endregion
 
+        // SQLite returns DateTime as Kind=Unspecified, Npgsql actually knows for sure it's Kind=Utc.
+        // Normalize DateTimes here so they're always Utc. Thanks.
+        protected abstract DateTime NormalizeDatabaseTime(DateTime time);
+
+        [return: NotNullIfNotNull(nameof(time))]
+        protected DateTime? NormalizeDatabaseTime(DateTime? time)
+        {
+            return time != null ? NormalizeDatabaseTime(time.Value) : time;
+        }
+
+        public async Task<bool> HasPendingModelChanges()
+        {
+            await using var db = await GetDb();
+            return db.DbContext.Database.HasPendingModelChanges();
+        }
+
         protected abstract Task<DbGuard> GetDb([CallerMemberName] string? name = null);
 
         protected void LogDbOp(string? name)
diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs
index 7deeeb8e95..5fda2a7e10 100644
--- a/Content.Server/Database/ServerDbManager.cs
+++ b/Content.Server/Database/ServerDbManager.cs
@@ -92,9 +92,9 @@ public Task EditServerBan(
             int id,
             string reason,
             NoteSeverity severity,
-            DateTime? expiration,
+            DateTimeOffset? expiration,
             Guid editedBy,
-            DateTime editedAt);
+            DateTimeOffset editedAt);
 
         /// <summary>
         /// Update ban exemption information for a player.
@@ -146,9 +146,9 @@ public Task EditServerRoleBan(
             int id,
             string reason,
             NoteSeverity severity,
-            DateTime? expiration,
+            DateTimeOffset? expiration,
             Guid editedBy,
-            DateTime editedAt);
+            DateTimeOffset editedAt);
         #endregion
 
         #region Playtime
@@ -239,7 +239,7 @@ Task<int> AddConnectionLogAsync(
 
         #region Uploaded Resources Logs
 
-        Task AddUploadedResourceLogAsync(NetUserId user, DateTime date, string path, byte[] data);
+        Task AddUploadedResourceLogAsync(NetUserId user, DateTimeOffset date, string path, byte[] data);
 
         Task PurgeUploadedResourceLogAsync(int days);
 
@@ -247,33 +247,33 @@ Task<int> AddConnectionLogAsync(
 
         #region Rules
 
-        Task<DateTime?> GetLastReadRules(NetUserId player);
-        Task SetLastReadRules(NetUserId player, DateTime time);
+        Task<DateTimeOffset?> GetLastReadRules(NetUserId player);
+        Task SetLastReadRules(NetUserId player, DateTimeOffset time);
 
         #endregion
 
         #region Admin Notes
 
-        Task<int> AddAdminNote(int? roundId, Guid player, TimeSpan playtimeAtNote, string message, NoteSeverity severity, bool secret, Guid createdBy, DateTime createdAt, DateTime? expiryTime);
-        Task<int> AddAdminWatchlist(int? roundId, Guid player, TimeSpan playtimeAtNote, string message, Guid createdBy, DateTime createdAt, DateTime? expiryTime);
-        Task<int> AddAdminMessage(int? roundId, Guid player, TimeSpan playtimeAtNote, string message, Guid createdBy, DateTime createdAt, DateTime? expiryTime);
-        Task<AdminNote?> GetAdminNote(int id);
-        Task<AdminWatchlist?> GetAdminWatchlist(int id);
-        Task<AdminMessage?> GetAdminMessage(int id);
-        Task<ServerBanNote?> GetServerBanAsNoteAsync(int id);
-        Task<ServerRoleBanNote?> GetServerRoleBanAsNoteAsync(int id);
-        Task<List<IAdminRemarksCommon>> GetAllAdminRemarks(Guid player);
-        Task<List<IAdminRemarksCommon>> GetVisibleAdminNotes(Guid player);
-        Task<List<AdminWatchlist>> GetActiveWatchlists(Guid player);
-        Task<List<AdminMessage>> GetMessages(Guid player);
-        Task EditAdminNote(int id, string message, NoteSeverity severity, bool secret, Guid editedBy, DateTime editedAt, DateTime? expiryTime);
-        Task EditAdminWatchlist(int id, string message, Guid editedBy, DateTime editedAt, DateTime? expiryTime);
-        Task EditAdminMessage(int id, string message, Guid editedBy, DateTime editedAt, DateTime? expiryTime);
-        Task DeleteAdminNote(int id, Guid deletedBy, DateTime deletedAt);
-        Task DeleteAdminWatchlist(int id, Guid deletedBy, DateTime deletedAt);
-        Task DeleteAdminMessage(int id, Guid deletedBy, DateTime deletedAt);
-        Task HideServerBanFromNotes(int id, Guid deletedBy, DateTime deletedAt);
-        Task HideServerRoleBanFromNotes(int id, Guid deletedBy, DateTime deletedAt);
+        Task<int> AddAdminNote(int? roundId, Guid player, TimeSpan playtimeAtNote, string message, NoteSeverity severity, bool secret, Guid createdBy, DateTimeOffset createdAt, DateTimeOffset? expiryTime);
+        Task<int> AddAdminWatchlist(int? roundId, Guid player, TimeSpan playtimeAtNote, string message, Guid createdBy, DateTimeOffset createdAt, DateTimeOffset? expiryTime);
+        Task<int> AddAdminMessage(int? roundId, Guid player, TimeSpan playtimeAtNote, string message, Guid createdBy, DateTimeOffset createdAt, DateTimeOffset? expiryTime);
+        Task<AdminNoteRecord?> GetAdminNote(int id);
+        Task<AdminWatchlistRecord?> GetAdminWatchlist(int id);
+        Task<AdminMessageRecord?> GetAdminMessage(int id);
+        Task<ServerBanNoteRecord?> GetServerBanAsNoteAsync(int id);
+        Task<ServerRoleBanNoteRecord?> GetServerRoleBanAsNoteAsync(int id);
+        Task<List<IAdminRemarksRecord>> GetAllAdminRemarks(Guid player);
+        Task<List<IAdminRemarksRecord>> GetVisibleAdminNotes(Guid player);
+        Task<List<AdminWatchlistRecord>> GetActiveWatchlists(Guid player);
+        Task<List<AdminMessageRecord>> GetMessages(Guid player);
+        Task EditAdminNote(int id, string message, NoteSeverity severity, bool secret, Guid editedBy, DateTimeOffset editedAt, DateTimeOffset? expiryTime);
+        Task EditAdminWatchlist(int id, string message, Guid editedBy, DateTimeOffset editedAt, DateTimeOffset? expiryTime);
+        Task EditAdminMessage(int id, string message, Guid editedBy, DateTimeOffset editedAt, DateTimeOffset? expiryTime);
+        Task DeleteAdminNote(int id, Guid deletedBy, DateTimeOffset deletedAt);
+        Task DeleteAdminWatchlist(int id, Guid deletedBy, DateTimeOffset deletedAt);
+        Task DeleteAdminMessage(int id, Guid deletedBy, DateTimeOffset deletedAt);
+        Task HideServerBanFromNotes(int id, Guid deletedBy, DateTimeOffset deletedAt);
+        Task HideServerRoleBanFromNotes(int id, Guid deletedBy, DateTimeOffset deletedAt);
         Task MarkMessageAsSeen(int id);
 
         #endregion
@@ -423,7 +423,7 @@ public Task AddServerUnbanAsync(ServerUnbanDef serverUnban)
             return RunDbCommand(() => _db.AddServerUnbanAsync(serverUnban));
         }
 
-        public Task EditServerBan(int id, string reason, NoteSeverity severity, DateTime? expiration, Guid editedBy, DateTime editedAt)
+        public Task EditServerBan(int id, string reason, NoteSeverity severity, DateTimeOffset? expiration, Guid editedBy, DateTimeOffset editedAt)
         {
             DbWriteOpsMetric.Inc();
             return RunDbCommand(() => _db.EditServerBan(id, reason, severity, expiration, editedBy, editedAt));
@@ -470,7 +470,7 @@ public Task AddServerRoleUnbanAsync(ServerRoleUnbanDef serverRoleUnban)
             return RunDbCommand(() => _db.AddServerRoleUnbanAsync(serverRoleUnban));
         }
 
-        public Task EditServerRoleBan(int id, string reason, NoteSeverity severity, DateTime? expiration, Guid editedBy, DateTime editedAt)
+        public Task EditServerRoleBan(int id, string reason, NoteSeverity severity, DateTimeOffset? expiration, Guid editedBy, DateTimeOffset editedAt)
         {
             DbWriteOpsMetric.Inc();
             return RunDbCommand(() => _db.EditServerRoleBan(id, reason, severity, expiration, editedBy, editedAt));
@@ -665,7 +665,7 @@ public Task RemoveFromWhitelistAsync(NetUserId player)
             return RunDbCommand(() => _db.RemoveFromWhitelistAsync(player));
         }
 
-        public Task AddUploadedResourceLogAsync(NetUserId user, DateTime date, string path, byte[] data)
+        public Task AddUploadedResourceLogAsync(NetUserId user, DateTimeOffset date, string path, byte[] data)
         {
             DbWriteOpsMetric.Inc();
             return RunDbCommand(() => _db.AddUploadedResourceLogAsync(user, date, path, data));
@@ -677,19 +677,19 @@ public Task PurgeUploadedResourceLogAsync(int days)
             return RunDbCommand(() => _db.PurgeUploadedResourceLogAsync(days));
         }
 
-        public Task<DateTime?> GetLastReadRules(NetUserId player)
+        public Task<DateTimeOffset?> GetLastReadRules(NetUserId player)
         {
             DbReadOpsMetric.Inc();
             return RunDbCommand(() => _db.GetLastReadRules(player));
         }
 
-        public Task SetLastReadRules(NetUserId player, DateTime time)
+        public Task SetLastReadRules(NetUserId player, DateTimeOffset time)
         {
             DbWriteOpsMetric.Inc();
             return RunDbCommand(() => _db.SetLastReadRules(player, time));
         }
 
-        public Task<int> AddAdminNote(int? roundId, Guid player, TimeSpan playtimeAtNote, string message, NoteSeverity severity, bool secret, Guid createdBy, DateTime createdAt, DateTime? expiryTime)
+        public Task<int> AddAdminNote(int? roundId, Guid player, TimeSpan playtimeAtNote, string message, NoteSeverity severity, bool secret, Guid createdBy, DateTimeOffset createdAt, DateTimeOffset? expiryTime)
         {
             DbWriteOpsMetric.Inc();
             var note = new AdminNote
@@ -702,15 +702,15 @@ public Task<int> AddAdminNote(int? roundId, Guid player, TimeSpan playtimeAtNote
                 Message = message,
                 Severity = severity,
                 Secret = secret,
-                CreatedAt = createdAt,
-                LastEditedAt = createdAt,
-                ExpirationTime = expiryTime
+                CreatedAt = createdAt.UtcDateTime,
+                LastEditedAt = createdAt.UtcDateTime,
+                ExpirationTime = expiryTime?.UtcDateTime
             };
 
             return RunDbCommand(() => _db.AddAdminNote(note));
         }
 
-        public Task<int> AddAdminWatchlist(int? roundId, Guid player, TimeSpan playtimeAtNote, string message, Guid createdBy, DateTime createdAt, DateTime? expiryTime)
+        public Task<int> AddAdminWatchlist(int? roundId, Guid player, TimeSpan playtimeAtNote, string message, Guid createdBy, DateTimeOffset createdAt, DateTimeOffset? expiryTime)
         {
             DbWriteOpsMetric.Inc();
             var note = new AdminWatchlist
@@ -721,15 +721,15 @@ public Task<int> AddAdminWatchlist(int? roundId, Guid player, TimeSpan playtimeA
                 PlayerUserId = player,
                 PlaytimeAtNote = playtimeAtNote,
                 Message = message,
-                CreatedAt = createdAt,
-                LastEditedAt = createdAt,
-                ExpirationTime = expiryTime
+                CreatedAt = createdAt.UtcDateTime,
+                LastEditedAt = createdAt.UtcDateTime,
+                ExpirationTime = expiryTime?.UtcDateTime
             };
 
             return RunDbCommand(() => _db.AddAdminWatchlist(note));
         }
 
-        public Task<int> AddAdminMessage(int? roundId, Guid player, TimeSpan playtimeAtNote, string message, Guid createdBy, DateTime createdAt, DateTime? expiryTime)
+        public Task<int> AddAdminMessage(int? roundId, Guid player, TimeSpan playtimeAtNote, string message, Guid createdBy, DateTimeOffset createdAt, DateTimeOffset? expiryTime)
         {
             DbWriteOpsMetric.Inc();
             var note = new AdminMessage
@@ -740,108 +740,108 @@ public Task<int> AddAdminMessage(int? roundId, Guid player, TimeSpan playtimeAtN
                 PlayerUserId = player,
                 PlaytimeAtNote = playtimeAtNote,
                 Message = message,
-                CreatedAt = createdAt,
-                LastEditedAt = createdAt,
-                ExpirationTime = expiryTime
+                CreatedAt = createdAt.UtcDateTime,
+                LastEditedAt = createdAt.UtcDateTime,
+                ExpirationTime = expiryTime?.UtcDateTime
             };
 
             return RunDbCommand(() => _db.AddAdminMessage(note));
         }
 
-        public Task<AdminNote?> GetAdminNote(int id)
+        public Task<AdminNoteRecord?> GetAdminNote(int id)
         {
             DbReadOpsMetric.Inc();
             return RunDbCommand(() => _db.GetAdminNote(id));
         }
-        public Task<AdminWatchlist?> GetAdminWatchlist(int id)
+        public Task<AdminWatchlistRecord?> GetAdminWatchlist(int id)
         {
             DbReadOpsMetric.Inc();
             return RunDbCommand(() => _db.GetAdminWatchlist(id));
         }
-        public Task<AdminMessage?> GetAdminMessage(int id)
+        public Task<AdminMessageRecord?> GetAdminMessage(int id)
         {
             DbReadOpsMetric.Inc();
             return RunDbCommand(() => _db.GetAdminMessage(id));
         }
 
-        public Task<ServerBanNote?> GetServerBanAsNoteAsync(int id)
+        public Task<ServerBanNoteRecord?> GetServerBanAsNoteAsync(int id)
         {
             DbReadOpsMetric.Inc();
             return RunDbCommand(() => _db.GetServerBanAsNoteAsync(id));
         }
 
-        public Task<ServerRoleBanNote?> GetServerRoleBanAsNoteAsync(int id)
+        public Task<ServerRoleBanNoteRecord?> GetServerRoleBanAsNoteAsync(int id)
         {
             DbReadOpsMetric.Inc();
             return RunDbCommand(() => _db.GetServerRoleBanAsNoteAsync(id));
         }
 
-    public Task<List<IAdminRemarksCommon>> GetAllAdminRemarks(Guid player)
+    public Task<List<IAdminRemarksRecord>> GetAllAdminRemarks(Guid player)
         {
             DbReadOpsMetric.Inc();
             return RunDbCommand(() => _db.GetAllAdminRemarks(player));
         }
 
-        public Task<List<IAdminRemarksCommon>> GetVisibleAdminNotes(Guid player)
+        public Task<List<IAdminRemarksRecord>> GetVisibleAdminNotes(Guid player)
         {
             DbReadOpsMetric.Inc();
             return RunDbCommand(() => _db.GetVisibleAdminRemarks(player));
         }
 
-        public Task<List<AdminWatchlist>> GetActiveWatchlists(Guid player)
+        public Task<List<AdminWatchlistRecord>> GetActiveWatchlists(Guid player)
         {
             DbReadOpsMetric.Inc();
             return RunDbCommand(() => _db.GetActiveWatchlists(player));
         }
 
-        public Task<List<AdminMessage>> GetMessages(Guid player)
+        public Task<List<AdminMessageRecord>> GetMessages(Guid player)
         {
             DbReadOpsMetric.Inc();
             return RunDbCommand(() => _db.GetMessages(player));
         }
-        public Task EditAdminNote(int id, string message, NoteSeverity severity, bool secret, Guid editedBy, DateTime editedAt, DateTime? expiryTime)
+        public Task EditAdminNote(int id, string message, NoteSeverity severity, bool secret, Guid editedBy, DateTimeOffset editedAt, DateTimeOffset? expiryTime)
         {
             DbWriteOpsMetric.Inc();
             return RunDbCommand(() => _db.EditAdminNote(id, message, severity, secret, editedBy, editedAt, expiryTime));
         }
 
-        public Task EditAdminWatchlist(int id, string message, Guid editedBy, DateTime editedAt, DateTime? expiryTime)
+        public Task EditAdminWatchlist(int id, string message, Guid editedBy, DateTimeOffset editedAt, DateTimeOffset? expiryTime)
         {
             DbWriteOpsMetric.Inc();
             return RunDbCommand(() => _db.EditAdminWatchlist(id, message, editedBy, editedAt, expiryTime));
         }
 
-        public Task EditAdminMessage(int id, string message, Guid editedBy, DateTime editedAt, DateTime? expiryTime)
+        public Task EditAdminMessage(int id, string message, Guid editedBy, DateTimeOffset editedAt, DateTimeOffset? expiryTime)
         {
             DbWriteOpsMetric.Inc();
             return RunDbCommand(() => _db.EditAdminMessage(id, message, editedBy, editedAt, expiryTime));
         }
 
-        public Task DeleteAdminNote(int id, Guid deletedBy, DateTime deletedAt)
+        public Task DeleteAdminNote(int id, Guid deletedBy, DateTimeOffset deletedAt)
         {
             DbWriteOpsMetric.Inc();
             return RunDbCommand(() => _db.DeleteAdminNote(id, deletedBy, deletedAt));
         }
 
-        public Task DeleteAdminWatchlist(int id, Guid deletedBy, DateTime deletedAt)
+        public Task DeleteAdminWatchlist(int id, Guid deletedBy, DateTimeOffset deletedAt)
         {
             DbWriteOpsMetric.Inc();
             return RunDbCommand(() => _db.DeleteAdminWatchlist(id, deletedBy, deletedAt));
         }
 
-        public Task DeleteAdminMessage(int id, Guid deletedBy, DateTime deletedAt)
+        public Task DeleteAdminMessage(int id, Guid deletedBy, DateTimeOffset deletedAt)
         {
             DbWriteOpsMetric.Inc();
             return RunDbCommand(() => _db.DeleteAdminMessage(id, deletedBy, deletedAt));
         }
 
-        public Task HideServerBanFromNotes(int id, Guid deletedBy, DateTime deletedAt)
+        public Task HideServerBanFromNotes(int id, Guid deletedBy, DateTimeOffset deletedAt)
         {
             DbWriteOpsMetric.Inc();
             return RunDbCommand(() => _db.HideServerBanFromNotes(id, deletedBy, deletedAt));
         }
 
-        public Task HideServerRoleBanFromNotes(int id, Guid deletedBy, DateTime deletedAt)
+        public Task HideServerRoleBanFromNotes(int id, Guid deletedBy, DateTimeOffset deletedAt)
         {
             DbWriteOpsMetric.Inc();
             return RunDbCommand(() => _db.HideServerRoleBanFromNotes(id, deletedBy, deletedAt));
diff --git a/Content.Server/Database/ServerDbPostgres.cs b/Content.Server/Database/ServerDbPostgres.cs
index 8a8f26e503..c81e735868 100644
--- a/Content.Server/Database/ServerDbPostgres.cs
+++ b/Content.Server/Database/ServerDbPostgres.cs
@@ -162,7 +162,7 @@ private static IQueryable<ServerBan> MakeBanLookupQuery(
             if (!includeUnbanned)
             {
                 query = query.Where(p =>
-                    p.Unban == null && (p.ExpirationTime == null || p.ExpirationTime.Value > DateTime.Now));
+                    p.Unban == null && (p.ExpirationTime == null || p.ExpirationTime.Value > DateTime.UtcNow));
             }
 
             if (exemptFlags is { } exempt)
@@ -354,7 +354,7 @@ private static IQueryable<ServerRoleBan> MakeRoleBanLookupQuery(
             if (!includeUnbanned)
             {
                 query = query?.Where(p =>
-                    p.Unban == null && (p.ExpirationTime == null || p.ExpirationTime.Value > DateTime.Now));
+                    p.Unban == null && (p.ExpirationTime == null || p.ExpirationTime.Value > DateTime.UtcNow));
             }
 
             query = query!.Distinct();
@@ -457,17 +457,6 @@ public override async Task AddServerRoleUnbanAsync(ServerRoleUnbanDef serverRole
         }
         #endregion
 
-        protected override PlayerRecord MakePlayerRecord(Player record)
-        {
-            return new PlayerRecord(
-                new NetUserId(record.UserId),
-                new DateTimeOffset(record.FirstSeenTime),
-                record.LastSeenUserName,
-                new DateTimeOffset(record.LastSeenTime),
-                record.LastSeenAddress,
-                record.LastSeenHWId?.ToImmutableArray());
-        }
-
         public override async Task<int> AddConnectionLogAsync(
             NetUserId userId,
             string userName,
@@ -532,6 +521,12 @@ WHERE to_tsvector('english'::regconfig, a.message) @@ websearch_to_tsquery('engl
             return db.AdminLog;
         }
 
+        protected override DateTime NormalizeDatabaseTime(DateTime time)
+        {
+            DebugTools.Assert(time.Kind == DateTimeKind.Utc);
+            return time;
+        }
+
         private async Task<DbGuardImpl> GetDbImpl([CallerMemberName] string? name = null)
         {
             LogDbOp(name);
diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs
index 90bbec023a..46886fe4d1 100644
--- a/Content.Server/Database/ServerDbSqlite.cs
+++ b/Content.Server/Database/ServerDbSqlite.cs
@@ -12,6 +12,7 @@
 using Microsoft.EntityFrameworkCore;
 using Robust.Shared.Configuration;
 using Robust.Shared.Network;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Database
 {
@@ -350,17 +351,6 @@ public override async Task AddServerRoleUnbanAsync(ServerRoleUnbanDef serverUnba
         }
         #endregion
 
-        protected override PlayerRecord MakePlayerRecord(Player record)
-        {
-            return new PlayerRecord(
-                new NetUserId(record.UserId),
-                new DateTimeOffset(record.FirstSeenTime, TimeSpan.Zero),
-                record.LastSeenUserName,
-                new DateTimeOffset(record.LastSeenTime, TimeSpan.Zero),
-                record.LastSeenAddress,
-                record.LastSeenHWId?.ToImmutableArray());
-        }
-
         private static ServerBanDef? ConvertBan(ServerBan? ban)
         {
             if (ban == null)
@@ -546,6 +536,12 @@ public override async Task<int> AddAdminMessage(AdminMessage message)
             return await base.AddAdminMessage(message);
         }
 
+        protected override DateTime NormalizeDatabaseTime(DateTime time)
+        {
+            DebugTools.Assert(time.Kind == DateTimeKind.Unspecified);
+            return DateTime.SpecifyKind(time, DateTimeKind.Utc);
+        }
+
         private async Task<DbGuardImpl> GetDbImpl([CallerMemberName] string? name = null)
         {
             LogDbOp(name);
diff --git a/Content.Server/Database/ServerRoleBanNote.cs b/Content.Server/Database/ServerRoleBanNote.cs
deleted file mode 100644
index 6db8110db8..0000000000
--- a/Content.Server/Database/ServerRoleBanNote.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Content.Shared.Database;
-
-namespace Content.Server.Database
-{
-    public record ServerRoleBanNote(int Id, int? RoundId, Round? Round, Guid? PlayerUserId, Player? Player,
-        TimeSpan PlaytimeAtNote, string Message, NoteSeverity Severity, Player? CreatedBy, DateTime CreatedAt,
-        Player? LastEditedBy, DateTime? LastEditedAt, DateTime? ExpirationTime, bool Deleted, string[] Roles,
-        Player? UnbanningAdmin, DateTime? UnbanTime) : IAdminRemarksCommon;
-}
diff --git a/Content.Server/Decals/DecalSystem.cs b/Content.Server/Decals/DecalSystem.cs
index 101d077d49..ad225afe22 100644
--- a/Content.Server/Decals/DecalSystem.cs
+++ b/Content.Server/Decals/DecalSystem.cs
@@ -21,6 +21,7 @@
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using static Content.Shared.Decals.DecalGridComponent;
+using ChunkIndicesEnumerator = Robust.Shared.Map.Enumerators.ChunkIndicesEnumerator;
 
 namespace Content.Server.Decals
 {
@@ -70,7 +71,7 @@ public override void Initialize()
             SubscribeNetworkEvent<RequestDecalRemovalEvent>(OnDecalRemovalRequest);
             SubscribeLocalEvent<PostGridSplitEvent>(OnGridSplit);
 
-            _conf.OnValueChanged(CVars.NetPVS, OnPvsToggle, true);
+            Subs.CVar(_conf, CVars.NetPVS, OnPvsToggle, true);
         }
 
         private void OnPvsToggle(bool value)
@@ -153,7 +154,6 @@ public override void Shutdown()
             base.Shutdown();
 
             _playerManager.PlayerStatusChanged -= OnPlayerStatusChanged;
-            _conf.UnsubValueChanged(CVars.NetPVS, OnPvsToggle);
         }
 
         private void OnTileChanged(ref TileChangedEvent args)
diff --git a/Content.Server/DeltaV/StationEvents/Components/PirateRadioSpawnRuleComponent.cs b/Content.Server/DeltaV/StationEvents/Components/PirateRadioSpawnRuleComponent.cs
index 288fe2a37f..432fbfb4ac 100644
--- a/Content.Server/DeltaV/StationEvents/Components/PirateRadioSpawnRuleComponent.cs
+++ b/Content.Server/DeltaV/StationEvents/Components/PirateRadioSpawnRuleComponent.cs
@@ -1,6 +1,10 @@
+/*
+* Delta-V - This file is licensed under AGPLv3
+* Copyright (c) 2024 Delta-V Contributors
+* See AGPLv3.txt for details.
+*/
+
 using Content.Server.StationEvents.Events;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.StationEvents.Components;
 
@@ -12,4 +16,21 @@ public sealed partial class PirateRadioSpawnRuleComponent : Component
 
     [DataField("additionalRule")]
     public EntityUid? AdditionalRule;
+
+    [DataField("debrisCount")]
+    public int DebrisCount { get; set; }
+
+    [DataField("distanceModifier")]
+    public float DistanceModifier { get; set; }
+
+    [DataField("debrisDistanceModifier")]
+    public float DebrisDistanceModifier { get; set; }
+
+    /// <summary>
+    /// "Stations of Unusual Size Constant", derived from the AABB.Width of Shoukou.
+    /// This Constant is used to check the size of a station relative to the reference point
+    /// </summary>
+    [DataField("sousk")]
+    public float SOUSK = 123.44f;
+
 }
diff --git a/Content.Server/DeltaV/StationEvents/Events/PirateRadioSpawnRule.cs b/Content.Server/DeltaV/StationEvents/Events/PirateRadioSpawnRule.cs
index 499300dfe3..f0538c47f9 100644
--- a/Content.Server/DeltaV/StationEvents/Events/PirateRadioSpawnRule.cs
+++ b/Content.Server/DeltaV/StationEvents/Events/PirateRadioSpawnRule.cs
@@ -1,32 +1,94 @@
+/*
+* Delta-V - This file is licensed under AGPLv3
+* Copyright (c) 2024 Delta-V Contributors
+* See AGPLv3.txt for details.
+*/
+
 using Robust.Server.GameObjects;
 using Robust.Server.Maps;
+using Robust.Shared.Configuration;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Robust.Shared.Utility;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.Rules;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
-using Content.Server.RoundEnd;
+using Content.Server.Station.Components;
+using Content.Shared.Salvage;
+using Content.Shared.Random.Helpers;
+using System.Linq;
+using Content.Shared.CCVar;
 
 namespace Content.Server.StationEvents.Events;
 
 public sealed class PirateRadioSpawnRule : StationEventSystem<PirateRadioSpawnRuleComponent>
 {
+    [Dependency] private readonly IEntityManager _entities = default!;
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly MapLoaderSystem _map = default!;
-    [Dependency] private readonly GameTicker _gameTicker = default!;
-    [Dependency] private readonly TraitorRuleSystem _TraitorRuleSystem = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IConfigurationManager _confMan = default!;
 
     protected override void Started(EntityUid uid, PirateRadioSpawnRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
+        //Start of Syndicate Listening Outpost spawning system
         base.Started(uid, component, gameRule, args);
-		
-        var shuttleMap = _mapManager.CreateMap();
-        var options = new MapLoadOptions
+        var xformQuery = GetEntityQuery<TransformComponent>();
+        var aabbs = EntityQuery<StationDataComponent>().SelectMany(x =>
+                x.Grids.Select(x =>
+                    xformQuery.GetComponent(x).WorldMatrix.TransformBox(_mapManager.GetGridComp(x).LocalAABB)))
+            .ToArray();
+        if (aabbs.Length < 1) return;
+        var aabb = aabbs[0];
+
+        for (var i = 1; i < aabbs.Length; i++)
+        {
+            aabb.Union(aabbs[i]);
+        }
+        var distanceFactorCoefficient = component.SOUSK / aabb.Width;
+        var distanceModifier = Math.Clamp(component.DistanceModifier, 1, 25);
+        var distanceModifierNormalized = distanceModifier * distanceFactorCoefficient;
+        var a = MathF.Max(aabb.Height / 2f, aabb.Width / 2f) * distanceModifierNormalized;
+        var randomoffset = _random.NextVector2(a, a * 2.5f);
+        var outpostOptions = new MapLoadOptions
         {
-            LoadMap = true,
+            Offset = aabb.Center + randomoffset,
+            LoadMap = false,
         };
+        if (!_map.TryLoad(GameTicker.DefaultMap, component.PirateRadioShuttlePath, out var outpostids, outpostOptions)) return;
+        //End of Syndicate Listening Outpost spawning system
+
+        //Start of Debris Field Generation
+        var debrisSpawner = _confMan.GetCVar<bool>(CCVars.WorldgenEnabled);
+        if (debrisSpawner == true) return;
+        var debrisCount = Math.Clamp(component.DebrisCount, 0, 6);
+        if (debrisCount == 0) return;
+        var debrisDistanceModifier = Math.Clamp(component.DebrisDistanceModifier, 3, 10);
+        foreach (var id in outpostids)
+        {
+            if (!TryComp<MapGridComponent>(id, out var grid)) return;
+            var outpostaabb = _entities.GetComponent<TransformComponent>(id).WorldMatrix.TransformBox(grid.LocalAABB);
+            var b = MathF.Max(outpostaabb.Height / 2f, aabb.Width / 2f) * debrisDistanceModifier;
+            var k = 1;
+            while (k < debrisCount + 1)
+            {
+                var debrisRandomOffset = _random.NextVector2(b, b * 2.5f);
+                var randomer = _random.NextVector2(b, b * 5f); //Second random vector to ensure the outpost isn't perfectly centered in the debris field
+                var debrisOptions = new MapLoadOptions
+                {
+                    Offset = outpostaabb.Center + debrisRandomOffset + randomer,
+                    LoadMap = false,
+                };
 
-        _map.TryLoad(shuttleMap, component.PirateRadioShuttlePath, out _, options);
+                var salvageProto = _random.Pick(_prototypeManager.EnumeratePrototypes<SalvageMapPrototype>().ToList());
+                _map.TryLoad(GameTicker.DefaultMap, salvageProto.MapPath.ToString(), out _, debrisOptions);
+                k++;
+            }
+        }
+        //End of Debris Field generation
     }
 
     protected override void Ended(EntityUid uid, PirateRadioSpawnRuleComponent component, GameRuleComponent gameRule, GameRuleEndedEvent args)
@@ -36,4 +98,4 @@ protected override void Ended(EntityUid uid, PirateRadioSpawnRuleComponent compo
         if (component.AdditionalRule != null)
             GameTicker.EndGameRule(component.AdditionalRule.Value);
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
index 5b9b7596ef..ed5777c42a 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
@@ -31,29 +31,38 @@ public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause
 
             var getRandomVector = () => new Vector2(system.Random.NextFloat(-Offset, Offset), system.Random.NextFloat(-Offset, Offset));
 
-            foreach (var (entityId, minMax) in Spawn)
+            var executions = 1;
+            if (system.EntityManager.TryGetComponent<StackComponent>(owner, out var stack))
             {
-                var count = minMax.Min >= minMax.Max
-                    ? minMax.Min
-                    : system.Random.Next(minMax.Min, minMax.Max + 1);
-
-                if (count == 0) continue;
+                executions = stack.Count;
+            }
 
-                if (EntityPrototypeHelpers.HasComponent<StackComponent>(entityId, system.PrototypeManager, system.ComponentFactory))
+            foreach (var (entityId, minMax) in Spawn)
+            {
+                for (var execution = 0; execution < executions; execution++)
                 {
-                    var spawned = system.EntityManager.SpawnEntity(entityId, position.Offset(getRandomVector()));
-                    system.StackSystem.SetCount(spawned, count);
+                    var count = minMax.Min >= minMax.Max
+                        ? minMax.Min
+                        : system.Random.Next(minMax.Min, minMax.Max + 1);
 
-                    TransferForensics(spawned, system, owner);
-                }
-                else
-                {
-                    for (var i = 0; i < count; i++)
+                    if (count == 0) continue;
+
+                    if (EntityPrototypeHelpers.HasComponent<StackComponent>(entityId, system.PrototypeManager, system.ComponentFactory))
                     {
                         var spawned = system.EntityManager.SpawnEntity(entityId, position.Offset(getRandomVector()));
+                        system.StackSystem.SetCount(spawned, count);
 
                         TransferForensics(spawned, system, owner);
                     }
+                    else
+                    {
+                        for (var i = 0; i < count; i++)
+                        {
+                            var spawned = system.EntityManager.SpawnEntity(entityId, position.Offset(getRandomVector()));
+
+                            TransferForensics(spawned, system, owner);
+                        }
+                    }
                 }
             }
         }
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs
index 9e22510307..38564380c0 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs
@@ -1,6 +1,6 @@
 using Content.Server.Chemistry.Containers.EntitySystems;
-using Content.Server.Fluids.Components;
 using Content.Server.Fluids.EntitySystems;
+using Content.Shared.Fluids.Components;
 using JetBrains.Annotations;
 
 namespace Content.Server.Destructible.Thresholds.Behaviors
diff --git a/Content.Server/DeviceLinking/Components/TwoWayLeverComponent.cs b/Content.Server/DeviceLinking/Components/TwoWayLeverComponent.cs
deleted file mode 100644
index bbf78b6876..0000000000
--- a/Content.Server/DeviceLinking/Components/TwoWayLeverComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Shared.DeviceLinking;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.DeviceLinking.Components
-{
-    [RegisterComponent]
-    public sealed partial class TwoWayLeverComponent : Component
-    {
-        [DataField("state")]
-        public TwoWayLeverState State;
-
-        [DataField("nextSignalLeft")]
-        public bool NextSignalLeft;
-
-        [DataField("leftPort", customTypeSerializer: typeof(PrototypeIdSerializer<SourcePortPrototype>))]
-        public string LeftPort = "Left";
-
-        [DataField("rightPort", customTypeSerializer: typeof(PrototypeIdSerializer<SourcePortPrototype>))]
-        public string RightPort = "Right";
-
-        [DataField("middlePort", customTypeSerializer: typeof(PrototypeIdSerializer<SourcePortPrototype>))]
-        public string MiddlePort = "Middle";
-    }
-}
diff --git a/Content.Server/DeviceLinking/Events/SignalReceivedEvent.cs b/Content.Server/DeviceLinking/Events/SignalReceivedEvent.cs
index c1928575fe..c8c611103d 100644
--- a/Content.Server/DeviceLinking/Events/SignalReceivedEvent.cs
+++ b/Content.Server/DeviceLinking/Events/SignalReceivedEvent.cs
@@ -1,4 +1,5 @@
 using Content.Server.DeviceNetwork;
+using Content.Shared.DeviceNetwork;
 
 namespace Content.Server.DeviceLinking.Events;
 
diff --git a/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs b/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs
index 47f632843d..f708237480 100644
--- a/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs
@@ -1,9 +1,11 @@
-using Content.Server.DeviceLinking.Components;
-using Content.Server.DeviceLinking.Events;
+using Content.Server.DeviceLinking.Components;
+using Content.Server.DeviceLinking.Events;
 using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Shared.DeviceLinking;
+using Content.Shared.DeviceLinking.Events;
+using Content.Shared.DeviceNetwork;
 
 namespace Content.Server.DeviceLinking.Systems;
 
@@ -14,7 +16,9 @@ public sealed class DeviceLinkSystem : SharedDeviceLinkSystem
     public override void Initialize()
     {
         base.Initialize();
+
         SubscribeLocalEvent<DeviceLinkSinkComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
+        SubscribeLocalEvent<DeviceLinkSourceComponent, NewLinkEvent>(OnNewLink);
     }
 
     public override void Update(float frameTime)
@@ -35,15 +39,7 @@ public override void Update(float frameTime)
     }
 
     #region Sending & Receiving
-    /// <summary>
-    /// Sends a network payload directed at the sink entity.
-    /// Just raises a <see cref="SignalReceivedEvent"/> without data if the source or the sink doesn't have a <see cref="DeviceNetworkComponent"/>
-    /// </summary>
-    /// <param name="uid">The source uid that invokes the port</param>
-    /// <param name="port">The port to invoke</param>
-    /// <param name="data">Optional data to send along</param>
-    /// <param name="sourceComponent"></param>
-    public void InvokePort(EntityUid uid, string port, NetworkPayload? data = null, DeviceLinkSourceComponent? sourceComponent = null)
+    public override void InvokePort(EntityUid uid, string port, NetworkPayload? data = null, DeviceLinkSourceComponent? sourceComponent = null)
     {
         if (!Resolve(uid, ref sourceComponent) || !sourceComponent.Outputs.TryGetValue(port, out var sinks))
             return;
@@ -58,61 +54,87 @@ public void InvokePort(EntityUid uid, string port, NetworkPayload? data = null,
 
             foreach (var (source, sink) in links)
             {
-                if (source != port)
-                    continue;
-
-                if (sinkComponent.InvokeCounter > sinkComponent.InvokeLimit)
-                {
-                    sinkComponent.InvokeCounter = 0;
-                    var args = new DeviceLinkOverloadedEvent();
-                    RaiseLocalEvent(sinkUid, ref args);
-                    RemoveAllFromSink(sinkUid, sinkComponent);
-                    continue;
-                }
-
-                sinkComponent.InvokeCounter++;
-
-                //Just skip using device networking if the source or the sink doesn't support it
-                if (!HasComp<DeviceNetworkComponent>(uid) || !TryComp<DeviceNetworkComponent>(sinkUid, out var sinkNetworkComponent))
-                {
-                    var eventArgs = new SignalReceivedEvent(sink, uid);
-
-                    RaiseLocalEvent(sinkUid, ref eventArgs);
-                    continue;
-                }
-
-                var payload = new NetworkPayload()
-                {
-                    [InvokedPort] = sink
-                };
-
-                if (data != null)
-                {
-                    //Prevent overriding the invoked port
-                    data.Remove(InvokedPort);
-                    foreach (var (key, value) in data)
-                    {
-                        payload.Add(key, value);
-                    }
-                }
-
-                // force using wireless network so things like atmos devices are able to send signals
-                var network = (int) DeviceNetworkComponent.DeviceNetIdDefaults.Wireless;
-                _deviceNetworkSystem.QueuePacket(uid, sinkNetworkComponent.Address, payload, sinkNetworkComponent.ReceiveFrequency, network);
+                if (source == port)
+                    InvokeDirect((uid, sourceComponent), (sinkUid, sinkComponent), source, sink, data);
             }
         }
     }
 
+    /// <summary>
+    /// Raises an event on or sends a network packet directly to a sink from a source.
+    /// </summary>
+    private void InvokeDirect(Entity<DeviceLinkSourceComponent> source, Entity<DeviceLinkSinkComponent?> sink, string sourcePort, string sinkPort, NetworkPayload? data)
+    {
+        if (!Resolve(sink, ref sink.Comp))
+            return;
+
+        if (sink.Comp.InvokeCounter > sink.Comp.InvokeLimit)
+        {
+            sink.Comp.InvokeCounter = 0;
+            var args = new DeviceLinkOverloadedEvent();
+            RaiseLocalEvent(sink, ref args);
+            RemoveAllFromSink(sink, sink.Comp);
+            return;
+        }
+
+        sink.Comp.InvokeCounter++;
+
+        //Just skip using device networking if the source or the sink doesn't support it
+        if (!HasComp<DeviceNetworkComponent>(source) || !TryComp<DeviceNetworkComponent>(sink, out var sinkNetwork))
+        {
+            var eventArgs = new SignalReceivedEvent(sinkPort, source);
+            RaiseLocalEvent(sink, ref eventArgs);
+            return;
+        }
+
+        var payload = new NetworkPayload()
+        {
+            [InvokedPort] = sinkPort
+        };
+
+        if (data != null)
+        {
+            //Prevent overriding the invoked port
+            data.Remove(InvokedPort);
+            foreach (var (key, value) in data)
+            {
+                payload.Add(key, value);
+            }
+        }
+
+        // force using wireless network so things like atmos devices are able to send signals
+        var network = (int) DeviceNetworkComponent.DeviceNetIdDefaults.Wireless;
+        _deviceNetworkSystem.QueuePacket(source, sinkNetwork.Address, payload, sinkNetwork.ReceiveFrequency, network);
+    }
+
     /// <summary>
     /// Helper function that invokes a port with a high/low binary logic signal.
     /// </summary>
     public void SendSignal(EntityUid uid, string port, bool signal, DeviceLinkSourceComponent? comp = null)
     {
+        if (!Resolve(uid, ref comp))
+            return;
+
         var data = new NetworkPayload
         {
             [DeviceNetworkConstants.LogicState] = signal ? SignalState.High : SignalState.Low
         };
         InvokePort(uid, port, data, comp);
+
+        comp.LastSignals[port] = signal;
+    }
+
+    /// <summary>
+    /// Clears the last signals state for linking.
+    /// This is not to be confused with sending a low signal, this is the complete absence of anything.
+    /// Use if the device is in an invalid state and has no reasonable output signal.
+    /// </summary>
+    public void ClearSignal(Entity<DeviceLinkSourceComponent?> ent, string port)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        ent.Comp.LastSignals.Remove(port);
     }
 
     /// <summary>
@@ -127,5 +149,24 @@ private void OnPacketReceived(EntityUid uid, DeviceLinkSinkComponent component,
         var eventArgs = new SignalReceivedEvent(port, args.Sender, args.Data);
         RaiseLocalEvent(uid,  ref eventArgs);
     }
+
+    /// <summary>
+    /// When linking from a port that currently has a signal being sent, invoke the new link with that signal.
+    /// </summary>
+    private void OnNewLink(Entity<DeviceLinkSourceComponent> ent, ref NewLinkEvent args)
+    {
+        if (args.Source != ent.Owner)
+            return;
+
+        // only do anything if a signal is being sent from a port
+        if (!ent.Comp.LastSignals.TryGetValue(args.SourcePort, out var signal))
+            return;
+
+        var payload = new NetworkPayload()
+        {
+            [DeviceNetworkConstants.LogicState] = signal ? SignalState.High : SignalState.Low
+        };
+        InvokeDirect(ent, args.Sink, args.SourcePort, args.SinkPort, payload);
+    }
     #endregion
 }
diff --git a/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs b/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs
index 90623dbae3..fab9a306ae 100644
--- a/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.DeviceLinking.Components;
 using Content.Server.DeviceNetwork;
 using Content.Server.Doors.Systems;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors;
 using JetBrains.Annotations;
@@ -11,7 +12,6 @@ namespace Content.Server.DeviceLinking.Systems
     [UsedImplicitly]
     public sealed class DoorSignalControlSystem : EntitySystem
     {
-        [Dependency] private readonly DoorBoltSystem _bolts = default!;
         [Dependency] private readonly DoorSystem _doorSystem = default!;
         [Dependency] private readonly DeviceLinkSystem _signalSystem = default!;
 
@@ -78,29 +78,24 @@ private void OnSignalReceived(EntityUid uid, DoorSignalControlComponent componen
                     bolt = state == SignalState.High;
                 }
 
-                _bolts.SetBoltsWithAudio(uid, bolts, bolt);
+                _doorSystem.SetBoltsDown((uid, bolts), bolt);
             }
         }
 
         private void OnStateChanged(EntityUid uid, DoorSignalControlComponent door, DoorStateChangedEvent args)
         {
-            var data = new NetworkPayload()
-            {
-                { DeviceNetworkConstants.LogicState, SignalState.Momentary }
-            };
-
             if (args.State == DoorState.Closed)
             {
-                data[DeviceNetworkConstants.LogicState] = SignalState.Low;
-                _signalSystem.InvokePort(uid, door.OutOpen, data);
+                // only ever say the door is closed when it is completely airtight
+                _signalSystem.SendSignal(uid, door.OutOpen, false);
             }
             else if (args.State == DoorState.Open
                   || args.State == DoorState.Opening
                   || args.State == DoorState.Closing
                   || args.State == DoorState.Emagging)
             {
-                data[DeviceNetworkConstants.LogicState] = SignalState.High;
-                _signalSystem.InvokePort(uid, door.OutOpen, data);
+                // say the door is open whenever it would be letting air pass
+                _signalSystem.SendSignal(uid, door.OutOpen, true);
             }
         }
     }
diff --git a/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs b/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
index 0426ee7cc3..f9c2d3430e 100644
--- a/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
@@ -68,7 +68,7 @@ public void Trigger(EntityUid uid, SignalTimerComponent signalTimer)
 
         if (TryComp<AppearanceComponent>(uid, out var appearance))
         {
-            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, new[] { signalTimer.Label }, appearance);
+            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, signalTimer.Label, appearance);
         }
 
         _audio.PlayPvs(signalTimer.DoneSound, uid);
@@ -142,7 +142,7 @@ private void OnTextChangedMessage(EntityUid uid, SignalTimerComponent component,
         component.Label = args.Text[..Math.Min(5, args.Text.Length)];
 
         if (!HasComp<ActiveSignalTimerComponent>(uid))
-            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, new string?[] { component.Label });
+            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, component.Label);
     }
 
     /// <summary>
@@ -186,7 +186,7 @@ public void OnStartTimer(EntityUid uid, SignalTimerComponent component)
         if (appearance != null)
         {
             _appearanceSystem.SetData(uid, TextScreenVisuals.TargetTime, timer.TriggerTime, appearance);
-            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, new string?[] { }, appearance);
+            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, string.Empty, appearance);
         }
 
         _signalSystem.InvokePort(uid, component.StartPort);
diff --git a/Content.Server/DeviceNetwork/Components/SingletonDeviceNetServerComponent.cs b/Content.Server/DeviceNetwork/Components/SingletonDeviceNetServerComponent.cs
new file mode 100644
index 0000000000..48272ff041
--- /dev/null
+++ b/Content.Server/DeviceNetwork/Components/SingletonDeviceNetServerComponent.cs
@@ -0,0 +1,20 @@
+using Content.Server.DeviceNetwork.Systems;
+
+namespace Content.Server.DeviceNetwork.Components;
+
+[RegisterComponent]
+[Access(typeof(SingletonDeviceNetServerSystem))]
+public sealed partial class SingletonDeviceNetServerComponent : Component
+{
+    /// <summary>
+    /// Whether the server can become the currently active server. The server being unavailable usually means that it isn't powered
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public bool Available = true;
+
+    /// <summary>
+    /// Whether the server is the currently active server for the station it's on
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public bool Active = true;
+}
diff --git a/Content.Server/DeviceNetwork/NetworkPayload.cs b/Content.Server/DeviceNetwork/NetworkPayload.cs
deleted file mode 100644
index eefbaa6eea..0000000000
--- a/Content.Server/DeviceNetwork/NetworkPayload.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Robust.Shared.Utility;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Content.Server.DeviceNetwork
-{
-    public sealed class NetworkPayload : Dictionary<string, object?>
-    {
-        /// <summary>
-        /// Tries to get a value from the payload and checks if that value is of type  T.
-        /// </summary>
-        /// <typeparam name="T">The type that should be casted to</typeparam>
-        /// <returns>Whether the value was present in the payload and of the required type</returns>
-        public bool TryGetValue<T>(string key, [NotNullWhen(true)] out T? value)
-        {
-            if (this.TryCastValue(key, out T? result))
-            {
-                value = result;
-                return true;
-            }
-
-            value = default;
-            return false;
-        }
-    }
-
-}
diff --git a/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs b/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs
index 11dc628df1..9a4a81a4c0 100644
--- a/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs
+++ b/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Components.Devices;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Interaction;
 
 namespace Content.Server.DeviceNetwork.Systems.Devices
diff --git a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs
new file mode 100644
index 0000000000..fd62514d00
--- /dev/null
+++ b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs
@@ -0,0 +1,137 @@
+using Content.Server.DeviceNetwork.Components;
+using Content.Server.Medical.CrewMonitoring;
+using Content.Server.Power.Components;
+using Content.Server.Station.Systems;
+
+namespace Content.Server.DeviceNetwork.Systems;
+
+/// <summary>
+/// Keeps one active server entity per station. Activates another available one if the currently active server becomes unavailable
+/// Server in this context means an entity that manages the devicenet packets like the <see cref="Content.Server.Medical.CrewMonitoring.CrewMonitoringServerSystem"/>
+/// </summary>
+public sealed class SingletonDeviceNetServerSystem : EntitySystem
+{
+    [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
+    [Dependency] private readonly StationSystem _stationSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<SingletonDeviceNetServerComponent, PowerChangedEvent>(OnPowerChanged);
+    }
+
+    /// <summary>
+    /// Returns whether the given entity is an active server or not
+    /// </summary>
+    public bool IsActiveServer(EntityUid serverId, SingletonDeviceNetServerComponent? serverComponent = default)
+    {
+        return Resolve(serverId, ref serverComponent) && serverComponent.Active;
+    }
+
+    /// <summary>
+    /// Returns the address of the currently active server for the given station id if there is one.<br/>
+    /// What kind of server you're trying to get the active instance of is determined by the component type parameter TComp.<br/>
+    /// <br/>
+    /// Setting TComp to <see cref="CrewMonitoringServerComponent"/>, for example, gives you the address of an entity containing the crew monitoring server component.<br/>
+    /// </summary>
+    /// <param name="stationId">The entityUid of the station</param>
+    /// <param name="address">The address of the active server if it exists</param>
+    /// <typeparam name="TComp">The component type that determines what type of server you're getting the address of</typeparam>
+    /// <returns>True if there is an active serve. False otherwise</returns>
+    public bool TryGetActiveServerAddress<TComp>(EntityUid stationId, out string? address) where TComp : IComponent
+    {
+        var servers = EntityQueryEnumerator<
+            SingletonDeviceNetServerComponent,
+            DeviceNetworkComponent,
+            TComp
+        >();
+
+        (EntityUid id, SingletonDeviceNetServerComponent server, DeviceNetworkComponent device)? last = default;
+
+        while (servers.MoveNext(out var uid, out var server, out var device, out _))
+        {
+            if (!_stationSystem.GetOwningStation(uid)?.Equals(stationId) ?? true)
+                continue;
+
+            if (!server.Available)
+            {
+                DisconnectServer(uid,server, device);
+                continue;
+            }
+
+            last = (uid, server, device);
+
+            if (!server.Active)
+                continue;
+
+            address = device.Address;
+            return true;
+        }
+
+        //If there was no active server for the station make the last available inactive one active
+        if (last.HasValue)
+        {
+            ConnectServer(last.Value.id, last.Value.server, last.Value.device);
+            address = last.Value.device.Address;
+            return true;
+        }
+
+        address = null;
+        return address != null;
+    }
+
+    /// <summary>
+    /// Disconnects the server losing power
+    /// </summary>
+    private void OnPowerChanged(EntityUid uid, SingletonDeviceNetServerComponent component, ref PowerChangedEvent args)
+    {
+        component.Available = args.Powered;
+
+        if (!args.Powered && component.Active)
+            DisconnectServer(uid, component);
+    }
+
+    private void ConnectServer(EntityUid uid, SingletonDeviceNetServerComponent? server = null, DeviceNetworkComponent? device = null)
+    {
+        if (!Resolve(uid, ref server, ref device))
+            return;
+
+        server.Active = true;
+
+        var connectedEvent = new DeviceNetServerConnectedEvent();
+        RaiseLocalEvent(uid, ref connectedEvent);
+
+        if (_deviceNetworkSystem.IsDeviceConnected(uid, device))
+            return;
+
+        _deviceNetworkSystem.ConnectDevice(uid, device);
+    }
+
+    /// <summary>
+    /// Disconnects a server from the device network and clears the currently active server
+    /// </summary>
+    private void DisconnectServer(EntityUid uid, SingletonDeviceNetServerComponent? server = null, DeviceNetworkComponent? device = null)
+    {
+        if (!Resolve(uid, ref server, ref device))
+            return;
+
+        server.Active = false;
+
+        var disconnectedEvent = new DeviceNetServerDisconnectedEvent();
+        RaiseLocalEvent(uid, ref disconnectedEvent);
+
+        _deviceNetworkSystem.DisconnectDevice(uid, device, false);
+    }
+}
+
+/// <summary>
+/// Raised when a server gets activated and connected to the device net
+/// </summary>
+[ByRefEvent]
+public record struct DeviceNetServerConnectedEvent;
+
+/// <summary>
+/// Raised when a server gets disconnected
+/// </summary>
+[ByRefEvent]
+public record struct DeviceNetServerDisconnectedEvent;
diff --git a/Content.Server/Disposal/Mailing/MailingUnitSystem.cs b/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
index 1a819ab0fb..001abad3dc 100644
--- a/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
+++ b/Content.Server/Disposal/Mailing/MailingUnitSystem.cs
@@ -4,6 +4,7 @@
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Disposal.Unit.EntitySystems;
 using Content.Server.Power.Components;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Disposal;
 using Content.Shared.Interaction;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
index 0dfc1ffe0d..6938792315 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -68,7 +68,6 @@ public override void Initialize()
 
         // Shouldn't need re-anchoring.
         SubscribeLocalEvent<DisposalUnitComponent, AnchorStateChangedEvent>(OnAnchorChanged);
-        SubscribeLocalEvent<DisposalUnitComponent, EntityUnpausedEvent>(OnUnpaused);
         // TODO: Predict me when hands predicted
         SubscribeLocalEvent<DisposalUnitComponent, ContainerRelayMovementEntityEvent>(OnMovement);
         SubscribeLocalEvent<DisposalUnitComponent, PowerChangedEvent>(OnPowerChange);
@@ -103,14 +102,6 @@ private void OnGetState(EntityUid uid, DisposalUnitComponent component, ref Comp
             GetNetEntityList(component.RecentlyEjected));
     }
 
-    private void OnUnpaused(EntityUid uid, SharedDisposalUnitComponent component, ref EntityUnpausedEvent args)
-    {
-        if (component.NextFlush != null)
-            component.NextFlush = component.NextFlush.Value + args.PausedTime;
-
-        component.NextPressurized += args.PausedTime;
-    }
-
     private void AddDisposalAltVerbs(EntityUid uid, SharedDisposalUnitComponent component, GetVerbsEvent<AlternativeVerb> args)
     {
         if (!args.CanAccess || !args.CanInteract)
@@ -198,7 +189,7 @@ private void OnDoAfter(EntityUid uid, SharedDisposalUnitComponent component, DoA
         if (args.Handled || args.Cancelled || args.Args.Target == null || args.Args.Used == null)
             return;
 
-        AfterInsert(uid, component, args.Args.Target.Value, args.Args.User);
+        AfterInsert(uid, component, args.Args.Target.Value, args.Args.User, doInsert: true);
 
         args.Handled = true;
     }
@@ -512,7 +503,7 @@ public bool TryInsert(EntityUid unitId, EntityUid toInsertId, EntityUid? userId,
 
         if (delay <= 0 || userId == null)
         {
-            AfterInsert(unitId, unit, toInsertId, userId);
+            AfterInsert(unitId, unit, toInsertId, userId, doInsert: true);
             return true;
         }
 
@@ -796,11 +787,11 @@ public void QueueAutomaticEngage(EntityUid uid, SharedDisposalUnitComponent comp
         Dirty(component);
     }
 
-    public void AfterInsert(EntityUid uid, SharedDisposalUnitComponent component, EntityUid inserted, EntityUid? user = null)
+    public void AfterInsert(EntityUid uid, SharedDisposalUnitComponent component, EntityUid inserted, EntityUid? user = null, bool doInsert = false)
     {
         _audioSystem.PlayPvs(component.InsertSound, uid);
 
-        if (!_containerSystem.Insert(inserted, component.Container))
+        if (doInsert && !_containerSystem.Insert(inserted, component.Container))
             return;
 
         if (user != inserted && user != null)
diff --git a/Content.Server/Doors/Systems/AirlockSystem.cs b/Content.Server/Doors/Systems/AirlockSystem.cs
index 6d9cde8eb4..71f9347e9e 100644
--- a/Content.Server/Doors/Systems/AirlockSystem.cs
+++ b/Content.Server/Doors/Systems/AirlockSystem.cs
@@ -1,13 +1,10 @@
 using Content.Server.DeviceLinking.Events;
 using Content.Server.Power.Components;
-using Content.Server.Power.EntitySystems;
 using Content.Server.Wires;
-using Content.Shared.Doors;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
 using Content.Shared.Interaction;
 using Content.Shared.Wires;
-using Content.Shared.Prying.Components;
 using Robust.Shared.Player;
 
 namespace Content.Server.Doors.Systems;
@@ -15,8 +12,6 @@ namespace Content.Server.Doors.Systems;
 public sealed class AirlockSystem : SharedAirlockSystem
 {
     [Dependency] private readonly WiresSystem _wiresSystem = default!;
-    [Dependency] private readonly PowerReceiverSystem _power = default!;
-    [Dependency] private readonly DoorBoltSystem _bolts = default!;
 
     public override void Initialize()
     {
@@ -26,13 +21,7 @@ public override void Initialize()
         SubscribeLocalEvent<AirlockComponent, SignalReceivedEvent>(OnSignalReceived);
 
         SubscribeLocalEvent<AirlockComponent, PowerChangedEvent>(OnPowerChanged);
-        SubscribeLocalEvent<AirlockComponent, DoorStateChangedEvent>(OnStateChanged);
-        SubscribeLocalEvent<AirlockComponent, BeforeDoorOpenedEvent>(OnBeforeDoorOpened);
-        SubscribeLocalEvent<AirlockComponent, BeforeDoorDeniedEvent>(OnBeforeDoorDenied);
         SubscribeLocalEvent<AirlockComponent, ActivateInWorldEvent>(OnActivate, before: new[] { typeof(DoorSystem) });
-        SubscribeLocalEvent<AirlockComponent, GetPryTimeModifierEvent>(OnGetPryMod);
-        SubscribeLocalEvent<AirlockComponent, BeforePryEvent>(OnBeforePry);
-
     }
 
     private void OnAirlockInit(EntityUid uid, AirlockComponent component, ComponentInit args)
@@ -53,6 +42,9 @@ private void OnSignalReceived(EntityUid uid, AirlockComponent component, ref Sig
 
     private void OnPowerChanged(EntityUid uid, AirlockComponent component, ref PowerChangedEvent args)
     {
+        component.Powered = args.Powered;
+        Dirty(uid, component);
+
         if (TryComp<AppearanceComponent>(uid, out var appearanceComponent))
         {
             Appearance.SetData(uid, DoorVisuals.Powered, args.Powered, appearanceComponent);
@@ -73,80 +65,6 @@ private void OnPowerChanged(EntityUid uid, AirlockComponent component, ref Power
         }
     }
 
-    private void OnStateChanged(EntityUid uid, AirlockComponent component, DoorStateChangedEvent args)
-    {
-        // TODO move to shared? having this be server-side, but having client-side door opening/closing & prediction
-        // means that sometimes the panels & bolt lights may be visible despite a door being completely open.
-
-        // Only show the maintenance panel if the airlock is closed
-        if (TryComp<WiresPanelComponent>(uid, out var wiresPanel))
-        {
-            _wiresSystem.ChangePanelVisibility(uid, wiresPanel, component.OpenPanelVisible || args.State != DoorState.Open);
-        }
-        // If the door is closed, we should look if the bolt was locked while closing
-        UpdateAutoClose(uid, component);
-
-        // Make sure the airlock auto closes again next time it is opened
-        if (args.State == DoorState.Closed)
-            component.AutoClose = true;
-    }
-
-    /// <summary>
-    /// Updates the auto close timer.
-    /// </summary>
-    public void UpdateAutoClose(EntityUid uid, AirlockComponent? airlock = null, DoorComponent? door = null)
-    {
-        if (!Resolve(uid, ref airlock, ref door))
-            return;
-
-        if (door.State != DoorState.Open)
-            return;
-
-        if (!airlock.AutoClose)
-            return;
-
-        if (!CanChangeState(uid, airlock))
-            return;
-
-        var autoev = new BeforeDoorAutoCloseEvent();
-        RaiseLocalEvent(uid, autoev, false);
-        if (autoev.Cancelled)
-            return;
-
-        DoorSystem.SetNextStateChange(uid, airlock.AutoCloseDelay * airlock.AutoCloseDelayModifier);
-    }
-
-    private void OnBeforeDoorOpened(EntityUid uid, AirlockComponent component, BeforeDoorOpenedEvent args)
-    {
-        if (!CanChangeState(uid, component))
-            args.Cancel();
-    }
-
-    protected override void OnBeforeDoorClosed(EntityUid uid, AirlockComponent component, BeforeDoorClosedEvent args)
-    {
-        base.OnBeforeDoorClosed(uid, component, args);
-
-        if (args.Cancelled)
-            return;
-
-        // only block based on bolts / power status when initially closing the door, not when its already
-        // mid-transition. Particularly relevant for when the door was pried-closed with a crowbar, which bypasses
-        // the initial power-check.
-
-        if (TryComp(uid, out DoorComponent? door)
-            && !door.Partial
-            && !CanChangeState(uid, component))
-        {
-            args.Cancel();
-        }
-    }
-
-    private void OnBeforeDoorDenied(EntityUid uid, AirlockComponent component, BeforeDoorDeniedEvent args)
-    {
-        if (!CanChangeState(uid, component))
-            args.Cancel();
-    }
-
     private void OnActivate(EntityUid uid, AirlockComponent component, ActivateInWorldEvent args)
     {
         if (TryComp<WiresPanelComponent>(uid, out var panel) &&
@@ -168,32 +86,4 @@ private void OnActivate(EntityUid uid, AirlockComponent component, ActivateInWor
             component.AutoClose = false;
         }
     }
-
-    private void OnGetPryMod(EntityUid uid, AirlockComponent component, ref GetPryTimeModifierEvent args)
-    {
-        if (_power.IsPowered(uid))
-            args.PryTimeModifier *= component.PoweredPryModifier;
-
-        if (_bolts.IsBolted(uid))
-            args.PryTimeModifier *= component.BoltedPryModifier;
-    }
-
-    private void OnBeforePry(EntityUid uid, AirlockComponent component, ref BeforePryEvent args)
-    {
-        if (args.Cancelled)
-            return;
-
-        if (!this.IsPowered(uid, EntityManager) || args.PryPowered)
-            return;
-
-        args.Message = "airlock-component-cannot-pry-is-powered-message";
-
-        args.Cancelled = true;
-
-    }
-
-    public bool CanChangeState(EntityUid uid, AirlockComponent component)
-    {
-        return this.IsPowered(uid, EntityManager) && !_bolts.IsBolted(uid);
-    }
 }
diff --git a/Content.Server/Doors/Systems/DoorBoltSystem.cs b/Content.Server/Doors/Systems/DoorBoltSystem.cs
deleted file mode 100644
index 133af0013d..0000000000
--- a/Content.Server/Doors/Systems/DoorBoltSystem.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using Content.Server.Power.Components;
-using Content.Server.Power.EntitySystems;
-using Content.Shared.Doors;
-using Content.Shared.Doors.Components;
-using Content.Shared.Doors.Systems;
-
-namespace Content.Server.Doors.Systems;
-
-public sealed class DoorBoltSystem : SharedDoorBoltSystem
-{
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<DoorBoltComponent, PowerChangedEvent>(OnPowerChanged);
-        SubscribeLocalEvent<DoorBoltComponent, DoorStateChangedEvent>(OnStateChanged);
-    }
-
-    private void OnPowerChanged(EntityUid uid, DoorBoltComponent component, ref PowerChangedEvent args)
-    {
-        if (args.Powered)
-        {
-            if (component.BoltWireCut)
-                SetBoltsWithAudio(uid, component, true);
-        }
-
-        UpdateBoltLightStatus(uid, component);
-    }
-
-    public void UpdateBoltLightStatus(EntityUid uid, DoorBoltComponent component)
-    {
-        if (!TryComp<AppearanceComponent>(uid, out var appearance))
-            return;
-
-        Appearance.SetData(uid, DoorVisuals.BoltLights, GetBoltLightsVisible(uid, component), appearance);
-    }
-
-    public bool GetBoltLightsVisible(EntityUid uid, DoorBoltComponent component)
-    {
-        return component.BoltLightsEnabled &&
-               component.BoltsDown &&
-               this.IsPowered(uid, EntityManager);
-    }
-
-    public void SetBoltLightsEnabled(EntityUid uid, DoorBoltComponent component, bool value)
-    {
-        if (component.BoltLightsEnabled == value)
-            return;
-
-        component.BoltLightsEnabled = value;
-        UpdateBoltLightStatus(uid, component);
-    }
-
-    public void SetBoltsDown(EntityUid uid, DoorBoltComponent component, bool value)
-    {
-        if (component.BoltsDown == value)
-            return;
-
-        component.BoltsDown = value;
-        UpdateBoltLightStatus(uid, component);
-    }
-
-    private void OnStateChanged(EntityUid uid, DoorBoltComponent component, DoorStateChangedEvent args)
-    {
-        // If the door is closed, we should look if the bolt was locked while closing
-        UpdateBoltLightStatus(uid, component);
-    }
-
-    public void SetBoltsWithAudio(EntityUid uid, DoorBoltComponent component, bool newBolts)
-    {
-        if (newBolts == component.BoltsDown)
-            return;
-
-        component.BoltsDown = newBolts;
-        Audio.PlayPvs(newBolts ? component.BoltDownSound : component.BoltUpSound, uid);
-        UpdateBoltLightStatus(uid, component);
-    }
-
-    public bool IsBolted(EntityUid uid, DoorBoltComponent? component = null)
-    {
-        if (!Resolve(uid, ref component))
-        {
-            return false;
-        }
-
-        return component.BoltsDown;
-    }
-}
-
diff --git a/Content.Server/Doors/Systems/DoorSystem.cs b/Content.Server/Doors/Systems/DoorSystem.cs
index d59ea59622..5968e445c1 100644
--- a/Content.Server/Doors/Systems/DoorSystem.cs
+++ b/Content.Server/Doors/Systems/DoorSystem.cs
@@ -1,49 +1,22 @@
 using Content.Server.Access;
-using Content.Server.Administration.Logs;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
-using Content.Server.Power.EntitySystems;
-using Content.Shared.Database;
+using Content.Server.Power.Components;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
-using Content.Shared.Emag.Systems;
-using Content.Shared.Interaction;
-using Content.Shared.Prying.Components;
-using Content.Shared.Prying.Systems;
-using Content.Shared.Tools.Systems;
-using Robust.Shared.Audio;
 using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Events;
 
 namespace Content.Server.Doors.Systems;
 
 public sealed class DoorSystem : SharedDoorSystem
 {
-    [Dependency] private readonly IAdminLogManager _adminLog = default!;
-    [Dependency] private readonly DoorBoltSystem _bolts = default!;
     [Dependency] private readonly AirtightSystem _airtightSystem = default!;
-    [Dependency] private readonly PryingSystem _pryingSystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<DoorComponent, WeldableAttemptEvent>(OnWeldAttempt);
-        SubscribeLocalEvent<DoorComponent, WeldableChangedEvent>(OnWeldChanged);
-        SubscribeLocalEvent<DoorComponent, GotEmaggedEvent>(OnEmagged);
-        SubscribeLocalEvent<DoorComponent, PriedEvent>(OnAfterPry);
-    }
-
-    protected override void OnActivate(EntityUid uid, DoorComponent door, ActivateInWorldEvent args)
-    {
-        // TODO once access permissions are shared, move this back to shared.
-        if (args.Handled || !door.ClickOpen)
-            return;
-
-        if (!TryToggleDoor(uid, door, args.User))
-            _pryingSystem.TryPry(uid, args.User, out _);
-
-        args.Handled = true;
+        SubscribeLocalEvent<DoorBoltComponent, PowerChangedEvent>(OnBoltPowerChanged);
     }
 
     protected override void SetCollidable(
@@ -65,144 +38,16 @@ protected override void SetCollidable(
         base.SetCollidable(uid, collidable, door, physics, occluder);
     }
 
-    // TODO AUDIO PREDICT Figure out a better way to handle sound and prediction. For now, this works well enough?
-    //
-    // Currently a client will predict when a door is going to close automatically. So any client in PVS range can just
-    // play their audio locally. Playing it server-side causes an odd delay, while in shared it causes double-audio.
-    //
-    // But if we just do that, then if a door is closed prematurely as the result of an interaction (i.e., using "E" on
-    // an open door), then the audio would only be played for the client performing the interaction.
-    //
-    // So we do this:
-    // - Play audio client-side IF the closing is being predicted (auto-close or predicted interaction)
-    // - Server assumes automated closing is predicted by clients and does not play audio unless otherwise specified.
-    // - Major exception is player interactions, which other players cannot predict
-    // - In that case, send audio to all players, except possibly the interacting player if it was a predicted
-    //   interaction.
-
-    /// <summary>
-    /// Selectively send sound to clients, taking care to not send the double-audio.
-    /// </summary>
-    /// <param name="uid">The audio source</param>
-    /// <param name="soundSpecifier">The sound</param>
-    /// <param name="audioParams">The audio parameters.</param>
-    /// <param name="predictingPlayer">The user (if any) that instigated an interaction</param>
-    /// <param name="predicted">Whether this interaction would have been predicted. If the predicting player is null,
-    /// this assumes it would have been predicted by all players in PVS range.</param>
-    protected override void PlaySound(EntityUid uid, SoundSpecifier soundSpecifier, AudioParams audioParams, EntityUid? predictingPlayer, bool predicted)
-    {
-        // If this sound would have been predicted by all clients, do not play any audio.
-        if (predicted && predictingPlayer == null)
-            return;
-
-        if (predicted)
-            Audio.PlayPredicted(soundSpecifier, uid, predictingPlayer, audioParams);
-        else
-            Audio.PlayPvs(soundSpecifier, uid, audioParams);
-    }
-
-    #region DoAfters
-    private void OnWeldAttempt(EntityUid uid, DoorComponent component, WeldableAttemptEvent args)
-    {
-        if (component.CurrentlyCrushing.Count > 0)
-        {
-            args.Cancel();
-            return;
-        }
-        if (component.State != DoorState.Closed && component.State != DoorState.Welded)
-        {
-            args.Cancel();
-        }
-    }
-
-    private void OnWeldChanged(EntityUid uid, DoorComponent component, ref WeldableChangedEvent args)
-    {
-        if (component.State == DoorState.Closed)
-            SetState(uid, DoorState.Welded, component);
-        else if (component.State == DoorState.Welded)
-            SetState(uid, DoorState.Closed, component);
-    }
-    #endregion
-
-
-    /// <summary>
-    ///     Open a door if a player or door-bumper (PDA, ID-card) collide with the door. Sadly, bullets no longer
-    ///     generate "access denied" sounds as you fire at a door.
-    /// </summary>
-    protected override void HandleCollide(EntityUid uid, DoorComponent door, ref StartCollideEvent args)
-    {
-        // TODO ACCESS READER move access reader to shared and predict door opening/closing
-        // Then this can be moved to the shared system without mispredicting.
-        if (!door.BumpOpen)
-            return;
-
-        if (door.State is not (DoorState.Closed or DoorState.Denying))
-            return;
-
-        var otherUid = args.OtherEntity;
-
-        if (Tags.HasTag(otherUid, "DoorBumpOpener"))
-            TryOpen(uid, door, otherUid, quiet: door.State == DoorState.Denying);
-    }
-    private void OnEmagged(EntityUid uid, DoorComponent door, ref GotEmaggedEvent args)
-    {
-        if (TryComp<AirlockComponent>(uid, out var airlockComponent))
-        {
-            if (_bolts.IsBolted(uid) || !this.IsPowered(uid, EntityManager))
-                return;
-
-            if (door.State == DoorState.Closed)
-            {
-                SetState(uid, DoorState.Emagging, door);
-                PlaySound(uid, door.SparkSound, AudioParams.Default.WithVolume(8), args.UserUid, false);
-                args.Handled = true;
-            }
-        }
-    }
-
-    public override void StartOpening(EntityUid uid, DoorComponent? door = null, EntityUid? user = null, bool predicted = false)
-    {
-        if (!Resolve(uid, ref door))
-            return;
-
-        var lastState = door.State;
-
-        SetState(uid, DoorState.Opening, door);
-
-        if (door.OpenSound != null)
-            PlaySound(uid, door.OpenSound, AudioParams.Default.WithVolume(-5), user, predicted);
-
-        if (lastState == DoorState.Emagging && TryComp<DoorBoltComponent>(uid, out var doorBoltComponent))
-            _bolts.SetBoltsWithAudio(uid, doorBoltComponent, !doorBoltComponent.BoltsDown);
-    }
-
-    /// <summary>
-    ///     Open or close a door after it has been successfuly pried.
-    /// </summary>
-    private void OnAfterPry(EntityUid uid, DoorComponent door, ref PriedEvent args)
+    private void OnBoltPowerChanged(Entity<DoorBoltComponent> ent, ref PowerChangedEvent args)
     {
-        if (door.State == DoorState.Closed)
+        if (args.Powered)
         {
-            _adminLog.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(args.User)} pried {ToPrettyString(uid)} open");
-            StartOpening(uid, door, args.User);
+            if (ent.Comp.BoltWireCut)
+                SetBoltsDown(ent, true);
         }
-        else if (door.State == DoorState.Open)
-        {
-            _adminLog.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(args.User)} pried {ToPrettyString(uid)} closed");
-            StartClosing(uid, door, args.User);
-        }
-    }
 
-    protected override void CheckDoorBump(Entity<DoorComponent, PhysicsComponent> ent)
-    {
-        var (uid, door, physics) = ent;
-        if (door.BumpOpen)
-        {
-            foreach (var other in PhysicsSystem.GetContactingEntities(uid, physics, approximate: true))
-            {
-                if (Tags.HasTag(other, "DoorBumpOpener") && TryOpen(uid, door, other, quiet: true))
-                    break;
-            }
-        }
+        UpdateBoltLightStatus(ent);
+        ent.Comp.Powered = args.Powered;
+        Dirty(ent, ent.Comp);
     }
 }
diff --git a/Content.Server/Doors/WireActions/DoorBoltLightWireAction.cs b/Content.Server/Doors/WireActions/DoorBoltLightWireAction.cs
index 233ebfed3f..c5e3aa80c9 100644
--- a/Content.Server/Doors/WireActions/DoorBoltLightWireAction.cs
+++ b/Content.Server/Doors/WireActions/DoorBoltLightWireAction.cs
@@ -18,19 +18,18 @@ public sealed partial class DoorBoltLightWireAction : ComponentWireAction<DoorBo
 
     public override bool Cut(EntityUid user, Wire wire, DoorBoltComponent door)
     {
-        EntityManager.System<DoorBoltSystem>().SetBoltLightsEnabled(wire.Owner, door, false);
+        EntityManager.System<DoorSystem>().SetBoltLightsEnabled((wire.Owner, door), false);
         return true;
     }
 
     public override bool Mend(EntityUid user, Wire wire, DoorBoltComponent door)
     {
-
-        EntityManager.System<DoorBoltSystem>().SetBoltLightsEnabled(wire.Owner, door, true);
+        EntityManager.System<DoorSystem>().SetBoltLightsEnabled((wire.Owner, door), true);
         return true;
     }
 
     public override void Pulse(EntityUid user, Wire wire, DoorBoltComponent door)
     {
-        EntityManager.System<DoorBoltSystem>().SetBoltLightsEnabled(wire.Owner, door, !door.BoltLightsEnabled);
+        EntityManager.System<DoorSystem>().SetBoltLightsEnabled((wire.Owner, door), !door.BoltLightsEnabled);
     }
 }
diff --git a/Content.Server/Doors/WireActions/DoorBoltWireAction.cs b/Content.Server/Doors/WireActions/DoorBoltWireAction.cs
index 29b5d726a2..fc1cf50cd8 100644
--- a/Content.Server/Doors/WireActions/DoorBoltWireAction.cs
+++ b/Content.Server/Doors/WireActions/DoorBoltWireAction.cs
@@ -19,24 +19,24 @@ public sealed partial class DoorBoltWireAction : ComponentWireAction<DoorBoltCom
 
     public override bool Cut(EntityUid user, Wire wire, DoorBoltComponent airlock)
     {
-        EntityManager.System<DoorBoltSystem>().SetBoltWireCut(airlock, true);
+        EntityManager.System<DoorSystem>().SetBoltWireCut((wire.Owner, airlock), true);
         if (!airlock.BoltsDown && IsPowered(wire.Owner))
-            EntityManager.System<DoorBoltSystem>().SetBoltsWithAudio(wire.Owner, airlock, true);
+            EntityManager.System<DoorSystem>().SetBoltsDown((wire.Owner, airlock), true, user);
 
         return true;
     }
 
     public override bool Mend(EntityUid user, Wire wire, DoorBoltComponent door)
     {
-        EntityManager.System<DoorBoltSystem>().SetBoltWireCut(door, false);
+        EntityManager.System<DoorSystem>().SetBoltWireCut((wire.Owner, door), false);
         return true;
     }
 
     public override void Pulse(EntityUid user, Wire wire, DoorBoltComponent door)
     {
         if (IsPowered(wire.Owner))
-            EntityManager.System<DoorBoltSystem>().SetBoltsWithAudio(wire.Owner, door, !door.BoltsDown);
+            EntityManager.System<DoorSystem>().SetBoltsDown((wire.Owner, door), !door.BoltsDown);
         else if (!door.BoltsDown)
-            EntityManager.System<DoorBoltSystem>().SetBoltsWithAudio(wire.Owner, door, true);
+            EntityManager.System<DoorSystem>().SetBoltsDown((wire.Owner, door), true);
     }
 }
diff --git a/Content.Server/Drone/Components/DroneComponent.cs b/Content.Server/Drone/Components/DroneComponent.cs
deleted file mode 100644
index df7ad2bcc8..0000000000
--- a/Content.Server/Drone/Components/DroneComponent.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Content.Server.Drone.Components
-{
-    [RegisterComponent]
-    public sealed partial class DroneComponent : Component
-    {
-        public float InteractionBlockRange = 2.15f;
-    }
-}
diff --git a/Content.Server/Drone/DroneSystem.cs b/Content.Server/Drone/DroneSystem.cs
deleted file mode 100644
index 769d1b5d11..0000000000
--- a/Content.Server/Drone/DroneSystem.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using Content.Server.Body.Systems;
-using Content.Server.Drone.Components;
-using Content.Server.Ghost.Roles.Components;
-using Content.Server.Popups;
-using Content.Server.Tools.Innate;
-using Content.Shared.UserInterface;
-using Content.Shared.Body.Components;
-using Content.Shared.Drone;
-using Content.Shared.Emoting;
-using Content.Shared.Examine;
-using Content.Shared.Ghost;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction.Components;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Item;
-using Content.Shared.Mind.Components;
-using Content.Shared.Mobs;
-using Content.Shared.Mobs.Components;
-using Content.Shared.Mobs.Systems;
-using Content.Shared.Popups;
-using Content.Shared.Tag;
-using Content.Shared.Throwing;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Drone
-{
-    public sealed class DroneSystem : SharedDroneSystem
-    {
-        [Dependency] private readonly BodySystem _bodySystem = default!;
-        [Dependency] private readonly PopupSystem _popupSystem = default!;
-        [Dependency] private readonly TagSystem _tagSystem = default!;
-        [Dependency] private readonly EntityLookupSystem _lookup = default!;
-        [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly InnateToolSystem _innateToolSystem = default!;
-        [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
-        [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<DroneComponent, InteractionAttemptEvent>(OnInteractionAttempt);
-            SubscribeLocalEvent<DroneComponent, UserOpenActivatableUIAttemptEvent>(OnActivateUIAttempt);
-            SubscribeLocalEvent<DroneComponent, MobStateChangedEvent>(OnMobStateChanged);
-            SubscribeLocalEvent<DroneComponent, ExaminedEvent>(OnExamined);
-            SubscribeLocalEvent<DroneComponent, MindAddedMessage>(OnMindAdded);
-            SubscribeLocalEvent<DroneComponent, MindRemovedMessage>(OnMindRemoved);
-            SubscribeLocalEvent<DroneComponent, EmoteAttemptEvent>(OnEmoteAttempt);
-            SubscribeLocalEvent<DroneComponent, ThrowAttemptEvent>(OnThrowAttempt);
-        }
-
-        private void OnInteractionAttempt(EntityUid uid, DroneComponent component, InteractionAttemptEvent args)
-        {
-            if (args.Target != null && !HasComp<UnremoveableComponent>(args.Target) && NonDronesInRange(uid, component))
-                args.Cancel();
-
-            if (HasComp<ItemComponent>(args.Target) && !HasComp<UnremoveableComponent>(args.Target))
-            {
-                if (!_tagSystem.HasAnyTag(args.Target.Value, "DroneUsable", "Trash"))
-                    args.Cancel();
-            }
-        }
-
-        private void OnActivateUIAttempt(EntityUid uid, DroneComponent component, UserOpenActivatableUIAttemptEvent args)
-        {
-            if (!_tagSystem.HasTag(args.Target, "DroneUsable"))
-            {
-                args.Cancel();
-            }
-        }
-
-        private void OnExamined(EntityUid uid, DroneComponent component, ExaminedEvent args)
-        {
-            if (TryComp<MindContainerComponent>(uid, out var mind) && mind.HasMind)
-            {
-                args.PushMarkup(Loc.GetString("drone-active"));
-            }
-            else
-            {
-                args.PushMarkup(Loc.GetString("drone-dormant"));
-            }
-        }
-
-        private void OnMobStateChanged(EntityUid uid, DroneComponent drone, MobStateChangedEvent args)
-        {
-            if (args.NewMobState == MobState.Dead)
-            {
-                if (TryComp<InnateToolComponent>(uid, out var innate))
-                    _innateToolSystem.Cleanup(uid, innate);
-
-                if (TryComp<BodyComponent>(uid, out var body))
-                    _bodySystem.GibBody(uid, body: body);
-                QueueDel(uid);
-            }
-        }
-
-        private void OnMindAdded(EntityUid uid, DroneComponent drone, MindAddedMessage args)
-        {
-            UpdateDroneAppearance(uid, DroneStatus.On);
-            _popupSystem.PopupEntity(Loc.GetString("drone-activated"), uid, PopupType.Large);
-        }
-
-        private void OnMindRemoved(EntityUid uid, DroneComponent drone, MindRemovedMessage args)
-        {
-            UpdateDroneAppearance(uid, DroneStatus.Off);
-            EnsureComp<GhostTakeoverAvailableComponent>(uid);
-        }
-
-        private void OnEmoteAttempt(EntityUid uid, DroneComponent component, EmoteAttemptEvent args)
-        {
-            // No.
-            args.Cancel();
-        }
-
-        private void OnThrowAttempt(EntityUid uid, DroneComponent drone, ThrowAttemptEvent args)
-        {
-            args.Cancel();
-        }
-
-        private void UpdateDroneAppearance(EntityUid uid, DroneStatus status)
-        {
-            if (TryComp<AppearanceComponent>(uid, out var appearance))
-            {
-                _appearance.SetData(uid, DroneVisuals.Status, status, appearance);
-            }
-        }
-
-        private bool NonDronesInRange(EntityUid uid, DroneComponent component)
-        {
-            var xform = Comp<TransformComponent>(uid);
-            foreach (var entity in _lookup.GetEntitiesInRange(xform.MapPosition, component.InteractionBlockRange))
-            {
-                // Return true if the entity is/was controlled by a player and is not a drone or ghost.
-                if (HasComp<MindContainerComponent>(entity) && !HasComp<DroneComponent>(entity) && !HasComp<GhostComponent>(entity))
-                {
-                    // Filter out dead ghost roles. Dead normal players are intended to block.
-                    if ((TryComp<MobStateComponent>(entity, out var entityMobState) && HasComp<GhostTakeoverAvailableComponent>(entity) && _mobStateSystem.IsDead(entity, entityMobState)))
-                        continue;
-                    if (_gameTiming.IsFirstTimePredicted)
-                        _popupSystem.PopupEntity(Loc.GetString("drone-too-close", ("being", Identity.Entity(entity, EntityManager))), uid, uid);
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-}
diff --git a/Content.Server/Emp/EmpSystem.cs b/Content.Server/Emp/EmpSystem.cs
index 02a18284e8..7c1a6f9b5d 100644
--- a/Content.Server/Emp/EmpSystem.cs
+++ b/Content.Server/Emp/EmpSystem.cs
@@ -17,7 +17,6 @@ public sealed class EmpSystem : SharedEmpSystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<EmpDisabledComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<EmpDisabledComponent, ExaminedEvent>(OnExamine);
         SubscribeLocalEvent<EmpOnTriggerComponent, TriggerEvent>(HandleEmpTrigger);
 
@@ -96,12 +95,6 @@ public override void Update(float frameTime)
         }
     }
 
-    private void OnUnpaused(EntityUid uid, EmpDisabledComponent component, ref EntityUnpausedEvent args)
-    {
-        component.DisabledUntil += args.PausedTime;
-        component.TargetTime += args.PausedTime;
-    }
-
     private void OnExamine(EntityUid uid, EmpDisabledComponent component, ExaminedEvent args)
     {
         args.PushMarkup(Loc.GetString("emp-disabled-comp-on-examine"));
diff --git a/Content.Server/Entry/IgnoredComponents.cs b/Content.Server/Entry/IgnoredComponents.cs
index c1b646ec4f..fe073da7a4 100644
--- a/Content.Server/Entry/IgnoredComponents.cs
+++ b/Content.Server/Entry/IgnoredComponents.cs
@@ -19,6 +19,7 @@ public static class IgnoredComponents
             "InventorySlots",
             "LightFade",
             "HolidayRsiSwap",
+            "OptionsVisualizer",
         };
     }
 }
diff --git a/Content.Server/Explosion/Components/OnTrigger/TwoStageTriggerComponent.cs b/Content.Server/Explosion/Components/OnTrigger/TwoStageTriggerComponent.cs
index 357286b192..a63d6fcf66 100644
--- a/Content.Server/Explosion/Components/OnTrigger/TwoStageTriggerComponent.cs
+++ b/Content.Server/Explosion/Components/OnTrigger/TwoStageTriggerComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Server.Explosion.Components.OnTrigger;
 /// <summary>
 /// After being triggered applies the specified components and runs triggers again.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, AutoGenerateComponentPause]
 public sealed partial class TwoStageTriggerComponent : Component
 {
     /// <summary>
@@ -23,6 +23,7 @@ public sealed partial class TwoStageTriggerComponent : Component
     public ComponentRegistry SecondStageComponents = new();
 
     [DataField("nextTriggerTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan? NextTriggerTime;
 
     [DataField("triggered")]
diff --git a/Content.Server/Explosion/Components/TriggerOnProximityComponent.cs b/Content.Server/Explosion/Components/TriggerOnProximityComponent.cs
index 504ef4dee4..4f3fb4754e 100644
--- a/Content.Server/Explosion/Components/TriggerOnProximityComponent.cs
+++ b/Content.Server/Explosion/Components/TriggerOnProximityComponent.cs
@@ -13,7 +13,7 @@ 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]
+    [RegisterComponent, AutoGenerateComponentPause]
     public sealed partial class TriggerOnProximityComponent : SharedTriggerOnProximityComponent
     {
         public const string FixtureID = "trigger-on-proximity-fixture";
@@ -58,6 +58,7 @@ public sealed partial class TriggerOnProximityComponent : SharedTriggerOnProximi
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("nextTrigger", customTypeSerializer: typeof(TimeOffsetSerializer))]
+        [AutoPausedField]
         public TimeSpan NextTrigger = TimeSpan.Zero;
 
         /// <summary>
@@ -65,6 +66,7 @@ public sealed partial class TriggerOnProximityComponent : SharedTriggerOnProximi
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("nextVisualUpdate", customTypeSerializer: typeof(TimeOffsetSerializer))]
+        [AutoPausedField]
         public TimeSpan NextVisualUpdate = TimeSpan.Zero;
 
         /// <summary>
diff --git a/Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs b/Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs
index 09c2be33a0..78e41c59ae 100644
--- a/Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs
@@ -1,15 +1,12 @@
 using Content.Server.Explosion.Components;
 using Content.Shared.Flash.Components;
-using Content.Shared.Explosion;
 using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
 using Content.Shared.Throwing;
 using Robust.Shared.Containers;
 using Robust.Shared.Random;
 using Content.Server.Weapons.Ranged.Systems;
 using System.Numerics;
 using Content.Shared.Explosion.Components;
-using Content.Shared.Flash.Components;
 using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs
index d03c64fd37..1f03109333 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs
@@ -15,34 +15,13 @@ public sealed partial class ExplosionSystem : EntitySystem
 
     private void SubscribeCvars()
     {
-        _cfg.OnValueChanged(CCVars.ExplosionTilesPerTick, SetTilesPerTick, true);
-        _cfg.OnValueChanged(CCVars.ExplosionThrowLimit, SetThrowLimit, true);
-        _cfg.OnValueChanged(CCVars.ExplosionSleepNodeSys, SetSleepNodeSys, true);
-        _cfg.OnValueChanged(CCVars.ExplosionMaxArea, SetMaxArea, true);
-        _cfg.OnValueChanged(CCVars.ExplosionMaxIterations, SetMaxIterations, true);
-        _cfg.OnValueChanged(CCVars.ExplosionMaxProcessingTime, SetMaxProcessingTime, true);
-        _cfg.OnValueChanged(CCVars.ExplosionIncrementalTileBreaking, SetIncrementalTileBreaking, true);
-        _cfg.OnValueChanged(CCVars.ExplosionSingleTickAreaLimit, SetSingleTickAreaLimit, true);
+        Subs.CVar(_cfg, CCVars.ExplosionTilesPerTick, value => TilesPerTick = value, true);
+        Subs.CVar(_cfg, CCVars.ExplosionThrowLimit, value => ThrowLimit = value, true);
+        Subs.CVar(_cfg, CCVars.ExplosionSleepNodeSys, value => SleepNodeSys = value, true);
+        Subs.CVar(_cfg, CCVars.ExplosionMaxArea, value => MaxArea = value, true);
+        Subs.CVar(_cfg, CCVars.ExplosionMaxIterations, value => MaxIterations = value, true);
+        Subs.CVar(_cfg, CCVars.ExplosionMaxProcessingTime, value => MaxProcessingTime = value, true);
+        Subs.CVar(_cfg, CCVars.ExplosionIncrementalTileBreaking, value => IncrementalTileBreaking = value, true);
+        Subs.CVar(_cfg, CCVars.ExplosionSingleTickAreaLimit, value => SingleTickAreaLimit = value, true);
     }
-
-    private void UnsubscribeCvars()
-    {
-        _cfg.UnsubValueChanged(CCVars.ExplosionTilesPerTick, SetTilesPerTick);
-        _cfg.UnsubValueChanged(CCVars.ExplosionThrowLimit, SetThrowLimit);
-        _cfg.UnsubValueChanged(CCVars.ExplosionSleepNodeSys, SetSleepNodeSys);
-        _cfg.UnsubValueChanged(CCVars.ExplosionMaxArea, SetMaxArea);
-        _cfg.UnsubValueChanged(CCVars.ExplosionMaxIterations, SetMaxIterations);
-        _cfg.UnsubValueChanged(CCVars.ExplosionMaxProcessingTime, SetMaxProcessingTime);
-        _cfg.UnsubValueChanged(CCVars.ExplosionIncrementalTileBreaking, SetIncrementalTileBreaking);
-        _cfg.UnsubValueChanged(CCVars.ExplosionSingleTickAreaLimit, SetSingleTickAreaLimit);
-    }
-
-    private void SetTilesPerTick(int value) => TilesPerTick = value;
-    private void SetThrowLimit(int value) => ThrowLimit = value;
-    private void SetSleepNodeSys(bool value) => SleepNodeSys = value;
-    private void SetMaxArea(int value) => MaxArea = value;
-    private void SetMaxIterations(int value) => MaxIterations = value;
-    private void SetMaxProcessingTime(float value) => MaxProcessingTime = value;
-    private void SetIncrementalTileBreaking(bool value) => IncrementalTileBreaking = value;
-    private void SetSingleTickAreaLimit(int value) => SingleTickAreaLimit = value;
 }
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 31df23b89d..7495ecbb34 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -122,7 +122,6 @@ private void OnReset(RoundRestartCleanupEvent ev)
     public override void Shutdown()
     {
         base.Shutdown();
-        UnsubscribeCvars();
         _nodeGroupSystem.PauseUpdating = false;
         _pathfindingSystem.PauseUpdating = false;
     }
diff --git a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
index 2f475a07b4..c0775947ba 100644
--- a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
@@ -3,8 +3,6 @@
 using Content.Server.Fluids.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Coordinates.Helpers;
-using Content.Shared.Explosion.Components.OnTrigger;
-using Content.Shared.Explosion.EntitySystems;
 using Content.Shared.Maps;
 using Robust.Shared.Map;
 
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs
index d3d97a851e..119b1a3d36 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs
@@ -17,7 +17,6 @@ private void InitializeProximity()
         SubscribeLocalEvent<TriggerOnProximityComponent, StartCollideEvent>(OnProximityStartCollide);
         SubscribeLocalEvent<TriggerOnProximityComponent, EndCollideEvent>(OnProximityEndCollide);
         SubscribeLocalEvent<TriggerOnProximityComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<TriggerOnProximityComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<TriggerOnProximityComponent, ComponentShutdown>(OnProximityShutdown);
         // Shouldn't need re-anchoring.
         SubscribeLocalEvent<TriggerOnProximityComponent, AnchorStateChangedEvent>(OnProximityAnchor);
@@ -65,12 +64,6 @@ private void OnMapInit(EntityUid uid, TriggerOnProximityComponent component, Map
             collisionLayer: component.Layer);
     }
 
-    private void OnUnpaused(EntityUid uid, TriggerOnProximityComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextTrigger += args.PausedTime;
-        component.NextVisualUpdate += args.PausedTime;
-    }
-
     private void OnProximityStartCollide(EntityUid uid, TriggerOnProximityComponent component, ref StartCollideEvent args)
     {
         if (args.OurFixtureId != TriggerOnProximityComponent.FixtureID)
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.Voice.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.Voice.cs
index c00f591d92..c78a8923cd 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.Voice.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.Voice.cs
@@ -32,8 +32,19 @@ private void OnListen(Entity<TriggerOnVoiceComponent> ent, ref ListenEvent args)
 
             if (component.IsRecording)
             {
-                if (message.Length >= component.MinLength || message.Length <= component.MaxLength)
+                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;
             }
 
@@ -55,7 +66,7 @@ private void OnVoiceGetAltVerbs(Entity<TriggerOnVoiceComponent> ent, ref GetVerb
             var @event = args;
             args.Verbs.Add(new AlternativeVerb()
             {
-                Text = Loc.GetString(component.IsRecording ? "verb-trigger-voice-record-stop" : "verb-trigger-voice-record"),
+                Text = Loc.GetString(component.IsRecording ? "verb-trigger-voice-stop" : "verb-trigger-voice-record"),
                 Act = () =>
                 {
                     if (component.IsRecording)
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index aa81f80c50..9b9a042641 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -12,6 +12,7 @@
 using Content.Shared.Explosion.Components.OnTrigger;
 using Content.Shared.Implants.Components;
 using Content.Shared.Interaction;
+using Content.Shared.Inventory;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Payload.Components;
@@ -28,6 +29,8 @@
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Robust.Shared.Player;
+using Content.Shared.Coordinates;
 
 namespace Content.Server.Explosion.EntitySystems
 {
@@ -68,6 +71,7 @@ public sealed partial class TriggerSystem : EntitySystem
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
+        [Dependency] private readonly InventorySystem _inventory = default!;
 
         public override void Initialize()
         {
@@ -101,9 +105,15 @@ public override void Initialize()
 
         private void OnSoundTrigger(EntityUid uid, SoundOnTriggerComponent component, TriggerEvent args)
         {
-            _audio.PlayPvs(component.Sound, uid);
-            if (component.RemoveOnTrigger)
-                RemCompDeferred<SoundOnTriggerComponent>(uid);
+            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 OnAnchorTrigger(EntityUid uid, AnchorOnTriggerComponent component, TriggerEvent args)
@@ -154,9 +164,15 @@ private void HandleGibTrigger(EntityUid uid, GibOnTriggerComponent component, Tr
         {
             if (!TryComp<TransformComponent>(uid, out var xform))
                 return;
-
-            _body.GibBody(xform.ParentUid, true, deleteItems: component.DeleteItems);
-
+            if (component.DeleteItems)
+            {
+                var items = _inventory.GetHandOrInventoryEntities(xform.ParentUid);
+                foreach (var item in items)
+                {
+                    Del(item);
+                }
+            }
+            _body.GibBody(xform.ParentUid, true);
             args.Handled = true;
         }
 
diff --git a/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs
index a8c48f21d6..4e95eabff0 100644
--- a/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs
@@ -14,16 +14,9 @@ public sealed class TwoStageTriggerSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<TwoStageTriggerComponent, EntityUnpausedEvent>(OnTriggerUnpaused);
         SubscribeLocalEvent<TwoStageTriggerComponent, TriggerEvent>(OnTrigger);
     }
 
-    private void OnTriggerUnpaused(EntityUid uid, TwoStageTriggerComponent component, ref EntityUnpausedEvent args)
-    {
-        if (component.NextTriggerTime != null)
-            component.NextTriggerTime = component.NextTriggerTime.Value + args.PausedTime;
-    }
-
     private void OnTrigger(EntityUid uid, TwoStageTriggerComponent component, TriggerEvent args)
     {
         if (component.Triggered)
diff --git a/Content.Server/Extinguisher/FireExtinguisherSystem.cs b/Content.Server/Extinguisher/FireExtinguisherSystem.cs
index 5adf067d9b..dfecd72398 100644
--- a/Content.Server/Extinguisher/FireExtinguisherSystem.cs
+++ b/Content.Server/Extinguisher/FireExtinguisherSystem.cs
@@ -93,7 +93,7 @@ private void OnAfterInteract(Entity<FireExtinguisherComponent> entity, ref After
 
     private void OnGetInteractionVerbs(Entity<FireExtinguisherComponent> entity, ref GetVerbsEvent<InteractionVerb> args)
     {
-        if (!args.CanInteract)
+        if (!args.CanAccess || !args.CanInteract)
             return;
 
         var user = args.User;
diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs
index f25fb62542..265a20ce1c 100644
--- a/Content.Server/Fax/FaxSystem.cs
+++ b/Content.Server/Fax/FaxSystem.cs
@@ -12,6 +12,7 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Emag.Components;
 using Content.Shared.Emag.Systems;
 using Content.Shared.Fax;
@@ -50,6 +51,9 @@ public sealed class FaxSystem : EntitySystem
     /// </summary>
     [ValidatePrototypeId<EntityPrototype>]
     private const string DefaultPaperPrototypeId = "Paper";
+    
+    [ValidatePrototypeId<EntityPrototype>]
+    private const string OfficePaperPrototypeId = "PaperOffice";
 
     public override void Initialize()
     {
@@ -71,6 +75,7 @@ public override void Initialize()
 
         // UI
         SubscribeLocalEvent<FaxMachineComponent, AfterActivatableUIOpenEvent>(OnToggleInterface);
+        SubscribeLocalEvent<FaxMachineComponent, FaxFileMessage>(OnFileButtonPressed);
         SubscribeLocalEvent<FaxMachineComponent, FaxCopyMessage>(OnCopyButtonPressed);
         SubscribeLocalEvent<FaxMachineComponent, FaxSendMessage>(OnSendButtonPressed);
         SubscribeLocalEvent<FaxMachineComponent, FaxRefreshMessage>(OnRefreshButtonPressed);
@@ -300,6 +305,12 @@ private void OnToggleInterface(EntityUid uid, FaxMachineComponent component, Aft
         UpdateUserInterface(uid, component);
     }
 
+    private void OnFileButtonPressed(EntityUid uid, FaxMachineComponent component, FaxFileMessage args)
+    {
+        args.Content = args.Content[..Math.Min(args.Content.Length, FaxFileMessageValidation.MaxContentSize)];
+        PrintFile(uid, component, args);
+    }
+
     private void OnCopyButtonPressed(EntityUid uid, FaxMachineComponent component, FaxCopyMessage args)
     {
         Copy(uid, component);
@@ -386,6 +397,27 @@ public void Refresh(EntityUid uid, FaxMachineComponent? component = null)
         _deviceNetworkSystem.QueuePacket(uid, null, payload);
     }
 
+    /// <summary>
+    ///     Makes fax print from a file from the computer. A timeout is set after copying,
+    ///     which is shared by the send button.
+    /// </summary>
+    public void PrintFile(EntityUid uid, FaxMachineComponent component, FaxFileMessage args)
+    {
+        string prototype;
+        if (args.OfficePaper)
+            prototype = OfficePaperPrototypeId;
+        else
+            prototype = DefaultPaperPrototypeId;
+
+        var name  = Loc.GetString("fax-machine-printed-paper-name");
+        
+        var printout = new FaxPrintout(args.Content, name, prototype);
+        component.PrintingQueue.Enqueue(printout);
+        component.SendTimeoutRemaining += component.SendTimeout;
+
+        UpdateUserInterface(uid, component);
+    }
+
     /// <summary>
     ///     Copies the paper in the fax. A timeout is set after copying,
     ///     which is shared by the send button.
diff --git a/Content.Server/Flash/Components/DamagedByFlashingComponent.cs b/Content.Server/Flash/Components/DamagedByFlashingComponent.cs
new file mode 100644
index 0000000000..2a9024607d
--- /dev/null
+++ b/Content.Server/Flash/Components/DamagedByFlashingComponent.cs
@@ -0,0 +1,15 @@
+using Content.Shared.Damage;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Flash.Components;
+
+// Also needed FlashableComponent on entity to work
+[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/DamagedByFlashingSystem.cs b/Content.Server/Flash/DamagedByFlashingSystem.cs
new file mode 100644
index 0000000000..cf0368ca42
--- /dev/null
+++ b/Content.Server/Flash/DamagedByFlashingSystem.cs
@@ -0,0 +1,22 @@
+using Content.Server.Flash.Components;
+using Content.Shared.Damage;
+
+namespace Content.Server.Flash;
+public sealed class DamagedByFlashingSystem : EntitySystem
+{
+    [Dependency] private readonly DamageableSystem _damageable = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DamagedByFlashingComponent, FlashAttemptEvent>(OnFlashAttempt);
+    }
+    private void OnFlashAttempt(Entity<DamagedByFlashingComponent> ent, ref FlashAttemptEvent args)
+    {
+        _damageable.TryChangeDamage(ent, ent.Comp.FlashDamage);
+
+        //To Do: 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.Server/Flash/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs
index 4f0ccc27fd..fe7eb81d1e 100644
--- a/Content.Server/Flash/FlashSystem.cs
+++ b/Content.Server/Flash/FlashSystem.cs
@@ -8,7 +8,6 @@
 using Content.Shared.Charges.Systems;
 using Content.Shared.Eye.Blinding.Components;
 using Content.Shared.Flash;
-using Content.Shared.Flash.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
@@ -20,7 +19,6 @@
 using Robust.Server.Audio;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
-using Robust.Shared.Player;
 using Robust.Shared.Timing;
 using InventoryComponent = Content.Shared.Inventory.InventoryComponent;
 
@@ -33,6 +31,7 @@ internal sealed class FlashSystem : SharedFlashSystem
         [Dependency] private readonly SharedChargesSystem _charges = default!;
         [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
+        [Dependency] private readonly SharedTransformSystem _transform = default!;
         [Dependency] private readonly SharedInteractionSystem _interaction = default!;
         [Dependency] private readonly InventorySystem _inventory = default!;
         [Dependency] private readonly PopupSystem _popup = default!;
@@ -152,27 +151,23 @@ public void Flash(EntityUid target,
         public void FlashArea(EntityUid source, EntityUid? user, float range, float duration, float slowTo = 0.8f, bool displayPopup = false, SoundSpecifier? sound = null)
         {
             var transform = EntityManager.GetComponent<TransformComponent>(source);
-            var mapPosition = transform.MapPosition;
-            var flashableEntities = new List<EntityUid>();
+            var mapPosition = _transform.GetMapCoordinates(transform);
             var flashableQuery = GetEntityQuery<FlashableComponent>();
 
             foreach (var entity in _entityLookup.GetEntitiesInRange(transform.Coordinates, range))
             {
-                if (!flashableQuery.HasComponent(entity))
+                if (!flashableQuery.TryGetComponent(entity, out var flashable))
                     continue;
 
-                flashableEntities.Add(entity);
-            }
 
-            foreach (var entity in flashableEntities)
-            {
                 // Check for unobstructed entities while ignoring the mobs with flashable components.
-                if (!_interaction.InRangeUnobstructed(entity, mapPosition, range, CollisionGroup.Opaque, (e) => flashableEntities.Contains(e) || e == source))
+                if (!_interaction.InRangeUnobstructed(entity, mapPosition, range, flashable.CollisionGroup, (e) => e == source))
                     continue;
 
                 // They shouldn't have flash removed in between right?
                 Flash(entity, user, source, duration, slowTo, displayPopup, flashableQuery.GetComponent(entity));
             }
+
             if (sound != null)
             {
                 _audio.PlayPvs(sound, source, AudioParams.Default.WithVolume(1f).WithMaxDistance(3f));
diff --git a/Content.Server/Fluids/Components/EvaporationComponent.cs b/Content.Server/Fluids/Components/EvaporationComponent.cs
deleted file mode 100644
index 0f530da79e..0000000000
--- a/Content.Server/Fluids/Components/EvaporationComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Content.Server.Fluids.EntitySystems;
-using Content.Shared.FixedPoint;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Server.Fluids.Components;
-
-/// <summary>
-/// Added to puddles that contain water so it may evaporate over time.
-/// </summary>
-[RegisterComponent, Access(typeof(PuddleSystem))]
-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;
-
-    /// <summary>
-    /// How much evaporation occurs every tick.
-    /// </summary>
-    [DataField("evaporationAmount")]
-    public FixedPoint2 EvaporationAmount = FixedPoint2.New(0.3);
-}
diff --git a/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs b/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs
index ac967b3c20..859f2d80a6 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs
@@ -13,9 +13,11 @@ public sealed class PuddleDebugDebugOverlaySystem : SharedPuddleDebugOverlaySyst
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly PuddleSystem _puddle = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
 
-    private readonly HashSet<ICommonSession> _playerObservers = new();
-    private List<Entity<MapGridComponent>> _grids = new();
+    private readonly HashSet<ICommonSession> _playerObservers = [];
+    private List<Entity<MapGridComponent>> _grids = [];
 
     public bool ToggleObserver(ICommonSession observer)
     {
@@ -55,7 +57,8 @@ public override void Update(float frameTime)
 
             var transform = EntityManager.GetComponent<TransformComponent>(entity);
 
-            var worldBounds = Box2.CenteredAround(transform.WorldPosition,
+
+            var worldBounds = Box2.CenteredAround(_transform.GetWorldPosition(transform),
                 new Vector2(LocalViewRange, LocalViewRange));
 
             _grids.Clear();
@@ -69,14 +72,14 @@ public override void Update(float frameTime)
                 if (!Exists(gridUid))
                     continue;
 
-                foreach (var uid in grid.Comp.GetAnchoredEntities(worldBounds))
+                foreach (var uid in _map.GetAnchoredEntities(gridUid, grid, worldBounds))
                 {
                     PuddleComponent? puddle = null;
                     TransformComponent? xform = null;
                     if (!Resolve(uid, ref puddle, ref xform, false))
                         continue;
 
-                    var pos = xform.Coordinates.ToVector2i(EntityManager, _mapManager);
+                    var pos = xform.Coordinates.ToVector2i(EntityManager, _mapManager, _transform);
                     var vol = _puddle.CurrentVolume(uid, puddle);
                     data.Add(new PuddleDebugOverlayData(pos, vol));
                 }
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
index 2a80c33836..d9605c775c 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
@@ -1,6 +1,4 @@
-using Content.Server.Fluids.Components;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
 using Content.Shared.Fluids.Components;
 
@@ -10,11 +8,6 @@ public sealed partial class PuddleSystem
 {
     private static readonly TimeSpan EvaporationCooldown = TimeSpan.FromSeconds(1);
 
-    [ValidatePrototypeId<ReagentPrototype>]
-    private const string Water = "Water";
-
-    public static string[] EvaporationReagents = new[] { Water };
-
     private void OnEvaporationMapInit(Entity<EvaporationComponent> entity, ref MapInitEvent args)
     {
         entity.Comp.NextTick = _timing.CurTime + EvaporationCooldown;
@@ -64,9 +57,4 @@ private void TickEvaporation()
             }
         }
     }
-
-    public bool CanFullyEvaporate(Solution solution)
-    {
-        return solution.GetTotalPrototypeQuantity(EvaporationReagents) == solution.Volume;
-    }
 }
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
index 177391de22..3cd6d06aeb 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
@@ -9,15 +9,14 @@
 using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
-using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
+using Content.Shared.Fluids.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Popups;
 using Content.Shared.Spillable;
 using Content.Shared.Throwing;
 using Content.Shared.Verbs;
-using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Player;
 
@@ -28,12 +27,13 @@ public sealed partial class PuddleSystem
     [Dependency] private readonly OpenableSystem _openable = default!;
     [Dependency] private readonly IEntityManager _entityManager = default!;
 
-    private void InitializeSpillable()
+    protected override void InitializeSpillable()
     {
-        SubscribeLocalEvent<SpillableComponent, ExaminedEvent>(OnExamined);
+        base.InitializeSpillable();
+
         SubscribeLocalEvent<SpillableComponent, LandEvent>(SpillOnLand);
-        // openable handles the event if its closed
-        SubscribeLocalEvent<SpillableComponent, MeleeHitEvent>(SplashOnMeleeHit, after: new[] { typeof(OpenableSystem) });
+        // Openable handles the event if it's closed
+        SubscribeLocalEvent<SpillableComponent, MeleeHitEvent>(SplashOnMeleeHit, after: [typeof(OpenableSystem)]);
         SubscribeLocalEvent<SpillableComponent, GetVerbsEvent<Verb>>(AddSpillVerb);
         SubscribeLocalEvent<SpillableComponent, GotEquippedEvent>(OnGotEquipped);
         SubscribeLocalEvent<SpillableComponent, SolutionContainerOverflowEvent>(OnOverflow);
@@ -41,17 +41,6 @@ private void InitializeSpillable()
         SubscribeLocalEvent<SpillableComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
     }
 
-    private void OnExamined(Entity<SpillableComponent> entity, ref ExaminedEvent args)
-    {
-        using (args.PushGroup(nameof(SpillableComponent)))
-        {
-            args.PushMarkup(Loc.GetString("spill-examine-is-spillable"));
-
-            if (HasComp<MeleeWeaponComponent>(entity))
-                args.PushMarkup(Loc.GetString("spill-examine-spillable-weapon"));
-        }
-    }
-
     private void OnOverflow(Entity<SpillableComponent> entity, ref SolutionContainerOverflowEvent args)
     {
         if (args.Handled)
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
index 44d28379ab..c03e6f593c 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
@@ -11,7 +11,6 @@
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Database;
 using Content.Shared.Effects;
-using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
 using Content.Shared.Fluids;
 using Content.Shared.Fluids.Components;
@@ -42,7 +41,7 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
 {
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ITileDefinitionManager _tileDefMan = default!;
@@ -67,13 +66,13 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
     [ValidatePrototypeId<ReagentPrototype>]
     private const string CopperBlood = "CopperBlood";
 
-    private static string[] _standoutReagents = new[] { Blood, Slime, CopperBlood };
+    private static string[] _standoutReagents = [Blood, Slime, CopperBlood];
 
-    public static float PuddleVolume = 1000;
+    public static readonly float PuddleVolume = 1000;
 
     // 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.
-    private HashSet<EntityUid> _deletionQueue = new();
+    private HashSet<EntityUid> _deletionQueue = [];
 
     private EntityQuery<PuddleComponent> _puddleQuery;
 
@@ -91,7 +90,6 @@ public override void Initialize()
 
         // Shouldn't need re-anchoring.
         SubscribeLocalEvent<PuddleComponent, AnchorStateChangedEvent>(OnAnchorChanged);
-        SubscribeLocalEvent<PuddleComponent, ExaminedEvent>(HandlePuddleExamined);
         SubscribeLocalEvent<PuddleComponent, SolutionContainerChangedEvent>(OnSolutionUpdate);
         SubscribeLocalEvent<PuddleComponent, ComponentInit>(OnPuddleInit);
         SubscribeLocalEvent<PuddleComponent, SpreadNeighborsEvent>(OnPuddleSpread);
@@ -99,7 +97,6 @@ public override void Initialize()
 
         SubscribeLocalEvent<EvaporationComponent, MapInitEvent>(OnEvaporationMapInit);
 
-        InitializeSpillable();
         InitializeTransfers();
     }
 
@@ -127,7 +124,7 @@ private void OnPuddleSpread(Entity<PuddleComponent> entity, ref SpreadNeighborsE
             foreach (var neighbor in args.NeighborFreeTiles)
             {
                 var split = overflow.SplitSolution(spillAmount);
-                TrySpillAt(neighbor.Grid.GridTileToLocal(neighbor.Tile), split, out _, false);
+                TrySpillAt(_map.GridTileToLocal(neighbor.Tile.GridUid, neighbor.Grid, neighbor.Tile.GridIndices), split, out _, false);
                 args.Updates--;
 
                 if (args.Updates <= 0)
@@ -448,31 +445,6 @@ private void UpdateSlow(EntityUid uid, Solution solution)
         }
     }
 
-    private void HandlePuddleExamined(Entity<PuddleComponent> entity, ref ExaminedEvent args)
-    {
-        using (args.PushGroup(nameof(PuddleComponent)))
-        {
-            if (TryComp<StepTriggerComponent>(entity, out var slippery) && slippery.Active)
-            {
-                args.PushMarkup(Loc.GetString("puddle-component-examine-is-slipper-text"));
-            }
-
-            if (HasComp<EvaporationComponent>(entity) &&
-                _solutionContainerSystem.ResolveSolution(entity.Owner, entity.Comp.SolutionName,
-                    ref entity.Comp.Solution, out var solution))
-            {
-                if (CanFullyEvaporate(solution))
-                    args.PushMarkup(Loc.GetString("puddle-component-examine-evaporating"));
-                else if (solution.GetTotalPrototypeQuantity(EvaporationReagents) > FixedPoint2.Zero)
-                    args.PushMarkup(Loc.GetString("puddle-component-examine-evaporating-partial"));
-                else
-                    args.PushMarkup(Loc.GetString("puddle-component-examine-evaporating-no"));
-            }
-            else
-                args.PushMarkup(Loc.GetString("puddle-component-examine-evaporating-no"));
-        }
-    }
-
     private void OnAnchorChanged(Entity<PuddleComponent> entity, ref AnchorStateChangedEvent args)
     {
         if (!args.Anchored)
@@ -640,13 +612,14 @@ public bool TrySpillAt(EntityCoordinates coordinates, Solution solution, out Ent
             return false;
         }
 
-        if (!_mapManager.TryGetGrid(coordinates.GetGridUid(EntityManager), out var mapGrid))
+        var gridUid = coordinates.GetGridUid(EntityManager);
+        if (!TryComp<MapGridComponent>(gridUid, out var mapGrid))
         {
             puddleUid = EntityUid.Invalid;
             return false;
         }
 
-        return TrySpillAt(mapGrid.GetTileRef(coordinates), solution, out puddleUid, sound);
+        return TrySpillAt(_map.GetTileRef(gridUid.Value, mapGrid, coordinates), solution, out puddleUid, sound);
     }
 
     /// <summary>
@@ -685,7 +658,7 @@ public bool TrySpillAt(TileRef tileRef, Solution solution, out EntityUid puddleU
 
         // Let's not spill to invalid grids.
         var gridId = tileRef.GridUid;
-        if (!_mapManager.TryGetGrid(gridId, out var mapGrid))
+        if (!TryComp<MapGridComponent>(gridId, out var mapGrid))
         {
             puddleUid = EntityUid.Invalid;
             return false;
@@ -706,7 +679,7 @@ public bool TrySpillAt(TileRef tileRef, Solution solution, out EntityUid puddleU
 
         // Get normalized co-ordinate for spill location and spill it in the centre
         // TODO: Does SnapGrid or something else already do this?
-        var anchored = mapGrid.GetAnchoredEntitiesEnumerator(tileRef.GridIndices);
+        var anchored = _map.GetAnchoredEntitiesEnumerator(gridId, mapGrid, tileRef.GridIndices);
         var puddleQuery = GetEntityQuery<PuddleComponent>();
         var sparklesQuery = GetEntityQuery<EvaporationSparkleComponent>();
 
@@ -731,7 +704,7 @@ public bool TrySpillAt(TileRef tileRef, Solution solution, out EntityUid puddleU
             return true;
         }
 
-        var coords = mapGrid.GridTileToLocal(tileRef.GridIndices);
+        var coords = _map.GridTileToLocal(gridId, mapGrid, tileRef.GridIndices);
         puddleUid = EntityManager.SpawnEntity("Puddle", coords);
         EnsureComp<PuddleComponent>(puddleUid);
         if (TryAddSolution(puddleUid, solution, sound))
@@ -768,7 +741,7 @@ public bool TryGetPuddle(TileRef tile, out EntityUid puddleUid)
         if (!TryComp<MapGridComponent>(tile.GridUid, out var grid))
             return false;
 
-        var anc = grid.GetAnchoredEntitiesEnumerator(tile.GridIndices);
+        var anc = _map.GetAnchoredEntitiesEnumerator(tile.GridUid, grid, tile.GridIndices);
         var puddleQuery = GetEntityQuery<PuddleComponent>();
 
         while (anc.MoveNext(out var ent))
diff --git a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
index 795655068f..ae170842a0 100644
--- a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs
@@ -13,7 +13,7 @@
 using Content.Shared.FixedPoint;
 using Content.Shared.Smoking;
 using Robust.Server.GameObjects;
-using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
@@ -35,7 +35,7 @@ public sealed class SmokeSystem : EntitySystem
     // If I could do it all again this could probably use a lot more of puddles.
     [Dependency] private readonly IAdminLogManager _logger = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly AppearanceSystem _appearance = default!;
@@ -45,7 +45,6 @@ public sealed class SmokeSystem : EntitySystem
     [Dependency] private readonly SharedBroadphaseSystem _broadphase = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
-    [Dependency] private readonly TransformSystem _transform = default!;
 
     private EntityQuery<SmokeComponent> _smokeQuery;
     private EntityQuery<SmokeAffectedComponent> _smokeAffectedQuery;
@@ -63,7 +62,6 @@ public override void Initialize()
         SubscribeLocalEvent<SmokeComponent, ReactionAttemptEvent>(OnReactionAttempt);
         SubscribeLocalEvent<SmokeComponent, SolutionRelayEvent<ReactionAttemptEvent>>(OnReactionAttempt);
         SubscribeLocalEvent<SmokeComponent, SpreadNeighborsEvent>(OnSmokeSpread);
-        SubscribeLocalEvent<SmokeAffectedComponent, EntityUnpausedEvent>(OnAffectedUnpaused);
     }
 
     /// <inheritdoc/>
@@ -124,11 +122,6 @@ private void OnEndCollide(Entity<SmokeComponent> entity, ref EndCollideEvent arg
             RemComp(args.OtherEntity, smokeAffectedComponent);
     }
 
-    private void OnAffectedUnpaused(Entity<SmokeAffectedComponent> entity, ref EntityUnpausedEvent args)
-    {
-        entity.Comp.NextSecond += args.PausedTime;
-    }
-
     private void OnSmokeSpread(Entity<SmokeComponent> entity, ref SpreadNeighborsEvent args)
     {
         if (entity.Comp.SpreadAmount == 0 || !_solutionContainerSystem.ResolveSolution(entity.Owner, SmokeComponent.SolutionName, ref entity.Comp.Solution, out var solution))
@@ -143,7 +136,7 @@ private void OnSmokeSpread(Entity<SmokeComponent> entity, ref SpreadNeighborsEve
             return;
         }
 
-        if (!args.NeighborFreeTiles.Any())
+        if (args.NeighborFreeTiles.Count == 0)
             return;
 
         TryComp<TimedDespawnComponent>(entity, out var timer);
@@ -152,10 +145,10 @@ private void OnSmokeSpread(Entity<SmokeComponent> entity, ref SpreadNeighborsEve
         var smokePerSpread = entity.Comp.SpreadAmount / Math.Max(1, args.NeighborFreeTiles.Count);
         foreach (var neighbor in args.NeighborFreeTiles)
         {
-            var coords = neighbor.Grid.GridTileToLocal(neighbor.Tile);
+            var coords = _map.GridTileToLocal(neighbor.Tile.GridUid, neighbor.Grid, neighbor.Tile.GridIndices);
             var ent = Spawn(prototype.ID, coords);
             var spreadAmount = Math.Max(0, smokePerSpread);
-            entity.Comp.SpreadAmount -= args.NeighborFreeTiles.Count();
+            entity.Comp.SpreadAmount -= args.NeighborFreeTiles.Count;
 
             StartSmoke(ent, solution.Clone(), timer?.Lifetime ?? entity.Comp.Duration, spreadAmount);
 
@@ -311,10 +304,10 @@ private void ReactOnTile(EntityUid uid, SmokeComponent? component = null, Transf
         if (!_solutionContainerSystem.ResolveSolution(uid, SmokeComponent.SolutionName, ref component.Solution, out var solution) || !solution.Any())
             return;
 
-        if (!_mapManager.TryGetGrid(xform.GridUid, out var mapGrid))
+        if (!TryComp<MapGridComponent>(xform.GridUid, out var mapGrid))
             return;
 
-        var tile = mapGrid.GetTileRef(xform.Coordinates.ToVector2i(EntityManager, _mapManager, _transform));
+        var tile = _map.GetTileRef(xform.GridUid.Value, mapGrid, xform.Coordinates);
 
         foreach (var reagentQuantity in solution.Contents.ToArray())
         {
diff --git a/Content.Server/Forensics/Systems/ForensicsSystem.cs b/Content.Server/Forensics/Systems/ForensicsSystem.cs
index 16bd2a50ee..a081429fd3 100644
--- a/Content.Server/Forensics/Systems/ForensicsSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicsSystem.cs
@@ -3,6 +3,7 @@
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Forensics.Components;
 using Content.Server.Popups;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.DoAfter;
 using Content.Shared.Forensics;
 using Content.Shared.Interaction;
@@ -27,6 +28,7 @@ public override void Initialize()
 
             SubscribeLocalEvent<DnaComponent, BeingGibbedEvent>(OnBeingGibbed);
             SubscribeLocalEvent<ForensicsComponent, MeleeHitEvent>(OnMeleeHit);
+            SubscribeLocalEvent<ForensicsComponent, GotRehydratedEvent>(OnRehydrated);
             SubscribeLocalEvent<CleansForensicsComponent, AfterInteractEvent>(OnAfterInteract, after: new[] { typeof(AbsorbentSystem) });
             SubscribeLocalEvent<ForensicsComponent, CleanForensicsDoAfterEvent>(OnCleanForensicsDoAfter);
             SubscribeLocalEvent<DnaComponent, TransferDnaEvent>(OnTransferDnaEvent);
@@ -71,6 +73,34 @@ private void OnMeleeHit(EntityUid uid, ForensicsComponent component, MeleeHitEve
             }
         }
 
+        private void OnRehydrated(Entity<ForensicsComponent> ent, ref GotRehydratedEvent args)
+        {
+            CopyForensicsFrom(ent.Comp, args.Target);
+        }
+
+        /// <summary>
+        /// Copy forensic information from a source entity to a destination.
+        /// Existing forensic information on the target is still kept.
+        /// </summary>
+        public void CopyForensicsFrom(ForensicsComponent src, EntityUid target)
+        {
+            var dest = EnsureComp<ForensicsComponent>(target);
+            foreach (var dna in src.DNAs)
+            {
+                dest.DNAs.Add(dna);
+            }
+
+            foreach (var fiber in src.Fibers)
+            {
+                dest.Fibers.Add(fiber);
+            }
+
+            foreach (var print in src.Fingerprints)
+            {
+                dest.Fingerprints.Add(print);
+            }
+        }
+
         private void OnAfterInteract(EntityUid uid, CleansForensicsComponent component, AfterInteractEvent args)
         {
             if (args.Handled)
diff --git a/Content.Server/Friends/Systems/PettableFriendSystem.cs b/Content.Server/Friends/Systems/PettableFriendSystem.cs
index c4f6586341..8f70c843e7 100644
--- a/Content.Server/Friends/Systems/PettableFriendSystem.cs
+++ b/Content.Server/Friends/Systems/PettableFriendSystem.cs
@@ -1,7 +1,7 @@
-using Content.Server.Chemistry.Components;
 using Content.Server.Friends.Components;
 using Content.Server.NPC.Components;
 using Content.Server.NPC.Systems;
+using Content.Shared.Chemistry.Components;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Popups;
 
diff --git a/Content.Server/GameTicking/GameTicker.CVars.cs b/Content.Server/GameTicking/GameTicker.CVars.cs
index c77d56ad14..60ffa660f5 100644
--- a/Content.Server/GameTicking/GameTicker.CVars.cs
+++ b/Content.Server/GameTicking/GameTicker.CVars.cs
@@ -26,6 +26,9 @@ public sealed partial class GameTicker
 
         private WebhookIdentifier? _webhookIdentifier;
 
+        [ViewVariables]
+        private string? RoundEndSoundCollection { get; set; }
+
 #if EXCEPTION_TOLERANCE
         [ViewVariables]
         public int RoundStartFailShutdownCount { get; private set; } = 0;
@@ -33,7 +36,7 @@ public sealed partial class GameTicker
 
         private void InitializeCVars()
         {
-            _configurationManager.OnValueChanged(CCVars.GameLobbyEnabled, value =>
+            Subs.CVar(_configurationManager, CCVars.GameLobbyEnabled, value =>
             {
                 LobbyEnabled = value;
                 foreach (var (userId, status) in _playerGameStatuses)
@@ -44,23 +47,23 @@ private void InitializeCVars()
                         LobbyEnabled ? PlayerGameStatus.NotReadyToPlay : PlayerGameStatus.ReadyToPlay;
                 }
             }, true);
-            _configurationManager.OnValueChanged(CCVars.GameDummyTicker, value => DummyTicker = value, true);
-            _configurationManager.OnValueChanged(CCVars.GameLobbyDuration, value => LobbyDuration = TimeSpan.FromSeconds(value), true);
-            _configurationManager.OnValueChanged(CCVars.GameDisallowLateJoins,
+            Subs.CVar(_configurationManager, CCVars.GameDummyTicker, value => DummyTicker = value, true);
+            Subs.CVar(_configurationManager, CCVars.GameLobbyDuration, value => LobbyDuration = TimeSpan.FromSeconds(value), true);
+            Subs.CVar(_configurationManager, CCVars.GameDisallowLateJoins,
                 value => { DisallowLateJoin = value; UpdateLateJoinStatus(); }, true);
-            _configurationManager.OnValueChanged(CCVars.AdminLogsServerName, value =>
+            Subs.CVar(_configurationManager, CCVars.AdminLogsServerName, value =>
             {
                 // TODO why tf is the server name on admin logs
                 ServerName = value;
             }, true);
-            _configurationManager.OnValueChanged(CCVars.DiscordRoundUpdateWebhook, value =>
+            Subs.CVar(_configurationManager, CCVars.DiscordRoundUpdateWebhook, value =>
             {
                 if (!string.IsNullOrWhiteSpace(value))
                 {
                     _discord.GetWebhook(value, data => _webhookIdentifier = data.ToIdentifier());
                 }
             }, true);
-            _configurationManager.OnValueChanged(CCVars.DiscordRoundEndRoleWebhook, value =>
+            Subs.CVar(_configurationManager, CCVars.DiscordRoundEndRoleWebhook, value =>
             {
                 DiscordRoundEndRole = value;
 
@@ -69,8 +72,9 @@ private void InitializeCVars()
                     DiscordRoundEndRole = null;
                 }
             }, true);
+            Subs.CVar(_configurationManager, CCVars.RoundEndSoundCollection, value => RoundEndSoundCollection = value, true);
 #if EXCEPTION_TOLERANCE
-            _configurationManager.OnValueChanged(CCVars.RoundStartFailShutdownCount, value => RoundStartFailShutdownCount = value, true);
+            Subs.CVar(_configurationManager, CCVars.RoundStartFailShutdownCount, value => RoundStartFailShutdownCount = value, true);
 #endif
         }
     }
diff --git a/Content.Server/GameTicking/GameTicker.Lobby.cs b/Content.Server/GameTicking/GameTicker.Lobby.cs
index 3a6f742baa..82ef8c6012 100644
--- a/Content.Server/GameTicking/GameTicker.Lobby.cs
+++ b/Content.Server/GameTicking/GameTicker.Lobby.cs
@@ -94,7 +94,7 @@ private TickerConnectionStatusEvent GetConnectionStatusMsg()
         private TickerLobbyStatusEvent GetStatusMsg(ICommonSession session)
         {
             _playerGameStatuses.TryGetValue(session.UserId, out var status);
-            return new TickerLobbyStatusEvent(RunLevel != GameRunLevel.PreRoundLobby, LobbySong, LobbyBackground, status == PlayerGameStatus.ReadyToPlay, _roundStartTime, RoundPreloadTime, RoundStartTimeSpan, Paused);
+            return new TickerLobbyStatusEvent(RunLevel != GameRunLevel.PreRoundLobby, LobbyBackground, status == PlayerGameStatus.ReadyToPlay, _roundStartTime, RoundPreloadTime, RoundStartTimeSpan, Paused);
         }
 
         private void SendStatusToAll()
diff --git a/Content.Server/GameTicking/GameTicker.LobbyBackground.cs b/Content.Server/GameTicking/GameTicker.LobbyBackground.cs
index 7f2ccfe235..2090e3e31f 100644
--- a/Content.Server/GameTicking/GameTicker.LobbyBackground.cs
+++ b/Content.Server/GameTicking/GameTicker.LobbyBackground.cs
@@ -13,7 +13,7 @@ public sealed partial class GameTicker
     [ViewVariables]
     private List<ResPath>? _lobbyBackgrounds;
 
-    private static readonly string[] WhitelistedBackgroundExtensions = new string[] {"png", "jpg", "jpeg"};
+    private static readonly string[] WhitelistedBackgroundExtensions = new string[] {"png", "jpg", "jpeg", "webp"};
 
     private void InitializeLobbyBackground()
     {
diff --git a/Content.Server/GameTicking/GameTicker.LobbyMusic.cs b/Content.Server/GameTicking/GameTicker.LobbyMusic.cs
deleted file mode 100644
index 5a44320ff3..0000000000
--- a/Content.Server/GameTicking/GameTicker.LobbyMusic.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.Random;
-using Robust.Shared.Utility;
-
-namespace Content.Server.GameTicking
-{
-    public sealed partial class GameTicker
-    {
-        [ValidatePrototypeId<SoundCollectionPrototype>]
-        private const string LobbyMusicCollection = "LobbyMusic";
-
-        [ViewVariables]
-        private bool _lobbyMusicInitialized = false;
-
-        [ViewVariables]
-        private SoundCollectionPrototype _lobbyMusicCollection = default!;
-
-        [ViewVariables]
-        public string? LobbySong { get; private set; }
-
-        private void InitializeLobbyMusic()
-        {
-            DebugTools.Assert(!_lobbyMusicInitialized);
-            _lobbyMusicCollection = _prototypeManager.Index<SoundCollectionPrototype>(LobbyMusicCollection);
-
-            // Now that the collection is set, the lobby music has been initialized and we can choose a random song.
-            _lobbyMusicInitialized = true;
-
-            ChooseRandomLobbySong();
-        }
-
-        /// <summary>
-        ///     Sets the current lobby song, or stops it if null.
-        /// </summary>
-        /// <param name="song">The lobby song to play, or null to stop any lobby songs.</param>
-        public void SetLobbySong(string? song)
-        {
-            DebugTools.Assert(_lobbyMusicInitialized);
-
-            if (song == null)
-            {
-                LobbySong = null;
-                return;
-                // TODO GAMETICKER send song stop event
-            }
-
-            LobbySong = song;
-            // TODO GAMETICKER send song change event
-        }
-
-        /// <summary>
-        ///     Plays a random song from the LobbyMusic sound collection.
-        /// </summary>
-        public void ChooseRandomLobbySong()
-        {
-            DebugTools.Assert(_lobbyMusicInitialized);
-            SetLobbySong(_robustRandom.Pick(_lobbyMusicCollection.PickFiles).ToString());
-        }
-
-        /// <summary>
-        ///     Stops the current lobby song being played.
-        /// </summary>
-        public void StopLobbySong()
-        {
-            SetLobbySong(null);
-        }
-    }
-}
diff --git a/Content.Server/GameTicking/GameTicker.Replays.cs b/Content.Server/GameTicking/GameTicker.Replays.cs
index 7e1a553a85..9109fbf96a 100644
--- a/Content.Server/GameTicking/GameTicker.Replays.cs
+++ b/Content.Server/GameTicking/GameTicker.Replays.cs
@@ -1,7 +1,11 @@
-using Content.Shared.CCVar;
+using Content.Shared.CCVar;
 using Robust.Shared;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Replays;
+using Robust.Shared.Serialization.Manager;
+using Robust.Shared.Serialization.Markdown;
+using Robust.Shared.Serialization.Markdown.Mapping;
+using Robust.Shared.Serialization.Markdown.Value;
 using Robust.Shared.Utility;
 
 namespace Content.Server.GameTicking;
@@ -10,12 +14,15 @@ public sealed partial class GameTicker
 {
     [Dependency] private readonly IReplayRecordingManager _replays = default!;
     [Dependency] private readonly IResourceManager _resourceManager = default!;
+    [Dependency] private readonly ISerializationManager _serialman = default!;
+
 
     private ISawmill _sawmillReplays = default!;
 
     private void InitializeReplays()
     {
         _replays.RecordingFinished += ReplaysOnRecordingFinished;
+        _replays.RecordingStopped += ReplaysOnRecordingStopped;
     }
 
     /// <summary>
@@ -41,6 +48,10 @@ private void ReplayStartRound()
             var tempDir = _cfg.GetCVar(CCVars.ReplayAutoRecordTempDir);
             ResPath? moveToPath = null;
 
+            // Set the round end player and text back to null to prevent it from writing the previous round's data.
+            _replayRoundPlayerInfo = null;
+            _replayRoundText = null;
+
             if (!string.IsNullOrEmpty(tempDir))
             {
                 var baseReplayPath = new ResPath(_cfg.GetCVar(CVars.ReplayDirectory)).ToRootedPath();
@@ -108,6 +119,19 @@ private void ReplaysOnRecordingFinished(ReplayRecordingFinished data)
         data.Directory.Rename(data.Path, state.MoveToPath.Value);
     }
 
+    private void ReplaysOnRecordingStopped(MappingDataNode metadata)
+    {
+        // Write round info like map and round end summery into the replay_final.yml file. Useful for external parsers.
+
+        metadata["map"] = new ValueDataNode(_gameMapManager.GetSelectedMap()?.MapName);
+        metadata["gamemode"] = new ValueDataNode(CurrentPreset != null ? Loc.GetString(CurrentPreset.ModeTitle) : string.Empty);
+        metadata["roundEndPlayers"] = _serialman.WriteValue(_replayRoundPlayerInfo);
+        metadata["roundEndText"] = new ValueDataNode(_replayRoundText);
+        metadata["server_id"] = new ValueDataNode(_configurationManager.GetCVar(CCVars.ServerId));
+        metadata["server_name"] = new ValueDataNode(_configurationManager.GetCVar(CCVars.AdminLogsServerName));
+        metadata["roundId"] = new ValueDataNode(RoundId.ToString());
+    }
+
     private ResPath GetAutoReplayPath()
     {
         var cfgValue = _cfg.GetCVar(CCVars.ReplayAutoRecordName);
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 0111816bb6..bcec43bca7 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -47,6 +47,10 @@ public sealed partial class GameTicker
         [ViewVariables]
         private GameRunLevel _runLevel;
 
+        private RoundEndMessageEvent.RoundEndPlayerInfo[]? _replayRoundPlayerInfo;
+
+        private string? _replayRoundText;
+
         [ViewVariables]
         public GameRunLevel RunLevel
         {
@@ -299,12 +303,6 @@ public void EndRound(string text = "")
 
             RunLevel = GameRunLevel.PostRound;
 
-            // The lobby song is set here instead of in RestartRound,
-            // because ShowRoundEndScoreboard triggers the start of the music playing
-            // at the end of a round, and this needs to be set before RestartRound
-            // in order for the lobby song status display to be accurate.
-            LobbySong = _robustRandom.Pick(_lobbyMusicCollection.PickFiles).ToString();
-
             ShowRoundEndScoreboard(text);
             SendRoundEndDiscordMessage();
         }
@@ -374,11 +372,14 @@ public void ShowRoundEndScoreboard(string text = "")
                     PlayerOOCName = contentPlayerData?.Name ?? "(IMPOSSIBLE: REGISTERED MIND WITH NO OWNER)",
                     // Character name takes precedence over current entity name
                     PlayerICName = playerIcName,
+                    PlayerGuid = userId,
                     PlayerNetEntity = GetNetEntity(entity),
                     Role = antag
                         ? roles.First(role => role.Antagonist).Name
                         : roles.FirstOrDefault().Name ?? Loc.GetString("game-ticker-unknown-role"),
                     Antag = antag,
+                    JobPrototypes = roles.Where(role => !role.Antagonist).Select(role => role.Prototype).ToArray(),
+                    AntagPrototypes = roles.Where(role => role.Antagonist).Select(role => role.Prototype).ToArray(),
                     Observer = observer,
                     Connected = connected
                 };
@@ -387,11 +388,22 @@ public void ShowRoundEndScoreboard(string text = "")
 
             // This ordering mechanism isn't great (no ordering of minds) but functions
             var listOfPlayerInfoFinal = listOfPlayerInfo.OrderBy(pi => pi.PlayerOOCName).ToArray();
-            var sound = _audio.GetSound(new SoundCollectionSpecifier("RoundEnd"));
-
-            RaiseNetworkEvent(new RoundEndMessageEvent(gamemodeTitle, roundEndText, roundDuration, RoundId,
-                listOfPlayerInfoFinal.Length, listOfPlayerInfoFinal, LobbySong, sound));
-            RaiseLocalEvent(new RoundEndedEvent(RoundId, roundDuration)); // Corvax-RoundFlow
+            var sound = RoundEndSoundCollection == null ? null : _audio.GetSound(new SoundCollectionSpecifier(RoundEndSoundCollection));
+
+            var roundEndMessageEvent = new RoundEndMessageEvent(
+                gamemodeTitle,
+                roundEndText,
+                roundDuration,
+                RoundId,
+                listOfPlayerInfoFinal.Length,
+                listOfPlayerInfoFinal,
+                sound
+            );
+            RaiseNetworkEvent(roundEndMessageEvent);
+            RaiseLocalEvent(roundEndMessageEvent);
+
+            _replayRoundPlayerInfo = listOfPlayerInfoFinal;
+            _replayRoundText = roundEndText;
         }
 
         private async void SendRoundEndDiscordMessage()
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index af2c5b5e79..52b59703e3 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -93,7 +93,7 @@ private void SpawnPlayers(List<ICommonSession> readyPlayers, Dictionary<NetUserI
             {
                 if (job == null)
                 {
-                    var playerSession = _playerManager.GetSessionByUserId(netUser);
+                    var playerSession = _playerManager.GetSessionById(netUser);
                     _chatManager.DispatchServerMessage(playerSession, Loc.GetString("job-not-available-wait-in-lobby"));
                 }
                 else
@@ -110,13 +110,13 @@ private void SpawnPlayers(List<ICommonSession> readyPlayers, Dictionary<NetUserI
                 if (job == null)
                     continue;
 
-                SpawnPlayer(_playerManager.GetSessionByUserId(player), profiles[player], station, job, false);
+                SpawnPlayer(_playerManager.GetSessionById(player), profiles[player], station, job, false);
             }
 
             RefreshLateJoinAllowed();
 
             // Allow rules to add roles to players who have been spawned in. (For example, on-station traitors)
-            RaiseLocalEvent(new RulePlayerJobsAssignedEvent(assignedJobs.Keys.Select(x => _playerManager.GetSessionByUserId(x)).ToArray(), profiles, force));
+            RaiseLocalEvent(new RulePlayerJobsAssignedEvent(assignedJobs.Keys.Select(x => _playerManager.GetSessionById(x)).ToArray(), profiles, force));
         }
 
         private void SpawnPlayer(ICommonSession player, EntityUid station, string? jobId = null, bool lateJoin = true, bool silent = false)
diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs
index 1d07814ece..efda3df0ca 100644
--- a/Content.Server/GameTicking/GameTicker.cs
+++ b/Content.Server/GameTicking/GameTicker.cs
@@ -93,7 +93,6 @@ public override void Initialize()
             InitializeStatusShell();
             InitializeCVars();
             InitializePlayer();
-            InitializeLobbyMusic();
             InitializeLobbyBackground();
             InitializeGamePreset();
             DebugTools.Assert(_prototypeManager.Index<JobPrototype>(FallbackOverflowJob).Name == FallbackOverflowJobName,
diff --git a/Content.Server/GameTicking/Rules/Components/GameRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/GameRuleComponent.cs
index 80a5ab340a..6309b97402 100644
--- a/Content.Server/GameTicking/Rules/Components/GameRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/GameRuleComponent.cs
@@ -1,4 +1,4 @@
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.GameTicking.Rules.Components;
 
diff --git a/Content.Server/GameTicking/Rules/Components/NukeOperativeSpawnerComponent.cs b/Content.Server/GameTicking/Rules/Components/NukeOperativeSpawnerComponent.cs
index 56907788a5..e02d90c18b 100644
--- a/Content.Server/GameTicking/Rules/Components/NukeOperativeSpawnerComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/NukeOperativeSpawnerComponent.cs
@@ -14,9 +14,6 @@ public sealed partial class NukeOperativeSpawnerComponent : Component
     [DataField("name", required:true)]
     public string OperativeName = default!;
 
-    [DataField("rolePrototype", customTypeSerializer:typeof(PrototypeIdSerializer<AntagPrototype>), required:true)]
-    public string OperativeRolePrototype = default!;
-
-    [DataField("startingGearPrototype", customTypeSerializer:typeof(PrototypeIdSerializer<StartingGearPrototype>), required:true)]
-    public string OperativeStartingGear = default!;
+    [DataField]
+    public NukeopSpawnPreset SpawnDetails = default!;
 }
diff --git a/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs
index 8d9da3646d..8efd61b469 100644
--- a/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs
@@ -1,3 +1,4 @@
+using Content.Server.Maps;
 using Content.Server.NPC.Components;
 using Content.Server.RoundEnd;
 using Content.Server.StationEvents.Events;
@@ -16,15 +17,8 @@ namespace Content.Server.GameTicking.Rules.Components;
 [RegisterComponent, Access(typeof(NukeopsRuleSystem), typeof(LoneOpsSpawnRule))]
 public sealed partial class NukeopsRuleComponent : Component
 {
-    // TODO Replace with GameRuleComponent.minPlayers
     /// <summary>
-    /// The minimum needed amount of players
-    /// </summary>
-    [DataField]
-    public int MinPlayers = 20;
-
-    /// <summary>
-    ///     This INCLUDES the operatives. So a value of 3 is satisfied by 2 players & 1 operative
+    /// This INCLUDES the operatives. So a value of 3 is satisfied by 2 players & 1 operative
     /// </summary>
     [DataField]
     public int PlayersPerOperative = 10;
@@ -92,17 +86,11 @@ public sealed partial class NukeopsRuleComponent : Component
     [DataField]
     public int WarTCAmountPerNukie = 40;
 
-    /// <summary>
-    ///     Time allowed for declaration of war
-    /// </summary>
-    [DataField("warDeclarationDelay")]
-    public TimeSpan WarDeclarationDelay = TimeSpan.FromMinutes(6);
-
     /// <summary>
     ///     Delay between war declaration and nuke ops arrival on station map. Gives crew time to prepare
     /// </summary>
     [DataField]
-    public TimeSpan? WarNukieArriveDelay = TimeSpan.FromMinutes(15);
+    public TimeSpan WarNukieArriveDelay = TimeSpan.FromMinutes(15);
 
     /// <summary>
     ///     Minimal operatives count for war declaration
@@ -116,38 +104,11 @@ public sealed partial class NukeopsRuleComponent : Component
     [DataField]
     public EntProtoId GhostSpawnPointProto = "SpawnPointGhostNukeOperative";
 
-    [DataField]
-    public ProtoId<AntagPrototype> CommanderRoleProto = "NukeopsCommander";
-
-    [DataField]
-    public ProtoId<AntagPrototype> OperativeRoleProto = "Nukeops";
-
-    [DataField]
-    public ProtoId<AntagPrototype> MedicRoleProto = "NukeopsMedic";
-
-    [DataField]
-    public ProtoId<StartingGearPrototype> CommanderStartGearProto = "SyndicateCommanderGearFull";
-
-    [DataField]
-    public ProtoId<StartingGearPrototype> MedicStartGearProto = "SyndicateOperativeMedicFull";
-
-    [DataField]
-    public ProtoId<StartingGearPrototype> OperativeStartGearProto = "SyndicateOperativeGearFull";
-
-    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<DatasetPrototype>))]
-    public string EliteNames = "SyndicateNamesElite";
-
     [DataField]
     public string OperationName = "Test Operation";
 
-    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<DatasetPrototype>))]
-    public string NormalNames = "SyndicateNamesNormal";
-
-    [DataField(customTypeSerializer: typeof(ResPathSerializer))]
-    public ResPath OutpostMap = new("/Maps/nukieplanet.yml");
-
-    [DataField(customTypeSerializer: typeof(ResPathSerializer))]
-    public ResPath ShuttleMap = new("/Maps/infiltrator.yml");
+    [DataField]
+    public ProtoId<GameMapPrototype> OutpostMapPrototype = "NukieOutpost";
 
     [DataField]
     public WinType WinType = WinType.Neutral;
@@ -164,32 +125,52 @@ public sealed partial class NukeopsRuleComponent : Component
     public EntityUid? TargetStation;
 
     /// <summary>
-    ///     Cached starting gear prototypes.
+    ///     Data to be used in <see cref="OnMindAdded"/> for an operative once the Mind has been added.
     /// </summary>
     [DataField]
-    public Dictionary<string, StartingGearPrototype> StartingGearPrototypes = new ();
+    public Dictionary<EntityUid, string> OperativeMindPendingData = new();
+
+    [DataField(required: true)]
+    public ProtoId<NpcFactionPrototype> Faction = default!;
+
+    [DataField]
+    public NukeopSpawnPreset CommanderSpawnDetails = new() { AntagRoleProto = "NukeopsCommander", GearProto = "SyndicateCommanderGearFull", NamePrefix = "nukeops-role-commander", NameList = "SyndicateNamesElite" };
+
+    [DataField]
+    public NukeopSpawnPreset AgentSpawnDetails = new() { AntagRoleProto = "NukeopsMedic", GearProto = "SyndicateOperativeMedicFull", NamePrefix = "nukeops-role-agent", NameList = "SyndicateNamesNormal" };
+
+    [DataField]
+    public NukeopSpawnPreset OperativeSpawnDetails = new();
+}
+
+/// <summary>
+/// Stores the presets for each operative type
+/// Ie Commander, Agent and Operative
+/// </summary>
+[DataDefinition, Serializable]
+public sealed partial class NukeopSpawnPreset
+{
+
+    [DataField]
+    public ProtoId<AntagPrototype> AntagRoleProto = "Nukeops";
 
     /// <summary>
-    ///     Cached operator name prototypes.
+    /// The equipment set this operative will be given when spawned
     /// </summary>
     [DataField]
-    public Dictionary<string, List<string>> OperativeNames = new();
+    public ProtoId<StartingGearPrototype> GearProto = "SyndicateOperativeGearFull";
 
     /// <summary>
-    ///     Data to be used in <see cref="OnMindAdded"/> for an operative once the Mind has been added.
+    /// The name prefix, ie "Agent"
     /// </summary>
     [DataField]
-    public Dictionary<EntityUid, string> OperativeMindPendingData = new();
+    public LocId NamePrefix = "nukeops-role-operator";
 
     /// <summary>
-    ///     Players who played as an operative at some point in the round.
-    ///     Stores the mind as well as the entity name
+    /// The entity name suffix will be chosen from this list randomly
     /// </summary>
     [DataField]
-    public Dictionary<string, EntityUid> OperativePlayers = new();
-
-    [DataField(required: true)]
-    public ProtoId<NpcFactionPrototype> Faction = default!;
+    public ProtoId<DatasetPrototype> NameList = "SyndicateNamesNormal";
 }
 
 public enum WinType : byte
diff --git a/Content.Server/GameTicking/Rules/Components/RevolutionaryRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/RevolutionaryRuleComponent.cs
index e9c8d50cdc..2ce3f1f9a6 100644
--- a/Content.Server/GameTicking/Rules/Components/RevolutionaryRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/RevolutionaryRuleComponent.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Roles;
-using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
@@ -32,15 +31,6 @@ public sealed partial class RevolutionaryRuleComponent : Component
     [DataField]
     public ProtoId<AntagPrototype> HeadRevPrototypeId = "HeadRev";
 
-    [DataField]
-    public ProtoId<AntagPrototype> RevPrototypeId = "Rev";
-
-    /// <summary>
-    /// Sound that plays when you are chosen as Rev. (Placeholder until I find something cool I guess)
-    /// </summary>
-    [DataField]
-    public SoundSpecifier HeadRevStartSound = new SoundPathSpecifier("/Audio/Ambience/Antag/headrev_start.ogg");
-
     /// <summary>
     /// Min players needed for Revolutionary gamemode to start.
     /// </summary>
diff --git a/Content.Server/GameTicking/Rules/Components/SubGamemodesComponent.cs b/Content.Server/GameTicking/Rules/Components/SubGamemodesComponent.cs
new file mode 100644
index 0000000000..76ee6103d9
--- /dev/null
+++ b/Content.Server/GameTicking/Rules/Components/SubGamemodesComponent.cs
@@ -0,0 +1,20 @@
+using Content.Server.GameTicking.Rules;
+using Content.Shared.Storage;
+
+namespace Content.Server.GameTicking.Rules.Components;
+
+/// <summary>
+/// When this gamerule is added it has a chance of adding other gamerules.
+/// Since it's done when added and not when started you can still use normal start logic.
+/// Used for starting subgamemodes in game presets.
+/// </summary>
+[RegisterComponent, Access(typeof(SubGamemodesSystem))]
+public sealed partial class SubGamemodesComponent : Component
+{
+    /// <summary>
+    /// Spawn entries for each gamerule prototype.
+    /// Use orGroups if you want to limit rules.
+    /// </summary>
+    [DataField(required: true)]
+    public List<EntitySpawnEntry> Rules = new();
+}
diff --git a/Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs
index 01ca9df114..9dfd6e6627 100644
--- a/Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs
@@ -1,8 +1,7 @@
+using Content.Shared.Random;
+using Content.Shared.Roles;
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
-using Content.Shared.Roles;
-using Robust.Shared.Player;
-using Content.Shared.Preferences;
 
 namespace Content.Server.GameTicking.Rules.Components;
 
@@ -12,23 +11,27 @@ namespace Content.Server.GameTicking.Rules.Components;
 [RegisterComponent, Access(typeof(ThiefRuleSystem))]
 public sealed partial class ThiefRuleComponent : Component
 {
-    /// <summary>
-    /// Add a Pacified comp to thieves
-    /// </summary>
     [DataField]
-    public bool PacifistThieves = true;
+    public ProtoId<WeightedRandomPrototype> BigObjectiveGroup = "ThiefBigObjectiveGroups";
+
+    [DataField]
+    public ProtoId<WeightedRandomPrototype> SmallObjectiveGroup = "ThiefObjectiveGroups";
+
+    [DataField]
+    public ProtoId<WeightedRandomPrototype> EscapeObjectiveGroup = "ThiefEscapeObjectiveGroups";
+
+    [DataField]
+    public float BigObjectiveChance = 0.7f;
 
     /// <summary>
-    /// A chance for this mode to be added to the game.
+    /// Add a Pacified comp to thieves
     /// </summary>
     [DataField]
-    public float RuleChance = 1f;
+    public bool PacifistThieves = true;
 
     [DataField]
     public ProtoId<AntagPrototype> ThiefPrototypeId = "Thief";
 
-    public Dictionary<ICommonSession, HumanoidCharacterProfile> StartCandidates = new();
-
     [DataField]
     public float MaxObjectiveDifficulty = 2.5f;
 
@@ -39,7 +42,7 @@ public sealed partial class ThiefRuleComponent : Component
     /// Things that will be given to thieves
     /// </summary>
     [DataField]
-    public List<EntProtoId> StarterItems = new List<EntProtoId> { "ToolboxThief", "ClothingHandsChameleonThief" }; //TO DO - replace to chameleon thieving gloves whem merg
+    public List<EntProtoId> StarterItems = new() { "ToolboxThief", "ClothingHandsChameleonThief" };
 
     /// <summary>
     /// All Thieves created by this rule
diff --git a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
index 7af87179d6..62619db76a 100644
--- a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
@@ -1,8 +1,10 @@
-using Content.Shared.Preferences;
+using Content.Server.NPC.Components;
+using Content.Shared.Dataset;
+using Content.Shared.Random;
 using Content.Shared.Roles;
 using Robust.Shared.Audio;
-using Robust.Shared.Player;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.GameTicking.Rules.Components;
 
@@ -11,8 +13,23 @@ public sealed partial class TraitorRuleComponent : Component
 {
     public readonly List<EntityUid> TraitorMinds = new();
 
-    [DataField("traitorPrototypeId", customTypeSerializer: typeof(PrototypeIdSerializer<AntagPrototype>))]
-    public string TraitorPrototypeId = "Traitor";
+    [DataField]
+    public ProtoId<AntagPrototype> TraitorPrototypeId = "Traitor";
+
+    [DataField]
+    public ProtoId<NpcFactionPrototype> NanoTrasenFaction = "NanoTrasen";
+
+    [DataField]
+    public ProtoId<NpcFactionPrototype> SyndicateFaction = "Syndicate";
+
+    [DataField]
+    public ProtoId<WeightedRandomPrototype> ObjectiveGroup = "TraitorObjectiveGroups";
+
+    [DataField]
+    public ProtoId<DatasetPrototype> CodewordAdjectives = "adjectives";
+
+    [DataField]
+    public ProtoId<DatasetPrototype> CodewordVerbs = "verbs";
 
     public int TotalTraitors => TraitorMinds.Count;
     public string[] Codewords = new string[3];
@@ -20,17 +37,24 @@ public sealed partial class TraitorRuleComponent : Component
     public enum SelectionState
     {
         WaitingForSpawn = 0,
-        ReadyToSelect = 1,
-        SelectionMade = 2,
+        ReadyToStart = 1,
+        Started = 2,
     }
 
+    /// <summary>
+    /// Current state of the rule
+    /// </summary>
     public SelectionState SelectionStatus = SelectionState.WaitingForSpawn;
-    public TimeSpan AnnounceAt = TimeSpan.Zero;
-    public Dictionary<ICommonSession, HumanoidCharacterProfile> StartCandidates = new();
+
+    /// <summary>
+    /// When should traitors be selected and the announcement made
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    public TimeSpan? AnnounceAt;
 
     /// <summary>
     ///     Path to antagonist alert sound.
     /// </summary>
-    [DataField("greetSoundNotification")]
+    [DataField]
     public SoundSpecifier GreetSoundNotification = new SoundPathSpecifier("/Audio/Ambience/Antag/traitor_start.ogg");
 }
diff --git a/Content.Server/GameTicking/Rules/Components/ZombieRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/ZombieRuleComponent.cs
index 88759402f9..4fe91e3a5f 100644
--- a/Content.Server/GameTicking/Rules/Components/ZombieRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/ZombieRuleComponent.cs
@@ -2,98 +2,85 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.GameTicking.Rules.Components;
 
 [RegisterComponent, Access(typeof(ZombieRuleSystem))]
 public sealed partial class ZombieRuleComponent : Component
 {
-    [DataField("initialInfectedNames")]
+    [DataField]
     public Dictionary<string, string> InitialInfectedNames = new();
 
-    [DataField("patientZeroPrototypeId", customTypeSerializer: typeof(PrototypeIdSerializer<AntagPrototype>))]
-    public string PatientZeroPrototypeId = "InitialInfected";
-
-    /// <summary>
-    /// Whether or not the initial infected have been chosen.
-    /// </summary>
-    [DataField("infectedChosen")]
-    public bool InfectedChosen;
+    [DataField]
+    public ProtoId<AntagPrototype> PatientZeroPrototypeId = "InitialInfected";
 
     /// <summary>
     /// When the round will next check for round end.
     /// </summary>
-    [DataField("nextRoundEndCheck", customTypeSerializer: typeof(TimeOffsetSerializer))]
-    public TimeSpan NextRoundEndCheck;
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan? NextRoundEndCheck;
 
     /// <summary>
     /// The amount of time between each check for the end of the round.
     /// </summary>
-    [DataField("endCheckDelay")]
+    [DataField]
     public TimeSpan EndCheckDelay = TimeSpan.FromSeconds(30);
 
     /// <summary>
     /// The time at which the initial infected will be chosen.
     /// </summary>
-    [DataField("startTime", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
     public TimeSpan? StartTime;
 
     /// <summary>
     /// The minimum amount of time after the round starts that the initial infected will be chosen.
     /// </summary>
-    [DataField("minStartDelay")]
+    [DataField]
     public TimeSpan MinStartDelay = TimeSpan.FromMinutes(10);
 
     /// <summary>
     /// The maximum amount of time after the round starts that the initial infected will be chosen.
     /// </summary>
-    [DataField("maxStartDelay")]
+    [DataField]
     public TimeSpan MaxStartDelay = TimeSpan.FromMinutes(15);
 
     /// <summary>
     /// The sound that plays when someone becomes an initial infected.
     /// todo: this should have a unique sound instead of reusing the zombie one.
     /// </summary>
-    [DataField("initialInfectedSound")]
+    [DataField]
     public SoundSpecifier InitialInfectedSound = new SoundPathSpecifier("/Audio/Ambience/Antag/zombie_start.ogg");
 
     /// <summary>
     /// The minimum amount of time initial infected have before they start taking infection damage.
     /// </summary>
-    [DataField("minInitialInfectedGrace")]
+    [DataField]
     public TimeSpan MinInitialInfectedGrace = TimeSpan.FromMinutes(12.5f);
 
     /// <summary>
     /// The maximum amount of time initial infected have before they start taking damage.
     /// </summary>
-    [DataField("maxInitialInfectedGrace")]
+    [DataField]
     public TimeSpan MaxInitialInfectedGrace = TimeSpan.FromMinutes(15f);
 
     /// <summary>
     /// How many players for each initial infected.
     /// </summary>
-    [DataField("playersPerInfected")]
+    [DataField]
     public int PlayersPerInfected = 10;
 
     /// <summary>
     /// The maximum number of initial infected.
     /// </summary>
-    [DataField("maxInitialInfected")]
+    [DataField]
     public int MaxInitialInfected = 6;
 
     /// <summary>
     /// After this amount of the crew become zombies, the shuttle will be automatically called.
     /// </summary>
-    [DataField("zombieShuttleCallPercentage")]
+    [DataField]
     public float ZombieShuttleCallPercentage = 0.7f;
 
-    /// <summary>
-    /// Have we called the evac shuttle yet?
-    /// </summary>
-    [DataField("shuttleCalled")]
-    public bool ShuttleCalled;
-
-    [ValidatePrototypeId<EntityPrototype>]
-    public const string ZombifySelfActionPrototype = "ActionTurnUndead";
+    [DataField]
+    public EntProtoId ZombifySelfActionPrototype = "ActionTurnUndead";
 }
diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
index 9d75e65472..7563d66dba 100644
--- a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
+++ b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Components;
 using Robust.Shared.Collections;
diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.cs
index 1667e73d04..363c2ad7f7 100644
--- a/Content.Server/GameTicking/Rules/GameRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/GameRuleSystem.cs
@@ -1,13 +1,9 @@
-using System.Diagnostics.CodeAnalysis;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Station.Components;
 using Robust.Server.GameObjects;
-using Robust.Shared.Collections;
-using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 
 namespace Content.Server.GameTicking.Rules;
 
@@ -16,9 +12,9 @@ public abstract partial class GameRuleSystem<T> : EntitySystem where T : ICompon
     [Dependency] protected readonly IRobustRandom RobustRandom = default!;
     [Dependency] protected readonly IChatManager ChatManager = default!;
     [Dependency] protected readonly GameTicker GameTicker = default!;
+    [Dependency] protected readonly IGameTiming Timing = default!;
 
     // Not protected, just to be used in utility methods
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
     [Dependency] private readonly MapSystem _map = default!;
 
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index 5bce7f20e4..b9255bcbe4 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -1,12 +1,7 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Numerics;
 using Content.Server.Administration.Commands;
 using Content.Server.Administration.Managers;
-using Content.Server.Chat.Managers;
-using Content.Server.Chat.Systems;
+using Content.Server.Antag;
 using Content.Server.Communications;
-using Content.Server.RandomMetadata;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Ghost.Roles.Events;
@@ -18,9 +13,9 @@
 using Content.Server.NukeOps;
 using Content.Server.Popups;
 using Content.Server.Preferences.Managers;
+using Content.Server.RandomMetadata;
 using Content.Server.Roles;
 using Content.Server.RoundEnd;
-using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
 using Content.Server.Shuttles.Systems;
 using Content.Server.Spawners.Components;
@@ -32,7 +27,6 @@
 using Content.Shared.Dataset;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Prototypes;
-using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
@@ -43,50 +37,41 @@
 using Content.Shared.Store;
 using Content.Shared.Tag;
 using Content.Shared.Zombies;
-using Robust.Server.GameObjects;
-using Robust.Server.Maps;
 using Robust.Server.Player;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
+using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Robust.Shared.Configuration;
+using System.Linq;
 
 namespace Content.Server.GameTicking.Rules;
 
 public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
 {
-    [Dependency] private readonly ChatSystem _chat = default!;
-    [Dependency] private readonly EmergencyShuttleSystem _emergency = default!;
-    [Dependency] private readonly HumanoidAppearanceSystem _humanoid = default!;
-    [Dependency] private readonly IChatManager _chatManager = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IServerPreferencesManager _prefs = default!;
-    [Dependency] private readonly MapLoaderSystem _map = default!;
+    [Dependency] private readonly IAdminManager _adminManager = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly ILogManager _logManager = default!;
+    [Dependency] private readonly EmergencyShuttleSystem _emergency = default!;
+    [Dependency] private readonly HumanoidAppearanceSystem _humanoid = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly RandomMetadataSystem _randomMetadata = default!;
     [Dependency] private readonly MindSystem _mind = default!;
     [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly RoundEndSystem _roundEndSystem = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedRoleSystem _roles = default!;
-    [Dependency] private readonly ShuttleSystem _shuttle = default!;
     [Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
     [Dependency] private readonly StoreSystem _store = default!;
     [Dependency] private readonly TagSystem _tag = default!;
-    [Dependency] private readonly IAdminManager _adminManager = default!;
-    [Dependency] private readonly IConfigurationManager _cfg = default!;
-    [Dependency] private readonly WarDeclaratorSystem _warDeclarator = default!;
+    [Dependency] private readonly AntagSelectionSystem _antagSelection = default!;
 
+    private ISawmill _sawmill = default!;
 
     [ValidatePrototypeId<CurrencyPrototype>]
     private const string TelecrystalCurrencyPrototype = "Telecrystal";
@@ -107,171 +92,136 @@ public override void Initialize()
     {
         base.Initialize();
 
+        _sawmill = _logManager.GetSawmill("NukeOps");
+
         SubscribeLocalEvent<RoundStartAttemptEvent>(OnStartAttempt);
         SubscribeLocalEvent<RulePlayerSpawningEvent>(OnPlayersSpawning);
-        SubscribeLocalEvent<NukeOperativeComponent, MobStateChangedEvent>(OnMobStateChanged);
         SubscribeLocalEvent<RoundEndTextAppendEvent>(OnRoundEndText);
         SubscribeLocalEvent<NukeExplodedEvent>(OnNukeExploded);
         SubscribeLocalEvent<GameRunLevelChangedEvent>(OnRunLevelChanged);
         SubscribeLocalEvent<NukeDisarmSuccessEvent>(OnNukeDisarm);
+
+        SubscribeLocalEvent<NukeOperativeComponent, ComponentRemove>(OnComponentRemove);
+        SubscribeLocalEvent<NukeOperativeComponent, MobStateChangedEvent>(OnMobStateChanged);
         SubscribeLocalEvent<NukeOperativeComponent, GhostRoleSpawnerUsedEvent>(OnPlayersGhostSpawning);
         SubscribeLocalEvent<NukeOperativeComponent, MindAddedMessage>(OnMindAdded);
-        SubscribeLocalEvent<NukeOperativeComponent, ComponentInit>(OnComponentInit);
-        SubscribeLocalEvent<NukeOperativeComponent, ComponentRemove>(OnComponentRemove);
         SubscribeLocalEvent<NukeOperativeComponent, EntityZombifiedEvent>(OnOperativeZombified);
-        SubscribeLocalEvent<CommunicationConsoleCallShuttleAttemptEvent>(OnShuttleCallAttempt);
-        SubscribeLocalEvent<ShuttleConsoleFTLTravelStartEvent>(OnShuttleConsoleFTLStart);
+
         SubscribeLocalEvent<ConsoleFTLAttemptEvent>(OnShuttleFTLAttempt);
+        SubscribeLocalEvent<WarDeclaredEvent>(OnWarDeclared);
+        SubscribeLocalEvent<CommunicationConsoleCallShuttleAttemptEvent>(OnShuttleCallAttempt);
     }
 
-    /// <summary>
-    ///     Returns true when the player with UID opUid is a nuclear operative. Prevents random
-    ///     people from using the war declarator outside of the game mode.
-    /// </summary>
-    public bool TryGetRuleFromOperative(EntityUid opUid, [NotNullWhen(true)] out (NukeopsRuleComponent, GameRuleComponent)? comps)
+    protected override void Started(EntityUid uid, NukeopsRuleComponent component, GameRuleComponent gameRule,
+        GameRuleStartedEvent args)
     {
-        comps = null;
-        var query = EntityQueryEnumerator<NukeopsRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var ruleEnt, out var nukeops, out var gameRule))
-        {
-            if (!GameTicker.IsGameRuleAdded(ruleEnt, gameRule))
-                continue;
-
-            if (_mind.TryGetMind(opUid, out var mind, out _))
-            {
-                var found = nukeops.OperativePlayers.Values.Any(v => v == mind);
-                if (found)
-                {
-                    comps = (nukeops, gameRule);
-                    return true;
-                }
-            }
-        }
+        base.Started(uid, component, gameRule, args);
 
-        return false;
+        if (GameTicker.RunLevel == GameRunLevel.InRound)
+            SpawnOperativesForGhostRoles(uid, component);
     }
 
-    /// <summary>
-    ///     Search rule components by grid uid
-    /// </summary>
-    public bool TryGetRuleFromGrid(EntityUid gridId, [NotNullWhen(true)] out (NukeopsRuleComponent, GameRuleComponent)? comps)
-    {
-        comps = null;
-        var query = EntityQueryEnumerator<NukeopsRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var ruleEnt, out var nukeops, out var gameRule))
-        {
-            if (!GameTicker.IsGameRuleAdded(ruleEnt, gameRule))
-                continue;
-
-            if (gridId == nukeops.NukieShuttle || gridId == nukeops.NukieOutpost)
-            {
-                comps = (nukeops, gameRule);
-                return true;
-            }
-        }
+    #region Event Handlers
 
-        return false;
+    private void OnStartAttempt(RoundStartAttemptEvent ev)
+    {
+        TryRoundStartAttempt(ev, Loc.GetString("nukeops-title"));
     }
 
-    /// <summary>
-    ///     Returns conditions for war declaration
-    /// </summary>
-    public WarConditionStatus GetWarCondition(NukeopsRuleComponent nukieRule, GameRuleComponent gameRule)
+    private void OnPlayersSpawning(RulePlayerSpawningEvent ev)
     {
-        if (!nukieRule.CanEnableWarOps)
-            return WarConditionStatus.NO_WAR_UNKNOWN;
-
-        if (nukieRule.WarDeclaredTime != null && nukieRule.WarNukieArriveDelay != null)
+        var query = QueryActiveRules();
+        while (query.MoveNext(out var uid, out _, out var nukeops, out _))
         {
-            // Nukies must wait some time after declaration of war to get on the station
-            var warTime = _gameTiming.CurTime.Subtract(nukieRule.WarDeclaredTime.Value);
-            if (warTime > nukieRule.WarNukieArriveDelay)
+            if (!SpawnMap((uid, nukeops)))
             {
-                return WarConditionStatus.WAR_READY;
+                _sawmill.Info("Failed to load map for nukeops");
+                continue;
             }
-            return WarConditionStatus.WAR_DELAY;
-        }
 
-        if (nukieRule.OperativePlayers.Count < nukieRule.WarDeclarationMinOps)
-            return WarConditionStatus.NO_WAR_SMALL_CREW;
-        if (nukieRule.LeftOutpost)
-            return WarConditionStatus.NO_WAR_SHUTTLE_DEPARTED;
+            //Handle there being nobody readied up
+            if (ev.PlayerPool.Count == 0)
+                continue;
 
-        var gameruleTime = _gameTiming.CurTime.Subtract(gameRule.ActivatedAt);
-        if (gameruleTime > nukieRule.WarDeclarationDelay)
-            return WarConditionStatus.NO_WAR_TIMEOUT;
+            var commanderEligible = _antagSelection.GetEligibleSessions(ev.PlayerPool, nukeops.CommanderSpawnDetails.AntagRoleProto);
+            var agentEligible = _antagSelection.GetEligibleSessions(ev.PlayerPool, nukeops.AgentSpawnDetails.AntagRoleProto);
+            var operativeEligible = _antagSelection.GetEligibleSessions(ev.PlayerPool, nukeops.OperativeSpawnDetails.AntagRoleProto);
+            //Calculate how large the nukeops team needs to be
+            var nukiesToSelect = _antagSelection.CalculateAntagCount(_playerManager.PlayerCount, nukeops.PlayersPerOperative, nukeops.MaxOps);
+
+            //Select Nukies
+            //Select Commander, priority : commanderEligible, agentEligible, operativeEligible, all players
+            var selectedCommander = _antagSelection.ChooseAntags(1, commanderEligible, agentEligible, operativeEligible, ev.PlayerPool).FirstOrDefault();
+            //Select Agent, priority : agentEligible, operativeEligible, all players
+            var selectedAgent = _antagSelection.ChooseAntags(1, agentEligible, operativeEligible, ev.PlayerPool).FirstOrDefault();
+            //Select Operatives, priority : operativeEligible, all players
+            var selectedOperatives = _antagSelection.ChooseAntags(nukiesToSelect - 2, operativeEligible, ev.PlayerPool);
+
+            //Create the team!
+            //If the session is null, they will be spawned as ghost roles (provided the cvar is set)
+            var operatives = new List<NukieSpawn> { new NukieSpawn(selectedCommander, nukeops.CommanderSpawnDetails) };
+            if (nukiesToSelect > 1)
+                operatives.Add(new NukieSpawn(selectedAgent, nukeops.AgentSpawnDetails));
+
+            for (var i = 0; i < nukiesToSelect - 2; i++)
+            {
+                //Use up all available sessions first, then spawn the rest as ghost roles (if enabled)
+                if (selectedOperatives.Count > i)
+                {
+                    operatives.Add(new NukieSpawn(selectedOperatives[i], nukeops.OperativeSpawnDetails));
+                }
+                else
+                {
+                    operatives.Add(new NukieSpawn(null, nukeops.OperativeSpawnDetails));
+                }
+            }
 
-        return WarConditionStatus.YES_WAR;
-    }
+            SpawnOperatives(operatives, _cfg.GetCVar(CCVars.NukeopsSpawnGhostRoles), nukeops);
 
-    public void DeclareWar(EntityUid opsUid, string msg, string title, SoundSpecifier? announcementSound = null, Color? colorOverride = null)
-    {
-        if (!TryGetRuleFromOperative(opsUid, out var comps))
-            return;
+            foreach (var nukieSpawn in operatives)
+            {
+                if (nukieSpawn.Session == null)
+                    continue;
 
-        var nukieRule = comps.Value.Item1;
-        nukieRule.WarDeclaredTime = _gameTiming.CurTime;
-        _chat.DispatchGlobalAnnouncement(msg, title, announcementSound: announcementSound, colorOverride: colorOverride);
-        DistributeExtraTC(nukieRule);
-        _warDeclarator.RefreshAllUI(comps.Value.Item1, comps.Value.Item2);
+                GameTicker.PlayerJoinGame(nukieSpawn.Session);
+            }
+        }
     }
 
-    private void DistributeExtraTC(NukeopsRuleComponent nukieRule)
+    private void OnRoundEndText(RoundEndTextAppendEvent ev)
     {
-        var enumerator = EntityQueryEnumerator<StoreComponent>();
-        while (enumerator.MoveNext(out var uid, out var component))
+        var ruleQuery = QueryActiveRules();
+        while (ruleQuery.MoveNext(out _, out _, out var nukeops, out _))
         {
-            if (!_tag.HasTag(uid, NukeOpsUplinkTagPrototype))
-                continue;
-
-            if (!nukieRule.NukieOutpost.HasValue)
-                continue;
-
-            if (Transform(uid).MapID != Transform(nukieRule.NukieOutpost.Value).MapID) // Will receive bonus TC only on their start outpost
-                continue;
-
-            _store.TryAddCurrency(new () { { TelecrystalCurrencyPrototype, nukieRule.WarTCAmountPerNukie } }, uid, component);
+            var winText = Loc.GetString($"nukeops-{nukeops.WinType.ToString().ToLower()}");
+            ev.AddLine(winText);
 
-            var msg = Loc.GetString("store-currency-war-boost-given", ("target", uid));
-            _popupSystem.PopupEntity(msg, uid);
+            foreach (var cond in nukeops.WinConditions)
+            {
+                var text = Loc.GetString($"nukeops-cond-{cond.ToString().ToLower()}");
+                ev.AddLine(text);
+            }
         }
-    }
 
-    private void OnComponentInit(EntityUid uid, NukeOperativeComponent component, ComponentInit args)
-    {
-        var query = EntityQueryEnumerator<NukeopsRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var ruleEnt, out var nukeops, out var gameRule))
-        {
-            if (!GameTicker.IsGameRuleAdded(ruleEnt, gameRule))
-                continue;
+        ev.AddLine(Loc.GetString("nukeops-list-start"));
 
-            // If entity has a prior mind attached, add them to the players list.
-            if (!_mind.TryGetMind(uid, out var mind, out _))
+        var nukiesQuery = EntityQueryEnumerator<NukeopsRoleComponent, MindContainerComponent>();
+        while (nukiesQuery.MoveNext(out var nukeopsUid, out _, out var mindContainer))
+        {
+            if (!_mind.TryGetMind(nukeopsUid, out _, out var mind, mindContainer))
                 continue;
 
-            var name = MetaData(uid).EntityName;
-            nukeops.OperativePlayers.Add(name, mind);
+            ev.AddLine(mind.Session != null
+                ? Loc.GetString("nukeops-list-name-user", ("name", Name(nukeopsUid)), ("user", mind.Session.Name))
+                : Loc.GetString("nukeops-list-name", ("name", Name(nukeopsUid))));
         }
     }
 
-    private void OnComponentRemove(EntityUid uid, NukeOperativeComponent component, ComponentRemove args)
-    {
-        CheckRoundShouldEnd();
-    }
-
-    private void OnOperativeZombified(EntityUid uid, NukeOperativeComponent component, ref EntityZombifiedEvent args)
-    {
-        RemCompDeferred(uid, component);
-    }
-
     private void OnNukeExploded(NukeExplodedEvent ev)
     {
-        var query = EntityQueryEnumerator<NukeopsRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var nukeops, out var gameRule))
+        var query = QueryActiveRules();
+        while (query.MoveNext(out var uid, out _, out var nukeops, out _))
         {
-            if (!GameTicker.IsGameRuleAdded(uid, gameRule))
-                continue;
-
             if (ev.OwningStation != null)
             {
                 if (ev.OwningStation == nukeops.NukieOutpost)
@@ -313,8 +263,8 @@ private void OnNukeExploded(NukeExplodedEvent ev)
 
     private void OnRunLevelChanged(GameRunLevelChangedEvent ev)
     {
-        var query = EntityQueryEnumerator<NukeopsRuleComponent>();
-        while (query.MoveNext(out var uid, out var nukeops))
+        var query = QueryActiveRules();
+        while (query.MoveNext(out var uid, out _, out var nukeops, out _))
         {
             switch (ev.New)
             {
@@ -328,12 +278,187 @@ private void OnRunLevelChanged(GameRunLevelChangedEvent ev)
         }
     }
 
+    private void OnNukeDisarm(NukeDisarmSuccessEvent ev)
+    {
+        CheckRoundShouldEnd();
+    }
+
+    private void OnComponentRemove(EntityUid uid, NukeOperativeComponent component, ComponentRemove args)
+    {
+        CheckRoundShouldEnd();
+    }
+
+    private void OnMobStateChanged(EntityUid uid, NukeOperativeComponent component, MobStateChangedEvent ev)
+    {
+        if (ev.NewMobState == MobState.Dead)
+            CheckRoundShouldEnd();
+    }
+
+    private void OnPlayersGhostSpawning(EntityUid uid, NukeOperativeComponent component, GhostRoleSpawnerUsedEvent args)
+    {
+        var spawner = args.Spawner;
+
+        if (!TryComp<NukeOperativeSpawnerComponent>(spawner, out var nukeOpSpawner))
+            return;
+
+        HumanoidCharacterProfile? profile = null;
+        if (TryComp(args.Spawned, out ActorComponent? actor))
+            profile = _prefs.GetPreferences(actor.PlayerSession.UserId).SelectedCharacter as HumanoidCharacterProfile;
+
+        // TODO: this is kinda awful for multi-nukies
+        foreach (var nukeops in EntityQuery<NukeopsRuleComponent>())
+        {
+            SetupOperativeEntity(uid, nukeOpSpawner.OperativeName, nukeOpSpawner.SpawnDetails, profile);
+
+            nukeops.OperativeMindPendingData.Add(uid, nukeOpSpawner.SpawnDetails.AntagRoleProto);
+        }
+    }
+
+    private void OnMindAdded(EntityUid uid, NukeOperativeComponent component, MindAddedMessage args)
+    {
+        if (!_mind.TryGetMind(uid, out var mindId, out var mind))
+            return;
+
+        var query = QueryActiveRules();
+        while (query.MoveNext(out _, out _, out var nukeops, out _))
+        {
+            if (nukeops.OperativeMindPendingData.TryGetValue(uid, out var role) || !nukeops.SpawnOutpost ||
+                nukeops.RoundEndBehavior == RoundEndBehavior.Nothing)
+            {
+                role ??= nukeops.OperativeSpawnDetails.AntagRoleProto;
+                _roles.MindAddRole(mindId, new NukeopsRoleComponent { PrototypeId = role });
+                nukeops.OperativeMindPendingData.Remove(uid);
+            }
+
+            if (mind.Session is not { } playerSession)
+                return;
+
+            if (GameTicker.RunLevel != GameRunLevel.InRound)
+                return;
+
+            if (nukeops.TargetStation != null && !string.IsNullOrEmpty(Name(nukeops.TargetStation.Value)))
+            {
+                NotifyNukie(playerSession, component, nukeops);
+            }
+        }
+    }
+
+    private void OnOperativeZombified(EntityUid uid, NukeOperativeComponent component, ref EntityZombifiedEvent args)
+    {
+        RemCompDeferred(uid, component);
+    }
+
+    private void OnShuttleFTLAttempt(ref ConsoleFTLAttemptEvent ev)
+    {
+        var query = QueryActiveRules();
+        while (query.MoveNext(out _, out _, out var nukeops, out _))
+        {
+            if (ev.Uid != nukeops.NukieShuttle)
+                continue;
+
+            if (nukeops.WarDeclaredTime != null)
+            {
+                var timeAfterDeclaration = Timing.CurTime.Subtract(nukeops.WarDeclaredTime.Value);
+                var timeRemain = nukeops.WarNukieArriveDelay.Subtract(timeAfterDeclaration);
+                if (timeRemain > TimeSpan.Zero)
+                {
+                    ev.Cancelled = true;
+                    ev.Reason = Loc.GetString("war-ops-infiltrator-unavailable",
+                        ("time", timeRemain.ToString("mm\\:ss")));
+                    continue;
+                }
+            }
+
+            nukeops.LeftOutpost = true;
+        }
+    }
+
+    private void OnShuttleCallAttempt(ref CommunicationConsoleCallShuttleAttemptEvent ev)
+    {
+        var query = QueryActiveRules();
+        while (query.MoveNext(out _, out _, out var nukeops, out _))
+        {
+            // Can't call while war nukies are preparing to arrive
+            if (nukeops is { WarDeclaredTime: not null })
+            {
+                // Nukies must wait some time after declaration of war to get on the station
+                var warTime = Timing.CurTime.Subtract(nukeops.WarDeclaredTime.Value);
+                if (warTime < nukeops.WarNukieArriveDelay)
+                {
+                    ev.Cancelled = true;
+                    ev.Reason = Loc.GetString("war-ops-shuttle-call-unavailable");
+                    return;
+                }
+            }
+        }
+    }
+
+    private void OnWarDeclared(ref WarDeclaredEvent ev)
+    {
+        // TODO: this is VERY awful for multi-nukies
+        var query = QueryActiveRules();
+        while (query.MoveNext(out _, out _, out var nukeops, out _))
+        {
+            if (nukeops.WarDeclaredTime != null)
+                continue;
+
+            if (Transform(ev.DeclaratorEntity).MapID != nukeops.NukiePlanet)
+                continue;
+
+            var newStatus = GetWarCondition(nukeops, ev.Status);
+            ev.Status = newStatus;
+            if (newStatus == WarConditionStatus.WarReady)
+            {
+                nukeops.WarDeclaredTime = Timing.CurTime;
+                var timeRemain = nukeops.WarNukieArriveDelay + Timing.CurTime;
+                ev.DeclaratorEntity.Comp.ShuttleDisabledTime = timeRemain;
+
+                DistributeExtraTc(nukeops);
+            }
+        }
+    }
+
+    #endregion Event Handlers
+
     /// <summary>
-    /// Loneops can only spawn if there is no nukeops active
+    ///     Returns conditions for war declaration
     /// </summary>
-    public bool CheckLoneOpsSpawn()
+    public WarConditionStatus GetWarCondition(NukeopsRuleComponent nukieRule, WarConditionStatus? oldStatus)
     {
-        return !EntityQuery<NukeopsRuleComponent>().Any();
+        if (!nukieRule.CanEnableWarOps)
+            return WarConditionStatus.NoWarUnknown;
+
+        if (EntityQuery<NukeopsRoleComponent>().Count() < nukieRule.WarDeclarationMinOps)
+            return WarConditionStatus.NoWarSmallCrew;
+
+        if (nukieRule.LeftOutpost)
+            return WarConditionStatus.NoWarShuttleDeparted;
+
+        if (oldStatus == WarConditionStatus.YesWar)
+            return WarConditionStatus.WarReady;
+
+        return WarConditionStatus.YesWar;
+    }
+
+    private void DistributeExtraTc(NukeopsRuleComponent nukieRule)
+    {
+        var enumerator = EntityQueryEnumerator<StoreComponent>();
+        while (enumerator.MoveNext(out var uid, out var component))
+        {
+            if (!_tag.HasTag(uid, NukeOpsUplinkTagPrototype))
+                continue;
+
+            if (!nukieRule.NukieOutpost.HasValue)
+                continue;
+
+            if (Transform(uid).MapID != Transform(nukieRule.NukieOutpost.Value).MapID) // Will receive bonus TC only on their start outpost
+                continue;
+
+            _store.TryAddCurrency(new () { { TelecrystalCurrencyPrototype, nukieRule.WarTCAmountPerNukie } }, uid, component);
+
+            var msg = Loc.GetString("store-currency-war-boost-given", ("target", uid));
+            _popupSystem.PopupEntity(msg, uid);
+        }
     }
 
     private void OnRoundStart(EntityUid uid, NukeopsRuleComponent? component = null)
@@ -358,8 +483,8 @@ private void OnRoundStart(EntityUid uid, NukeopsRuleComponent? component = null)
         if (eligible.Count == 0)
             return;
 
-        component.TargetStation = _random.Pick(eligible);
-        component.OperationName = _randomMetadata.GetRandomFromSegments(new List<string> {OperationPrefixDataset, OperationSuffixDataset}, " ");
+        component.TargetStation = RobustRandom.Pick(eligible);
+        component.OperationName = _randomMetadata.GetRandomFromSegments([OperationPrefixDataset, OperationSuffixDataset], " ");
 
         var filter = Filter.Empty();
         var query = EntityQueryEnumerator<NukeOperativeComponent, ActorComponent>();
@@ -413,18 +538,16 @@ private void OnRoundEnd(EntityUid uid, NukeopsRuleComponent? component = null)
         }
 
         var allAlive = true;
-        var mindQuery = GetEntityQuery<MindComponent>();
-        var mobStateQuery = GetEntityQuery<MobStateComponent>();
-        foreach (var (_, mindId) in component.OperativePlayers)
+        var query = EntityQueryEnumerator<NukeopsRoleComponent, MindContainerComponent, MobStateComponent>();
+        while (query.MoveNext(out var nukeopsUid, out _, out var mindContainer, out var mobState))
         {
             // mind got deleted somehow so ignore it
-            if (!mindQuery.TryGetComponent(mindId, out var mind))
+            if (!_mind.TryGetMind(nukeopsUid, out _, out var mind, mindContainer))
                 continue;
 
             // check if player got gibbed or ghosted or something - count as dead
             if (mind.OwnedEntity != null &&
                 // if the player somehow isn't a mob anymore that also counts as dead
-                mobStateQuery.TryGetComponent(mind.OwnedEntity.Value, out var mobState) &&
                 // have to be alive, not crit or dead
                 mobState.CurrentState is MobState.Alive)
             {
@@ -474,37 +597,6 @@ private void OnRoundEnd(EntityUid uid, NukeopsRuleComponent? component = null)
         }
     }
 
-    private void OnRoundEndText(RoundEndTextAppendEvent ev)
-    {
-        var mindQuery = GetEntityQuery<MindComponent>();
-        foreach (var nukeops in EntityQuery<NukeopsRuleComponent>())
-        {
-            var winText = Loc.GetString($"nukeops-{nukeops.WinType.ToString().ToLower()}");
-
-            ev.AddLine(winText);
-
-            foreach (var cond in nukeops.WinConditions)
-            {
-                var text = Loc.GetString($"nukeops-cond-{cond.ToString().ToLower()}");
-
-                ev.AddLine(text);
-            }
-
-            ev.AddLine(Loc.GetString("nukeops-list-start"));
-            foreach (var (name, mindId) in nukeops.OperativePlayers)
-            {
-                if (mindQuery.TryGetComponent(mindId, out var mind) && mind.Session != null)
-                {
-                    ev.AddLine(Loc.GetString("nukeops-list-name-user", ("name", name), ("user", mind.Session.Name)));
-                }
-                else
-                {
-                    ev.AddLine(Loc.GetString("nukeops-list-name", ("name", name)));
-                }
-            }
-        }
-    }
-
     private void SetWinType(EntityUid uid, WinType type, NukeopsRuleComponent? component = null, bool endRound = true)
     {
         if (!Resolve(uid, ref component))
@@ -518,12 +610,9 @@ private void SetWinType(EntityUid uid, WinType type, NukeopsRuleComponent? compo
 
     private void CheckRoundShouldEnd()
     {
-        var query = EntityQueryEnumerator<NukeopsRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var nukeops, out var gameRule))
+        var query = QueryActiveRules();
+        while (query.MoveNext(out var uid, out _, out var nukeops, out _))
         {
-            if (!GameTicker.IsGameRuleAdded(uid, gameRule))
-                continue;
-
             if (nukeops.RoundEndBehavior == RoundEndBehavior.Nothing || nukeops.WinType == WinType.CrewMajor || nukeops.WinType == WinType.OpsMajor)
                 continue;
 
@@ -586,349 +675,52 @@ private void CheckRoundShouldEnd()
         }
     }
 
-    private void OnNukeDisarm(NukeDisarmSuccessEvent ev)
-    {
-        CheckRoundShouldEnd();
-    }
-
-    private void OnMobStateChanged(EntityUid uid, NukeOperativeComponent component, MobStateChangedEvent ev)
-    {
-        if (ev.NewMobState == MobState.Dead)
-            CheckRoundShouldEnd();
-    }
-
-    private void OnPlayersSpawning(RulePlayerSpawningEvent ev)
-    {
-        var query = EntityQueryEnumerator<NukeopsRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var nukeops, out var gameRule))
-        {
-            if (!GameTicker.IsGameRuleAdded(uid, gameRule))
-                continue;
-
-            if (!SpawnMap(uid, nukeops))
-            {
-                Logger.InfoS("nukies", "Failed to load map for nukeops");
-                continue;
-            }
-
-            // Basically copied verbatim from traitor code
-            var playersPerOperative = nukeops.PlayersPerOperative;
-            var maxOperatives = nukeops.MaxOps;
-
-            // Dear lord what is happening HERE.
-            var everyone = new List<ICommonSession>(ev.PlayerPool);
-            var prefList = new List<ICommonSession>();
-            var medPrefList = new List<ICommonSession>();
-            var cmdrPrefList = new List<ICommonSession>();
-            var operatives = new List<ICommonSession>();
-
-            // The LINQ expression ReSharper keeps suggesting is completely unintelligible so I'm disabling it
-            // ReSharper disable once ForeachCanBeConvertedToQueryUsingAnotherGetEnumerator
-            foreach (var player in everyone)
-            {
-                if (!ev.Profiles.ContainsKey(player.UserId))
-                {
-                    continue;
-                }
-
-                var profile = ev.Profiles[player.UserId];
-                if (profile.AntagPreferences.Contains(nukeops.OperativeRoleProto.Id))
-                {
-                    prefList.Add(player);
-                }
-                if (profile.AntagPreferences.Contains(nukeops.MedicRoleProto.Id))
-	            {
-	                medPrefList.Add(player);
-	            }
-                if (profile.AntagPreferences.Contains(nukeops.CommanderRoleProto.Id))
-                {
-                    cmdrPrefList.Add(player);
-                }
-            }
-
-            var numNukies = MathHelper.Clamp(_playerManager.PlayerCount / playersPerOperative, 1, maxOperatives);
-
-            for (var i = 0; i < numNukies; i++)
-            {
-                // TODO: Please fix this if you touch it.
-                ICommonSession nukeOp;
-                // Only one commander, so we do it at the start
-                if (i == 0)
-                {
-                    if (cmdrPrefList.Count == 0)
-                    {
-                        if (medPrefList.Count == 0)
-                        {
-                            if (prefList.Count == 0)
-                            {
-                                if (everyone.Count == 0)
-                                {
-                                    Logger.InfoS("preset", "Insufficient ready players to fill up with nukeops, stopping the selection");
-                                    break;
-                                }
-                                nukeOp = _random.PickAndTake(everyone);
-                                Logger.InfoS("preset", "Insufficient preferred nukeop commanders, agents or nukies, picking at random.");
-                            }
-                            else
-                            {
-                                nukeOp = _random.PickAndTake(prefList);
-                                everyone.Remove(nukeOp);
-                                Logger.InfoS("preset", "Insufficient preferred nukeop commander or agents, picking at random from regular op list.");
-                            }
-                        }
-                        else
-                        {
-                            nukeOp = _random.PickAndTake(medPrefList);
-                            everyone.Remove(nukeOp);
-                            prefList.Remove(nukeOp);
-                            Logger.InfoS("preset", "Insufficient preferred nukeop commanders, picking an agent");
-                        }
-                    }
-                    else
-                    {
-                        nukeOp = _random.PickAndTake(cmdrPrefList);
-                        everyone.Remove(nukeOp);
-                        prefList.Remove(nukeOp);
-                        medPrefList.Remove(nukeOp);
-                        Logger.InfoS("preset", "Selected a preferred nukeop commander.");
-                    }
-                }
-                else if (i == 1)
-                {
-                    if (medPrefList.Count == 0)
-                    {
-                        if (prefList.Count == 0)
-                        {
-                            if (everyone.Count == 0)
-                            {
-                                Logger.InfoS("preset", "Insufficient ready players to fill up with nukeops, stopping the selection");
-                                break;
-                            }
-                            nukeOp = _random.PickAndTake(everyone);
-                            Logger.InfoS("preset", "Insufficient preferred nukeop commanders, agents or nukies, picking at random.");
-                        }
-                        else
-                        {
-                            nukeOp = _random.PickAndTake(prefList);
-                            everyone.Remove(nukeOp);
-                            Logger.InfoS("preset", "Insufficient preferred nukeop commander or agents, picking at random from regular op list.");
-                        }
-                    }
-                    else
-                    {
-                        nukeOp = _random.PickAndTake(medPrefList);
-                        everyone.Remove(nukeOp);
-                        prefList.Remove(nukeOp);
-                        Logger.InfoS("preset", "Insufficient preferred nukeop commanders, picking an agent");
-                    }
-
-                }
-                else
-                {
-                    nukeOp = _random.PickAndTake(prefList);
-                    everyone.Remove(nukeOp);
-                    Logger.InfoS("preset", "Selected a preferred nukeop commander.");
-                }
-
-                operatives.Add(nukeOp);
-            }
-
-            SpawnOperatives(numNukies, operatives, false, nukeops);
-
-            foreach (var session in operatives)
-            {
-                ev.PlayerPool.Remove(session);
-                GameTicker.PlayerJoinGame(session);
-
-                if (!_mind.TryGetMind(session, out var mind, out _))
-                    continue;
-
-                var name = session.AttachedEntity == null
-                    ? string.Empty
-                    : Name(session.AttachedEntity.Value);
-                nukeops.OperativePlayers[name] = mind;
-            }
-        }
-    }
-
-    private void OnPlayersGhostSpawning(EntityUid uid, NukeOperativeComponent component, GhostRoleSpawnerUsedEvent args)
-    {
-        var spawner = args.Spawner;
-
-        if (!TryComp<NukeOperativeSpawnerComponent>(spawner, out var nukeOpSpawner))
-            return;
-
-        HumanoidCharacterProfile? profile = null;
-        if (TryComp(args.Spawned, out ActorComponent? actor))
-            profile = _prefs.GetPreferences(actor.PlayerSession.UserId).SelectedCharacter as HumanoidCharacterProfile;
-
-        // todo: this is kinda awful for multi-nukies
-        foreach (var nukeops in EntityQuery<NukeopsRuleComponent>())
-        {
-            if (nukeOpSpawner.OperativeName == null
-                || nukeOpSpawner.OperativeStartingGear == null
-                || nukeOpSpawner.OperativeRolePrototype == null)
-            {
-                // I have no idea what is going on with nuke ops code, but I'm pretty sure this shouldn't be possible.
-                Log.Error($"Invalid nuke op spawner: {ToPrettyString(spawner)}");
-                continue;
-            }
-
-            SetupOperativeEntity(uid, nukeOpSpawner.OperativeName, nukeOpSpawner.OperativeStartingGear, profile, nukeops);
-
-            nukeops.OperativeMindPendingData.Add(uid, nukeOpSpawner.OperativeRolePrototype);
-        }
-    }
-
-    private void OnMindAdded(EntityUid uid, NukeOperativeComponent component, MindAddedMessage args)
-    {
-        if (!_mind.TryGetMind(uid, out var mindId, out var mind))
-            return;
-
-        foreach (var (nukeops, gameRule) in EntityQuery<NukeopsRuleComponent, GameRuleComponent>())
-        {
-            if (nukeops.OperativeMindPendingData.TryGetValue(uid, out var role) || !nukeops.SpawnOutpost || nukeops.RoundEndBehavior == RoundEndBehavior.Nothing)
-            {
-                role ??= nukeops.OperativeRoleProto;
-                _roles.MindAddRole(mindId, new NukeopsRoleComponent { PrototypeId = role });
-                nukeops.OperativeMindPendingData.Remove(uid);
-            }
-
-            if (mind.Session is not { } playerSession)
-                return;
-
-            if (nukeops.OperativePlayers.ContainsValue(mindId))
-                return;
-
-            nukeops.OperativePlayers.Add(Name(uid), mindId);
-            _warDeclarator.RefreshAllUI(nukeops, gameRule);
-
-            if (GameTicker.RunLevel != GameRunLevel.InRound)
-                return;
-
-            if (nukeops.TargetStation != null && !string.IsNullOrEmpty(Name(nukeops.TargetStation.Value)))
-            {
-                NotifyNukie(playerSession, component, nukeops);
-            }
-        }
-    }
-
-    private bool SpawnMap(EntityUid uid, NukeopsRuleComponent? component = null)
+    private bool SpawnMap(Entity<NukeopsRuleComponent> ent)
     {
-        if (!Resolve(uid, ref component))
-            return false;
-
-        if (component.NukiePlanet != null)
-            return true; // Map is already loaded.
-
-        if (!component.SpawnOutpost)
+        if (!ent.Comp.SpawnOutpost
+            || ent.Comp.NukiePlanet != null)
             return true;
 
-        var path = component.OutpostMap;
-        var shuttlePath = component.ShuttleMap;
-
-        var mapId = _mapManager.CreateMap();
-        var options = new MapLoadOptions
-        {
-            LoadMap = true,
-        };
-
-        if (!_map.TryLoad(mapId, path.ToString(), out var outpostGrids, options) || outpostGrids.Count == 0)
+        ent.Comp.NukiePlanet = _mapManager.CreateMap();
+        var gameMap = _prototypeManager.Index(ent.Comp.OutpostMapPrototype);
+        ent.Comp.NukieOutpost = GameTicker.LoadGameMap(gameMap, ent.Comp.NukiePlanet.Value, null)[0];
+        var query = EntityQueryEnumerator<NukeOpsShuttleComponent, TransformComponent>();
+        while (query.MoveNext(out var grid, out _, out var shuttleTransform))
         {
-            Logger.ErrorS("nukies", $"Error loading map {path} for nukies!");
-            return false;
-        }
-
-        // Assume the first grid is the outpost grid.
-        component.NukieOutpost = outpostGrids[0];
-
-        // Listen I just don't want it to overlap.
-        if (!_map.TryLoad(mapId, shuttlePath.ToString(), out var grids, new MapLoadOptions {Offset = Vector2.One * 1000f}) || !grids.Any())
-        {
-            Logger.ErrorS("nukies", $"Error loading grid {shuttlePath} for nukies!");
-            return false;
-        }
-
-        var shuttleId = grids.First();
-
-        // Naughty, someone saved the shuttle as a map.
-        if (Deleted(shuttleId))
-        {
-            Logger.ErrorS("nukeops", $"Tried to load nukeops shuttle as a map, aborting.");
-            _mapManager.DeleteMap(mapId);
-            return false;
-        }
+            if (shuttleTransform.MapID != ent.Comp.NukiePlanet)
+                continue;
 
-        if (TryComp<ShuttleComponent>(shuttleId, out var shuttle))
-        {
-            _shuttle.TryFTLDock(shuttleId, shuttle, component.NukieOutpost.Value);
+            ent.Comp.NukieShuttle = grid;
+            break;
         }
 
-        AddComp<NukeOpsShuttleComponent>(shuttleId);
-
-        component.NukiePlanet = mapId;
-        component.NukieShuttle = shuttleId;
         return true;
     }
 
-    private (string Name, string Role, string Gear) GetOperativeSpawnDetails(int spawnNumber, NukeopsRuleComponent component )
-    {
-        string name;
-        string role;
-        string gear;
-
-        // Spawn the Commander then Agent first.
-        switch (spawnNumber)
-        {
-            case 0:
-                name = Loc.GetString("nukeops-role-commander") + " " + _random.PickAndTake(component.OperativeNames[component.EliteNames]);
-                role = component.CommanderRoleProto;
-                gear = component.CommanderStartGearProto;
-                break;
-            case 1:
-                name = Loc.GetString("nukeops-role-agent") + " " + _random.PickAndTake(component.OperativeNames[component.NormalNames]);
-                role = component.MedicRoleProto;
-                gear = component.MedicStartGearProto;
-                break;
-            default:
-                name = Loc.GetString("nukeops-role-operator") + " " + _random.PickAndTake(component.OperativeNames[component.NormalNames]);
-                role = component.OperativeRoleProto;
-                gear = component.OperativeStartGearProto;
-                break;
-        }
-
-        return (name, role, gear);
-    }
-
     /// <summary>
     ///     Adds missing nuke operative components, equips starting gear and renames the entity.
     /// </summary>
-    private void SetupOperativeEntity(EntityUid mob, string name, string gear, HumanoidCharacterProfile? profile, NukeopsRuleComponent component)
+    private void SetupOperativeEntity(EntityUid mob, string name, NukeopSpawnPreset spawnDetails, HumanoidCharacterProfile? profile)
     {
         _metaData.SetEntityName(mob, name);
         EnsureComp<NukeOperativeComponent>(mob);
 
         if (profile != null)
-        {
             _humanoid.LoadProfile(mob, profile);
-        }
 
-        if (component.StartingGearPrototypes.TryGetValue(gear, out var gearPrototype))
-            _stationSpawning.EquipStartingGear(mob, gearPrototype, profile);
+        var gear = _prototypeManager.Index(spawnDetails.GearProto);
+        _stationSpawning.EquipStartingGear(mob, gear, profile);
 
         _npcFaction.RemoveFaction(mob, "NanoTrasen", false);
         _npcFaction.AddFaction(mob, "Syndicate");
     }
 
-    private void SpawnOperatives(int spawnCount, List<ICommonSession> sessions, bool addSpawnPoints, NukeopsRuleComponent component)
+    private void SpawnOperatives(List<NukieSpawn> sessions, bool spawnGhostRoles, NukeopsRuleComponent component)
     {
-        if (component.NukieOutpost == null)
+        if (component.NukieOutpost is not { Valid: true } outpostUid)
             return;
 
-        var outpostUid = component.NukieOutpost.Value;
         var spawns = new List<EntityCoordinates>();
-
-        // Forgive me for hardcoding prototypes
         foreach (var (_, meta, xform) in EntityQuery<SpawnPointComponent, MetaDataComponent, TransformComponent>(true))
         {
             if (meta.EntityPrototype?.ID != component.SpawnPointProto.Id)
@@ -941,50 +733,54 @@ private void SpawnOperatives(int spawnCount, List<ICommonSession> sessions, bool
             break;
         }
 
+        //Fallback, spawn at the centre of the map
         if (spawns.Count == 0)
         {
             spawns.Add(Transform(outpostUid).Coordinates);
-            Logger.WarningS("nukies", $"Fell back to default spawn for nukies!");
+            _sawmill.Warning($"Fell back to default spawn for nukies!");
         }
 
-        // TODO: This should spawn the nukies in regardless and transfer if possible; rest should go to shot roles.
-        for(var i = 0; i < spawnCount; i++)
+        //Spawn the team
+        foreach (var nukieSession in sessions)
         {
-            var spawnDetails = GetOperativeSpawnDetails(i, component);
-            var nukeOpsAntag = _prototypeManager.Index<AntagPrototype>(spawnDetails.Role);
+            var name = $"{Loc.GetString(nukieSession.Type.NamePrefix)} {RobustRandom.PickAndTake(_prototypeManager.Index(nukieSession.Type.NameList).Values.ToList())}";
+
+            var nukeOpsAntag = _prototypeManager.Index(nukieSession.Type.AntagRoleProto);
 
-            if (sessions.TryGetValue(i, out var session))
+            //If a session is available, spawn mob and transfer mind into it
+            if (nukieSession.Session != null)
             {
-                var profile = _prefs.GetPreferences(session.UserId).SelectedCharacter as HumanoidCharacterProfile;
+                var profile = _prefs.GetPreferences(nukieSession.Session.UserId).SelectedCharacter as HumanoidCharacterProfile;
                 if (!_prototypeManager.TryIndex(profile?.Species ?? SharedHumanoidAppearanceSystem.DefaultSpecies, out SpeciesPrototype? species))
                 {
                     species = _prototypeManager.Index<SpeciesPrototype>(SharedHumanoidAppearanceSystem.DefaultSpecies);
                 }
 
-                var mob = Spawn(species.Prototype, _random.Pick(spawns));
-                SetupOperativeEntity(mob, spawnDetails.Name, spawnDetails.Gear, profile, component);
-                var newMind = _mind.CreateMind(session.UserId, spawnDetails.Name);
-                _mind.SetUserId(newMind, session.UserId);
-                _roles.MindAddRole(newMind, new NukeopsRoleComponent { PrototypeId = spawnDetails.Role });
+                var mob = Spawn(species.Prototype, RobustRandom.Pick(spawns));
+                SetupOperativeEntity(mob, name, nukieSession.Type, profile);
+
+                var newMind = _mind.CreateMind(nukieSession.Session.UserId, name);
+                _mind.SetUserId(newMind, nukieSession.Session.UserId);
+                _roles.MindAddRole(newMind, new NukeopsRoleComponent { PrototypeId = nukieSession.Type.AntagRoleProto });
 
                 // Automatically de-admin players who are being made nukeops
-                if (_cfg.GetCVar(CCVars.AdminDeadminOnJoin) && _adminManager.IsAdmin(session))
-                    _adminManager.DeAdmin(session);
+                if (_cfg.GetCVar(CCVars.AdminDeadminOnJoin) && _adminManager.IsAdmin(nukieSession.Session))
+                    _adminManager.DeAdmin(nukieSession.Session);
 
                 _mind.TransferTo(newMind, mob);
             }
-            else if (addSpawnPoints)
+            //Otherwise, spawn as a ghost role
+            else if (spawnGhostRoles)
             {
-                var spawnPoint = Spawn(component.GhostSpawnPointProto, _random.Pick(spawns));
+                var spawnPoint = Spawn(component.GhostSpawnPointProto, RobustRandom.Pick(spawns));
                 var ghostRole = EnsureComp<GhostRoleComponent>(spawnPoint);
                 EnsureComp<GhostRoleMobSpawnerComponent>(spawnPoint);
                 ghostRole.RoleName = Loc.GetString(nukeOpsAntag.Name);
                 ghostRole.RoleDescription = Loc.GetString(nukeOpsAntag.Objective);
 
                 var nukeOpSpawner = EnsureComp<NukeOperativeSpawnerComponent>(spawnPoint);
-                nukeOpSpawner.OperativeName = spawnDetails.Name;
-                nukeOpSpawner.OperativeRolePrototype = spawnDetails.Role;
-                nukeOpSpawner.OperativeStartingGear = spawnDetails.Gear;
+                nukeOpSpawner.OperativeName = name;
+                nukeOpSpawner.SpawnDetails = nukieSession.Type;
             }
         }
     }
@@ -997,181 +793,67 @@ private void NotifyNukie(ICommonSession session, NukeOperativeComponent nukeop,
         if (nukeopsRule.TargetStation is not { } station)
             return;
 
-        _chatManager.DispatchServerMessage(session, Loc.GetString("nukeops-welcome", ("station", station), ("name", nukeopsRule.OperationName)));
-        _audio.PlayGlobal(nukeop.GreetSoundNotification, session);
+        _antagSelection.SendBriefing(session, Loc.GetString("nukeops-welcome", ("station", station), ("name", nukeopsRule.OperationName)), Color.Red, nukeop.GreetSoundNotification);
     }
 
-
+    /// <summary>
+    /// Spawn nukie ghost roles if this gamerule was started mid round
+    /// </summary>
     private void SpawnOperativesForGhostRoles(EntityUid uid, NukeopsRuleComponent? component = null)
     {
         if (!Resolve(uid, ref component))
             return;
 
-        if (!SpawnMap(uid, component))
+        if (!SpawnMap((uid, component)))
         {
-            Logger.InfoS("nukies", "Failed to load map for nukeops");
+            _sawmill.Info("Failed to load map for nukeops");
             return;
         }
-        // Basically copied verbatim from traitor code
-        var playersPerOperative = component.PlayersPerOperative;
-        var maxOperatives = component.MaxOps;
 
-        var playerPool = _playerManager.Sessions.ToList();
-        var numNukies = MathHelper.Clamp(playerPool.Count / playersPerOperative, 1, maxOperatives);
-
-        var operatives = new List<ICommonSession>();
-        SpawnOperatives(numNukies, operatives, true, component);
-    }
+        var numNukies = _antagSelection.CalculateAntagCount(_playerManager.PlayerCount, component.PlayersPerOperative, component.MaxOps);
 
-    //For admins forcing someone to nukeOps.
-    public void MakeLoneNukie(EntityUid mindId, MindComponent mind)
-    {
-        if (!mind.OwnedEntity.HasValue)
+        //Dont continue if we have no nukies to spawn
+        if (numNukies == 0)
             return;
 
-        //ok hardcoded value bad but so is everything else here
-        _roles.MindAddRole(mindId, new NukeopsRoleComponent { PrototypeId = NukeopsId }, mind);
-        if (mind.CurrentEntity != null)
-        {
-            foreach (var (nukeops, _) in EntityQuery<NukeopsRuleComponent, GameRuleComponent>())
-            {
-                nukeops.OperativePlayers.Add(mind.CharacterName!, mindId);
-            }
-        }
-
-        SetOutfitCommand.SetOutfit(mind.OwnedEntity.Value, "SyndicateOperativeGearFull", EntityManager);
-    }
-
-    private void OnStartAttempt(RoundStartAttemptEvent ev)
-    {
-        var query = EntityQueryEnumerator<NukeopsRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var nukeops, out var gameRule))
+        //Fill the ranks, commander first, then agent, then operatives
+        //TODO: Possible alternative team compositions? Like multiple commanders or agents
+        var operatives = new List<NukieSpawn>();
+        if (numNukies >= 1)
+            operatives.Add(new NukieSpawn(null, component.CommanderSpawnDetails));
+        if (numNukies >= 2)
+            operatives.Add(new NukieSpawn(null, component.AgentSpawnDetails));
+        if (numNukies >= 3)
         {
-            if (!GameTicker.IsGameRuleAdded(uid, gameRule))
-                continue;
-
-            var minPlayers = nukeops.MinPlayers;
-            if (!ev.Forced && ev.Players.Length < minPlayers)
+            for (var i = 2; i < numNukies; i++)
             {
-                _chatManager.SendAdminAnnouncement(Loc.GetString("nukeops-not-enough-ready-players",
-                    ("readyPlayersCount", ev.Players.Length), ("minimumPlayers", minPlayers)));
-                ev.Cancel();
-                continue;
+                operatives.Add(new NukieSpawn(null, component.OperativeSpawnDetails));
             }
-
-            if (ev.Players.Length != 0)
-                continue;
-
-            _chatManager.DispatchServerAnnouncement(Loc.GetString("nukeops-no-one-ready"));
-            ev.Cancel();
         }
-    }
 
-    private void OnShuttleFTLAttempt(ref ConsoleFTLAttemptEvent ev)
-    {
-        var query = EntityQueryEnumerator<NukeopsRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var ruleUid, out var nukeops, out var gameRule))
-        {
-            if (!GameTicker.IsGameRuleAdded(ruleUid, gameRule))
-                continue;
-
-            if (nukeops.NukieOutpost == null ||
-                nukeops.WarDeclaredTime == null ||
-                nukeops.WarNukieArriveDelay == null ||
-                ev.Uid != nukeops.NukieShuttle)
-                continue;
-
-            var mapOutpost = Transform(nukeops.NukieOutpost.Value).MapID;
-            var mapShuttle = Transform(ev.Uid).MapID;
-
-            if (mapOutpost == mapShuttle)
-            {
-                var timeAfterDeclaration = _gameTiming.CurTime.Subtract(nukeops.WarDeclaredTime.Value);
-                var timeRemain = nukeops.WarNukieArriveDelay.Value.Subtract(timeAfterDeclaration);
-                if (timeRemain > TimeSpan.Zero)
-                {
-                    ev.Cancelled = true;
-                    ev.Reason = Loc.GetString("war-ops-infiltrator-unavailable", ("minutes", timeRemain.Minutes), ("seconds", timeRemain.Seconds));
-                }
-            }
-        }
+        SpawnOperatives(operatives, true, component);
     }
 
-    private void OnShuttleConsoleFTLStart(ref ShuttleConsoleFTLTravelStartEvent ev)
-    {
-        var query = EntityQueryEnumerator<NukeopsRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var ruleUid, out var nukeops, out var gameRule))
-        {
-            if (!GameTicker.IsGameRuleAdded(ruleUid, gameRule))
-                continue;
-
-            var gridUid = Transform(ev.Uid).GridUid;
-            if (nukeops.NukieOutpost == null ||
-                gridUid == null ||
-                gridUid.Value != nukeops.NukieShuttle)
-                continue;
-
-            var mapOutpost = Transform(nukeops.NukieOutpost.Value).MapID;
-            var mapShuttle = Transform(ev.Uid).MapID;
-
-            if (mapOutpost == mapShuttle)
-            {
-                nukeops.LeftOutpost = true;
-
-                if (TryGetRuleFromGrid(gridUid.Value, out var comps))
-                    _warDeclarator.RefreshAllUI(comps.Value.Item1, comps.Value.Item2);
-            }
-        }
-    }
-
-    private void OnShuttleCallAttempt(ref CommunicationConsoleCallShuttleAttemptEvent ev)
+    //For admins forcing someone to nukeOps.
+    public void MakeLoneNukie(EntityUid entity)
     {
-        var query = EntityQueryEnumerator<NukeopsRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var ruleUid, out var nukeops, out var gameRule))
-        {
-            if (!GameTicker.IsGameRuleAdded(ruleUid, gameRule))
-                continue;
+        if (!_mind.TryGetMind(entity, out var mindId, out var mindComponent))
+            return;
 
-            // Can't call while nukies are preparing to arrive
-            if (GetWarCondition(nukeops, gameRule) == WarConditionStatus.WAR_DELAY)
-            {
-                ev.Cancelled = true;
-                ev.Reason = Loc.GetString("war-ops-shuttle-call-unavailable");
-                return;
-            }
-        }
+        //ok hardcoded value bad but so is everything else here
+        _roles.MindAddRole(mindId, new NukeopsRoleComponent { PrototypeId = NukeopsId }, mindComponent);
+        SetOutfitCommand.SetOutfit(entity, "SyndicateOperativeGearFull", EntityManager);
     }
 
-    protected override void Started(EntityUid uid, NukeopsRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
+    private sealed class NukieSpawn
     {
-        base.Started(uid, component, gameRule, args);
-        // TODO: Loot table or something
-        foreach (var proto in new[]
-                 {
-                     component.CommanderStartGearProto,
-                     component.MedicStartGearProto,
-                     component.OperativeStartGearProto
-                 })
-        {
-            component.StartingGearPrototypes.Add(proto, _prototypeManager.Index<StartingGearPrototype>(proto));
-        }
+        public ICommonSession? Session { get; private set; }
+        public NukeopSpawnPreset Type { get; private set; }
 
-        foreach (var proto in new[] { component.EliteNames, component.NormalNames })
+        public NukieSpawn(ICommonSession? session, NukeopSpawnPreset type)
         {
-            component.OperativeNames.Add(proto, new List<string>(_prototypeManager.Index<DatasetPrototype>(proto).Values));
+            Session = session;
+            Type = type;
         }
-
-        // Add pre-existing nuke operatives to the credit list.
-        var query = EntityQuery<NukeOperativeComponent, MindContainerComponent, MetaDataComponent>(true);
-        foreach (var (_, mindComp, metaData) in query)
-        {
-            if (!mindComp.HasMind)
-                continue;
-
-            component.OperativePlayers.Add(metaData.EntityName, mindComp.Mind.Value);
-        }
-
-        if (GameTicker.RunLevel == GameRunLevel.InRound)
-            SpawnOperativesForGhostRoles(uid, component);
     }
 }
diff --git a/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs b/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
index eb22ba9ead..f83d719c21 100644
--- a/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs
@@ -271,11 +271,12 @@ private void OnPlayerSpawningEvent(RulePlayerSpawningEvent ev)
     }
 
     //Forcing one player to be a pirate.
-    public void MakePirate(EntityUid mindId, MindComponent mind)
+    public void MakePirate(EntityUid entity)
     {
-        if (!mind.OwnedEntity.HasValue)
+        if (!_mindSystem.TryGetMind(entity, out var mindId, out var mind))
             return;
-        SetOutfitCommand.SetOutfit(mind.OwnedEntity.Value, GearId, EntityManager);
+
+        SetOutfitCommand.SetOutfit(entity, GearId, EntityManager);
 
         var pirateRule = EntityQuery<PiratesRuleComponent>().FirstOrDefault();
         if (pirateRule == null)
diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
index 5645858543..d20775c734 100644
--- a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
@@ -1,7 +1,5 @@
-using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Antag;
-using Content.Server.Chat.Managers;
 using Content.Server.EUI;
 using Content.Server.Flash;
 using Content.Server.GameTicking.Rules.Components;
@@ -13,10 +11,12 @@
 using Content.Server.Revolutionary.Components;
 using Content.Server.Roles;
 using Content.Server.RoundEnd;
-using Content.Shared.Chat;
+using Content.Server.Shuttles.Systems;
+using Content.Server.Station.Systems;
 using Content.Shared.Database;
 using Content.Shared.Humanoid;
 using Content.Shared.IdentityManagement;
+using Content.Shared.Inventory;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mindshield.Components;
@@ -27,9 +27,9 @@
 using Content.Shared.Roles;
 using Content.Shared.Stunnable;
 using Content.Shared.Zombies;
-using Robust.Server.Audio;
-using Robust.Server.GameObjects;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
+using System.Linq;
 
 namespace Content.Server.GameTicking.Rules;
 
@@ -39,7 +39,6 @@ namespace Content.Server.GameTicking.Rules;
 public sealed class RevolutionaryRuleSystem : GameRuleSystem<RevolutionaryRuleComponent>
 {
     [Dependency] private readonly IAdminLogManager _adminLogManager = default!;
-    [Dependency] private readonly IChatManager _chatManager = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly AntagSelectionSystem _antagSelection = default!;
     [Dependency] private readonly EuiManager _euiMan = default!;
@@ -50,12 +49,13 @@ public sealed class RevolutionaryRuleSystem : GameRuleSystem<RevolutionaryRuleCo
     [Dependency] private readonly RoleSystem _role = default!;
     [Dependency] private readonly SharedStunSystem _stun = default!;
     [Dependency] private readonly RoundEndSystem _roundEnd = default!;
-    [Dependency] private readonly AudioSystem _audioSystem = default!;
+    [Dependency] private readonly StationSystem _stationSystem = default!;
+    [Dependency] private readonly EmergencyShuttleSystem _emergencyShuttle = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
 
-    [ValidatePrototypeId<NpcFactionPrototype>]
-    public const string RevolutionaryNpcFaction = "Revolutionary";
-    [ValidatePrototypeId<AntagPrototype>]
-    public const string RevolutionaryAntagRole = "Rev";
+    //Used in OnPostFlash, no reference to the rule component is available
+    public readonly ProtoId<NpcFactionPrototype> RevolutionaryNpcFaction = "Revolutionary";
+    public readonly ProtoId<NpcFactionPrototype> RevPrototypeId = "Rev";
 
     public override void Initialize()
     {
@@ -69,15 +69,20 @@ public override void Initialize()
         SubscribeLocalEvent<HeadRevolutionaryComponent, AfterFlashedEvent>(OnPostFlash);
     }
 
+    //Set miniumum players
+    protected override void Added(EntityUid uid, RevolutionaryRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
+    {
+        base.Added(uid, component, gameRule, args);
+
+        gameRule.MinPlayers = component.MinPlayers;
+    }
+
     protected override void Started(EntityUid uid, RevolutionaryRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
         base.Started(uid, component, gameRule, args);
         component.CommandCheck = _timing.CurTime + component.TimerWait;
     }
 
-    /// <summary>
-    /// Checks if the round should end and also checks who has a mindshield.
-    /// </summary>
     protected override void ActiveTick(EntityUid uid, RevolutionaryRuleComponent component, GameRuleComponent gameRule, float frameTime)
     {
         base.ActiveTick(uid, component, gameRule, frameTime);
@@ -139,63 +144,63 @@ private void OnGetBriefing(EntityUid uid, RevolutionaryRoleComponent comp, ref G
         args.Append(Loc.GetString(head ? "head-rev-briefing" : "rev-briefing"));
     }
 
+    //Check for enough players to start rule
     private void OnStartAttempt(RoundStartAttemptEvent ev)
     {
-        var query = AllEntityQuery<RevolutionaryRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var comp, out var gameRule))
-        {
-            _antagSelection.AttemptStartGameRule(ev, uid, comp.MinPlayers, gameRule);
-        }
+        TryRoundStartAttempt(ev, Loc.GetString("roles-antag-rev-name"));
     }
 
     private void OnPlayerJobAssigned(RulePlayerJobsAssignedEvent ev)
     {
         var query = QueryActiveRules();
-        while (query.MoveNext(out _, out var comp, out _))
+        while (query.MoveNext(out var uid, out var activeGameRule, out var comp, out var gameRule))
         {
-            _antagSelection.EligiblePlayers(comp.HeadRevPrototypeId, comp.MaxHeadRevs, comp.PlayersPerHeadRev, comp.HeadRevStartSound,
-                "head-rev-role-greeting", "#5e9cff", out var chosen);
-            if (chosen.Any())
-                GiveHeadRev(chosen, comp.HeadRevPrototypeId, comp);
-            else
-            {
-                _chatManager.SendAdminAnnouncement(Loc.GetString("rev-no-heads"));
-            }
+            var eligiblePlayers = _antagSelection.GetEligiblePlayers(ev.Players, comp.HeadRevPrototypeId);
+
+            if (eligiblePlayers.Count == 0)
+                continue;
+
+            var headRevCount = _antagSelection.CalculateAntagCount(ev.Players.Length, comp.PlayersPerHeadRev, comp.MaxHeadRevs);
+
+            var headRevs = _antagSelection.ChooseAntags(headRevCount, eligiblePlayers);
+
+            GiveHeadRev(headRevs, comp.HeadRevPrototypeId, comp);
         }
     }
 
-    private void GiveHeadRev(List<EntityUid> chosen, string antagProto, RevolutionaryRuleComponent comp)
+    private void GiveHeadRev(IEnumerable<EntityUid> chosen, ProtoId<AntagPrototype> antagProto, RevolutionaryRuleComponent comp)
     {
         foreach (var headRev in chosen)
-        {
-            RemComp<CommandStaffComponent>(headRev);
+            GiveHeadRev(headRev, antagProto, comp);
+    }
+    private void GiveHeadRev(EntityUid chosen, ProtoId<AntagPrototype> antagProto, RevolutionaryRuleComponent comp)
+    {
+        RemComp<CommandStaffComponent>(chosen);
 
-            var inCharacterName = MetaData(headRev).EntityName;
-            if (_mind.TryGetMind(headRev, out var mindId, out var mind))
-            {
-                if (!_role.MindHasRole<RevolutionaryRoleComponent>(mindId))
-                {
-                    _role.MindAddRole(mindId, new RevolutionaryRoleComponent { PrototypeId = antagProto });
-                }
-                if (mind.Session != null)
-                {
-                    comp.HeadRevs.Add(inCharacterName, mindId);
-                }
-            }
+        var inCharacterName = MetaData(chosen).EntityName;
 
-            _antagSelection.GiveAntagBagGear(headRev, comp.StartingGear);
-            EnsureComp<RevolutionaryComponent>(headRev);
-            EnsureComp<HeadRevolutionaryComponent>(headRev);
+        if (!_mind.TryGetMind(chosen, out var mind, out _))
+            return;
+
+        if (!_role.MindHasRole<RevolutionaryRoleComponent>(mind))
+        {
+            _role.MindAddRole(mind, new RevolutionaryRoleComponent { PrototypeId = antagProto }, silent: true);
         }
+
+        comp.HeadRevs.Add(inCharacterName, mind);
+        _inventory.SpawnItemsOnEntity(chosen, comp.StartingGear);
+        var revComp = EnsureComp<RevolutionaryComponent>(chosen);
+        EnsureComp<HeadRevolutionaryComponent>(chosen);
+
+        _antagSelection.SendBriefing(chosen, Loc.GetString("head-rev-role-greeting"), Color.CornflowerBlue, revComp.RevStartSound);
     }
 
     /// <summary>
     /// Called when a Head Rev uses a flash in melee to convert somebody else.
     /// </summary>
-    public void OnPostFlash(EntityUid uid, HeadRevolutionaryComponent comp, ref AfterFlashedEvent ev)
+    private void OnPostFlash(EntityUid uid, HeadRevolutionaryComponent comp, ref AfterFlashedEvent ev)
     {
-        TryComp<AlwaysRevolutionaryConvertibleComponent>(ev.Target, out var alwaysConvertibleComp);
-        var alwaysConvertible = alwaysConvertibleComp != null;
+        var alwaysConvertible = HasComp<AlwaysRevolutionaryConvertibleComponent>(ev.Target);
 
         if (!_mind.TryGetMind(ev.Target, out var mindId, out var mind) && !alwaysConvertible)
             return;
@@ -211,8 +216,9 @@ public void OnPostFlash(EntityUid uid, HeadRevolutionaryComponent comp, ref Afte
         }
 
         _npcFaction.AddFaction(ev.Target, RevolutionaryNpcFaction);
-        EnsureComp<RevolutionaryComponent>(ev.Target);
+        var revComp = EnsureComp<RevolutionaryComponent>(ev.Target);
         _stun.TryParalyze(ev.Target, comp.StunTime, true);
+
         if (ev.User != null)
         {
             _adminLogManager.Add(LogType.Mind, LogImpact.Medium, $"{ToPrettyString(ev.User.Value)} converted {ToPrettyString(ev.Target)} into a Revolutionary");
@@ -223,20 +229,16 @@ public void OnPostFlash(EntityUid uid, HeadRevolutionaryComponent comp, ref Afte
 
         if (mindId == default || !_role.MindHasRole<RevolutionaryRoleComponent>(mindId))
         {
-            _role.MindAddRole(mindId, new RevolutionaryRoleComponent { PrototypeId = RevolutionaryAntagRole });
+            _role.MindAddRole(mindId, new RevolutionaryRoleComponent { PrototypeId = RevPrototypeId });
         }
+
         if (mind?.Session != null)
-        {
-            var message = Loc.GetString("rev-role-greeting");
-            var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", message));
-            _chatManager.ChatMessageToOne(ChatChannel.Server, message, wrappedMessage, default, false, mind.Session.Channel, Color.Red);
-            _audioSystem.PlayGlobal("/Audio/Ambience/Antag/headrev_start.ogg", ev.Target);
-        }
+            _antagSelection.SendBriefing(mind.Session, Loc.GetString("rev-role-greeting"), Color.Red, revComp.RevStartSound);
     }
 
-    public void OnHeadRevAdmin(EntityUid mindId, MindComponent? mind = null)
+    public void OnHeadRevAdmin(EntityUid entity)
     {
-        if (!Resolve(mindId, ref mind))
+        if (HasComp<HeadRevolutionaryComponent>(entity))
             return;
 
         var revRule = EntityQuery<RevolutionaryRuleComponent>().FirstOrDefault();
@@ -246,24 +248,10 @@ public void OnHeadRevAdmin(EntityUid mindId, MindComponent? mind = null)
             revRule = Comp<RevolutionaryRuleComponent>(ruleEnt);
         }
 
-        if (!HasComp<HeadRevolutionaryComponent>(mind.OwnedEntity))
-        {
-            if (mind.OwnedEntity != null)
-            {
-                var player = new List<EntityUid>
-                {
-                    mind.OwnedEntity.Value
-                };
-                GiveHeadRev(player, RevolutionaryAntagRole, revRule);
-            }
-            if (mind.Session != null)
-            {
-                var message = Loc.GetString("head-rev-role-greeting");
-                var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", message));
-                _chatManager.ChatMessageToOne(ChatChannel.Server, message, wrappedMessage, default, false, mind.Session.Channel, Color.FromHex("#5e9cff"));
-            }
-        }
+        GiveHeadRev(entity, revRule.HeadRevPrototypeId, revRule);
     }
+
+    //TODO: Enemies of the revolution
     private void OnCommandMobStateChanged(EntityUid uid, CommandStaffComponent comp, MobStateChangedEvent ev)
     {
         if (ev.NewMobState == MobState.Dead || ev.NewMobState == MobState.Invalid)
@@ -283,7 +271,7 @@ private bool CheckCommandLose()
             commandList.Add(id);
         }
 
-        return _antagSelection.IsGroupDead(commandList, true);
+        return IsGroupDead(commandList, true);
     }
 
     private void OnHeadRevMobStateChanged(EntityUid uid, HeadRevolutionaryComponent comp, MobStateChangedEvent ev)
@@ -307,7 +295,7 @@ private bool CheckRevsLose()
         }
 
         // If no Head Revs are alive all normal Revs will lose their Rev status and rejoin Nanotrasen
-        if (_antagSelection.IsGroupDead(headRevList, false))
+        if (IsGroupDead(headRevList, false))
         {
             var rev = AllEntityQuery<RevolutionaryComponent, MindContainerComponent>();
             while (rev.MoveNext(out var uid, out _, out var mc))
@@ -338,6 +326,38 @@ private bool CheckRevsLose()
         return false;
     }
 
+    /// <summary>
+    /// Will take a group of entities and check if they are all alive or dead
+    /// </summary>
+    /// <param name="list">The list of the entities</param>
+    /// <param name="checkOffStation">Bool for if you want to check if someone is in space and consider them dead. (Won't check when emergency shuttle arrives just in case)</param>
+    /// <returns></returns>
+    private bool IsGroupDead(List<EntityUid> list, bool checkOffStation)
+    {
+        var dead = 0;
+        foreach (var entity in list)
+        {
+            if (TryComp<MobStateComponent>(entity, out var state))
+            {
+                if (state.CurrentState == MobState.Dead || state.CurrentState == MobState.Invalid)
+                {
+                    dead++;
+                }
+                else if (checkOffStation && _stationSystem.GetOwningStation(entity) == null && !_emergencyShuttle.EmergencyShuttleArrived)
+                {
+                    dead++;
+                }
+            }
+            //If they don't have the MobStateComponent they might as well be dead.
+            else
+            {
+                dead++;
+            }
+        }
+
+        return dead == list.Count || list.Count == 0;
+    }
+
     private static readonly string[] Outcomes =
     {
         // revs survived and heads survived... how
diff --git a/Content.Server/GameTicking/Rules/SubGamemodesSystem.cs b/Content.Server/GameTicking/Rules/SubGamemodesSystem.cs
new file mode 100644
index 0000000000..42e7e82335
--- /dev/null
+++ b/Content.Server/GameTicking/Rules/SubGamemodesSystem.cs
@@ -0,0 +1,17 @@
+using Content.Server.GameTicking.Rules.Components;
+using Content.Shared.Storage;
+
+namespace Content.Server.GameTicking.Rules;
+
+public sealed class SubGamemodesSystem : GameRuleSystem<SubGamemodesComponent>
+{
+    protected override void Added(EntityUid uid, SubGamemodesComponent comp, GameRuleComponent rule, GameRuleAddedEvent args)
+    {
+        var picked = EntitySpawnCollection.GetSpawns(comp.Rules, RobustRandom);
+        foreach (var id in picked)
+        {
+            Log.Info($"Starting gamerule {id} as a subgamemode of {ToPrettyString(uid):rule}");
+            GameTicker.AddGameRule(id);
+        }
+    }
+}
diff --git a/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs b/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
index 11ce2314a1..32f9040f89 100644
--- a/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
@@ -1,42 +1,29 @@
-using Content.Server.Chat.Managers;
+using Content.Server.Antag;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Mind;
 using Content.Server.Objectives;
 using Content.Server.Roles;
+using Content.Shared.Antag;
+using Content.Shared.CombatMode.Pacification;
+using Content.Shared.Humanoid;
+using Content.Shared.Inventory;
 using Content.Shared.Mind;
 using Content.Shared.Objectives.Components;
 using Content.Shared.Roles;
-using Content.Shared.Roles.Jobs;
-using Robust.Shared.Player;
 using Robust.Shared.Random;
-using Robust.Shared.Prototypes;
 using System.Linq;
-using Content.Shared.Humanoid;
-using Content.Server.Antag;
-using Robust.Server.Audio;
-using Content.Shared.CombatMode.Pacification;
-using Content.Shared.Random;
 
 namespace Content.Server.GameTicking.Rules;
 
 public sealed class ThiefRuleSystem : GameRuleSystem<ThiefRuleComponent>
 {
-    [Dependency] private readonly IChatManager _chatManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly AntagSelectionSystem _antagSelection = default!;
-    [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly MindSystem _mindSystem = default!;
     [Dependency] private readonly SharedRoleSystem _roleSystem = default!;
     [Dependency] private readonly ObjectivesSystem _objectives = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!;
 
-    [ValidatePrototypeId<WeightedRandomPrototype>]
-    const string BigObjectiveGroup = "ThiefBigObjectiveGroups";
-    [ValidatePrototypeId<WeightedRandomPrototype>]
-    const string SmallObjectiveGroup = "ThiefObjectiveGroups";
-    [ValidatePrototypeId<WeightedRandomPrototype>]
-    const string EscapeObjectiveGroup = "ThiefEscapeObjectiveGroups";
-
-    private const float BigObjectiveChance = 0.7f;
     public override void Initialize()
     {
         base.Initialize();
@@ -49,99 +36,95 @@ public override void Initialize()
 
     private void OnPlayersSpawned(RulePlayerJobsAssignedEvent ev)
     {
-        var query = EntityQueryEnumerator<ThiefRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var thief, out var gameRule))
+        var query = QueryActiveRules();
+        while (query.MoveNext(out var uid, out _, out var comp, out var gameRule))
         {
-            //Chance to not lauch gamerule  
-            if (_random.Prob(thief.RuleChance))
+            //Get all players eligible for this role, allow selecting existing antags
+            //TO DO: When voxes specifies are added, increase their chance of becoming a thief by 4 times >:)
+            var eligiblePlayers = _antagSelection.GetEligiblePlayers(ev.Players, comp.ThiefPrototypeId, acceptableAntags: AntagAcceptability.All, allowNonHumanoids: true);
+
+            //Abort if there are none
+            if (eligiblePlayers.Count == 0)
             {
-                if (!GameTicker.IsGameRuleAdded(uid, gameRule))
-                    continue;
+                Log.Warning($"No eligible thieves found, ending game rule {ToPrettyString(uid):rule}");
+                GameTicker.EndGameRule(uid, gameRule);
+                continue;
+            }
 
-                foreach (var player in ev.Players)
-                {
-                    if (!ev.Profiles.TryGetValue(player.UserId, out var profile))
-                        continue;
+            //Calculate number of thieves to choose
+            var thiefCount = _random.Next(1, comp.MaxAllowThief + 1);
 
-                    thief.StartCandidates[player] = profile;
-                }
-                DoThiefStart(thief);
-            }
+            //Select our theives
+            var thieves = _antagSelection.ChooseAntags(thiefCount, eligiblePlayers);
+
+            MakeThief(thieves, comp, comp.PacifistThieves);
         }
     }
 
-    private void DoThiefStart(ThiefRuleComponent component)
+    public void MakeThief(List<EntityUid> players, ThiefRuleComponent thiefRule, bool addPacified)
     {
-        if (!component.StartCandidates.Any())
-        {
-            Log.Error("There are no players who can become thieves.");
-            return;
-        }
-
-        var startThiefCount = Math.Min(component.MaxAllowThief, component.StartCandidates.Count);
-        var thiefPool = _antagSelection.FindPotentialAntags(component.StartCandidates, component.ThiefPrototypeId);
-        //TO DO: When voxes specifies are added, increase their chance of becoming a thief by 4 times >:)
-
-        //Add 1, as Next() is exclusive of maxValue
-        var numberOfThievesToSelect = _random.Next(1, startThiefCount + 1);
-
-        //While we dont have the correct number of thieves, and there are potential thieves remaining
-        while (component.ThievesMinds.Count < numberOfThievesToSelect && thiefPool.Count > 0)
+        foreach (var thief in players)
         {
-            Log.Info($"{numberOfThievesToSelect} thieves required, {component.ThievesMinds.Count} currently chosen, {thiefPool.Count} potentials");
-            var selectedThieves = _antagSelection.PickAntag(numberOfThievesToSelect - component.ThievesMinds.Count, thiefPool);
-            foreach (var thief in selectedThieves)
-            {
-                MakeThief(component, thief, component.PacifistThieves);
-            }
+            MakeThief(thief, thiefRule, addPacified);
         }
     }
 
-    public bool MakeThief(ThiefRuleComponent thiefRule, ICommonSession thief, bool addPacified)
+    public void MakeThief(EntityUid thief, ThiefRuleComponent thiefRule, bool addPacified)
     {
-        //checks
         if (!_mindSystem.TryGetMind(thief, out var mindId, out var mind))
-        {
-            Log.Info("Failed getting mind for picked thief.");
-            return false;
-        }
+            return;
+
         if (HasComp<ThiefRoleComponent>(mindId))
-        {
-            Log.Error($"Player {thief.Name} is already a thief.");
-            return false;
-        }
-        if (mind.OwnedEntity is not { } entity)
-        {
-            Log.Error("Mind picked for thief did not have an attached entity.");
-            return false;
-        }
+            return;
 
         // Assign thief roles
         _roleSystem.MindAddRole(mindId, new ThiefRoleComponent
         {
-            PrototypeId = thiefRule.ThiefPrototypeId
-        });
+            PrototypeId = thiefRule.ThiefPrototypeId,
+        }, silent: true);
 
         //Add Pacified  
         //To Do: Long-term this should just be using the antag code to add components.
         if (addPacified) //This check is important because some servers may want to disable the thief's pacifism. Do not remove.
         {
-            EnsureComp<PacifiedComponent>(mind.OwnedEntity.Value);
+            EnsureComp<PacifiedComponent>(thief);
         }
 
-        // Notificate player about new role assignment
-        if (_mindSystem.TryGetSession(mindId, out var session))
+        //Generate objectives
+        GenerateObjectives(mindId, mind, thiefRule);
+
+        //Send briefing here to account for humanoid/animal
+        _antagSelection.SendBriefing(thief, MakeBriefing(thief), null, thiefRule.GreetingSound);
+
+        // Give starting items
+        _inventory.SpawnItemsOnEntity(thief, thiefRule.StarterItems);
+
+        thiefRule.ThievesMinds.Add(mindId);
+    }
+
+    public void AdminMakeThief(EntityUid entity, bool addPacified)
+    {
+        var thiefRule = EntityQuery<ThiefRuleComponent>().FirstOrDefault();
+        if (thiefRule == null)
         {
-            _audio.PlayGlobal(thiefRule.GreetingSound, session);
-            _chatManager.DispatchServerMessage(session, MakeBriefing(mind.OwnedEntity.Value));
+            GameTicker.StartGameRule("Thief", out var ruleEntity);
+            thiefRule = Comp<ThiefRuleComponent>(ruleEntity);
         }
 
+        if (HasComp<ThiefRoleComponent>(entity))
+            return;
+
+        MakeThief(entity, thiefRule, addPacified);
+    }
+
+    private void GenerateObjectives(EntityUid mindId, MindComponent mind, ThiefRuleComponent thiefRule)
+    {
         // Give thieves their objectives
         var difficulty = 0f;
 
-        if (_random.Prob(BigObjectiveChance)) // 70% chance to 1 big objective (structure or animal)
+        if (_random.Prob(thiefRule.BigObjectiveChance)) // 70% chance to 1 big objective (structure or animal)
         {
-            var objective = _objectives.GetRandomObjective(mindId, mind, BigObjectiveGroup);
+            var objective = _objectives.GetRandomObjective(mindId, mind, thiefRule.BigObjectiveGroup);
             if (objective != null)
             {
                 _mindSystem.AddObjective(mindId, mind, objective.Value);
@@ -151,7 +134,7 @@ public bool MakeThief(ThiefRuleComponent thiefRule, ICommonSession thief, bool a
 
         for (var i = 0; i < thiefRule.MaxStealObjectives && thiefRule.MaxObjectiveDifficulty > difficulty; i++)  // Many small objectives
         {
-            var objective = _objectives.GetRandomObjective(mindId, mind, SmallObjectiveGroup);
+            var objective = _objectives.GetRandomObjective(mindId, mind, thiefRule.SmallObjectiveGroup);
             if (objective == null)
                 continue;
 
@@ -160,27 +143,9 @@ public bool MakeThief(ThiefRuleComponent thiefRule, ICommonSession thief, bool a
         }
 
         //Escape target
-        var escapeObjective = _objectives.GetRandomObjective(mindId, mind, EscapeObjectiveGroup);
+        var escapeObjective = _objectives.GetRandomObjective(mindId, mind, thiefRule.EscapeObjectiveGroup);
         if (escapeObjective != null)
             _mindSystem.AddObjective(mindId, mind, escapeObjective.Value);
-
-        // Give starting items
-        _antagSelection.GiveAntagBagGear(mind.OwnedEntity.Value, thiefRule.StarterItems);
-
-        thiefRule.ThievesMinds.Add(mindId);
-        return true;
-    }
-
-    public void AdminMakeThief(ICommonSession thief, bool addPacified)
-    {
-        var thiefRule = EntityQuery<ThiefRuleComponent>().FirstOrDefault();
-        if (thiefRule == null)
-        {
-            GameTicker.StartGameRule("Thief", out var ruleEntity);
-            thiefRule = Comp<ThiefRuleComponent>(ruleEntity);
-        }
-
-        MakeThief(thiefRule, thief, addPacified);
     }
 
     //Add mind briefing
diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
index dce144901f..fc9f0a9a9f 100644
--- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
@@ -1,13 +1,10 @@
-using System.Linq;
 using Content.Server.Antag;
-using Content.Server.Chat.Managers;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Mind;
 using Content.Server.NPC.Systems;
 using Content.Server.Objectives;
 using Content.Server.PDA.Ringer;
 using Content.Server.Roles;
-using Content.Server.Shuttles.Components;
 using Content.Server.Traitor.Uplink;
 using Content.Shared.CCVar;
 using Content.Shared.Dataset;
@@ -15,17 +12,15 @@
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Objectives.Components;
 using Content.Shared.PDA;
-using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Content.Shared.Roles.Jobs;
 using Robust.Server.Player;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
+using System.Linq;
+using System.Text;
 
 namespace Content.Server.GameTicking.Rules;
 
@@ -35,16 +30,15 @@ public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
-    [Dependency] private readonly IChatManager _chatManager = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
     [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
     [Dependency] private readonly UplinkSystem _uplink = default!;
-    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] private readonly MindSystem _mindSystem = default!;
     [Dependency] private readonly SharedRoleSystem _roleSystem = default!;
     [Dependency] private readonly SharedJobSystem _jobs = default!;
     [Dependency] private readonly ObjectivesSystem _objectives = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
 
     private int PlayersPerTraitor => _cfg.GetCVar(CCVars.TraitorPlayersPerTraitor);
     private int MaxTraitors => _cfg.GetCVar(CCVars.TraitorMaxTraitors);
@@ -61,46 +55,45 @@ public override void Initialize()
         SubscribeLocalEvent<TraitorRuleComponent, ObjectivesTextPrependEvent>(OnObjectivesTextPrepend);
     }
 
+    //Set min players on game rule
+    protected override void Added(EntityUid uid, TraitorRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
+    {
+        base.Added(uid, component, gameRule, args);
+
+        gameRule.MinPlayers = _cfg.GetCVar(CCVars.TraitorMinPlayers);
+    }
+
+    protected override void Started(EntityUid uid, TraitorRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
+    {
+        base.Started(uid, component, gameRule, args);
+        MakeCodewords(component);
+    }
+
     protected override void ActiveTick(EntityUid uid, TraitorRuleComponent component, GameRuleComponent gameRule, float frameTime)
     {
         base.ActiveTick(uid, component, gameRule, frameTime);
 
-        if (component.SelectionStatus == TraitorRuleComponent.SelectionState.ReadyToSelect && _gameTiming.CurTime > component.AnnounceAt)
+        if (component.SelectionStatus < TraitorRuleComponent.SelectionState.Started && component.AnnounceAt < _timing.CurTime)
+        {
             DoTraitorStart(component);
+            component.SelectionStatus = TraitorRuleComponent.SelectionState.Started;
+        }
     }
 
+    /// <summary>
+    /// Check for enough players
+    /// </summary>
+    /// <param name="ev"></param>
     private void OnStartAttempt(RoundStartAttemptEvent ev)
     {
-        var query = EntityQueryEnumerator<TraitorRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var traitor, out var gameRule))
-        {
-            if (!GameTicker.IsGameRuleAdded(uid, gameRule))
-                continue;
-
-            MakeCodewords(traitor);
-
-            var minPlayers = _cfg.GetCVar(CCVars.TraitorMinPlayers);
-            if (!ev.Forced && ev.Players.Length < minPlayers)
-            {
-                _chatManager.SendAdminAnnouncement(Loc.GetString("traitor-not-enough-ready-players",
-                    ("readyPlayersCount", ev.Players.Length), ("minimumPlayers", minPlayers)));
-                ev.Cancel();
-                continue;
-            }
-
-            if (ev.Players.Length == 0)
-            {
-                _chatManager.DispatchServerAnnouncement(Loc.GetString("traitor-no-one-ready"));
-                ev.Cancel();
-            }
-        }
+        TryRoundStartAttempt(ev, Loc.GetString("traitor-title"));
     }
 
     private void MakeCodewords(TraitorRuleComponent component)
     {
         var codewordCount = _cfg.GetCVar(CCVars.TraitorCodewordCount);
-        var adjectives = _prototypeManager.Index<DatasetPrototype>("adjectives").Values;
-        var verbs = _prototypeManager.Index<DatasetPrototype>("verbs").Values;
+        var adjectives = _prototypeManager.Index<DatasetPrototype>(component.CodewordAdjectives).Values;
+        var verbs = _prototypeManager.Index<DatasetPrototype>(component.CodewordVerbs).Values;
         var codewordPool = adjectives.Concat(verbs).ToList();
         var finalCodewordCount = Math.Min(codewordCount, codewordPool.Count);
         component.Codewords = new string[finalCodewordCount];
@@ -112,125 +105,99 @@ private void MakeCodewords(TraitorRuleComponent component)
 
     private void DoTraitorStart(TraitorRuleComponent component)
     {
-        if (!component.StartCandidates.Any())
-        {
-            Log.Error("Tried to start Traitor mode without any candidates.");
+        var eligiblePlayers = _antagSelection.GetEligiblePlayers(_playerManager.Sessions, component.TraitorPrototypeId);
+
+        if (eligiblePlayers.Count == 0)
             return;
-        }
 
-        var numTraitors = MathHelper.Clamp(component.StartCandidates.Count / PlayersPerTraitor, 1, MaxTraitors);
-        var traitorPool = _antagSelection.FindPotentialAntags(component.StartCandidates, component.TraitorPrototypeId);
-        var selectedTraitors = _antagSelection.PickAntag(numTraitors, traitorPool);
+        var traitorsToSelect = _antagSelection.CalculateAntagCount(_playerManager.PlayerCount, PlayersPerTraitor, MaxTraitors);
 
-        foreach (var traitor in selectedTraitors)
-        {
-            MakeTraitor(traitor);
-        }
+        var selectedTraitors = _antagSelection.ChooseAntags(traitorsToSelect, eligiblePlayers);
 
-        component.SelectionStatus = TraitorRuleComponent.SelectionState.SelectionMade;
+        MakeTraitor(selectedTraitors, component);
     }
 
     private void OnPlayersSpawned(RulePlayerJobsAssignedEvent ev)
     {
-        var query = EntityQueryEnumerator<TraitorRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var traitor, out var gameRule))
+        //Start the timer
+        var query = QueryActiveRules();
+        while (query.MoveNext(out _, out var comp, out var gameRuleComponent))
         {
-            if (!GameTicker.IsGameRuleAdded(uid, gameRule))
-                continue;
-            foreach (var player in ev.Players)
-            {
-                if (!ev.Profiles.ContainsKey(player.UserId))
-                    continue;
-
-                traitor.StartCandidates[player] = ev.Profiles[player.UserId];
-            }
-
             var delay = TimeSpan.FromSeconds(
                 _cfg.GetCVar(CCVars.TraitorStartDelay) +
                 _random.NextFloat(0f, _cfg.GetCVar(CCVars.TraitorStartDelayVariance)));
 
-            traitor.AnnounceAt = _gameTiming.CurTime + delay;
+            //Set the delay for choosing traitors
+            comp.AnnounceAt = _timing.CurTime + delay;
 
-            traitor.SelectionStatus = TraitorRuleComponent.SelectionState.ReadyToSelect;
+            comp.SelectionStatus = TraitorRuleComponent.SelectionState.ReadyToStart;
         }
     }
 
-    public bool MakeTraitor(ICommonSession traitor, bool giveUplink = true, bool giveObjectives = true)
+    public bool MakeTraitor(List<EntityUid> traitors, TraitorRuleComponent component, bool giveUplink = true, bool giveObjectives = true)
     {
-        var traitorRule = EntityQuery<TraitorRuleComponent>().FirstOrDefault();
-        if (traitorRule == null)
+        foreach (var traitor in traitors)
         {
-            //todo fuck me this shit is awful
-            //no i wont fuck you, erp is against rules
-            GameTicker.StartGameRule("Traitor", out var ruleEntity);
-            traitorRule = Comp<TraitorRuleComponent>(ruleEntity);
-            MakeCodewords(traitorRule);
+            MakeTraitor(traitor, component, giveUplink, giveObjectives);
         }
 
+        return true;
+    }
+
+    public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component, bool giveUplink = true, bool giveObjectives = true)
+    {
+        //Grab the mind if it wasnt provided
         if (!_mindSystem.TryGetMind(traitor, out var mindId, out var mind))
-        {
-            Log.Info("Failed getting mind for picked traitor.");
             return false;
-        }
 
         if (HasComp<TraitorRoleComponent>(mindId))
         {
-            Log.Error($"Player {traitor.Name} is already a traitor.");
-            return false;
-        }
-
-        if (mind.OwnedEntity is not { } entity)
-        {
-            Log.Error("Mind picked for traitor did not have an attached entity.");
+            Log.Error($"Player {mind.CharacterName} is already a traitor.");
             return false;
         }
 
-        // Calculate the amount of currency on the uplink.
-        var startingBalance = _cfg.GetCVar(CCVars.TraitorStartingBalance);
-        if (_jobs.MindTryGetJob(mindId, out _, out var prototype))
-            startingBalance = Math.Max(startingBalance - prototype.AntagAdvantage, 0);
+        var briefing = Loc.GetString("traitor-role-codewords-short", ("codewords", string.Join(", ", component.Codewords)));
 
-        // Give traitors their codewords and uplink code to keep in their character info menu
-        var briefing = Loc.GetString("traitor-role-codewords-short", ("codewords", string.Join(", ", traitorRule.Codewords)));
         Note[]? code = null;
         if (giveUplink)
         {
+            // Calculate the amount of currency on the uplink.
+            var startingBalance = _cfg.GetCVar(CCVars.TraitorStartingBalance);
+            if (_jobs.MindTryGetJob(mindId, out _, out var prototype))
+                startingBalance = Math.Max(startingBalance - prototype.AntagAdvantage, 0);
+
             // creadth: we need to create uplink for the antag.
             // PDA should be in place already
-            var pda = _uplink.FindUplinkTarget(mind.OwnedEntity!.Value);
-            if (pda == null || !_uplink.AddUplink(mind.OwnedEntity.Value, startingBalance))
+            var pda = _uplink.FindUplinkTarget(traitor);
+            if (pda == null || !_uplink.AddUplink(traitor, startingBalance))
                 return false;
 
             // Give traitors their codewords and uplink code to keep in their character info menu
             code = EnsureComp<RingerUplinkComponent>(pda.Value).Code;
+
             // If giveUplink is false the uplink code part is omitted
             briefing = string.Format("{0}\n{1}", briefing,
-                Loc.GetString("traitor-role-uplink-code-short", ("code", string.Join("-", code).Replace("sharp","#"))));
+                Loc.GetString("traitor-role-uplink-code-short", ("code", string.Join("-", code).Replace("sharp", "#"))));
         }
 
-        // Prepare traitor role
-        var traitorRole = new TraitorRoleComponent
-        {
-            PrototypeId = traitorRule.TraitorPrototypeId,
-        };
+        _antagSelection.SendBriefing(traitor, GenerateBriefing(component.Codewords, code), null, component.GreetSoundNotification);
+
+        component.TraitorMinds.Add(mindId);
 
         // Assign traitor roles
         _roleSystem.MindAddRole(mindId, new TraitorRoleComponent
         {
-            PrototypeId = traitorRule.TraitorPrototypeId
-        }, mind);
-        // Assign briefing and greeting sound
+            PrototypeId = component.TraitorPrototypeId
+        }, mind, true);
+        // Assign briefing
         _roleSystem.MindAddRole(mindId, new RoleBriefingComponent
         {
-            Briefing = briefing
-        }, mind);
-        _roleSystem.MindPlaySound(mindId, traitorRule.GreetSoundNotification, mind);
-        SendTraitorBriefing(mindId, traitorRule.Codewords, code);
-        traitorRule.TraitorMinds.Add(mindId);
+            Briefing = briefing.ToString()
+        }, mind, true);
 
         // Change the faction
-        _npcFaction.RemoveFaction(entity, "NanoTrasen", false);
-        _npcFaction.AddFaction(entity, "Syndicate");
+        _npcFaction.RemoveFaction(traitor, component.NanoTrasenFaction, false);
+        _npcFaction.AddFaction(traitor, component.SyndicateFaction);
 
         // Give traitors their objectives
         if (giveObjectives)
@@ -241,7 +208,7 @@ public bool MakeTraitor(ICommonSession traitor, bool giveUplink = true, bool giv
             Log.Debug($"Attempting {maxPicks} objective picks with {maxDifficulty} difficulty");
             for (var pick = 0; pick < maxPicks && maxDifficulty > difficulty; pick++)
             {
-                var objective = _objectives.GetRandomObjective(mindId, mind, "TraitorObjectiveGroups");
+                var objective = _objectives.GetRandomObjective(mindId, mind, component.ObjectiveGroup);
                 if (objective == null)
                     continue;
 
@@ -255,54 +222,26 @@ public bool MakeTraitor(ICommonSession traitor, bool giveUplink = true, bool giv
         return true;
     }
 
-    /// <summary>
-    ///     Send a codewords and uplink codes to traitor chat.
-    /// </summary>
-    /// <param name="mind">A mind (player)</param>
-    /// <param name="codewords">Codewords</param>
-    /// <param name="code">Uplink codes</param>
-    private void SendTraitorBriefing(EntityUid mind, string[] codewords, Note[]? code)
-    {
-        if (!_mindSystem.TryGetSession(mind, out var session))
-            return;
-
-       _chatManager.DispatchServerMessage(session, Loc.GetString("traitor-role-greeting"));
-       _chatManager.DispatchServerMessage(session, Loc.GetString("traitor-role-codewords", ("codewords", string.Join(", ", codewords))));
-       if (code != null)
-           _chatManager.DispatchServerMessage(session, Loc.GetString("traitor-role-uplink-code", ("code", string.Join("-", code).Replace("sharp","#"))));
-    }
-
     private void HandleLatejoin(PlayerSpawnCompleteEvent ev)
     {
-        var query = EntityQueryEnumerator<TraitorRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var traitor, out var gameRule))
+        var query = QueryActiveRules();
+        while (query.MoveNext(out _, out var comp, out _))
         {
-            if (!GameTicker.IsGameRuleAdded(uid, gameRule))
+            if (comp.TotalTraitors >= MaxTraitors)
                 continue;
 
-            if (traitor.TotalTraitors >= MaxTraitors)
-                continue;
             if (!ev.LateJoin)
                 continue;
-            if (!ev.Profile.AntagPreferences.Contains(traitor.TraitorPrototypeId))
-                continue;
-
-            if (ev.JobId == null || !_prototypeManager.TryIndex<JobPrototype>(ev.JobId, out var job))
-                continue;
 
-            if (!job.CanBeAntag)
+            if (!_antagSelection.IsPlayerEligible(ev.Player, comp.TraitorPrototypeId))
                 continue;
 
-            // Before the announcement is made, late-joiners are considered the same as players who readied.
-            if (traitor.SelectionStatus < TraitorRuleComponent.SelectionState.SelectionMade)
-            {
-                traitor.StartCandidates[ev.Player] = ev.Profile;
+            //If its before we have selected traitors, continue
+            if (comp.SelectionStatus < TraitorRuleComponent.SelectionState.Started)
                 continue;
-            }
 
             // the nth player we adjust our probabilities around
-            var target = PlayersPerTraitor * traitor.TotalTraitors + 1;
-
+            var target = PlayersPerTraitor * comp.TotalTraitors + 1;
             var chance = 1f / PlayersPerTraitor;
 
             // If we have too many traitors, divide by how many players below target for next traitor we are.
@@ -322,7 +261,7 @@ private void HandleLatejoin(PlayerSpawnCompleteEvent ev)
             // You get one shot.
             if (_random.Prob(chance))
             {
-                MakeTraitor(ev.Player);
+                MakeTraitor(ev.Mob, comp);
             }
         }
     }
@@ -338,6 +277,38 @@ private void OnObjectivesTextPrepend(EntityUid uid, TraitorRuleComponent comp, r
         args.Text += "\n" + Loc.GetString("traitor-round-end-codewords", ("codewords", string.Join(", ", comp.Codewords)));
     }
 
+    /// <summary>
+    /// Start this game rule manually
+    /// </summary>
+    public TraitorRuleComponent StartGameRule()
+    {
+        var comp = EntityQuery<TraitorRuleComponent>().FirstOrDefault();
+        if (comp == null)
+        {
+            GameTicker.StartGameRule("Traitor", out var ruleEntity);
+            comp = Comp<TraitorRuleComponent>(ruleEntity);
+        }
+
+        return comp;
+    }
+
+    public void MakeTraitorAdmin(EntityUid entity, bool giveUplink, bool giveObjectives)
+    {
+        var traitorRule = StartGameRule();
+        MakeTraitor(entity, traitorRule, giveUplink, giveObjectives);
+    }
+
+    private string GenerateBriefing(string[] codewords, Note[]? uplinkCode)
+    {
+        var sb = new StringBuilder();
+        sb.AppendLine(Loc.GetString("traitor-role-greeting"));
+        sb.AppendLine(Loc.GetString("traitor-role-codewords-short", ("codewords", string.Join(", ", codewords))));
+        if (uplinkCode != null)
+            sb.AppendLine(Loc.GetString("traitor-role-uplink-code-short", ("code", string.Join("-", uplinkCode).Replace("sharp", "#"))));
+
+        return sb.ToString();
+    }
+
     public List<(EntityUid Id, MindComponent Mind)> GetOtherTraitorMindsAliveAndConnected(MindComponent ourMind)
     {
         List<(EntityUid Id, MindComponent Mind)> allTraitors = new();
diff --git a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
index 886ff965c7..0b7cb9cf8f 100644
--- a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
@@ -1,11 +1,8 @@
-using System.Globalization;
-using System.Linq;
 using Content.Server.Actions;
-using Content.Server.Chat.Managers;
+using Content.Server.Antag;
 using Content.Server.Chat.Systems;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Popups;
-using Content.Server.Preferences.Managers;
 using Content.Server.Roles;
 using Content.Server.RoundEnd;
 using Content.Server.Station.Components;
@@ -17,17 +14,14 @@
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
-using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Content.Shared.Zombies;
-using Robust.Server.GameObjects;
 using Robust.Server.Player;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
+using System.Globalization;
 
 namespace Content.Server.GameTicking.Rules;
 
@@ -35,10 +29,7 @@ public sealed class ZombieRuleSystem : GameRuleSystem<ZombieRuleComponent>
 {
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
-    [Dependency] private readonly IChatManager _chatManager = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
-    [Dependency] private readonly IServerPreferencesManager _prefs = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
     [Dependency] private readonly RoundEndSystem _roundEnd = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
@@ -48,7 +39,8 @@ public sealed class ZombieRuleSystem : GameRuleSystem<ZombieRuleComponent>
     [Dependency] private readonly SharedMindSystem _mindSystem = default!;
     [Dependency] private readonly SharedRoleSystem _roles = default!;
     [Dependency] private readonly StationSystem _station = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly AntagSelectionSystem _antagSelection = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
 
     public override void Initialize()
     {
@@ -59,6 +51,16 @@ public override void Initialize()
         SubscribeLocalEvent<PendingZombieComponent, ZombifySelfActionEvent>(OnZombifySelf);
     }
 
+    /// <summary>
+    /// Set the required minimum players for this gamemode to start
+    /// </summary>
+    protected override void Added(EntityUid uid, ZombieRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
+    {
+        base.Added(uid, component, gameRule, args);
+
+        gameRule.MinPlayers = _cfg.GetCVar(CCVars.ZombieMinPlayers);
+    }
+
     private void OnRoundEndText(RoundEndTextAppendEvent ev)
     {
         foreach (var zombie in EntityQuery<ZombieRuleComponent>())
@@ -111,85 +113,59 @@ private void OnRoundEndText(RoundEndTextAppendEvent ev)
     /// <summary>
     ///     The big kahoona function for checking if the round is gonna end
     /// </summary>
-    private void CheckRoundEnd()
+    private void CheckRoundEnd(ZombieRuleComponent zombieRuleComponent)
     {
-        var query = EntityQueryEnumerator<ZombieRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var comp, out var gameRule))
-        {
-            if (!GameTicker.IsGameRuleActive(uid, gameRule))
-                continue;
-
-            var healthy = GetHealthyHumans();
-            if (healthy.Count == 1) // Only one human left. spooky
-                _popup.PopupEntity(Loc.GetString("zombie-alone"), healthy[0], healthy[0]);
+        var healthy = GetHealthyHumans();
+        if (healthy.Count == 1) // Only one human left. spooky
+            _popup.PopupEntity(Loc.GetString("zombie-alone"), healthy[0], healthy[0]);
 
-            if (!comp.ShuttleCalled && GetInfectedFraction(false) >= comp.ZombieShuttleCallPercentage)
+        if (GetInfectedFraction(false) > zombieRuleComponent.ZombieShuttleCallPercentage && !_roundEnd.IsRoundEndRequested())
+        {
+            foreach (var station in _station.GetStations())
             {
-                comp.ShuttleCalled = true;
-                foreach (var station in _station.GetStations())
-                {
-                    _chat.DispatchStationAnnouncement(station, Loc.GetString("zombie-shuttle-call"), colorOverride: Color.Crimson);
-                }
-                _roundEnd.RequestRoundEnd(null, false);
+                _chat.DispatchStationAnnouncement(station, Loc.GetString("zombie-shuttle-call"), colorOverride: Color.Crimson);
             }
-
-            // we include dead for this count because we don't want to end the round
-            // when everyone gets on the shuttle.
-            if (GetInfectedFraction() >= 1) // Oops, all zombies
-                _roundEnd.EndRound();
+            _roundEnd.RequestRoundEnd(null, false);
         }
+
+        // we include dead for this count because we don't want to end the round
+        // when everyone gets on the shuttle.
+        if (GetInfectedFraction() >= 1) // Oops, all zombies
+            _roundEnd.EndRound();
     }
 
+    /// <summary>
+    /// Check we have enough players to start this game mode, if not - cancel and announce
+    /// </summary>
     private void OnStartAttempt(RoundStartAttemptEvent ev)
     {
-        var query = EntityQueryEnumerator<ZombieRuleComponent, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out _, out var gameRule))
-        {
-            if (!GameTicker.IsGameRuleAdded(uid, gameRule))
-                continue;
-
-            var minPlayers = _cfg.GetCVar(CCVars.ZombieMinPlayers);
-            if (!ev.Forced && ev.Players.Length < minPlayers)
-            {
-                _chatManager.SendAdminAnnouncement(Loc.GetString("zombie-not-enough-ready-players",
-                    ("readyPlayersCount", ev.Players.Length),
-                    ("minimumPlayers", minPlayers)));
-                ev.Cancel();
-                continue;
-            }
-
-            if (ev.Players.Length == 0)
-            {
-                _chatManager.DispatchServerAnnouncement(Loc.GetString("zombie-no-one-ready"));
-                ev.Cancel();
-            }
-        }
+        TryRoundStartAttempt(ev, Loc.GetString("zombie-title"));
     }
 
     protected override void Started(EntityUid uid, ZombieRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
         base.Started(uid, component, gameRule, args);
-        component.StartTime = _timing.CurTime + _random.Next(component.MinStartDelay, component.MaxStartDelay);
+
+        var delay = _random.Next(component.MinStartDelay, component.MaxStartDelay);
+        component.StartTime = _timing.CurTime + delay;
     }
 
     protected override void ActiveTick(EntityUid uid, ZombieRuleComponent component, GameRuleComponent gameRule, float frameTime)
     {
         base.ActiveTick(uid, component, gameRule, frameTime);
 
-        if (component.InfectedChosen)
+        if (component.StartTime.HasValue && component.StartTime < _timing.CurTime)
         {
-            if (_timing.CurTime >= component.NextRoundEndCheck)
-            {
-                component.NextRoundEndCheck += component.EndCheckDelay;
-                CheckRoundEnd();
-            }
-            return;
+            InfectInitialPlayers(component);
+            component.StartTime = null;
+            component.NextRoundEndCheck = _timing.CurTime + component.EndCheckDelay;
         }
 
-        if (component.StartTime == null || _timing.CurTime < component.StartTime)
-            return;
-
-        InfectInitialPlayers(component);
+        if (component.NextRoundEndCheck.HasValue && component.NextRoundEndCheck < _timing.CurTime)
+        {
+            CheckRoundEnd(component);
+            component.NextRoundEndCheck = _timing.CurTime + component.EndCheckDelay;
+        }
     }
 
     private void OnZombifySelf(EntityUid uid, PendingZombieComponent component, ZombifySelfActionEvent args)
@@ -199,6 +175,12 @@ private void OnZombifySelf(EntityUid uid, PendingZombieComponent component, Zomb
             Del(component.Action.Value);
     }
 
+    /// <summary>
+    /// Get the fraction of players that are infected, between 0 and 1
+    /// </summary>
+    /// <param name="includeOffStation">Include healthy players that are not on the station grid</param>
+    /// <param name="includeDead">Should dead zombies be included in the count</param>
+    /// <returns></returns>
     private float GetInfectedFraction(bool includeOffStation = true, bool includeDead = false)
     {
         var players = GetHealthyHumans(includeOffStation);
@@ -262,86 +244,68 @@ private List<EntityUid> GetHealthyHumans(bool includeOffStation = true)
     /// </remarks>
     private void InfectInitialPlayers(ZombieRuleComponent component)
     {
-        if (component.InfectedChosen)
+        //Get all players with initial infected enabled, and exclude those with the ZombieImmuneComponent and roles with CanBeAntag = False
+        var eligiblePlayers = _antagSelection.GetEligiblePlayers(
+            _playerManager.Sessions,
+            component.PatientZeroPrototypeId,
+            includeAllJobs: false,
+            customExcludeCondition: player => HasComp<ZombieImmuneComponent>(player) || HasComp<InitialInfectedExemptComponent>(player) 
+            );
+
+        //And get all players, excluding ZombieImmune and roles with CanBeAntag = False - to fill any leftover initial infected slots
+        var allPlayers = _antagSelection.GetEligiblePlayers(
+            _playerManager.Sessions,
+            component.PatientZeroPrototypeId,
+            acceptableAntags: Shared.Antag.AntagAcceptability.All,
+            includeAllJobs: false ,
+            ignorePreferences: true,
+            customExcludeCondition: HasComp<ZombieImmuneComponent> 
+            );
+
+        //If there are no players to choose, abort
+        if (allPlayers.Count == 0)
             return;
-        component.InfectedChosen = true;
 
-        var allPlayers = _playerManager.Sessions.ToList();
-        var playerList = new List<ICommonSession>();
-        var prefList = new List<ICommonSession>();
-        foreach (var player in allPlayers)
-        {
-            if (player.AttachedEntity == null || !HasComp<HumanoidAppearanceComponent>(player.AttachedEntity) || HasComp<ZombieImmuneComponent>(player.AttachedEntity))
-                continue;
-
-            if (HasComp<InitialInfectedExemptComponent>(player.AttachedEntity))
-                continue; // used (for example) on ERT
+        //How many initial infected should we select
+        var initialInfectedCount = _antagSelection.CalculateAntagCount(_playerManager.PlayerCount, component.PlayersPerInfected, component.MaxInitialInfected);
 
-            playerList.Add(player);
-
-            var pref = (HumanoidCharacterProfile) _prefs.GetPreferences(player.UserId).SelectedCharacter;
-            if (pref.AntagPreferences.Contains(component.PatientZeroPrototypeId))
-                prefList.Add(player);
-        }
+        //Choose the required number of initial infected from the eligible players, making up any shortfall by choosing from all players
+        var initialInfected = _antagSelection.ChooseAntags(initialInfectedCount, eligiblePlayers, allPlayers);
 
-        if (playerList.Count == 0)
-            return;
+        //Make brain craving
+        MakeZombie(initialInfected, component);
 
-        var numInfected = Math.Max(1,
-            (int) Math.Min(
-                Math.Floor((double) playerList.Count / component.PlayersPerInfected), component.MaxInitialInfected));
+        //Send the briefing, play greeting sound
+        _antagSelection.SendBriefing(initialInfected, Loc.GetString("zombie-patientzero-role-greeting"), Color.Plum, component.InitialInfectedSound);
+    }
 
-        var totalInfected = 0;
-        while (totalInfected < numInfected)
+    private void MakeZombie(List<EntityUid> entities, ZombieRuleComponent component)
+    {
+        foreach (var entity in entities)
         {
-            ICommonSession zombie;
-            if (prefList.Count == 0)
-            {
-                if (playerList.Count == 0)
-                {
-                    Log.Info("Insufficient number of players. stopping selection.");
-                    break;
-                }
-                zombie = _random.Pick(playerList);
-                Log.Info("Insufficient preferred patient 0, picking at random.");
-            }
-            else
-            {
-                zombie = _random.Pick(prefList);
-                Log.Info("Selected a patient 0.");
-            }
-
-            prefList.Remove(zombie);
-            playerList.Remove(zombie);
-            if (!_mindSystem.TryGetMind(zombie, out var mindId, out var mind) ||
-                mind.OwnedEntity is not { } ownedEntity)
-            {
-                continue;
-            }
-
-            totalInfected++;
-
-            _roles.MindAddRole(mindId, new InitialInfectedRoleComponent { PrototypeId = component.PatientZeroPrototypeId });
+            MakeZombie(entity, component);
+        }
+    }
+    private void MakeZombie(EntityUid entity, ZombieRuleComponent component)
+    {
+        if (!_mindSystem.TryGetMind(entity, out var mind, out var mindComponent))
+            return;
 
-            var pending = EnsureComp<PendingZombieComponent>(ownedEntity);
-            pending.GracePeriod = _random.Next(component.MinInitialInfectedGrace, component.MaxInitialInfectedGrace);
-            EnsureComp<ZombifyOnDeathComponent>(ownedEntity);
-            EnsureComp<IncurableZombieComponent>(ownedEntity);
-            var inCharacterName = MetaData(ownedEntity).EntityName;
-            _action.AddAction(ownedEntity, ref pending.Action, ZombieRuleComponent.ZombifySelfActionPrototype, ownedEntity);
+        //Add the role to the mind silently (to avoid repeating job assignment)
+        _roles.MindAddRole(mind, new InitialInfectedRoleComponent { PrototypeId = component.PatientZeroPrototypeId }, silent: true);
 
-            var message = Loc.GetString("zombie-patientzero-role-greeting");
-            var wrappedMessage = Loc.GetString("chat-manager-server-wrap-message", ("message", message));
+        //Add the zombie components and grace period
+        var pending = EnsureComp<PendingZombieComponent>(entity);
+        pending.GracePeriod = _random.Next(component.MinInitialInfectedGrace, component.MaxInitialInfectedGrace);
+        EnsureComp<ZombifyOnDeathComponent>(entity);
+        EnsureComp<IncurableZombieComponent>(entity);
 
-            //gets the names now in case the players leave.
-            //this gets unhappy if people with the same name get chosen. Probably shouldn't happen.
-            component.InitialInfectedNames.Add(inCharacterName, zombie.Name);
+        //Add the zombify action
+        _action.AddAction(entity, ref pending.Action, component.ZombifySelfActionPrototype, entity);
 
-            // I went all the way to ChatManager.cs and all i got was this lousy T-shirt
-            // You got a free T-shirt!?!?
-            _chatManager.ChatMessageToOne(Shared.Chat.ChatChannel.Server, message,
-               wrappedMessage, default, false, zombie.Channel, Color.Plum);
-            _audio.PlayGlobal(component.InitialInfectedSound, ownedEntity);
-        }
+        //Get names for the round end screen, incase they leave mid-round
+        var inCharacterName = MetaData(entity).EntityName;
+        var accountName = mindComponent.Session == null ? string.Empty : mindComponent.Session.Name;
+        component.InitialInfectedNames.Add(inCharacterName, accountName);
     }
 }
diff --git a/Content.Server/Gateway/Components/GatewayComponent.cs b/Content.Server/Gateway/Components/GatewayComponent.cs
index 71d070f699..9650baafa3 100644
--- a/Content.Server/Gateway/Components/GatewayComponent.cs
+++ b/Content.Server/Gateway/Components/GatewayComponent.cs
@@ -8,7 +8,7 @@ namespace Content.Server.Gateway.Components;
 /// <summary>
 /// Controlling gateway that links to other gateway destinations on the server.
 /// </summary>
-[RegisterComponent, Access(typeof(GatewaySystem))]
+[RegisterComponent, Access(typeof(GatewaySystem)), AutoGenerateComponentPause]
 public sealed partial class GatewayComponent : Component
 {
     /// <summary>
@@ -61,5 +61,6 @@ public sealed partial class GatewayComponent : Component
     /// The time at which the portal can next be opened.
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan NextReady;
 }
diff --git a/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs b/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs
index 670cbea307..d65760e270 100644
--- a/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs
+++ b/Content.Server/Gateway/Components/GatewayGeneratorComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Server.Gateway.Components;
 /// <summary>
 /// Generates gateway destinations at a regular interval.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, AutoGenerateComponentPause]
 public sealed partial class GatewayGeneratorComponent : Component
 {
     /// <summary>
@@ -20,6 +20,7 @@ public sealed partial class GatewayGeneratorComponent : Component
     /// Next time another seed unlocks.
     /// </summary>
     [DataField(customTypeSerializer:typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan NextUnlock;
 
     /// <summary>
diff --git a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
index c8b30af620..7558f7afc0 100644
--- a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
+++ b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
@@ -67,7 +67,6 @@ public sealed class GatewayGeneratorSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<GatewayGeneratorComponent, EntityUnpausedEvent>(OnGeneratorUnpaused);
         SubscribeLocalEvent<GatewayGeneratorComponent, MapInitEvent>(OnGeneratorMapInit);
         SubscribeLocalEvent<GatewayGeneratorComponent, ComponentShutdown>(OnGeneratorShutdown);
         SubscribeLocalEvent<GatewayGeneratorDestinationComponent, AttemptGatewayOpenEvent>(OnGeneratorAttemptOpen);
@@ -85,11 +84,6 @@ private void OnGeneratorShutdown(EntityUid uid, GatewayGeneratorComponent compon
         }
     }
 
-    private void OnGeneratorUnpaused(Entity<GatewayGeneratorComponent> ent, ref EntityUnpausedEvent args)
-    {
-        ent.Comp.NextUnlock += args.PausedTime;
-    }
-
     private void OnGeneratorMapInit(EntityUid uid, GatewayGeneratorComponent generator, MapInitEvent args)
     {
         if (!_cfgManager.GetCVar(CCVars.GatewayGeneratorEnabled))
diff --git a/Content.Server/Gateway/Systems/GatewaySystem.cs b/Content.Server/Gateway/Systems/GatewaySystem.cs
index 52525ee0d4..7ebc751dd2 100644
--- a/Content.Server/Gateway/Systems/GatewaySystem.cs
+++ b/Content.Server/Gateway/Systems/GatewaySystem.cs
@@ -32,7 +32,6 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<GatewayComponent, EntityUnpausedEvent>(OnGatewayUnpaused);
         SubscribeLocalEvent<GatewayComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<GatewayComponent, ActivatableUIOpenAttemptEvent>(OnGatewayOpenAttempt);
         SubscribeLocalEvent<GatewayComponent, BoundUIOpenedEvent>(UpdateUserInterface);
@@ -48,11 +47,6 @@ public void SetEnabled(EntityUid uid, bool value, GatewayComponent? component =
         UpdateAllGateways();
     }
 
-    private void OnGatewayUnpaused(EntityUid uid, GatewayComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextReady += args.PausedTime;
-    }
-
     private void OnStartup(EntityUid uid, GatewayComponent comp, ComponentStartup args)
     {
         // no need to update ui since its just been created, just do portal
diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs
index 9d664d0f9a..a783a9e096 100644
--- a/Content.Server/Hands/Systems/HandsSystem.cs
+++ b/Content.Server/Hands/Systems/HandsSystem.cs
@@ -47,7 +47,6 @@ public override void Initialize()
             SubscribeLocalEvent<HandsComponent, BodyPartRemovedEvent>(HandleBodyPartRemoved);
 
             SubscribeLocalEvent<HandsComponent, ComponentGetState>(GetComponentState);
-            SubscribeLocalEvent<HandsComponent, EntityUnpausedEvent>(OnUnpaused);
 
             SubscribeLocalEvent<HandsComponent, BeforeExplodeEvent>(OnExploded);
 
@@ -68,10 +67,6 @@ private void GetComponentState(EntityUid uid, HandsComponent hands, ref Componen
             args.State = new HandsComponentState(hands);
         }
 
-        private void OnUnpaused(Entity<HandsComponent> ent, ref EntityUnpausedEvent args)
-        {
-            ent.Comp.NextThrowTime += args.PausedTime;
-        }
 
         private void OnExploded(Entity<HandsComponent> ent, ref BeforeExplodeEvent args)
         {
diff --git a/Content.Server/Holiday/HolidaySystem.cs b/Content.Server/Holiday/HolidaySystem.cs
index 865d78c8f1..001508593d 100644
--- a/Content.Server/Holiday/HolidaySystem.cs
+++ b/Content.Server/Holiday/HolidaySystem.cs
@@ -23,7 +23,7 @@ public sealed class HolidaySystem : EntitySystem
 
         public override void Initialize()
         {
-            _configManager.OnValueChanged(CCVars.HolidaysEnabled, OnHolidaysEnableChange);
+            Subs.CVar(_configManager, CCVars.HolidaysEnabled, OnHolidaysEnableChange);
             SubscribeLocalEvent<GameRunLevelChangedEvent>(OnRunLevelChanged);
             SubscribeLocalEvent<HolidayVisualsComponent, ComponentInit>(OnVisualsInit);
         }
diff --git a/Content.Server/Holosign/HolosignSystem.cs b/Content.Server/Holosign/HolosignSystem.cs
index f0fc3bbe14..58a0bf0d5f 100644
--- a/Content.Server/Holosign/HolosignSystem.cs
+++ b/Content.Server/Holosign/HolosignSystem.cs
@@ -1,19 +1,22 @@
-using Content.Shared.Interaction.Events;
 using Content.Shared.Examine;
 using Content.Shared.Coordinates.Helpers;
 using Content.Server.Power.Components;
 using Content.Server.PowerCell;
+using Content.Shared.Interaction;
+using Content.Shared.Storage;
 
 namespace Content.Server.Holosign;
 
 public sealed class HolosignSystem : EntitySystem
 {
     [Dependency] private readonly PowerCellSystem _powerCell = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
 
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<HolosignProjectorComponent, UseInHandEvent>(OnUse);
+        SubscribeLocalEvent<HolosignProjectorComponent, BeforeRangedInteractEvent>(OnBeforeInteract);
         SubscribeLocalEvent<HolosignProjectorComponent, ExaminedEvent>(OnExamine);
     }
 
@@ -36,16 +39,22 @@ private void OnExamine(EntityUid uid, HolosignProjectorComponent component, Exam
         }
     }
 
-    private void OnUse(EntityUid uid, HolosignProjectorComponent component, UseInHandEvent args)
+    private void OnBeforeInteract(EntityUid uid, HolosignProjectorComponent component, BeforeRangedInteractEvent args)
     {
-        if (args.Handled ||
-            !_powerCell.TryGetBatteryFromSlot(uid, out var battery) ||
-            !battery.TryUseCharge(component.ChargeUse))
+
+        if (args.Handled
+            || !args.CanReach // prevent placing out of range
+            || HasComp<StorageComponent>(args.Target) // if it's a storage component like a bag, we ignore usage so it can be stored
+            || !_powerCell.TryUseCharge(uid, component.ChargeUse) // if no battery or no charge, doesn't work
+            )
             return;
 
-        // TODO: Too tired to deal
-        var holo = EntityManager.SpawnEntity(component.SignProto, Transform(args.User).Coordinates.SnapToGrid(EntityManager));
-        Transform(holo).Anchored = true;
+        // 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 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)
 
         args.Handled = true;
     }
diff --git a/Content.Server/IgnitionSource/IgnitionSourceSystem.cs b/Content.Server/IgnitionSource/IgnitionSourceSystem.cs
index 0a714063f4..2c0b82613c 100644
--- a/Content.Server/IgnitionSource/IgnitionSourceSystem.cs
+++ b/Content.Server/IgnitionSource/IgnitionSourceSystem.cs
@@ -1,4 +1,5 @@
-using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.EntitySystems;
+using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Temperature;
 using Robust.Server.GameObjects;
 
@@ -17,12 +18,18 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<IgnitionSourceComponent, IsHotEvent>(OnIsHot);
+        SubscribeLocalEvent<ItemToggleHotComponent, ItemToggledEvent>(OnItemToggle);
     }
 
     private void OnIsHot(Entity<IgnitionSourceComponent> ent, ref IsHotEvent args)
     {
         SetIgnited((ent.Owner, ent.Comp), args.IsHot);
     }
+    private void OnItemToggle(Entity<ItemToggleHotComponent> ent, ref ItemToggledEvent args)
+    {
+        if (TryComp<IgnitionSourceComponent>(ent, out var comp))
+            SetIgnited((ent.Owner, comp), args.Activated);
+    }
 
     /// <summary>
     /// Simply sets the ignited field to the ignited param.
diff --git a/Content.Server/Info/InfoSystem.cs b/Content.Server/Info/InfoSystem.cs
index 69bce80592..04fa6a57e5 100644
--- a/Content.Server/Info/InfoSystem.cs
+++ b/Content.Server/Info/InfoSystem.cs
@@ -2,7 +2,6 @@
 using Content.Shared.Info;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
-using Robust.Shared.Log;
 
 namespace Content.Server.Info;
 
@@ -16,9 +15,9 @@ public override void Initialize()
         SubscribeNetworkEvent<RequestRulesMessage>(OnRequestRules);
     }
 
-    protected void OnRequestRules(RequestRulesMessage message, EntitySessionEventArgs eventArgs)
+    private void OnRequestRules(RequestRulesMessage message, EntitySessionEventArgs eventArgs)
     {
-        Logger.DebugS("info", "Client requested rules.");
+        Log.Debug("info", "Client requested rules.");
         var title = Loc.GetString(_cfg.GetCVar(CCVars.RulesHeader));
         var path = _cfg.GetCVar(CCVars.RulesFile);
         var rules = "Server could not read its rules.";
@@ -28,7 +27,7 @@ protected void OnRequestRules(RequestRulesMessage message, EntitySessionEventArg
         }
         catch (Exception)
         {
-            Logger.ErrorS("info", "Could not read server rules file.");
+            Log.Debug("info", "Could not read server rules file.");
         }
         var response = new RulesMessage(title, rules);
         RaiseNetworkEvent(response, eventArgs.SenderSession.Channel);
diff --git a/Content.Server/Info/ShowRulesCommand.cs b/Content.Server/Info/ShowRulesCommand.cs
index 66273e4f63..32c24c2999 100644
--- a/Content.Server/Info/ShowRulesCommand.cs
+++ b/Content.Server/Info/ShowRulesCommand.cs
@@ -60,7 +60,7 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args)
         var message = new SharedRulesManager.ShowRulesPopupMessage();
         message.PopupTime = seconds;
 
-        var player = IoCManager.Resolve<IPlayerManager>().GetSessionByUserId(located.UserId);
+        var player = IoCManager.Resolve<IPlayerManager>().GetSessionById(located.UserId);
         netManager.ServerSendMessage(message, player.Channel);
     }
 }
diff --git a/Content.Server/Instruments/InstrumentSystem.CVars.cs b/Content.Server/Instruments/InstrumentSystem.CVars.cs
index 0467d94f2b..cf4cca30b3 100644
--- a/Content.Server/Instruments/InstrumentSystem.CVars.cs
+++ b/Content.Server/Instruments/InstrumentSystem.CVars.cs
@@ -11,37 +11,9 @@ public sealed partial class InstrumentSystem
 
     private void InitializeCVars()
     {
-        _cfg.OnValueChanged(CCVars.MaxMidiEventsPerSecond, OnMaxMidiEventsPerSecondChanged, true);
-        _cfg.OnValueChanged(CCVars.MaxMidiEventsPerBatch, OnMaxMidiEventsPerBatchChanged, true);
-        _cfg.OnValueChanged(CCVars.MaxMidiBatchesDropped, OnMaxMidiBatchesDroppedChanged, true);
-        _cfg.OnValueChanged(CCVars.MaxMidiLaggedBatches, OnMaxMidiLaggedBatchesChanged, true);
-    }
-
-    private void ShutdownCVars()
-    {
-        _cfg.UnsubValueChanged(CCVars.MaxMidiEventsPerSecond, OnMaxMidiEventsPerSecondChanged);
-        _cfg.UnsubValueChanged(CCVars.MaxMidiEventsPerBatch, OnMaxMidiEventsPerBatchChanged);
-        _cfg.UnsubValueChanged(CCVars.MaxMidiBatchesDropped, OnMaxMidiBatchesDroppedChanged);
-        _cfg.UnsubValueChanged(CCVars.MaxMidiLaggedBatches, OnMaxMidiLaggedBatchesChanged);
-    }
-
-    private void OnMaxMidiLaggedBatchesChanged(int obj)
-    {
-        MaxMidiLaggedBatches = obj;
-    }
-
-    private void OnMaxMidiBatchesDroppedChanged(int obj)
-    {
-        MaxMidiBatchesDropped = obj;
-    }
-
-    private void OnMaxMidiEventsPerBatchChanged(int obj)
-    {
-        MaxMidiEventsPerBatch = obj;
-    }
-
-    private void OnMaxMidiEventsPerSecondChanged(int obj)
-    {
-        MaxMidiEventsPerSecond = obj;
+        Subs.CVar(_cfg, CCVars.MaxMidiEventsPerSecond, obj => MaxMidiEventsPerSecond = obj, true);
+        Subs.CVar(_cfg, CCVars.MaxMidiEventsPerBatch, obj => MaxMidiEventsPerBatch = obj, true);
+        Subs.CVar(_cfg, CCVars.MaxMidiBatchesDropped, obj => MaxMidiBatchesDropped = obj, true);
+        Subs.CVar(_cfg, CCVars.MaxMidiLaggedBatches, obj => MaxMidiLaggedBatches = obj, true);
     }
 }
diff --git a/Content.Server/Instruments/InstrumentSystem.cs b/Content.Server/Instruments/InstrumentSystem.cs
index 17899b7232..8dd9644e3c 100644
--- a/Content.Server/Instruments/InstrumentSystem.cs
+++ b/Content.Server/Instruments/InstrumentSystem.cs
@@ -191,13 +191,6 @@ private void OnMidiSetFilteredChannel(InstrumentSetFilteredChannelEvent msg, Ent
         Dirty(uid, instrument);
     }
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-
-        ShutdownCVars();
-    }
-
     private void OnBoundUIClosed(EntityUid uid, InstrumentComponent component, BoundUIClosedEvent args)
     {
         if (HasComp<ActiveInstrumentComponent>(uid)
diff --git a/Content.Server/Kitchen/Components/ActiveMicrowaveComponent.cs b/Content.Server/Kitchen/Components/ActiveMicrowaveComponent.cs
index bd5449dde6..1e32e039db 100644
--- a/Content.Server/Kitchen/Components/ActiveMicrowaveComponent.cs
+++ b/Content.Server/Kitchen/Components/ActiveMicrowaveComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Server.Kitchen.Components;
 /// <summary>
 /// Attached to a microwave that is currently in the process of cooking
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, AutoGenerateComponentPause]
 public sealed partial class ActiveMicrowaveComponent : Component
 {
     [ViewVariables(VVAccess.ReadWrite)]
@@ -17,6 +17,7 @@ public sealed partial class ActiveMicrowaveComponent : Component
 
     [ViewVariables(VVAccess.ReadWrite)]
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan MalfunctionTime = TimeSpan.Zero;
 
     [ViewVariables]
diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
index 142a98236a..815ba8f521 100644
--- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs
+++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
@@ -56,6 +56,12 @@ public sealed partial class MicrowaveComponent : Component
         [DataField("currentCookTimerTime"), ViewVariables(VVAccess.ReadWrite)]
         public uint CurrentCookTimerTime = 0;
 
+        /// <summary>
+        /// Tracks the elapsed time of the current cook timer.
+        /// </summary>
+        [DataField, ViewVariables(VVAccess.ReadWrite)]
+        public TimeSpan CurrentCookTimeEnd = TimeSpan.Zero;
+
         /// <summary>
         /// The maximum number of seconds a microwave can be set to.
         /// This is currently only used for validation and the client does not check this.
diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index b8ea32c2a6..212383c463 100644
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -86,7 +86,6 @@ public override void Initialize()
 
             SubscribeLocalEvent<ActiveMicrowaveComponent, ComponentStartup>(OnCookStart);
             SubscribeLocalEvent<ActiveMicrowaveComponent, ComponentShutdown>(OnCookStop);
-            SubscribeLocalEvent<ActiveMicrowaveComponent, EntityUnpausedEvent>(OnEntityUnpaused);
             SubscribeLocalEvent<ActiveMicrowaveComponent, EntInsertedIntoContainerMessage>(OnActiveMicrowaveInsert);
             SubscribeLocalEvent<ActiveMicrowaveComponent, EntRemovedFromContainerMessage>(OnActiveMicrowaveRemove);
 
@@ -112,11 +111,6 @@ private void OnCookStop(Entity<ActiveMicrowaveComponent> ent, ref ComponentShutd
             microwaveComponent.PlayingStream = _audio.Stop(microwaveComponent.PlayingStream);
         }
 
-        private void OnEntityUnpaused(Entity<ActiveMicrowaveComponent> ent, ref EntityUnpausedEvent args)
-        {
-            ent.Comp.MalfunctionTime += args.PausedTime;
-        }
-
         private void OnActiveMicrowaveInsert(Entity<ActiveMicrowaveComponent> ent, ref EntInsertedIntoContainerMessage args)
         {
             AddComp<ActivelyMicrowavedComponent>(args.Entity);
@@ -369,7 +363,8 @@ public void UpdateUserInterfaceState(EntityUid uid, MicrowaveComponent component
                 GetNetEntityArray(component.Storage.ContainedEntities.ToArray()),
                 HasComp<ActiveMicrowaveComponent>(uid),
                 component.CurrentCookTimeButtonIndex,
-                component.CurrentCookTimerTime
+                component.CurrentCookTimerTime,
+                component.CurrentCookTimeEnd
             ));
         }
 
@@ -492,6 +487,7 @@ public void Wzhzhzh(EntityUid uid, MicrowaveComponent component, EntityUid? user
             activeComp.CookTimeRemaining = component.CurrentCookTimerTime * component.CookTimeMultiplier;
             activeComp.TotalTime = component.CurrentCookTimerTime; //this doesn't scale so that we can have the "actual" time
             activeComp.PortionedRecipe = portionedRecipe;
+            component.CurrentCookTimeEnd = _gameTiming.CurTime + TimeSpan.FromSeconds(component.CurrentCookTimerTime);
             if (malfunctioning)
                 activeComp.MalfunctionTime = _gameTiming.CurTime + TimeSpan.FromSeconds(component.MalfunctionInterval);
             UpdateUserInterfaceState(uid, component);
@@ -557,7 +553,7 @@ public override void Update(float frameTime)
 
                 active.CookTimeRemaining -= frameTime;
 
-                RollMalfunction((uid, active,microwave));
+                RollMalfunction((uid, active, microwave));
 
                 //check if there's still cook time left
                 if (active.CookTimeRemaining > 0)
@@ -580,6 +576,7 @@ public override void Update(float frameTime)
                 }
 
                 _container.EmptyContainer(microwave.Storage);
+                microwave.CurrentCookTimeEnd = TimeSpan.Zero;
                 UpdateUserInterfaceState(uid, microwave);
                 _audio.PlayPvs(microwave.FoodDoneSound, uid);
                 StopCooking((uid, microwave));
@@ -617,6 +614,7 @@ private void OnSelectTime(Entity<MicrowaveComponent> ent, ref MicrowaveSelectCoo
 
             ent.Comp.CurrentCookTimeButtonIndex = args.ButtonIndex;
             ent.Comp.CurrentCookTimerTime = args.NewCookTime;
+            ent.Comp.CurrentCookTimeEnd = TimeSpan.Zero;
             _audio.PlayPvs(ent.Comp.ClickSound, ent, AudioParams.Default.WithVolume(-2));
             UpdateUserInterfaceState(ent, ent.Comp);
         }
diff --git a/Content.Server/Labels/Label/Components/LabelComponent.cs b/Content.Server/Labels/Label/Components/LabelComponent.cs
deleted file mode 100644
index a23acc55da..0000000000
--- a/Content.Server/Labels/Label/Components/LabelComponent.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-namespace Content.Server.Labels.Components
-{
-    /// <summary>
-    /// Makes entities have a label in their name. Labels are normally given by <see cref="HandLabelerComponent"/>
-    /// </summary>
-    [RegisterComponent]
-    public sealed partial class LabelComponent : Component
-    {
-        /// <summary>
-        /// Current text on the label. If set before map init, during map init this string will be localized.
-        /// This permits localized preset labels with fallback to the text written on the label.
-        /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("currentLabel")]
-        public string? CurrentLabel { get; set; }
-
-        /// <summary>
-        ///  The original name of the entity
-        ///  Used for reverting the modified entity name when the label is removed
-        /// </summary>
-        [DataField("originalName")]
-        public string? OriginalName { get; set; }
-    }
-}
diff --git a/Content.Server/Labels/Label/LabelSystem.cs b/Content.Server/Labels/Label/LabelSystem.cs
index 29da983b9d..f45eac8eab 100644
--- a/Content.Server/Labels/Label/LabelSystem.cs
+++ b/Content.Server/Labels/Label/LabelSystem.cs
@@ -3,11 +3,11 @@
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Examine;
 using Content.Shared.Labels;
+using Content.Shared.Labels.Components;
+using Content.Shared.Labels.EntitySystems;
 using Content.Shared.Tag;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
-using Robust.Shared.Utility;
 
 namespace Content.Server.Labels
 {
@@ -15,7 +15,7 @@ namespace Content.Server.Labels
     /// A system that lets players see the contents of a label on an object.
     /// </summary>
     [UsedImplicitly]
-    public sealed class LabelSystem : EntitySystem
+    public sealed class LabelSystem : SharedLabelSystem
     {
         [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
@@ -30,7 +30,6 @@ public override void Initialize()
         {
             base.Initialize();
 
-            SubscribeLocalEvent<LabelComponent, ExaminedEvent>(OnExamine);
             SubscribeLocalEvent<LabelComponent, MapInitEvent>(OnLabelCompMapInit);
             SubscribeLocalEvent<PaperLabelComponent, ComponentInit>(OnComponentInit);
             SubscribeLocalEvent<PaperLabelComponent, ComponentRemove>(OnComponentRemove);
@@ -42,7 +41,10 @@ public override void Initialize()
         private void OnLabelCompMapInit(EntityUid uid, LabelComponent component, MapInitEvent args)
         {
             if (!string.IsNullOrEmpty(component.CurrentLabel))
+            {
                 component.CurrentLabel = Loc.GetString(component.CurrentLabel);
+                Dirty(uid, component);
+            }
         }
 
         /// <summary>
@@ -71,6 +73,8 @@ public void Label(EntityUid uid, string? text, MetaDataComponent? metadata = nul
                 label.CurrentLabel = null;
                 label.OriginalName = null;
 
+                Dirty(uid, label);
+
                 return;
             }
 
@@ -78,6 +82,8 @@ public void Label(EntityUid uid, string? text, MetaDataComponent? metadata = nul
             label.OriginalName ??= metadata.EntityName;
             label.CurrentLabel = text;
             _metaData.SetEntityName(uid, $"{label.OriginalName} ({text})", metadata);
+
+            Dirty(uid, label);
         }
 
         private void OnComponentInit(EntityUid uid, PaperLabelComponent component, ComponentInit args)
@@ -95,19 +101,6 @@ private void OnComponentRemove(EntityUid uid, PaperLabelComponent component, Com
             _itemSlotsSystem.RemoveItemSlot(uid, component.LabelSlot);
         }
 
-        private void OnExamine(EntityUid uid, LabelComponent? label, ExaminedEvent args)
-        {
-            if (!Resolve(uid, ref label))
-                return;
-
-            if (label.CurrentLabel == null)
-                return;
-
-            var message = new FormattedMessage();
-            message.AddText(Loc.GetString("hand-labeler-has-label", ("label", label.CurrentLabel)));
-            args.PushMessage(message);
-        }
-
         private void OnExamined(EntityUid uid, PaperLabelComponent comp, ExaminedEvent args)
         {
             if (comp.LabelSlot.Item is not {Valid: true} item)
diff --git a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
index 0b60787dfb..3fa5237948 100644
--- a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
@@ -151,7 +151,7 @@ private void Update(EntityUid uid, EmergencyLightComponent component, BatteryCom
         }
         else
         {
-            battery.CurrentCharge += component.ChargingWattage * frameTime * component.ChargingEfficiency;
+            _battery.SetCharge(uid, battery.CurrentCharge + component.ChargingWattage * frameTime * component.ChargingEfficiency, battery);
             if (battery.IsFullyCharged)
             {
                 if (TryComp<ApcPowerReceiverComponent>(uid, out var receiver))
diff --git a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
index 70ce3c7488..813f8c407b 100644
--- a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.Actions;
 using Content.Server.Popups;
+using Content.Server.Power.EntitySystems;
 using Content.Server.PowerCell;
 using Content.Shared.Actions;
 using Content.Shared.Examine;
@@ -25,6 +26,7 @@ public sealed class HandheldLightSystem : SharedHandheldLightSystem
         [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
         [Dependency] private readonly PopupSystem _popup = default!;
         [Dependency] private readonly PowerCellSystem _powerCell = default!;
+        [Dependency] private readonly BatterySystem _battery = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly SharedPointLightSystem _lights = default!;
@@ -245,13 +247,16 @@ public bool TurnOn(EntityUid user, Entity<HandheldLightComponent> uid)
         public void TryUpdate(Entity<HandheldLightComponent> uid, float frameTime)
         {
             var component = uid.Comp;
-            if (!_powerCell.TryGetBatteryFromSlot(uid, out var battery) &&
+            if (!_powerCell.TryGetBatteryFromSlot(uid, out var batteryUid, out var battery, null) &&
                 !TryComp(uid, out battery))
             {
                 TurnOff(uid, false);
                 return;
             }
 
+            if (batteryUid == null)
+                return;
+
             var appearanceComponent = EntityManager.GetComponentOrNull<AppearanceComponent>(uid);
 
             var fraction = battery.CurrentCharge / battery.MaxCharge;
@@ -268,7 +273,7 @@ public void TryUpdate(Entity<HandheldLightComponent> uid, float frameTime)
                 _appearance.SetData(uid, HandheldLightVisuals.Power, HandheldLightPowerStates.Dying, appearanceComponent);
             }
 
-            if (component.Activated && !battery.TryUseCharge(component.Wattage * frameTime))
+            if (component.Activated && !_battery.TryUseCharge(batteryUid.Value, component.Wattage * frameTime, battery))
                 TurnOff(uid, false);
 
             UpdateLevel(uid);
diff --git a/Content.Server/Light/EntitySystems/LightReplacerSystem.cs b/Content.Server/Light/EntitySystems/LightReplacerSystem.cs
index 1260a0dd0d..71cc0173da 100644
--- a/Content.Server/Light/EntitySystems/LightReplacerSystem.cs
+++ b/Content.Server/Light/EntitySystems/LightReplacerSystem.cs
@@ -233,7 +233,7 @@ public bool TryInsertBulbsFromStorage(EntityUid replacerUid, EntityUid storageUi
         // show some message if success
         if (insertedBulbs > 0 && userUid != null)
         {
-            var msg = Loc.GetString("comp-light-replacer-refill-from-storage", ("light-replacer", storageUid));
+            var msg = Loc.GetString("comp-light-replacer-refill-from-storage", ("light-replacer", replacerUid));
             _popupSystem.PopupEntity(msg, replacerUid, userUid.Value, PopupType.Medium);
         }
 
diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
index ca44b1a4c9..e880cec5bb 100644
--- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs
@@ -23,11 +23,6 @@
 using Robust.Shared.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
-using Content.Shared.DoAfter;
-using Content.Server.Emp;
-using Content.Server.DeviceLinking.Events;
-using Content.Server.DeviceLinking.Systems;
-using Content.Shared.Inventory;
 using Robust.Shared.Audio.Systems;
 
 namespace Content.Server.Light.EntitySystems
diff --git a/Content.Server/Magic/MagicSystem.cs b/Content.Server/Magic/MagicSystem.cs
index d8febe0d1f..2c9b11dbd3 100644
--- a/Content.Server/Magic/MagicSystem.cs
+++ b/Content.Server/Magic/MagicSystem.cs
@@ -36,7 +36,6 @@ public sealed class MagicSystem : EntitySystem
     [Dependency] private readonly IComponentFactory _compFact = default!;
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly DoorBoltSystem _boltsSystem = default!;
     [Dependency] private readonly BodySystem _bodySystem = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly SharedDoorSystem _doorSystem = default!;
@@ -307,7 +306,7 @@ private void OnKnockSpell(KnockSpellEvent args)
         foreach (var entity in _lookup.GetEntitiesInRange(coords, args.Range))
         {
             if (TryComp<DoorBoltComponent>(entity, out var bolts))
-                _boltsSystem.SetBoltsDown(entity, bolts, false);
+                _doorSystem.SetBoltsDown((entity, bolts), false);
 
             if (TryComp<DoorComponent>(entity, out var doorComp) && doorComp.State is not DoorState.Open)
                 _doorSystem.StartOpening(entity);
diff --git a/Content.Server/Mapping/MappingSystem.cs b/Content.Server/Mapping/MappingSystem.cs
index 5b4609bcd6..0678dab7ce 100644
--- a/Content.Server/Mapping/MappingSystem.cs
+++ b/Content.Server/Mapping/MappingSystem.cs
@@ -45,14 +45,7 @@ public override void Initialize()
             ToggleAutosaveCommand);
 
         _sawmill = Logger.GetSawmill("autosave");
-        _cfg.OnValueChanged(CCVars.AutosaveEnabled, SetAutosaveEnabled, true);
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-
-        _cfg.UnsubValueChanged(CCVars.AutosaveEnabled, SetAutosaveEnabled);
+        Subs.CVar(_cfg, CCVars.AutosaveEnabled, SetAutosaveEnabled, true);
     }
 
     private void SetAutosaveEnabled(bool b)
diff --git a/Content.Server/MassMedia/Components/NewsWriteComponent.cs b/Content.Server/MassMedia/Components/NewsWriteComponent.cs
deleted file mode 100644
index c064759610..0000000000
--- a/Content.Server/MassMedia/Components/NewsWriteComponent.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using Robust.Shared.Audio;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Server.MassMedia.Components
-{
-    [RegisterComponent]
-    public sealed partial class NewsWriteComponent : Component
-    {
-        [ViewVariables(VVAccess.ReadWrite)]
-        public bool ShareAvalible = false;
-
-        [ViewVariables(VVAccess.ReadWrite), DataField("nextShare", customTypeSerializer: typeof(TimeOffsetSerializer))]
-        public TimeSpan NextShare;
-
-        [ViewVariables(VVAccess.ReadWrite), DataField("shareCooldown")]
-        public float ShareCooldown = 60f;
-
-        [DataField("noAccessSound")]
-        public SoundSpecifier NoAccessSound = new SoundPathSpecifier("/Audio/Machines/airlock_deny.ogg");
-        [DataField("confirmSound")]
-        public SoundSpecifier ConfirmSound = new SoundPathSpecifier("/Audio/Machines/scan_finish.ogg");
-    }
-}
diff --git a/Content.Server/MassMedia/Components/NewsWriterComponent.cs b/Content.Server/MassMedia/Components/NewsWriterComponent.cs
new file mode 100644
index 0000000000..7005600c10
--- /dev/null
+++ b/Content.Server/MassMedia/Components/NewsWriterComponent.cs
@@ -0,0 +1,25 @@
+using Content.Server.MassMedia.Systems;
+using Robust.Shared.Audio;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Server.MassMedia.Components;
+
+[RegisterComponent, AutoGenerateComponentPause]
+[Access(typeof(NewsSystem))]
+public sealed partial class NewsWriterComponent : Component
+{
+    [ViewVariables(VVAccess.ReadWrite), DataField]
+    public bool PublishEnabled;
+
+    [ViewVariables(VVAccess.ReadWrite), DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
+    public TimeSpan NextPublish;
+
+    [ViewVariables(VVAccess.ReadWrite), DataField]
+    public float PublishCooldown = 20f;
+
+    [DataField]
+    public SoundSpecifier NoAccessSound = new SoundPathSpecifier("/Audio/Machines/airlock_deny.ogg");
+
+    [DataField]
+    public SoundSpecifier ConfirmSound = new SoundPathSpecifier("/Audio/Machines/scan_finish.ogg");
+}
diff --git a/Content.Server/MassMedia/Systems/NewsSystem.cs b/Content.Server/MassMedia/Systems/NewsSystem.cs
index 40e2a0911b..2b18b57ff8 100644
--- a/Content.Server/MassMedia/Systems/NewsSystem.cs
+++ b/Content.Server/MassMedia/Systems/NewsSystem.cs
@@ -3,297 +3,321 @@
 using Content.Server.CartridgeLoader;
 using Content.Server.CartridgeLoader.Cartridges;
 using Content.Server.GameTicking;
-using Content.Server.MassMedia.Components;
-using Content.Server.PDA.Ringer;
+using System.Diagnostics.CodeAnalysis;
+using Content.Server.Access.Systems;
 using Content.Server.Popups;
-using Content.Server.StationRecords.Systems;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.CartridgeLoader;
 using Content.Shared.CartridgeLoader.Cartridges;
 using Content.Shared.Database;
-using Content.Shared.GameTicking;
 using Content.Shared.MassMedia.Components;
 using Content.Shared.MassMedia.Systems;
-using Content.Shared.PDA;
 using Robust.Server.GameObjects;
-using System.Linq;
-using Content.Server.Administration.Logs;
-using Content.Server.CartridgeLoader.Cartridges;
-using Content.Shared.CartridgeLoader;
-using Content.Shared.CartridgeLoader.Cartridges;
-using Content.Server.CartridgeLoader;
-using Content.Server.GameTicking;
+using Content.Server.MassMedia.Components;
 using Robust.Shared.Timing;
-using Content.Server.Popups;
-using Content.Server.StationRecords.Systems;
-using Content.Shared.Database;
-using Robust.Shared.Audio;
+using Content.Server.Station.Systems;
+using Content.Shared.Popups;
+using Content.Shared.StationRecords;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Containers;
-using Robust.Shared.Player;
-using Robust.Shared.Timing;
 
 namespace Content.Server.MassMedia.Systems;
 
 public sealed class NewsSystem : SharedNewsSystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
-    [Dependency] private readonly RingerSystem _ringer = default!;
     [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoaderSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly GameTicker _ticker = default!;
     [Dependency] private readonly AccessReaderSystem _accessReader = default!;
-    [Dependency] private readonly StationRecordsSystem _stationRecords = default!;
-
-    // TODO remove this. Dont store data on systems
-    // Honestly NewsSystem just needs someone to rewrite it entirely.
-    private readonly List<NewsArticle> _articles = new List<NewsArticle>();
+    [Dependency] private readonly IdCardSystem _idCardSystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<NewsWriteComponent, NewsWriteShareMessage>(OnWriteUiShareMessage);
-        SubscribeLocalEvent<NewsWriteComponent, NewsWriteDeleteMessage>(OnWriteUiDeleteMessage);
-        SubscribeLocalEvent<NewsWriteComponent, NewsWriteArticlesRequestMessage>(OnRequestWriteUiMessage);
+        // News writer
+        SubscribeLocalEvent<NewsWriterComponent, MapInitEvent>(OnMapInit);
 
-        SubscribeLocalEvent<NewsReadCartridgeComponent, CartridgeUiReadyEvent>(OnReadUiReady);
-        SubscribeLocalEvent<NewsReadCartridgeComponent, CartridgeMessageEvent>(OnReadUiMessage);
-
-        SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
-    }
-
-    private void OnRoundRestart(RoundRestartCleanupEvent ev)
-    {
-        _articles.Clear();
+        // New writer bui messages
+        Subs.BuiEvents<NewsWriterComponent>(NewsWriterUiKey.Key, subs =>
+        {
+            subs.Event<NewsWriterDeleteMessage>(OnWriteUiDeleteMessage);
+            subs.Event<NewsWriterArticlesRequestMessage>(OnRequestArticlesUiMessage);
+            subs.Event<NewsWriterPublishMessage>(OnWriteUiPublishMessage);
+        });
+
+        // News reader
+        SubscribeLocalEvent<NewsReaderCartridgeComponent, NewsArticlePublishedEvent>(OnArticlePublished);
+        SubscribeLocalEvent<NewsReaderCartridgeComponent, NewsArticleDeletedEvent>(OnArticleDeleted);
+        SubscribeLocalEvent<NewsReaderCartridgeComponent, CartridgeMessageEvent>(OnReaderUiMessage);
+        SubscribeLocalEvent<NewsReaderCartridgeComponent, CartridgeUiReadyEvent>(OnReaderUiReady);
     }
 
-    public void ToggleUi(EntityUid user, EntityUid deviceEnt, NewsWriteComponent? component)
+    public override void Update(float frameTime)
     {
-        if (!Resolve(deviceEnt, ref component))
-            return;
+        base.Update(frameTime);
 
-        if (!TryComp<ActorComponent>(user, out var actor))
-            return;
+        var query = EntityQueryEnumerator<NewsWriterComponent>();
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            if (comp.PublishEnabled || _timing.CurTime < comp.NextPublish)
+                continue;
 
-        _ui.TryToggleUi(deviceEnt, NewsWriteUiKey.Key, actor.PlayerSession);
+            comp.PublishEnabled = true;
+            UpdateWriterUi((uid, comp));
+        }
     }
 
-    public void OnReadUiReady(EntityUid uid, NewsReadCartridgeComponent component, CartridgeUiReadyEvent args)
-    {
-        UpdateReadUi(uid, args.Loader, component);
-    }
+    #region Writer Event Handlers
 
-    public void UpdateWriteUi(EntityUid uid, NewsWriteComponent component)
+    private void OnMapInit(Entity<NewsWriterComponent> ent, ref MapInitEvent args)
     {
-        if (!_ui.TryGetUi(uid, NewsWriteUiKey.Key, out _))
+        var station = _station.GetOwningStation(ent);
+        if (!station.HasValue)
             return;
 
-        var state = new NewsWriteBoundUserInterfaceState(_articles.ToArray(), component.ShareAvalible);
-        _ui.TrySetUiState(uid, NewsWriteUiKey.Key, state);
+        EnsureComp<StationNewsComponent>(station.Value);
     }
 
-    public void UpdateReadUi(EntityUid uid, EntityUid loaderUid, NewsReadCartridgeComponent? component)
+    private void OnWriteUiDeleteMessage(Entity<NewsWriterComponent> ent, ref NewsWriterDeleteMessage msg)
     {
-        if (!Resolve(uid, ref component))
+        if (!TryGetArticles(ent, out var articles))
+            return;
+
+        if (msg.ArticleNum >= articles.Count)
+            return;
+
+        if (msg.Session.AttachedEntity is not { } actor)
             return;
 
-        NewsReadLeafArticle(component, 0);
+        var article = articles[msg.ArticleNum];
+        if (CheckDeleteAccess(article, ent, actor))
+        {
+            _adminLogger.Add(
+                LogType.Chat, LogImpact.Medium,
+                $"{ToPrettyString(actor):actor} deleted news article {article.Title} by {article.Author}: {article.Content}"
+                );
 
-        if (_articles.Any())
-            _cartridgeLoaderSystem?.UpdateCartridgeUiState(loaderUid, new NewsReadBoundUserInterfaceState(_articles[component.ArticleNum], component.ArticleNum + 1, _articles.Count, component.NotificationOn));
+            articles.RemoveAt(msg.ArticleNum);
+            _audio.PlayPvs(ent.Comp.ConfirmSound, ent);
+        }
         else
-            _cartridgeLoaderSystem?.UpdateCartridgeUiState(loaderUid, new NewsReadEmptyBoundUserInterfaceState(component.NotificationOn));
-    }
+        {
+            _popup.PopupEntity(Loc.GetString("news-write-no-access-popup"), ent, PopupType.SmallCaution);
+            _audio.PlayPvs(ent.Comp.NoAccessSound, ent);
+        }
 
-    private void OnReadUiMessage(EntityUid uid, NewsReadCartridgeComponent component, CartridgeMessageEvent args)
-    {
-        if (args is not NewsReadUiMessageEvent message)
-            return;
+        var args = new NewsArticleDeletedEvent();
+        var query = EntityQueryEnumerator<NewsReaderCartridgeComponent>();
+        while (query.MoveNext(out var readerUid, out _))
+        {
+            RaiseLocalEvent(readerUid, ref args);
+        }
 
-        if (message.Action == NewsReadUiAction.Next)
-            NewsReadLeafArticle(component, 1);
-        if (message.Action == NewsReadUiAction.Prev)
-            NewsReadLeafArticle(component, -1);
-        if (message.Action == NewsReadUiAction.NotificationSwith)
-            component.NotificationOn = !component.NotificationOn;
+        UpdateWriterDevices();
+    }
 
-        UpdateReadUi(uid, GetEntity(args.LoaderUid), component);
+    private void OnRequestArticlesUiMessage(Entity<NewsWriterComponent> ent, ref NewsWriterArticlesRequestMessage msg)
+    {
+        UpdateWriterUi(ent);
     }
 
-    public void OnWriteUiShareMessage(EntityUid uid, NewsWriteComponent component, NewsWriteShareMessage msg)
+    private void OnWriteUiPublishMessage(Entity<NewsWriterComponent> ent, ref NewsWriterPublishMessage msg)
     {
-        // dont blindly trust input from clients.
-        if (msg.Session.AttachedEntity is not {} author)
+        if (!ent.Comp.PublishEnabled)
             return;
 
-        if (!_accessReader.FindAccessItemsInventory(author, out var items))
-            return;
+        ent.Comp.PublishEnabled = false;
+        ent.Comp.NextPublish = _timing.CurTime + TimeSpan.FromSeconds(ent.Comp.PublishCooldown);
 
-        if (!_accessReader.FindStationRecordKeys(author, out _, items))
+        if (!TryGetArticles(ent, out var articles))
             return;
 
-        string? authorName = null;
+        if (msg.Session.AttachedEntity is not { } author)
+            return;
 
-        // TODO: There is a dedicated helper for this.
-        foreach (var item in items)
-        {
-            // ID Card
-            if (TryComp(item, out IdCardComponent? id))
-            {
-                authorName = id.FullName;
-                break;
-            }
+        if (!_accessReader.FindStationRecordKeys(author, out _))
+            return;
 
-            if (TryComp(item, out PdaComponent? pda)
-                     && pda.ContainedId != null
-                     && TryComp(pda.ContainedId, out id))
-            {
-                authorName = id.FullName;
-                break;
-            }
-        }
+        string? authorName = null;
+        if (_idCardSystem.TryFindIdCard(author, out var idCard))
+            authorName = idCard.Comp.FullName;
 
-        var trimmedName = msg.Name.Trim();
-        var trimmedContent = msg.Content.Trim();
+        var title = msg.Title.Trim();
+        var content = msg.Content.Trim();
 
         var article = new NewsArticle
         {
+            Title = title.Length <= MaxTitleLength ? title : $"{title[..MaxTitleLength]}...",
+            Content = content.Length <= MaxContentLength ? content : $"{content[..MaxContentLength]}...",
             Author = authorName,
-            Name = trimmedName.Length <= MaxNameLength ? trimmedName : $"{trimmedName[..MaxNameLength]}...",
-            Content = trimmedContent.Length <= MaxArticleLength ? trimmedContent : $"{trimmedContent[..MaxArticleLength]}...",
             ShareTime = _ticker.RoundDuration()
         };
 
-        _audio.PlayPvs(component.ConfirmSound, uid);
-        _adminLogger.Add(LogType.Chat, LogImpact.Medium, $"{ToPrettyString(author):actor} created news article {article.Name} by {article.Author}: {article.Content}");
-        _articles.Add(article);
+        _audio.PlayPvs(ent.Comp.ConfirmSound, ent);
+
+        _adminLogger.Add(
+            LogType.Chat,
+            LogImpact.Medium,
+            $"{ToPrettyString(author):actor} created news article {article.Title} by {article.Author}: {article.Content}"
+            );
 
-        component.ShareAvalible = false;
-        component.NextShare = _timing.CurTime + TimeSpan.FromSeconds(component.ShareCooldown);
+        articles.Add(article);
+
+        var args = new NewsArticlePublishedEvent(article);
+        var query = EntityQueryEnumerator<NewsReaderCartridgeComponent>();
+        while (query.MoveNext(out var readerUid, out _))
+        {
+            RaiseLocalEvent(readerUid, ref args);
+        }
 
-        UpdateReadDevices();
-        UpdateWriteDevices();
-        TryNotify();
+        UpdateWriterDevices();
     }
+    #endregion
 
-    public void OnWriteUiDeleteMessage(EntityUid uid, NewsWriteComponent component, NewsWriteDeleteMessage msg)
+    #region Reader Event Handlers
+
+    private void OnArticlePublished(Entity<NewsReaderCartridgeComponent> ent, ref NewsArticlePublishedEvent args)
     {
-        if (msg.ArticleNum > _articles.Count)
+        if (Comp<CartridgeComponent>(ent).LoaderUid is not { } loaderUid)
             return;
 
-        var articleDeleter = msg.Session.AttachedEntity;
-        if (CheckDeleteAccess(_articles[msg.ArticleNum], uid, articleDeleter))
-        {
-            if (articleDeleter != null)
-                _adminLogger.Add(LogType.Chat, LogImpact.Medium, $"{ToPrettyString(articleDeleter.Value):actor} deleted news article {_articles[msg.ArticleNum].Name} by {_articles[msg.ArticleNum].Author}: {_articles[msg.ArticleNum].Content}");
-            else
-                _adminLogger.Add(LogType.Chat, LogImpact.Medium, $"{msg.Session.Name:actor} created news article {_articles[msg.ArticleNum].Name}: {_articles[msg.ArticleNum].Content}");
-            _articles.RemoveAt(msg.ArticleNum);
-            _audio.PlayPvs(component.ConfirmSound, uid);
-        }
-        else
+        UpdateReaderUi(ent, loaderUid);
+
+        if (!ent.Comp.NotificationOn)
+            return;
+
+        _cartridgeLoaderSystem.SendNotification(
+            loaderUid,
+            Loc.GetString("news-pda-notification-header"),
+            args.Article.Title);
+    }
+
+    private void OnArticleDeleted(Entity<NewsReaderCartridgeComponent> ent, ref NewsArticleDeletedEvent args)
+    {
+        if (Comp<CartridgeComponent>(ent).LoaderUid is not { } loaderUid)
+            return;
+
+        UpdateReaderUi(ent, loaderUid);
+    }
+
+    private void OnReaderUiMessage(Entity<NewsReaderCartridgeComponent> ent, ref CartridgeMessageEvent args)
+    {
+        if (args is not NewsReaderUiMessageEvent message)
+            return;
+
+        switch (message.Action)
         {
-            _popup.PopupEntity(Loc.GetString("news-write-no-access-popup"), uid);
-            _audio.PlayPvs(component.NoAccessSound, uid);
+            case NewsReaderUiAction.Next:
+                NewsReaderLeafArticle(ent, 1);
+                break;
+            case NewsReaderUiAction.Prev:
+                NewsReaderLeafArticle(ent, -1);
+                break;
+            case NewsReaderUiAction.NotificationSwitch:
+                ent.Comp.NotificationOn = !ent.Comp.NotificationOn;
+                break;
         }
 
-        UpdateReadDevices();
-        UpdateWriteDevices();
+        UpdateReaderUi(ent, GetEntity(args.LoaderUid));
     }
 
-    public void OnRequestWriteUiMessage(EntityUid uid, NewsWriteComponent component, NewsWriteArticlesRequestMessage msg)
+    private void OnReaderUiReady(Entity<NewsReaderCartridgeComponent> ent, ref CartridgeUiReadyEvent args)
     {
-        UpdateWriteUi(uid, component);
+        UpdateReaderUi(ent, args.Loader);
     }
+    #endregion
 
-    private void NewsReadLeafArticle(NewsReadCartridgeComponent component, int leafDir)
+    private bool TryGetArticles(EntityUid uid, [NotNullWhen(true)] out List<NewsArticle>? articles)
     {
-        component.ArticleNum += leafDir;
+        if (_station.GetOwningStation(uid) is not { } station ||
+            !TryComp<StationNewsComponent>(station, out var stationNews))
+        {
+            articles = null;
+            return false;
+        }
 
-        if (component.ArticleNum >= _articles.Count) component.ArticleNum = 0;
-        if (component.ArticleNum < 0) component.ArticleNum = _articles.Count - 1;
+        articles = stationNews.Articles;
+        return true;
     }
 
-    private void TryNotify()
+    private void UpdateWriterUi(Entity<NewsWriterComponent> ent)
     {
-        var query = EntityQueryEnumerator<CartridgeLoaderComponent, RingerComponent, ContainerManagerComponent>();
+        if (!_ui.TryGetUi(ent, NewsWriterUiKey.Key, out var ui))
+            return;
 
-        while (query.MoveNext(out var uid, out var comp, out var ringer, out var cont))
-        {
-            if (!_cartridgeLoaderSystem.TryGetProgram<NewsReadCartridgeComponent>(uid, out _, out var newsReadCartridgeComponent, false, comp, cont)
-                || !newsReadCartridgeComponent.NotificationOn)
-                continue;
+        if (!TryGetArticles(ent, out var articles))
+            return;
 
-            _ringer.RingerPlayRingtone(uid, ringer);
-        }
+        var state = new NewsWriterBoundUserInterfaceState(articles.ToArray(), ent.Comp.PublishEnabled, ent.Comp.NextPublish);
+        _ui.SetUiState(ui, state);
     }
 
-    private void UpdateReadDevices()
+    private void UpdateReaderUi(Entity<NewsReaderCartridgeComponent> ent, EntityUid loaderUid)
     {
-        var query = EntityQueryEnumerator<CartridgeLoaderComponent>();
+        if (!TryGetArticles(ent, out var articles))
+            return;
 
-        while (query.MoveNext(out var owner, out var comp))
+        NewsReaderLeafArticle(ent, 0);
+
+        if (articles.Count == 0)
         {
-            if (EntityManager.TryGetComponent<NewsReadCartridgeComponent>(comp.ActiveProgram, out var cartridge))
-                UpdateReadUi(comp.ActiveProgram.Value, owner, cartridge);
+            _cartridgeLoaderSystem.UpdateCartridgeUiState(loaderUid, new NewsReaderEmptyBoundUserInterfaceState(ent.Comp.NotificationOn));
+            return;
         }
+
+        var state = new NewsReaderBoundUserInterfaceState(
+            articles[ent.Comp.ArticleNumber],
+            ent.Comp.ArticleNumber + 1,
+            articles.Count,
+            ent.Comp.NotificationOn);
+
+        _cartridgeLoaderSystem.UpdateCartridgeUiState(loaderUid, state);
     }
 
-    private void UpdateWriteDevices()
+    private void NewsReaderLeafArticle(Entity<NewsReaderCartridgeComponent> ent, int leafDir)
     {
-        var query = EntityQueryEnumerator<NewsWriteComponent>();
+        if (!TryGetArticles(ent, out var articles))
+            return;
 
-        while (query.MoveNext(out var owner, out var comp))
-        {
-            UpdateWriteUi(owner, comp);
-        }
+        ent.Comp.ArticleNumber += leafDir;
+
+        if (ent.Comp.ArticleNumber >= articles.Count)
+            ent.Comp.ArticleNumber = 0;
+
+        if (ent.Comp.ArticleNumber < 0)
+            ent.Comp.ArticleNumber = articles.Count - 1;
     }
 
-    private bool CheckDeleteAccess(NewsArticle articleToDelete, EntityUid device, EntityUid? user)
+    private void UpdateWriterDevices()
     {
-        if (EntityManager.TryGetComponent<AccessReaderComponent>(device, out var accessReader) &&
-            user.HasValue &&
-            _accessReader.IsAllowed(user.Value, device, accessReader))
+        var query = EntityQueryEnumerator<NewsWriterComponent>();
+        while (query.MoveNext(out var owner, out var comp))
         {
-            return true;
+            UpdateWriterUi((owner, comp));
         }
+    }
 
-        if (articleToDelete.AuthorStationRecordKeyIds == null ||
-            !articleToDelete.AuthorStationRecordKeyIds.Any())
-        {
+    private bool CheckDeleteAccess(NewsArticle articleToDelete, EntityUid device, EntityUid user)
+    {
+        if (TryComp<AccessReaderComponent>(device, out var accessReader) &&
+            _accessReader.IsAllowed(user, device, accessReader))
             return true;
-        }
 
-        var conv = _stationRecords.Convert(articleToDelete.AuthorStationRecordKeyIds);
-        if (user.HasValue
-            && _accessReader.FindStationRecordKeys(user.Value, out var recordKeys)
-            && recordKeys.Intersect(conv).Any())
-        {
+        if (articleToDelete.AuthorStationRecordKeyIds == null || articleToDelete.AuthorStationRecordKeyIds.Count == 0)
             return true;
-        }
 
-        return false;
+        return _accessReader.FindStationRecordKeys(user, out var recordKeys)
+               && StationRecordsToNetEntities(recordKeys).Intersect(articleToDelete.AuthorStationRecordKeyIds).Any();
     }
 
-    public override void Update(float frameTime)
+    private ICollection<(NetEntity, uint)> StationRecordsToNetEntities(IEnumerable<StationRecordKey> records)
     {
-        base.Update(frameTime);
-
-        var query = EntityQueryEnumerator<NewsWriteComponent>();
-        while (query.MoveNext(out var uid, out var comp))
-        {
-            if (comp.ShareAvalible || _timing.CurTime < comp.NextShare)
-                continue;
-
-            comp.ShareAvalible = true;
-
-            UpdateWriteUi(uid, comp);
-        }
+        return records.Select(record => (GetNetEntity(record.OriginStation), record.Id)).ToList();
     }
 }
-
diff --git a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
index 0002f275c5..6380b71c8a 100644
--- a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
+++ b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
@@ -6,14 +6,15 @@ namespace Content.Server.Medical.Components;
 /// <summary>
 /// After scanning, retrieves the target Uid to use with its related UI.
 /// </summary>
-[RegisterComponent]
-[Access(typeof(HealthAnalyzerSystem))]
+[RegisterComponent, AutoGenerateComponentPause]
+[Access(typeof(HealthAnalyzerSystem), typeof(CryoPodSystem))]
 public sealed partial class HealthAnalyzerComponent : Component
 {
     /// <summary>
     /// When should the next update be sent for the patient
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan NextUpdate = TimeSpan.Zero;
 
     /// <summary>
diff --git a/Content.Server/Medical/Components/MedicalScannerComponent.cs b/Content.Server/Medical/Components/MedicalScannerComponent.cs
index aef56d6c0b..96de649987 100644
--- a/Content.Server/Medical/Components/MedicalScannerComponent.cs
+++ b/Content.Server/Medical/Components/MedicalScannerComponent.cs
@@ -15,5 +15,8 @@ public sealed partial class MedicalScannerComponent : SharedMedicalScannerCompon
 
         [DataField, ViewVariables(VVAccess.ReadWrite)]
         public float CloningFailChanceMultiplier = 1f;
+        
+        // Nyano, needed for Metem Machine.
+        public float MetemKarmaBonus = 0.25f;
     }
 }
diff --git a/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerComponent.cs b/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerComponent.cs
index 0d95cc48c7..7eeafb49c6 100644
--- a/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerComponent.cs
+++ b/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerComponent.cs
@@ -18,17 +18,4 @@ public sealed partial class CrewMonitoringServerComponent : Component
     /// </summary>
     [DataField("sensorTimeout"), ViewVariables(VVAccess.ReadWrite)]
     public float SensorTimeout = 10f;
-
-    /// <summary>
-    ///     Whether the server can become the currently active server. The server being unavailable usually means that it isn't powered
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    public bool Available = true;
-
-
-    /// <summary>
-    ///     Whether the server is the currently active server for the station it's on
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
-    public bool Active = true;
 }
diff --git a/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs b/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs
index 785ef60af9..864ce2c55e 100644
--- a/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs
+++ b/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs
@@ -2,8 +2,7 @@
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Medical.SuitSensors;
-using Content.Server.Power.Components;
-using Content.Server.Station.Systems;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Medical.SuitSensor;
 using Robust.Shared.Timing;
 
@@ -14,7 +13,7 @@ public sealed class CrewMonitoringServerSystem : EntitySystem
     [Dependency] private readonly SuitSensorSystem _sensors = default!;
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
-    [Dependency] private readonly StationSystem _stationSystem = default!;
+    [Dependency] private readonly SingletonDeviceNetServerSystem _singletonServerSystem = default!;
 
     private const float UpdateRate = 3f;
     private float _updateDiff;
@@ -24,7 +23,7 @@ public override void Initialize()
         base.Initialize();
         SubscribeLocalEvent<CrewMonitoringServerComponent, ComponentRemove>(OnRemove);
         SubscribeLocalEvent<CrewMonitoringServerComponent, DeviceNetworkPacketEvent>(OnPacketReceived);
-        SubscribeLocalEvent<CrewMonitoringServerComponent, PowerChangedEvent>(OnPowerChanged);
+        SubscribeLocalEvent<CrewMonitoringServerComponent, DeviceNetServerDisconnectedEvent>(OnDisconnected);
     }
 
     public override void Update(float frameTime)
@@ -38,70 +37,15 @@ public override void Update(float frameTime)
         _updateDiff -= UpdateRate;
 
         var servers = EntityQueryEnumerator<CrewMonitoringServerComponent>();
-        List<EntityUid> activeServers = new();
 
         while (servers.MoveNext(out var id, out var server))
         {
-            //Make sure the server is disconnected when it becomes unavailable
-            if (!server.Available)
-            {
-                if (server.Active)
-                    DisconnectServer(id, server);
-
-                continue;
-            }
-
-            if (!server.Active)
-                continue;
-
-            activeServers.Add(id);
-        }
-
-        foreach (var activeServer in activeServers)
-        {
-            UpdateTimeout(activeServer);
-            BroadcastSensorStatus(activeServer);
-        }
-    }
-
-    /// <summary>
-    /// Returns the address of the currently active server for the given station id if there is one
-    /// </summary>
-    public bool TryGetActiveServerAddress(EntityUid stationId, out string? address)
-    {
-        var servers = EntityQueryEnumerator<CrewMonitoringServerComponent, DeviceNetworkComponent>();
-        (EntityUid id, CrewMonitoringServerComponent server, DeviceNetworkComponent device)? last = default;
-
-        while (servers.MoveNext(out var uid, out var server, out var device))
-        {
-            if (!_stationSystem.GetOwningStation(uid)?.Equals(stationId) ?? true)
-                continue;
-
-            if (!server.Available)
-            {
-                DisconnectServer(uid,server, device);
+            if (!_singletonServerSystem.IsActiveServer(id))
                 continue;
-            }
-
-            last = (uid, server, device);
-
-            if (server.Active)
-            {
-                address = device.Address;
-                return true;
-            }
-        }
 
-        //If there was no active server for the station make the last available inactive one active
-        if (last.HasValue)
-        {
-            ConnectServer(last.Value.id, last.Value.server, last.Value.device);
-            address = last.Value.device.Address;
-            return true;
+            UpdateTimeout(id);
+            BroadcastSensorStatus(id, server);
         }
-
-        address = null;
-        return address != null;
     }
 
     /// <summary>
@@ -125,17 +69,6 @@ private void OnRemove(EntityUid uid, CrewMonitoringServerComponent component, Co
         component.SensorStatus.Clear();
     }
 
-    /// <summary>
-    /// Disconnects the server losing power
-    /// </summary>
-    private void OnPowerChanged(EntityUid uid, CrewMonitoringServerComponent component, ref PowerChangedEvent args)
-    {
-        component.Available = args.Powered;
-
-        if (!args.Powered)
-            DisconnectServer(uid, component);
-    }
-
     /// <summary>
     /// Drop the sensor status if it hasn't been updated for to long
     /// </summary>
@@ -169,30 +102,11 @@ private void BroadcastSensorStatus(EntityUid uid, CrewMonitoringServerComponent?
         _deviceNetworkSystem.QueuePacket(uid, null, payload, device: device);
     }
 
-    private void ConnectServer(EntityUid uid, CrewMonitoringServerComponent? server = null, DeviceNetworkComponent? device = null)
-    {
-        if (!Resolve(uid, ref server, ref device))
-            return;
-
-        server.Active = true;
-
-        if (_deviceNetworkSystem.IsDeviceConnected(uid, device))
-            return;
-
-        _deviceNetworkSystem.ConnectDevice(uid, device);
-    }
-
     /// <summary>
-    /// Disconnects a server from the device network and clears the currently active server
+    /// Clears sensor data on disconnect
     /// </summary>
-    private void DisconnectServer(EntityUid uid, CrewMonitoringServerComponent? server = null, DeviceNetworkComponent? device = null)
+    private void OnDisconnected(EntityUid uid, CrewMonitoringServerComponent component, ref DeviceNetServerDisconnectedEvent _)
     {
-        if (!Resolve(uid, ref server, ref device))
-         return;
-
-        server.SensorStatus.Clear();
-        server.Active = false;
-
-        _deviceNetworkSystem.DisconnectDevice(uid, device, false);
+        component.SensorStatus.Clear();
     }
 }
diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs
index 25a47933a8..4ab94c72b9 100644
--- a/Content.Server/Medical/CryoPodSystem.cs
+++ b/Content.Server/Medical/CryoPodSystem.cs
@@ -30,6 +30,7 @@
 using Content.Shared.MedicalScanner;
 using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
+using Robust.Shared.Containers;
 using Robust.Shared.Timing;
 using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
 
@@ -71,6 +72,7 @@ public override void Initialize()
         SubscribeLocalEvent<CryoPodComponent, GasAnalyzerScanEvent>(OnGasAnalyzed);
         SubscribeLocalEvent<CryoPodComponent, ActivatableUIOpenAttemptEvent>(OnActivateUIAttempt);
         SubscribeLocalEvent<CryoPodComponent, AfterActivatableUIOpenEvent>(OnActivateUI);
+        SubscribeLocalEvent<CryoPodComponent, EntRemovedFromContainerMessage>(OnEjected);
     }
 
     public override void Update(float frameTime)
@@ -187,6 +189,11 @@ private void OnActivateUI(Entity<CryoPodComponent> entity, ref AfterActivatableU
         TryComp<TemperatureComponent>(entity.Comp.BodyContainer.ContainedEntity, out var temp);
         TryComp<BloodstreamComponent>(entity.Comp.BodyContainer.ContainedEntity, out var bloodstream);
 
+        if (TryComp<HealthAnalyzerComponent>(entity, out var healthAnalyzer))
+        {
+            healthAnalyzer.ScannedEntity = entity.Comp.BodyContainer.ContainedEntity;
+        }
+
         _userInterfaceSystem.TrySendUiMessage(
             entity.Owner,
             HealthAnalyzerUiKey.Key,
@@ -196,6 +203,7 @@ private void OnActivateUI(Entity<CryoPodComponent> entity, ref AfterActivatableU
                 bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution))
                 ? bloodSolution.FillFraction
                 : 0,
+            null,
             null
         ));
     }
@@ -282,5 +290,16 @@ private void OnGasAnalyzed(Entity<CryoPodComponent> entity, ref GasAnalyzerScanE
         args.GasMixtures = gasMixDict;
     }
 
+    private void OnEjected(Entity<CryoPodComponent> cryoPod, ref EntRemovedFromContainerMessage args)
+    {
+        if (TryComp<HealthAnalyzerComponent>(cryoPod.Owner, out var healthAnalyzer))
+        {
+            healthAnalyzer.ScannedEntity = null;
+        }
+
+        // if body is ejected - no need to display health-analyzer
+        _uiSystem.TryCloseAll(cryoPod.Owner, HealthAnalyzerUiKey.Key);
+    }
+
     #endregion
 }
diff --git a/Content.Server/Medical/DefibrillatorSystem.cs b/Content.Server/Medical/DefibrillatorSystem.cs
index d8bbeb9982..bf2f880532 100644
--- a/Content.Server/Medical/DefibrillatorSystem.cs
+++ b/Content.Server/Medical/DefibrillatorSystem.cs
@@ -49,21 +49,12 @@ public sealed class DefibrillatorSystem : EntitySystem
     /// <inheritdoc/>
     public override void Initialize()
     {
-        SubscribeLocalEvent<DefibrillatorComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<DefibrillatorComponent, UseInHandEvent>(OnUseInHand);
         SubscribeLocalEvent<DefibrillatorComponent, PowerCellSlotEmptyEvent>(OnPowerCellSlotEmpty);
         SubscribeLocalEvent<DefibrillatorComponent, AfterInteractEvent>(OnAfterInteract);
         SubscribeLocalEvent<DefibrillatorComponent, DefibrillatorZapDoAfterEvent>(OnDoAfter);
     }
 
-    private void OnUnpaused(EntityUid uid, DefibrillatorComponent component, ref EntityUnpausedEvent args)
-    {
-        if (component.NextZapTime == null)
-            return;
-
-        component.NextZapTime = component.NextZapTime.Value + args.PausedTime;
-    }
-
     private void OnUseInHand(EntityUid uid, DefibrillatorComponent component, UseInHandEvent args)
     {
         if (args.Handled || !TryComp(uid, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((uid, useDelay)))
diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs
index 5c7d265e61..0e893c4114 100644
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@@ -30,7 +30,6 @@ public sealed class HealthAnalyzerSystem : EntitySystem
 
     public override void Initialize()
     {
-        SubscribeLocalEvent<HealthAnalyzerComponent, EntityUnpausedEvent>(OnEntityUnpaused);
         SubscribeLocalEvent<HealthAnalyzerComponent, AfterInteractEvent>(OnAfterInteract);
         SubscribeLocalEvent<HealthAnalyzerComponent, HealthAnalyzerDoAfterEvent>(OnDoAfter);
         SubscribeLocalEvent<HealthAnalyzerComponent, EntGotInsertedIntoContainerMessage>(OnInsertedIntoContainer);
@@ -65,11 +64,6 @@ public override void Update(float frameTime)
         }
     }
 
-    private void OnEntityUnpaused(Entity<HealthAnalyzerComponent> ent, ref EntityUnpausedEvent args)
-    {
-        ent.Comp.NextUpdate += args.PausedTime;
-    }
-
     /// <summary>
     /// Trigger the doafter for scanning
     /// </summary>
@@ -185,16 +179,24 @@ public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool s
             bodyTemperature = temp.CurrentTemperature;
 
         var bloodAmount = float.NaN;
+        var bleeding = false;
 
         if (TryComp<BloodstreamComponent>(target, out var bloodstream) &&
-            _solutionContainerSystem.ResolveSolution(target, bloodstream.BloodSolutionName, ref bloodstream.BloodSolution, out var bloodSolution))
+            _solutionContainerSystem.ResolveSolution(target, bloodstream.BloodSolutionName,
+                ref bloodstream.BloodSolution, out var bloodSolution))
+        {
             bloodAmount = bloodSolution.FillFraction;
+            bleeding = bloodstream.BleedAmount > 0;
+        }
+
+
 
         _uiSystem.SendUiMessage(ui, new HealthAnalyzerScannedUserMessage(
             GetNetEntity(target),
             bodyTemperature,
             bloodAmount,
-            scanMode
+            scanMode,
+            bleeding
         ));
     }
 }
diff --git a/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs b/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
index 5de11f848c..9079655c80 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Server.Medical.SuitSensors;
 ///     Tracking device, embedded in almost all uniforms and jumpsuits.
 ///     If enabled, will report to crew monitoring console owners position and status.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, AutoGenerateComponentPause]
 [Access(typeof(SuitSensorSystem))]
 public sealed partial class SuitSensorComponent : Component
 {
@@ -57,6 +57,7 @@ public sealed partial class SuitSensorComponent : Component
     ///     Next time when sensor updated owners status
     /// </summary>
     [DataField("nextUpdate", customTypeSerializer:typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan NextUpdate = TimeSpan.Zero;
 
     /// <summary>
diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
index aa6dca718d..b807b63e21 100644
--- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
@@ -8,6 +8,7 @@
 using Content.Server.Popups;
 using Content.Server.Station.Systems;
 using Content.Shared.Damage;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Emp;
 using Content.Shared.Examine;
 using Content.Shared.Inventory.Events;
@@ -33,13 +34,13 @@ public sealed class SuitSensorSystem : EntitySystem
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly StationSystem _stationSystem = default!;
+    [Dependency] private readonly SingletonDeviceNetServerSystem _singletonServerSystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<PlayerSpawnCompleteEvent>(OnPlayerSpawn);
         SubscribeLocalEvent<SuitSensorComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<SuitSensorComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<SuitSensorComponent, GotEquippedEvent>(OnEquipped);
         SubscribeLocalEvent<SuitSensorComponent, GotUnequippedEvent>(OnUnequipped);
         SubscribeLocalEvent<SuitSensorComponent, ExaminedEvent>(OnExamine);
@@ -50,11 +51,6 @@ public override void Initialize()
         SubscribeLocalEvent<SuitSensorComponent, EmpDisabledRemoved>(OnEmpFinished);
     }
 
-    private void OnUnpaused(EntityUid uid, SuitSensorComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextUpdate += args.PausedTime;
-    }
-
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
@@ -85,7 +81,7 @@ public override void Update(float frameTime)
             //Retrieve active server address if the sensor isn't connected to a server
             if (sensor.ConnectedServer == null)
             {
-                if (!_monitoringServerSystem.TryGetActiveServerAddress(sensor.StationId!.Value, out var address))
+                if (!_singletonServerSystem.TryGetActiveServerAddress<CrewMonitoringServerComponent>(sensor.StationId!.Value, out var address))
                     continue;
 
                 sensor.ConnectedServer = address;
diff --git a/Content.Server/Mind/MindSystem.cs b/Content.Server/Mind/MindSystem.cs
index 5e84e6c94e..4035fa0f86 100644
--- a/Content.Server/Mind/MindSystem.cs
+++ b/Content.Server/Mind/MindSystem.cs
@@ -122,12 +122,6 @@ public override bool TryGetMind(NetUserId user, [NotNullWhen(true)] out EntityUi
         return false;
     }
 
-    public bool TryGetSession(EntityUid? mindId, [NotNullWhen(true)] out ICommonSession? session)
-    {
-        session = null;
-        return TryComp(mindId, out MindComponent? mind) && (session = mind.Session) != null;
-    }
-
     public ICommonSession? GetSession(MindComponent mind)
     {
         return mind.Session;
@@ -251,7 +245,7 @@ public override void TransferTo(EntityUid mindId, EntityUid? entity, bool ghostC
 
             var position = Deleted(mind.OwnedEntity)
                 ? _gameTicker.GetObserverSpawnPoint().ToMap(EntityManager, _transform)
-                : Transform(mind.OwnedEntity.Value).MapPosition;
+                : _transform.GetMapCoordinates(mind.OwnedEntity.Value);
 
             entity = Spawn(GameTicker.ObserverPrototypeName, position);
             component = EnsureComp<MindContainerComponent>(entity.Value);
diff --git a/Content.Server/Mobs/CritMobActionsSystem.cs b/Content.Server/Mobs/CritMobActionsSystem.cs
index 8dd8274d10..c897102dca 100644
--- a/Content.Server/Mobs/CritMobActionsSystem.cs
+++ b/Content.Server/Mobs/CritMobActionsSystem.cs
@@ -7,6 +7,7 @@
 using Content.Shared.Mobs.Systems;
 using Robust.Server.Console;
 using Robust.Shared.Player;
+using Content.Shared.Speech.Muting;
 
 namespace Content.Server.Mobs;
 
diff --git a/Content.Server/Mobs/DeathgaspSystem.cs b/Content.Server/Mobs/DeathgaspSystem.cs
index 3919d9a4be..c531784ea6 100644
--- a/Content.Server/Mobs/DeathgaspSystem.cs
+++ b/Content.Server/Mobs/DeathgaspSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Speech.Muting;
 using Content.Shared.Mobs;
+using Content.Shared.Speech.Muting;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Mobs;
diff --git a/Content.Server/Motd/MOTDSystem.cs b/Content.Server/Motd/MOTDSystem.cs
index 65c1404065..3cf77cdf08 100644
--- a/Content.Server/Motd/MOTDSystem.cs
+++ b/Content.Server/Motd/MOTDSystem.cs
@@ -24,16 +24,10 @@ public sealed class MOTDSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        _configurationManager.OnValueChanged(CCVars.MOTD, OnMOTDChanged, invokeImmediately: true);
+        Subs.CVar(_configurationManager, CCVars.MOTD, OnMOTDChanged, invokeImmediately: true);
         SubscribeLocalEvent<PlayerJoinedLobbyEvent>(OnPlayerJoinedLobby);
     }
 
-    public override void Shutdown()
-    {
-        _configurationManager.UnsubValueChanged(CCVars.MOTD, OnMOTDChanged);
-        base.Shutdown();
-    }
-
     /// <summary>
     /// Sends the Message Of The Day, if any, to all connected players.
     /// </summary>
diff --git a/Content.Server/NPC/Components/NPCJukeComponent.cs b/Content.Server/NPC/Components/NPCJukeComponent.cs
index 4cbd8017f2..2c4136c24b 100644
--- a/Content.Server/NPC/Components/NPCJukeComponent.cs
+++ b/Content.Server/NPC/Components/NPCJukeComponent.cs
@@ -3,7 +3,7 @@
 
 namespace Content.Server.NPC.Components;
 
-[RegisterComponent]
+[RegisterComponent, AutoGenerateComponentPause]
 public sealed partial class NPCJukeComponent : Component
 {
     [DataField("jukeType")]
@@ -13,6 +13,7 @@ public sealed partial class NPCJukeComponent : Component
     public float JukeDuration = 0.5f;
 
     [DataField("nextJuke", customTypeSerializer:typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan NextJuke;
 
     [DataField("targetTile")]
diff --git a/Content.Server/NPC/Components/NPCSteeringComponent.cs b/Content.Server/NPC/Components/NPCSteeringComponent.cs
index 52f96e9c55..46fb968be5 100644
--- a/Content.Server/NPC/Components/NPCSteeringComponent.cs
+++ b/Content.Server/NPC/Components/NPCSteeringComponent.cs
@@ -11,7 +11,7 @@ namespace Content.Server.NPC.Components;
 /// <summary>
 /// Added to NPCs that are moving.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, AutoGenerateComponentPause]
 public sealed partial class NPCSteeringComponent : Component
 {
     #region Context Steering
@@ -28,11 +28,11 @@ public sealed partial class NPCSteeringComponent : Component
     [ViewVariables(VVAccess.ReadWrite)]
     public float Radius = 0.35f;
 
-    [ViewVariables]
-    public readonly float[] Interest = new float[SharedNPCSteeringSystem.InterestDirections];
+    [ViewVariables, DataField]
+    public float[] Interest = new float[SharedNPCSteeringSystem.InterestDirections];
 
-    [ViewVariables]
-    public readonly float[] Danger = new float[SharedNPCSteeringSystem.InterestDirections];
+    [ViewVariables, DataField]
+    public float[] Danger = new float[SharedNPCSteeringSystem.InterestDirections];
 
     // TODO: Update radius, also danger points debug only
     public readonly List<Vector2> DangerPoints = new();
@@ -45,20 +45,9 @@ public sealed partial class NPCSteeringComponent : Component
     [DataField("forceMove")]
     public bool ForceMove = false;
 
-    /// <summary>
-    /// Next time we can change our steering direction.
-    /// </summary>
-    [DataField("nextSteer", customTypeSerializer:typeof(TimeOffsetSerializer))]
-    public TimeSpan NextSteer = TimeSpan.Zero;
-
-    [DataField("lastSteerIndex")]
-    public int LastSteerIndex = -1;
-
     [DataField("lastSteerDirection")]
     public Vector2 LastSteerDirection = Vector2.Zero;
 
-    public const int SteeringFrequency = 5;
-
     /// <summary>
     /// Last position we considered for being stuck.
     /// </summary>
@@ -66,6 +55,7 @@ public sealed partial class NPCSteeringComponent : Component
     public EntityCoordinates LastStuckCoordinates;
 
     [DataField("lastStuckTime", customTypeSerializer:typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan LastStuckTime;
 
     public const float StuckDistance = 1f;
diff --git a/Content.Server/NPC/Pathfinding/GridPathfindingComponent.cs b/Content.Server/NPC/Pathfinding/GridPathfindingComponent.cs
index 335a2bbaa1..dac07ea842 100644
--- a/Content.Server/NPC/Pathfinding/GridPathfindingComponent.cs
+++ b/Content.Server/NPC/Pathfinding/GridPathfindingComponent.cs
@@ -5,7 +5,7 @@ namespace Content.Server.NPC.Pathfinding;
 /// <summary>
 /// Stores the relevant pathfinding data for grids.
 /// </summary>
-[RegisterComponent, Access(typeof(PathfindingSystem))]
+[RegisterComponent, Access(typeof(PathfindingSystem)), AutoGenerateComponentPause]
 public sealed partial class GridPathfindingComponent : Component
 {
     [ViewVariables]
@@ -15,6 +15,7 @@ public sealed partial class GridPathfindingComponent : Component
     /// Next time the graph is allowed to update.
     /// </summary>
     /// Removing this datafield is the lazy fix HOWEVER I want to purge this anyway and do pathfinding at runtime.
+    [AutoPausedField]
     public TimeSpan NextUpdate;
 
     [ViewVariables]
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
index c27947dedb..6462c10fe5 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
@@ -44,7 +44,6 @@ private void InitializeGrid()
     {
         SubscribeLocalEvent<GridInitializeEvent>(OnGridInit);
         SubscribeLocalEvent<GridRemovalEvent>(OnGridRemoved);
-        SubscribeLocalEvent<GridPathfindingComponent, EntityUnpausedEvent>(OnGridPathPause);
         SubscribeLocalEvent<GridPathfindingComponent, ComponentShutdown>(OnGridPathShutdown);
         SubscribeLocalEvent<CollisionChangeEvent>(OnCollisionChange);
         SubscribeLocalEvent<CollisionLayerChangeEvent>(OnCollisionLayerChange);
@@ -61,10 +60,6 @@ private void OnTileChange(ref TileChangedEvent ev)
         DirtyChunk(ev.Entity, Comp<MapGridComponent>(ev.Entity).GridTileToLocal(ev.NewTile.GridIndices));
     }
 
-    private void OnGridPathPause(EntityUid uid, GridPathfindingComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextUpdate += args.PausedTime;
-    }
 
     private void OnGridPathShutdown(EntityUid uid, GridPathfindingComponent component, ComponentShutdown args)
     {
diff --git a/Content.Server/NPC/Systems/NPCCombatSystem.Melee.cs b/Content.Server/NPC/Systems/NPCCombatSystem.Melee.cs
index 11ba4d102b..2ae20817e2 100644
--- a/Content.Server/NPC/Systems/NPCCombatSystem.Melee.cs
+++ b/Content.Server/NPC/Systems/NPCCombatSystem.Melee.cs
@@ -1,10 +1,7 @@
 using System.Numerics;
 using Content.Server.NPC.Components;
-using Content.Server.NPC.Events;
 using Content.Shared.CombatMode;
 using Content.Shared.NPC;
-using Content.Shared.NPC;
-using Content.Shared.Weapons.Melee;
 using Robust.Shared.Map;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Random;
diff --git a/Content.Server/NPC/Systems/NPCJukeSystem.cs b/Content.Server/NPC/Systems/NPCJukeSystem.cs
index 19f566405a..da9fa1f761 100644
--- a/Content.Server/NPC/Systems/NPCJukeSystem.cs
+++ b/Content.Server/NPC/Systems/NPCJukeSystem.cs
@@ -33,15 +33,9 @@ public override void Initialize()
         _npcRangedQuery = GetEntityQuery<NPCRangedCombatComponent>();
         _physicsQuery = GetEntityQuery<PhysicsComponent>();
 
-        SubscribeLocalEvent<NPCJukeComponent, EntityUnpausedEvent>(OnJukeUnpaused);
         SubscribeLocalEvent<NPCJukeComponent, NPCSteeringEvent>(OnJukeSteering);
     }
 
-    private void OnJukeUnpaused(EntityUid uid, NPCJukeComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextJuke += args.PausedTime;
-    }
-
     private void OnJukeSteering(EntityUid uid, NPCJukeComponent component, ref NPCSteeringEvent args)
     {
         if (component.JukeType == JukeType.AdjacentTile)
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
index 89e3e64e9f..7ac6768e35 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
@@ -9,6 +9,7 @@
 using Content.Shared.NPC;
 using Content.Shared.Physics;
 using Robust.Shared.Map;
+using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
 using ClimbingComponent = Content.Shared.Climbing.Components.ClimbingComponent;
 
@@ -16,7 +17,7 @@ namespace Content.Server.NPC.Systems;
 
 public sealed partial class NPCSteeringSystem
 {
-    private void ApplySeek(float[] interest, Vector2 direction, float weight)
+    private void ApplySeek(Span<float> interest, Vector2 direction, float weight)
     {
         if (weight == 0f || direction == Vector2.Zero)
             return;
@@ -25,13 +26,10 @@ private void ApplySeek(float[] interest, Vector2 direction, float weight)
 
         for (var i = 0; i < InterestDirections; i++)
         {
-            if (interest[i].Equals(-1f))
-                continue;
-
             var angle = i * InterestRadians;
             var dot = MathF.Cos(directionAngle - angle);
-            dot = (dot + 1) * 0.5f;
-            interest[i] += dot * weight;
+            dot = (dot + 1f) * 0.5f;
+            interest[i] = Math.Clamp(interest[i] + dot * weight, 0f, 1f);
         }
     }
 
@@ -72,7 +70,7 @@ private bool TrySeek(
         TransformComponent xform,
         Angle offsetRot,
         float moveSpeed,
-        float[] interest,
+        Span<float> interest,
         float frameTime,
         ref bool forceSteer)
     {
@@ -274,7 +272,8 @@ private bool TrySeek(
         }
 
         // If not in LOS and no path then get a new one fam.
-        if (!inLos && steering.CurrentPath.Count == 0)
+        if ((!inLos && steering.ArriveOnLineOfSight && steering.CurrentPath.Count == 0) ||
+            (!steering.ArriveOnLineOfSight && steering.CurrentPath.Count == 0))
         {
             needsPath = true;
         }
@@ -465,12 +464,12 @@ private void CollisionAvoidance(
         int layer,
         int mask,
         TransformComponent xform,
-        float[] danger)
+        Span<float> danger)
     {
-        var objectRadius = 0.15f;
+        var objectRadius = 0.25f;
         var detectionRadius = MathF.Max(0.35f, agentRadius + objectRadius);
         var ents = _entSetPool.Get();
-        _lookup.GetEntitiesInRange(uid, detectionRadius, ents, LookupFlags.Static);
+        _lookup.GetEntitiesInRange(uid, detectionRadius, ents, LookupFlags.Dynamic | LookupFlags.Static);
 
         foreach (var ent in ents)
         {
@@ -478,6 +477,7 @@ private void CollisionAvoidance(
             if (!_physicsQuery.TryGetComponent(ent, out var otherBody) ||
                 !otherBody.Hard ||
                 !otherBody.CanCollide ||
+                otherBody.BodyType == BodyType.KinematicController ||
                 (mask & otherBody.CollisionLayer) == 0x0 &&
                 (layer & otherBody.CollisionMask) == 0x0)
             {
@@ -506,7 +506,7 @@ private void CollisionAvoidance(
             }
             else
             {
-                weight = distance / detectionRadius;
+                weight = (detectionRadius - distance) / detectionRadius;
             }
 
             if (obstacleDirection == Vector2.Zero)
@@ -541,7 +541,7 @@ private void Separation(
         int mask,
         PhysicsComponent body,
         TransformComponent xform,
-        float[] danger)
+        Span<float> danger)
     {
         var objectRadius = 0.25f;
         var detectionRadius = MathF.Max(0.35f, agentRadius + objectRadius);
@@ -614,4 +614,35 @@ private void Separation(
     // TODO: Alignment
 
     // TODO: Cohesion
+    private void Blend(NPCSteeringComponent steering, float frameTime, Span<float> interest, Span<float> danger)
+    {
+        /*
+         * Future sloth notes:
+         * Pathfinder cleanup:
+            - Cleanup whatever the fuck is happening in pathfinder
+            - Use Flee for melee behavior / actions and get the seek direction from that rather than bulldozing
+            - Must always have a path
+            - Path should return the full version + the snipped version
+            - Pathfinder needs to do diagonals
+            - Next node is either <current node + 1> or <nearest node + 1> (on the full path)
+            - If greater than <1.5m distance> repath
+         */
+
+        // IDK why I didn't do this sooner but blending is a lot better than lastdir for fixing stuttering.
+        const float BlendWeight = 10f;
+        var blendValue = Math.Min(1f, frameTime * BlendWeight);
+
+        for (var i = 0; i < InterestDirections; i++)
+        {
+            var currentInterest = interest[i];
+            var lastInterest = steering.Interest[i];
+            var interestDiff = (currentInterest - lastInterest) * blendValue;
+            steering.Interest[i] = lastInterest + interestDiff;
+
+            var currentDanger = danger[i];
+            var lastDanger = steering.Danger[i];
+            var dangerDiff = (currentDanger - lastDanger) * blendValue;
+            steering.Danger[i] = lastDanger + dangerDiff;
+        }
+    }
 }
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
index 3db7c58674..c00375d648 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
@@ -3,7 +3,6 @@
 using System.Threading.Tasks;
 using Content.Server.Administration.Managers;
 using Content.Server.DoAfter;
-using Content.Server.Doors.Systems;
 using Content.Server.NPC.Components;
 using Content.Server.NPC.Events;
 using Content.Server.NPC.Pathfinding;
@@ -28,7 +27,6 @@
 using Robust.Shared.Utility;
 using Content.Shared.Prying.Systems;
 using Microsoft.Extensions.ObjectPool;
-using Robust.Shared.Threading;
 
 namespace Content.Server.NPC.Systems;
 
@@ -103,11 +101,10 @@ public override void Initialize()
         }
 
         UpdatesBefore.Add(typeof(SharedPhysicsSystem));
-        _configManager.OnValueChanged(CCVars.NPCEnabled, SetNPCEnabled, true);
-        _configManager.OnValueChanged(CCVars.NPCPathfinding, SetNPCPathfinding, true);
+        Subs.CVar(_configManager, CCVars.NPCEnabled, SetNPCEnabled, true);
+        Subs.CVar(_configManager, CCVars.NPCPathfinding, SetNPCPathfinding, true);
 
         SubscribeLocalEvent<NPCSteeringComponent, ComponentShutdown>(OnSteeringShutdown);
-        SubscribeLocalEvent<NPCSteeringComponent, EntityUnpausedEvent>(OnSteeringUnpaused);
         SubscribeNetworkEvent<RequestNPCSteeringDebugEvent>(OnDebugRequest);
     }
 
@@ -140,13 +137,6 @@ private void SetNPCPathfinding(bool value)
         }
     }
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        _configManager.UnsubValueChanged(CCVars.NPCEnabled, SetNPCEnabled);
-        _configManager.UnsubValueChanged(CCVars.NPCPathfinding, SetNPCPathfinding);
-    }
-
     private void OnDebugRequest(RequestNPCSteeringDebugEvent msg, EntitySessionEventArgs args)
     {
         if (!_admin.IsAdmin(args.SenderSession))
@@ -165,12 +155,6 @@ private void OnSteeringShutdown(EntityUid uid, NPCSteeringComponent component, C
         component.PathfindToken = null;
     }
 
-    private void OnSteeringUnpaused(EntityUid uid, NPCSteeringComponent component, ref EntityUnpausedEvent args)
-    {
-        component.LastStuckTime += args.PausedTime;
-        component.NextSteer += args.PausedTime;
-    }
-
     /// <summary>
     /// Adds the AI to the steering system to move towards a specific target
     /// </summary>
@@ -329,8 +313,6 @@ private void Steer(
             return;
         }
 
-        var interest = steering.Interest;
-        var danger = steering.Danger;
         var agentRadius = steering.Radius;
         var worldPos = _transform.GetWorldPosition(xform);
         var (layer, mask) = _physics.GetHardCollision(uid);
@@ -342,13 +324,10 @@ private void Steer(
         var body = _physicsQuery.GetComponent(uid);
         var dangerPoints = steering.DangerPoints;
         dangerPoints.Clear();
+        Span<float> interest = stackalloc float[InterestDirections];
+        Span<float> danger = stackalloc float[InterestDirections];
 
-        for (var i = 0; i < InterestDirections; i++)
-        {
-            steering.Interest[i] = 0f;
-            steering.Danger[i] = 0f;
-        }
-
+        // TODO: This should be fly
         steering.CanSeek = true;
 
         var ev = new NPCSteeringEvent(steering, xform, worldPos, offsetRot);
@@ -361,6 +340,7 @@ private void Steer(
             SetDirection(mover, steering, Vector2.Zero);
             return;
         }
+
         DebugTools.Assert(!float.IsNaN(interest[0]));
 
         // Don't steer too frequently to avoid twitchiness.
@@ -368,7 +348,7 @@ private void Steer(
         // I think doing this after all the ops above is best?
         // Originally I had it way above but sometimes mobs would overshoot their tile targets.
 
-        if (!forceSteer && steering.NextSteer > curTime)
+        if (!forceSteer)
         {
             SetDirection(mover, steering, steering.LastSteerDirection, false);
             return;
@@ -380,11 +360,8 @@ private void Steer(
 
         Separation(uid, offsetRot, worldPos, agentRadius, layer, mask, body, xform, danger);
 
-        // Prioritise whichever direction we went last tick if it's a tie-breaker.
-        if (steering.LastSteerIndex != -1)
-        {
-            interest[steering.LastSteerIndex] *= 1.1f;
-        }
+        // Blend last and current tick
+        Blend(steering, frameTime, interest, danger);
 
         // Remove the danger map from the interest map.
         var desiredDirection = -1;
@@ -392,7 +369,7 @@ private void Steer(
 
         for (var i = 0; i < InterestDirections; i++)
         {
-            var adjustedValue = Math.Clamp(interest[i] - danger[i], 0f, 1f);
+            var adjustedValue = Math.Clamp(steering.Interest[i] - steering.Danger[i], 0f, 1f);
 
             if (adjustedValue > desiredValue)
             {
@@ -408,9 +385,7 @@ private void Steer(
             resultDirection = new Angle(desiredDirection * InterestRadians).ToVec();
         }
 
-        steering.NextSteer = curTime + TimeSpan.FromSeconds(1f / NPCSteeringComponent.SteeringFrequency);
         steering.LastSteerDirection = resultDirection;
-        steering.LastSteerIndex = desiredDirection;
         DebugTools.Assert(!float.IsNaN(resultDirection.X));
         SetDirection(mover, steering, resultDirection, false);
     }
diff --git a/Content.Server/NPC/Systems/NPCSystem.cs b/Content.Server/NPC/Systems/NPCSystem.cs
index 7d33133a37..8abe0f7f54 100644
--- a/Content.Server/NPC/Systems/NPCSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSystem.cs
@@ -34,8 +34,8 @@ public override void Initialize()
         {
             base.Initialize();
 
-            _configurationManager.OnValueChanged(CCVars.NPCEnabled, SetEnabled, true);
-            _configurationManager.OnValueChanged(CCVars.NPCMaxUpdates, SetMaxUpdates, true);
+            Subs.CVar(_configurationManager, CCVars.NPCEnabled, value => Enabled = value, true);
+            Subs.CVar(_configurationManager, CCVars.NPCMaxUpdates, obj => _maxUpdates = obj, true);
         }
 
         public void OnPlayerNPCAttach(EntityUid uid, HTNComponent component, PlayerAttachedEvent args)
@@ -51,16 +51,6 @@ public void OnPlayerNPCDetach(EntityUid uid, HTNComponent component, PlayerDetac
             WakeNPC(uid, component);
         }
 
-        private void SetMaxUpdates(int obj) => _maxUpdates = obj;
-        private void SetEnabled(bool value) => Enabled = value;
-
-        public override void Shutdown()
-        {
-            base.Shutdown();
-            _configurationManager.UnsubValueChanged(CCVars.NPCEnabled, SetEnabled);
-            _configurationManager.UnsubValueChanged(CCVars.NPCMaxUpdates, SetMaxUpdates);
-        }
-
         public void OnNPCMapInit(EntityUid uid, HTNComponent component, MapInitEvent args)
         {
             component.Blackboard.SetValue(NPCBlackboard.Owner, uid);
diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs
index 77689c4e2b..652852ece2 100644
--- a/Content.Server/Nuke/NukeSystem.cs
+++ b/Content.Server/Nuke/NukeSystem.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Coordinates.Helpers;
 using Content.Shared.DoAfter;
+using Content.Shared.Examine;
 using Content.Shared.Maps;
 using Content.Shared.Nuke;
 using Content.Shared.Popups;
@@ -40,6 +41,7 @@ public sealed class NukeSystem : EntitySystem
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
+    [Dependency] private readonly AppearanceSystem _appearance = default!;
 
     /// <summary>
     ///     Used to calculate when the nuke song should start playing for maximum kino with the nuke sfx
@@ -60,6 +62,7 @@ public override void Initialize()
         SubscribeLocalEvent<NukeComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<NukeComponent, EntInsertedIntoContainerMessage>(OnItemSlotChanged);
         SubscribeLocalEvent<NukeComponent, EntRemovedFromContainerMessage>(OnItemSlotChanged);
+        SubscribeLocalEvent<NukeComponent, ExaminedEvent>(OnExaminedEvent);
 
         // Shouldn't need re-anchoring.
         SubscribeLocalEvent<NukeComponent, AnchorStateChangedEvent>(OnAnchorChanged);
@@ -148,6 +151,8 @@ private void OnAnchorChanged(EntityUid uid, NukeComponent component, ref AnchorS
             // 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.
             DisarmBomb(uid, component);
         }
+
+        UpdateAppearance(uid, component);
     }
 
     #endregion
@@ -299,6 +304,7 @@ private void TickTimer(EntityUid uid, float frameTime, NukeComponent? nuke = nul
             _sound.PlayGlobalOnStation(uid, _audio.GetSound(nuke.AlertSound), new AudioParams{Volume = -5f});
             _sound.StopStationEventMusic(uid, StationEventMusicType.Nuke);
             nuke.PlayedAlertSound = true;
+            UpdateAppearance(uid, nuke);
         }
 
         if (nuke.RemainingTime <= 0)
@@ -473,6 +479,7 @@ public void ArmBomb(EntityUid uid, NukeComponent? component = null)
 
         component.Status = NukeStatus.ARMED;
         UpdateUserInterface(uid, component);
+        UpdateAppearance(uid, component);
     }
 
     /// <summary>
@@ -514,6 +521,7 @@ public void DisarmBomb(EntityUid uid, NukeComponent? component = null)
         component.CooldownTime = component.Cooldown;
 
         UpdateUserInterface(uid, component);
+        UpdateAppearance(uid, component);
     }
 
     /// <summary>
@@ -589,6 +597,36 @@ private void DisarmBombDoafter(EntityUid uid, EntityUid user, NukeComponent nuke
         _popups.PopupEntity(Loc.GetString("nuke-component-doafter-warning"), user,
             user, PopupType.LargeCaution);
     }
+
+    private void UpdateAppearance(EntityUid uid, NukeComponent nuke)
+    {
+        var xform = Transform(uid);
+
+        _appearance.SetData(uid, NukeVisuals.Deployed, xform.Anchored);
+
+        NukeVisualState state;
+        if (nuke.PlayedAlertSound)
+            state = NukeVisualState.YoureFucked;
+        else if (nuke.Status == NukeStatus.ARMED)
+            state = NukeVisualState.Armed;
+        else
+            state = NukeVisualState.Idle;
+
+        _appearance.SetData(uid, NukeVisuals.State, state);
+    }
+
+    private void OnExaminedEvent(EntityUid uid, NukeComponent component, ExaminedEvent args)
+    {
+        if (component.PlayedAlertSound)
+            args.PushMarkup(Loc.GetString("nuke-examine-exploding"));
+        else if (component.Status == NukeStatus.ARMED)
+            args.PushMarkup(Loc.GetString("nuke-examine-armed"));
+
+        if (Transform(uid).Anchored)
+            args.PushMarkup(Loc.GetString("examinable-anchored"));
+        else
+            args.PushMarkup(Loc.GetString("examinable-unanchored"));
+    }
 }
 
 public sealed class NukeExplodedEvent : EntityEventArgs
diff --git a/Content.Server/NukeOps/WarDeclaratorComponent.cs b/Content.Server/NukeOps/WarDeclaratorComponent.cs
index ef6a3db5af..462d2b1681 100644
--- a/Content.Server/NukeOps/WarDeclaratorComponent.cs
+++ b/Content.Server/NukeOps/WarDeclaratorComponent.cs
@@ -1,11 +1,15 @@
-using Robust.Shared.Audio;
+using Content.Server.GameTicking.Rules;
+using Content.Shared.NukeOps;
+using Robust.Shared.Audio;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Server.NukeOps;
 
 /// <summary>
 /// Used with NukeOps game rule to send war declaration announcement
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, AutoGenerateComponentPause]
+[Access(typeof(WarDeclaratorSystem), typeof(NukeopsRuleSystem))]
 public sealed partial class WarDeclaratorComponent : Component
 {
     /// <summary>
@@ -23,22 +27,43 @@ public sealed partial class WarDeclaratorComponent : Component
     public bool AllowEditingMessage = true;
 
     /// <summary>
-    /// War declarement text color
+    /// War declaration text color
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
     [DataField]
     public Color Color = Color.Red;
 
     /// <summary>
-    /// War declarement sound file path
+    /// War declaration sound file path
     /// </summary>
     [DataField]
     public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Announcements/war.ogg");
 
     /// <summary>
-    /// Fluent ID for the declarement title
+    /// Fluent ID for the declaration sender title
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite)]
     [DataField]
-    public LocId Title = "comms-console-announcement-title-nukie";
+    public LocId SenderTitle = "comms-console-announcement-title-nukie";
+
+    /// <summary>
+    /// Time allowed for declaration of war
+    /// </summary>
+    [DataField]
+    public float WarDeclarationDelay = 6.0f;
+
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
+    public TimeSpan DisableAt;
+
+    /// <summary>
+    /// How long the shuttle will be disabled for
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
+    public TimeSpan ShuttleDisabledTime;
+
+    [DataField]
+    public WarConditionStatus? CurrentStatus;
 }
+
+[ByRefEvent]
+public record struct WarDeclaredEvent(WarConditionStatus? Status, Entity<WarDeclaratorComponent> DeclaratorEntity);
diff --git a/Content.Server/NukeOps/WarDeclaratorSystem.cs b/Content.Server/NukeOps/WarDeclaratorSystem.cs
index 7761651f4e..bcc0b9c0ea 100644
--- a/Content.Server/NukeOps/WarDeclaratorSystem.cs
+++ b/Content.Server/NukeOps/WarDeclaratorSystem.cs
@@ -1,7 +1,7 @@
 using Content.Server.Administration.Logs;
-using Content.Server.GameTicking.Rules;
-using Content.Server.GameTicking.Rules.Components;
+using Content.Server.Chat.Systems;
 using Content.Server.Popups;
+using Content.Shared.Access.Systems;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Database;
@@ -9,6 +9,7 @@
 using Content.Shared.UserInterface;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
+using Robust.Shared.Timing;
 
 namespace Content.Server.NukeOps;
 
@@ -17,101 +18,74 @@ namespace Content.Server.NukeOps;
 /// </summary>
 public sealed class WarDeclaratorSystem : EntitySystem
 {
-    [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly NukeopsRuleSystem _nukeopsRuleSystem = default!;
-    [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
+    [Dependency] private readonly ChatSystem _chat = default!;
+    [Dependency] private readonly PopupSystem _popupSystem = default!;
+    [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!;
 
     public override void Initialize()
     {
-        base.Initialize();
-        SubscribeLocalEvent<WarDeclaratorComponent, WarDeclaratorActivateMessage>(OnActivated);
+        SubscribeLocalEvent<WarDeclaratorComponent, MapInitEvent>(OnMapInit);
+
         SubscribeLocalEvent<WarDeclaratorComponent, ActivatableUIOpenAttemptEvent>(OnAttemptOpenUI);
+        SubscribeLocalEvent<WarDeclaratorComponent, WarDeclaratorActivateMessage>(OnActivated);
     }
 
-    private void OnAttemptOpenUI(EntityUid uid, WarDeclaratorComponent component, ActivatableUIOpenAttemptEvent args)
+    private void OnMapInit(Entity<WarDeclaratorComponent> ent, ref MapInitEvent args)
     {
-        if (!_nukeopsRuleSystem.TryGetRuleFromOperative(args.User, out var comps))
+        ent.Comp.Message = Loc.GetString("war-declarator-default-message");
+        ent.Comp.DisableAt = _gameTiming.CurTime + TimeSpan.FromMinutes(ent.Comp.WarDeclarationDelay);
+    }
+
+    private void OnAttemptOpenUI(Entity<WarDeclaratorComponent> ent, ref ActivatableUIOpenAttemptEvent args)
+    {
+        if (!_accessReaderSystem.IsAllowed(args.User, ent))
         {
-            var msg = Loc.GetString("war-declarator-not-nukeops");
-            _popupSystem.PopupEntity(msg, uid);
+            var msg = Loc.GetString("war-declarator-not-working");
+            _popupSystem.PopupEntity(msg, ent);
             args.Cancel();
             return;
         }
 
-        UpdateUI(uid, comps.Value.Item1, comps.Value.Item2);
+        UpdateUI(ent, ent.Comp.CurrentStatus);
     }
 
-    private void OnActivated(EntityUid uid, WarDeclaratorComponent component, WarDeclaratorActivateMessage args)
+    private void OnActivated(Entity<WarDeclaratorComponent> ent, ref WarDeclaratorActivateMessage args)
     {
-        if (!args.Session.AttachedEntity.HasValue ||
-            !_nukeopsRuleSystem.TryGetRuleFromOperative(args.Session.AttachedEntity.Value, out var comps))
+        if (args.Session.AttachedEntity is not {} playerEntity)
             return;
 
-        var condition = _nukeopsRuleSystem.GetWarCondition(comps.Value.Item1, comps.Value.Item2);
-        if (condition != WarConditionStatus.YES_WAR)
-        {
-            UpdateUI(uid, comps.Value.Item1, comps.Value.Item2);
-            return;
-        }
+        var ev = new WarDeclaredEvent(ent.Comp.CurrentStatus, ent);
+        RaiseLocalEvent(ref ev);
 
-        var maxLength = _cfg.GetCVar(CCVars.ChatMaxAnnouncementLength);
-        var message = SharedChatSystem.SanitizeAnnouncement(args.Message, maxLength);
-        if (component.AllowEditingMessage && message != string.Empty)
-        {
-            component.Message = message;
-        }
-        else
-        {
-            message = Loc.GetString("war-declarator-default-message");
-        }
-        var title = Loc.GetString(component.Title);
+        if (ent.Comp.DisableAt < _gameTiming.CurTime)
+            ev.Status = WarConditionStatus.NoWarTimeout;
 
-        _nukeopsRuleSystem.DeclareWar(args.Session.AttachedEntity.Value, message, title, component.Sound, component.Color);
+        ent.Comp.CurrentStatus = ev.Status;
 
-        if (args.Session.AttachedEntity != null)
-            _adminLogger.Add(LogType.Chat, LogImpact.Low, $"{ToPrettyString(args.Session.AttachedEntity.Value):player} has declared war with this text: {message}");
-    }
+        var maxLength = _cfg.GetCVar(CCVars.ChatMaxAnnouncementLength);
+        var message = SharedChatSystem.SanitizeAnnouncement(args.Message, maxLength);
+        if (ent.Comp.AllowEditingMessage && message != string.Empty)
+            ent.Comp.Message = message;
 
-    public void RefreshAllUI(NukeopsRuleComponent nukeops, GameRuleComponent gameRule)
-    {
-        var enumerator = EntityQueryEnumerator<WarDeclaratorComponent>();
-        while (enumerator.MoveNext(out var uid, out _))
+        if (ev.Status == WarConditionStatus.WarReady)
         {
-            UpdateUI(uid, nukeops, gameRule);
+            var title = Loc.GetString(ent.Comp.SenderTitle);
+            _chat.DispatchGlobalAnnouncement(ent.Comp.Message, title, true, ent.Comp.Sound, ent.Comp.Color);
+            _adminLogger.Add(LogType.Chat, LogImpact.Low, $"{ToPrettyString(playerEntity):player} has declared war with this text: {ent.Comp.Message}");
         }
+
+        UpdateUI(ent, ev.Status);
     }
 
-    private void UpdateUI(EntityUid declaratorUid, NukeopsRuleComponent nukeops, GameRuleComponent gameRule)
+    private void UpdateUI(Entity<WarDeclaratorComponent> ent, WarConditionStatus? status = null)
     {
-        var condition = _nukeopsRuleSystem.GetWarCondition(nukeops, gameRule);
-
-        TimeSpan startTime;
-        TimeSpan delayTime;
-        switch(condition)
-        {
-            case WarConditionStatus.YES_WAR:
-                startTime = gameRule.ActivatedAt;
-                delayTime = nukeops.WarDeclarationDelay;
-                break;
-            case WarConditionStatus.WAR_DELAY:
-                startTime = nukeops.WarDeclaredTime!.Value;
-                delayTime = nukeops.WarNukieArriveDelay!.Value;
-                break;
-            default:
-                startTime = TimeSpan.Zero;
-                delayTime = TimeSpan.Zero;
-                break;
-        }
-
         _userInterfaceSystem.TrySetUiState(
-            declaratorUid,
+            ent,
             WarDeclaratorUiKey.Key,
-            new WarDeclaratorBoundUserInterfaceState(
-                condition,
-                nukeops.WarDeclarationMinOps,
-                delayTime,
-                startTime));
+            new WarDeclaratorBoundUserInterfaceState(status, ent.Comp.DisableAt, ent.Comp.ShuttleDisabledTime));
     }
 }
diff --git a/Content.Server/Nutrition/Components/FatExtractorComponent.cs b/Content.Server/Nutrition/Components/FatExtractorComponent.cs
index bf81a173e4..e23c557236 100644
--- a/Content.Server/Nutrition/Components/FatExtractorComponent.cs
+++ b/Content.Server/Nutrition/Components/FatExtractorComponent.cs
@@ -10,7 +10,7 @@ namespace Content.Server.Nutrition.Components;
 /// <summary>
 /// This is used for a machine that extracts hunger from entities and creates meat. Yum!
 /// </summary>
-[RegisterComponent, Access(typeof(FatExtractorSystem))]
+[RegisterComponent, Access(typeof(FatExtractorSystem)), AutoGenerateComponentPause]
 public sealed partial class FatExtractorComponent : Component
 {
     /// <summary>
@@ -48,6 +48,7 @@ public sealed partial class FatExtractorComponent : Component
     /// When the next update will occur
     /// </summary>
     [DataField("nextUpdate", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    [AutoPausedField]
     public TimeSpan NextUpdate;
 
     /// <summary>
diff --git a/Content.Server/Nutrition/Components/OpenableComponent.cs b/Content.Server/Nutrition/Components/OpenableComponent.cs
deleted file mode 100644
index 63efd52096..0000000000
--- a/Content.Server/Nutrition/Components/OpenableComponent.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using Content.Server.Nutrition.EntitySystems;
-using Robust.Shared.Audio;
-
-namespace Content.Server.Nutrition.Components;
-
-/// <summary>
-/// A drink or food that can be opened.
-/// Starts closed, open it with Z or E.
-/// </summary>
-[RegisterComponent, Access(typeof(OpenableSystem))]
-public sealed partial class OpenableComponent : Component
-{
-    /// <summary>
-    /// Whether this drink or food is opened or not.
-    /// Drinks can only be drunk or poured from/into when open, and food can only be eaten when open.
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public bool Opened;
-
-    /// <summary>
-    /// If this is false you cant press Z to open it.
-    /// Requires an OpenBehavior damage threshold or other logic to open.
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public bool OpenableByHand = true;
-
-    /// <summary>
-    /// Text shown when examining and its open.
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public LocId ExamineText = "drink-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.
-    /// Defaults to the popup drink uses since its "correct".
-    /// 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, ViewVariables(VVAccess.ReadWrite)]
-    public LocId ClosedPopup = "drink-component-try-use-drink-not-open";
-
-    /// <summary>
-    /// Sound played when opening.
-    /// </summary>
-    [DataField]
-    public SoundSpecifier Sound = new SoundCollectionSpecifier("canOpenSounds");
-}
diff --git a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
index 1271c57a23..d0fcd11359 100644
--- a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs
@@ -40,23 +40,11 @@ public sealed class AnimalHusbandrySystem : EntitySystem
     /// <inheritdoc/>
     public override void Initialize()
     {
-        SubscribeLocalEvent<ReproductiveComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<ReproductiveComponent, MindAddedMessage>(OnMindAdded);
-        SubscribeLocalEvent<InfantComponent, EntityUnpausedEvent>(OnInfantUnpaused);
         SubscribeLocalEvent<InfantComponent, ComponentStartup>(OnInfantStartup);
         SubscribeLocalEvent<InfantComponent, ComponentShutdown>(OnInfantShutdown);
     }
 
-    private void OnUnpaused(EntityUid uid, ReproductiveComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextBreedAttempt += args.PausedTime;
-    }
-
-    private void OnInfantUnpaused(EntityUid uid, InfantComponent component, ref EntityUnpausedEvent args)
-    {
-        component.InfantEndTime += args.PausedTime;
-    }
-
     // we express EZ-pass terminate the pregnancy if a player takes the role
     private void OnMindAdded(EntityUid uid, ReproductiveComponent component, MindAddedMessage args)
     {
diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index f41ca44437..925e50b949 100644
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -130,21 +130,18 @@ public float TotalHydration(EntityUid uid, DrinkComponent? comp = null)
 
     private void OnExamined(Entity<DrinkComponent> entity, ref ExaminedEvent args)
     {
-        var hasOpenable = TryComp<OpenableComponent>(entity, out var openable);
+        TryComp<OpenableComponent>(entity, out var openable);
         if (_openable.IsClosed(entity.Owner, null, openable) || !args.IsInDetailsRange || !entity.Comp.Examinable)
             return;
 
-        // put Empty / Xu after Opened, or start a new line
-        args.AddMarkup(hasOpenable ? " - " : "\n");
-
         var empty = IsEmpty(entity, entity.Comp);
         if (empty)
         {
-            args.AddMarkup(Loc.GetString("drink-component-on-examine-is-empty"));
+            args.PushMarkup(Loc.GetString("drink-component-on-examine-is-empty"));
             return;
         }
 
-        if (TryComp<ExaminableSolutionComponent>(entity, out var comp))
+        if (HasComp<ExaminableSolutionComponent>(entity))
         {
             //provide exact measurement for beakers
             args.PushText(Loc.GetString("drink-component-on-examine-exact-volume", ("amount", DrinkVolume(entity, entity.Comp))));
@@ -159,7 +156,7 @@ private void OnExamined(Entity<DrinkComponent> entity, ref ExaminedEvent args)
                 > 33 => HalfEmptyOrHalfFull(args),
                 _ => "drink-component-on-examine-is-mostly-empty",
             };
-            args.AddMarkup(Loc.GetString(remainingString));
+            args.PushMarkup(Loc.GetString(remainingString));
         }
     }
 
diff --git a/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs b/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs
index 4bd8c94ac8..180e40d1e4 100644
--- a/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs
@@ -27,18 +27,12 @@ public sealed class FatExtractorSystem : EntitySystem
     /// <inheritdoc/>
     public override void Initialize()
     {
-        SubscribeLocalEvent<FatExtractorComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<FatExtractorComponent, GotEmaggedEvent>(OnGotEmagged);
         SubscribeLocalEvent<FatExtractorComponent, StorageAfterCloseEvent>(OnClosed);
         SubscribeLocalEvent<FatExtractorComponent, StorageAfterOpenEvent>(OnOpen);
         SubscribeLocalEvent<FatExtractorComponent, PowerChangedEvent>(OnPowerChanged);
     }
 
-    private void OnUnpaused(EntityUid uid, FatExtractorComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextUpdate += args.PausedTime;
-    }
-
     private void OnGotEmagged(EntityUid uid, FatExtractorComponent component, ref GotEmaggedEvent args)
     {
         args.Handled = true;
diff --git a/Content.Server/Nutrition/EntitySystems/OpenableSystem.cs b/Content.Server/Nutrition/EntitySystems/OpenableSystem.cs
index d7b7da25b8..8037b61572 100644
--- a/Content.Server/Nutrition/EntitySystems/OpenableSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/OpenableSystem.cs
@@ -1,59 +1,19 @@
 using Content.Server.Chemistry.EntitySystems;
-using Content.Server.Fluids.EntitySystems;
-using Content.Server.Nutrition.Components;
-using Content.Shared.Examine;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Nutrition.Components;
-using Content.Shared.Popups;
-using Content.Shared.Weapons.Melee.Events;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.GameObjects;
 
 namespace Content.Server.Nutrition.EntitySystems;
 
 /// <summary>
 /// Provides API for openable food and drinks, handles opening on use and preventing transfer when closed.
 /// </summary>
-public sealed class OpenableSystem : EntitySystem
+public sealed class OpenableSystem : SharedOpenableSystem
 {
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedPopupSystem _popup = default!;
-
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<OpenableComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<OpenableComponent, UseInHandEvent>(OnUse);
-        SubscribeLocalEvent<OpenableComponent, ExaminedEvent>(OnExamined, after: new[] { typeof(PuddleSystem) });
         SubscribeLocalEvent<OpenableComponent, SolutionTransferAttemptEvent>(OnTransferAttempt);
-        SubscribeLocalEvent<OpenableComponent, MeleeHitEvent>(HandleIfClosed);
-        SubscribeLocalEvent<OpenableComponent, AfterInteractEvent>(HandleIfClosed);
-    }
-
-    private void OnInit(EntityUid uid, OpenableComponent comp, ComponentInit args)
-    {
-        UpdateAppearance(uid, comp);
-    }
-
-    private void OnUse(EntityUid uid, OpenableComponent comp, UseInHandEvent args)
-    {
-        if (args.Handled || !comp.OpenableByHand)
-            return;
-
-        args.Handled = TryOpen(uid, comp);
-    }
-
-    private void OnExamined(EntityUid uid, OpenableComponent comp, ExaminedEvent args)
-    {
-        if (!comp.Opened || !args.IsInDetailsRange)
-            return;
-
-        var text = Loc.GetString(comp.ExamineText);
-        args.PushMarkup(text);
     }
 
     private void OnTransferAttempt(EntityUid uid, OpenableComponent comp, SolutionTransferAttemptEvent args)
@@ -64,79 +24,4 @@ private void OnTransferAttempt(EntityUid uid, OpenableComponent comp, SolutionTr
             args.Cancel(Loc.GetString("drink-component-try-use-drink-not-open", ("owner", uid)));
         }
     }
-
-    private void HandleIfClosed(EntityUid uid, OpenableComponent comp, HandledEntityEventArgs args)
-    {
-        // prevent spilling/pouring/whatever drinks when closed
-        args.Handled = !comp.Opened;
-    }
-
-    /// <summary>
-    /// Returns true if the entity either does not have OpenableComponent or it is opened.
-    /// Drinks that don't have OpenableComponent are automatically open, so it returns true.
-    /// </summary>
-    public bool IsOpen(EntityUid uid, OpenableComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp, false))
-            return true;
-
-        return comp.Opened;
-    }
-
-    /// <summary>
-    /// Returns true if the entity both has OpenableComponent and is not opened.
-    /// Drinks that don't have OpenableComponent are automatically open, so it returns false.
-    /// If user is not null a popup will be shown to them.
-    /// </summary>
-    public bool IsClosed(EntityUid uid, EntityUid? user = null, OpenableComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp, false))
-            return false;
-
-        if (comp.Opened)
-            return false;
-
-        if (user != null)
-            _popup.PopupEntity(Loc.GetString(comp.ClosedPopup, ("owner", uid)), user.Value, user.Value);
-
-        return true;
-    }
-
-    /// <summary>
-    /// Update open visuals to the current value.
-    /// </summary>
-    public void UpdateAppearance(EntityUid uid, OpenableComponent? comp = null, AppearanceComponent? appearance = null)
-    {
-        if (!Resolve(uid, ref comp))
-            return;
-
-        _appearance.SetData(uid, OpenableVisuals.Opened, comp.Opened, appearance);
-    }
-
-    /// <summary>
-    /// Sets the opened field and updates open visuals.
-    /// </summary>
-    public void SetOpen(EntityUid uid, bool opened = true, OpenableComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp, false) || opened == comp.Opened)
-            return;
-
-        comp.Opened = opened;
-
-        UpdateAppearance(uid, comp);
-    }
-
-    /// <summary>
-    /// If closed, opens it and plays the sound.
-    /// </summary>
-    /// <returns>Whether it got opened</returns>
-    public bool TryOpen(EntityUid uid, OpenableComponent? comp = null)
-    {
-        if (!Resolve(uid, ref comp, false) || comp.Opened)
-            return false;
-
-        SetOpen(uid, true, comp);
-        _audio.PlayPvs(comp.Sound, uid);
-        return true;
-    }
 }
diff --git a/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs b/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs
index 4adcf2acfa..bb071334fa 100644
--- a/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs
+++ b/Content.Server/Nyanotrasen/Carrying/CarryingSystem.cs
@@ -4,7 +4,6 @@
 using Content.Server.Hands.Systems;
 using Content.Server.Resist;
 using Content.Server.Popups;
-using Content.Server.Contests;
 using Content.Server.Inventory;
 using Content.Shared.Climbing; // Shared instead of Server
 using Content.Shared.Mobs;
@@ -28,6 +27,7 @@
 using Content.Shared.Physics.Pull;
 using Content.Shared.Mobs.Systems;
 using Robust.Shared.Map.Components;
+using Robust.Shared.Physics.Components;
 
 namespace Content.Server.Carrying
 {
@@ -42,7 +42,6 @@ public sealed class CarryingSystem : EntitySystem
         [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
         [Dependency] private readonly EscapeInventorySystem _escapeInventorySystem = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
-        [Dependency] private readonly ContestsSystem _contests = default!;
         [Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!;
         [Dependency] private readonly RespiratorSystem _respirator = default!;
 
@@ -120,7 +119,7 @@ private void OnThrow(EntityUid uid, CarryingComponent component, BeforeThrowEven
 
             args.ItemUid = virtItem.BlockingEntity;
 
-            var multiplier = _contests.MassContest(uid, virtItem.BlockingEntity);
+            var multiplier = MassContest(uid, virtItem.BlockingEntity);
             args.ThrowStrength = 5f * multiplier;
         }
 
@@ -161,7 +160,7 @@ private void OnMoveInput(EntityUid uid, BeingCarriedComponent component, ref Mov
 
             if (_actionBlockerSystem.CanInteract(uid, component.Carrier))
             {
-                _escapeInventorySystem.AttemptEscape(uid, component.Carrier, escape, _contests.MassContest(uid, component.Carrier));
+                _escapeInventorySystem.AttemptEscape(uid, component.Carrier, escape, MassContest(uid, component.Carrier));
             }
         }
 
@@ -212,7 +211,7 @@ private void StartCarryDoAfter(EntityUid carrier, EntityUid carried, CarriableCo
         {
             TimeSpan length = TimeSpan.FromSeconds(3);
 
-            var mod = _contests.MassContest(carrier, carried);
+            var mod = MassContest(carrier, carried);
 
             if (mod != 0)
                 length /= mod;
@@ -276,7 +275,7 @@ public void DropCarried(EntityUid carrier, EntityUid carried)
 
         private void ApplyCarrySlowdown(EntityUid carrier, EntityUid carried)
         {
-            var massRatio = _contests.MassContest(carrier, carried);
+            var massRatio = MassContest(carrier, carried);
 
             if (massRatio == 0)
                 massRatio = 1;
@@ -313,5 +312,16 @@ public bool CanCarry(EntityUid carrier, EntityUid carried, CarriableComponent? c
 
             return true;
         }
+
+        private float MassContest(EntityUid roller, EntityUid target, PhysicsComponent? rollerPhysics = null, PhysicsComponent? targetPhysics = null)
+        {
+            if (!Resolve(roller, ref rollerPhysics, false) || !Resolve(target, ref targetPhysics, false))
+                return 1f;
+
+            if (targetPhysics.FixturesMass == 0)
+                return 1f;
+
+            return rollerPhysics.FixturesMass / targetPhysics.FixturesMass;
+        }
     }
 }
diff --git a/Content.Server/Nyanotrasen/Cloning/MetempsychosisKarmaComponent.cs b/Content.Server/Nyanotrasen/Cloning/MetempsychosisKarmaComponent.cs
new file mode 100644
index 0000000000..246495cee0
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Cloning/MetempsychosisKarmaComponent.cs
@@ -0,0 +1,12 @@
+namespace Content.Server.Nyanotrasen.Cloning
+{
+    /// <summary>
+    /// This tracks how many times you have already been cloned and lowers your chance of getting a humanoid each time.
+    /// </summary>
+    [RegisterComponent]
+    public sealed partial class MetempsychosisKarmaComponent : Component
+    {
+        [DataField("score")]
+        public int Score = 0;
+    }
+}
diff --git a/Content.Server/Nyanotrasen/Cloning/MetempsychoticMachineComponent.cs b/Content.Server/Nyanotrasen/Cloning/MetempsychoticMachineComponent.cs
new file mode 100644
index 0000000000..0adcc9b5b2
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Cloning/MetempsychoticMachineComponent.cs
@@ -0,0 +1,22 @@
+using Content.Shared.Random;
+
+namespace Content.Server.Nyanotrasen.Cloning
+{
+    [RegisterComponent]
+    public sealed partial class MetempsychoticMachineComponent : Component
+    {
+        /// <summary>
+        /// Chance you will spawn as a humanoid instead of a non humanoid.
+        /// </summary>
+        [DataField("humanoidBaseChance")]
+        public float HumanoidBaseChance = 0.75f;
+
+        [ValidatePrototypeId<WeightedRandomPrototype>]
+        [DataField("metempsychoticHumanoidPool")]
+        public string MetempsychoticHumanoidPool = "MetempsychoticHumanoidPool";
+
+        [ValidatePrototypeId<WeightedRandomPrototype>]
+        [DataField("metempsychoticNonHumanoidPool")]
+        public string MetempsychoticNonHumanoidPool = "MetempsychoticNonhumanoidPool";
+    }
+}
diff --git a/Content.Server/Nyanotrasen/Cloning/MetempsychoticMachineSystem.cs b/Content.Server/Nyanotrasen/Cloning/MetempsychoticMachineSystem.cs
new file mode 100644
index 0000000000..62dc1b078e
--- /dev/null
+++ b/Content.Server/Nyanotrasen/Cloning/MetempsychoticMachineSystem.cs
@@ -0,0 +1,47 @@
+using Content.Shared.Humanoid.Prototypes;
+using Content.Shared.Random;
+using Content.Shared.Random.Helpers;
+using Robust.Shared.Random;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Nyanotrasen.Cloning
+{
+    public sealed class MetempsychoticMachineSystem : EntitySystem
+    {
+        [Dependency] private readonly IRobustRandom _random = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+        private ISawmill _sawmill = default!;
+
+        public string GetSpawnEntity(EntityUid uid, float karmaBonus, MetempsychoticMachineComponent component, SpeciesPrototype oldSpecies, out SpeciesPrototype? species, int? karma = null)
+        {
+            var chance = component.HumanoidBaseChance + karmaBonus;
+
+            if (karma != null)
+                chance -= ((1 - component.HumanoidBaseChance) * (float) karma);
+
+            if (chance > 1 && _random.Prob(chance - 1))
+            {
+                species = oldSpecies;
+                return oldSpecies.Prototype;
+            }
+            else
+                chance = 1;
+
+            chance = Math.Clamp(chance, 0, 1);
+            if (_random.Prob(chance) &&
+                _prototypeManager.TryIndex<WeightedRandomPrototype>(component.MetempsychoticHumanoidPool, out var humanoidPool) &&
+                _prototypeManager.TryIndex<SpeciesPrototype>(humanoidPool.Pick(), out var speciesPrototype))
+            {
+                species = speciesPrototype;
+                return speciesPrototype.Prototype;
+            }
+            else
+            {
+                species = null;
+                _sawmill.Error("Could not index species for metempsychotic machine...");
+                return "MobHuman";
+            }
+        }
+    }
+}
diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
index 84157ed5f1..69cf6a9939 100644
--- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
+++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
@@ -181,6 +181,7 @@ public FixedPoint2 GetWasteVolume(EntityUid uid, DeepFryerComponent component)
     /// </summary>
     public FixedPoint2 GetOilPurity(EntityUid uid, DeepFryerComponent component)
     {
+        if (component.Solution.Volume == 0) return 0;
         return GetOilVolume(uid, component) / component.Solution.Volume;
     }
 
diff --git a/Content.Server/Nyanotrasen/Mail/MailSystem.cs b/Content.Server/Nyanotrasen/Mail/MailSystem.cs
index 0f2352b29a..915f7399b0 100644
--- a/Content.Server/Nyanotrasen/Mail/MailSystem.cs
+++ b/Content.Server/Nyanotrasen/Mail/MailSystem.cs
@@ -34,12 +34,14 @@
 using Content.Shared.Destructible;
 using Content.Shared.Emag.Systems;
 using Content.Shared.Examine;
+using Content.Shared.Fluids.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Item;
 using Content.Shared.Mail;
 using Content.Shared.Maps;
+using Content.Shared.Nutrition.Components;
 using Content.Shared.PDA;
 using Content.Shared.Random.Helpers;
 using Content.Shared.Roles;
diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
index 38349c26fa..31e6b89f13 100644
--- a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
+++ b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
@@ -86,8 +86,6 @@ private void OnInvisInit(EntityUid uid, PsionicallyInvisibleComponent component,
             _visibilitySystem.AddLayer(uid, visibility, (int) VisibilityFlags.PsionicInvisibility, false);
             _visibilitySystem.RemoveLayer(uid, visibility, (int) VisibilityFlags.Normal, false);
             _visibilitySystem.RefreshVisibility(uid, visibility);
-
-            SetCanSeePsionicInvisiblity(uid, true);
         }
 
 
@@ -99,8 +97,6 @@ private void OnInvisShutdown(EntityUid uid, PsionicallyInvisibleComponent compon
                 _visibilitySystem.AddLayer(uid, visibility, (int) VisibilityFlags.Normal, false);
                 _visibilitySystem.RefreshVisibility(uid, visibility);
             }
-            if (HasComp<PotentialPsionicComponent>(uid) && !HasComp<PsionicInsulationComponent>(uid))
-                SetCanSeePsionicInvisiblity(uid, false);
         }
 
         private void OnEyeInit(EntityUid uid, EyeComponent component, ComponentInit args)
@@ -129,7 +125,7 @@ public void SetCanSeePsionicInvisiblity(EntityUid uid, bool set)
             {
                 if (EntityManager.TryGetComponent(uid, out EyeComponent? eye))
                 {
-                    //_eye.SetVisibilityMask(uid, eye.VisibilityMask & (int) VisibilityFlags.PsionicInvisibility, eye);
+                    _eye.SetVisibilityMask(uid, eye.VisibilityMask & ~ (int) VisibilityFlags.PsionicInvisibility, eye);
                 }
             }
         }
diff --git a/Content.Server/Nyanotrasen/Research/Oracle/OracleComponent.cs b/Content.Server/Nyanotrasen/Research/Oracle/OracleComponent.cs
index 73d1a4ecc6..e238d5c7a1 100644
--- a/Content.Server/Nyanotrasen/Research/Oracle/OracleComponent.cs
+++ b/Content.Server/Nyanotrasen/Research/Oracle/OracleComponent.cs
@@ -23,6 +23,12 @@ public sealed partial class OracleComponent : Component
     [DataField("barkTime")]
     public TimeSpan BarkTime = TimeSpan.FromMinutes(1);
 
+    [DataField("rejectAccumulator")]
+    public float RejectAccumulator;
+
+    [DataField("rejectTime")]
+    public TimeSpan RejectTime = TimeSpan.FromSeconds(5);
+
     [ViewVariables(VVAccess.ReadWrite)]
     public EntityPrototype DesiredPrototype = default!;
 
diff --git a/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs b/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
index eccf064e33..148598fe2c 100644
--- a/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
+++ b/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
@@ -38,6 +38,7 @@ public override void Update(float frameTime)
         {
             oracle.Accumulator += frameTime;
             oracle.BarkAccumulator += frameTime;
+            oracle.RejectAccumulator += frameTime;
             if (oracle.BarkAccumulator >= oracle.BarkTime.TotalSeconds)
             {
                 oracle.BarkAccumulator = 0;
@@ -120,8 +121,12 @@ private void OnInteractUsing(EntityUid uid, OracleComponent component, InteractU
 
         if (!validItem)
         {
-            if (!HasComp<RefillableSolutionComponent>(args.Used))
+            if (!HasComp<RefillableSolutionComponent>(args.Used) &&
+                component.RejectAccumulator >= component.RejectTime.TotalSeconds)
+            {
+                component.RejectAccumulator = 0;
                 _chat.TrySendInGameICMessage(uid, _random.Pick(component.RejectMessages), InGameICChatType.Speak, true);
+            }
             return;
         }
 
@@ -186,6 +191,7 @@ private void NextItem(OracleComponent component)
     {
         component.Accumulator = 0;
         component.BarkAccumulator = 0;
+        component.RejectAccumulator = 0;
         var protoString = GetDesiredItem(component);
         if (_prototypeManager.TryIndex<EntityPrototype>(protoString, out var proto))
             component.DesiredPrototype = proto;
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/MidRoundAntagRuleComponent.cs b/Content.Server/Nyanotrasen/StationEvents/Components/MidRoundAntagRuleComponent.cs
index df8b687c3e..c951e5d929 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Components/MidRoundAntagRuleComponent.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Components/MidRoundAntagRuleComponent.cs
@@ -6,12 +6,9 @@ namespace Content.Server.StationEvents.Components;
 [RegisterComponent, Access(typeof(MidRoundAntagRule))]
 public sealed partial class MidRoundAntagRuleComponent : Component
 {
-    [DataField("antags")]
-    public List<EntProtoId> MidRoundAntags = new()
-    {
-        "SpawnPointGhostRatKing",
-        //"SpawnPointGhostVampSpider",
-        //"SpawnPointGhostFugitive",
-        "SpawnPointGhostParadoxAnomaly"
-    };
+    /// <summary>
+    /// Spawner to create at a random mid round antag marker.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Spawner = string.Empty;
 }
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/MidRoundAntagRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/MidRoundAntagRule.cs
index 169f757549..7abbdcdab3 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/MidRoundAntagRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/MidRoundAntagRule.cs
@@ -1,38 +1,55 @@
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Robust.Shared.Random;
-using System.Linq;
 
 namespace Content.Server.StationEvents.Events;
 
 public sealed class MidRoundAntagRule : StationEventSystem<MidRoundAntagRuleComponent>
 {
-    [Dependency] private readonly IRobustRandom _random = default!;
-
     protected override void Started(EntityUid uid, MidRoundAntagRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
         base.Started(uid, component, gameRule, args);
 
-        var spawnLocations = EntityQuery<MidRoundAntagSpawnLocationComponent, TransformComponent>().ToList();
-        var backupSpawnLocations = EntityQuery<VentCritterSpawnLocationComponent, TransformComponent>().ToList();
-
-        TransformComponent? spawn = new();
+        if (!TryGetRandomStation(out var station))
+            return;
 
-        if (spawnLocations.Count > 0)
-        {
-            var spawnLoc = _random.Pick(spawnLocations);
-            spawn = spawnLoc.Item2;
-        } else if (backupSpawnLocations.Count > 0)
+        var spawnLocations = FindSpawns(station.Value);
+        if (spawnLocations.Count == 0)
         {
-            var spawnLoc = _random.Pick(backupSpawnLocations);
-            spawn = spawnLoc.Item2;
+            Log.Warning("Couldn't find any midround antag spawners or vent critter spawners, not spawning an antag.");
+            return;
         }
 
-        if (spawn?.GridUid == null)
-            return;
+        var spawn = RobustRandom.Pick(spawnLocations);
 
-        var proto = _random.Pick(component.MidRoundAntags);
+        var proto = component.Spawner;
         Log.Info($"Spawning midround antag {proto} at {spawn.Coordinates}");
         Spawn(proto, spawn.Coordinates);
     }
+
+    private List<TransformComponent> FindSpawns(EntityUid station)
+    {
+        var spawns = new List<TransformComponent>();
+        var query = EntityQueryEnumerator<MidRoundAntagSpawnLocationComponent, TransformComponent>();
+        while (query.MoveNext(out var uid, out _, out var xform))
+        {
+            if (StationSystem.GetOwningStation(uid, xform) == station && xform.GridUid != null)
+                spawns.Add(xform);
+        }
+
+        // if there are any midround antag spawns mapped, use them
+        if (spawns.Count > 0)
+            return spawns;
+
+        // otherwise, fall back to vent critter spawns
+        Log.Info($"Station {ToPrettyString(station):station} has no midround antag spawnpoints mapped, falling back. Please map them!");
+        var fallbackQuery = EntityQueryEnumerator<VentCritterSpawnLocationComponent, TransformComponent>();
+        while (fallbackQuery.MoveNext(out var uid, out _, out var xform))
+        {
+            if (StationSystem.GetOwningStation(uid, xform) == station && xform.GridUid != null)
+                spawns.Add(xform);
+        }
+
+        return spawns;
+    }
 }
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
index 6d8c03233d..175318e15b 100644
--- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
+++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
@@ -51,8 +51,8 @@ protected override void Started(EntityUid uid, NoosphericStormRuleComponent comp
 
         // Increase glimmer.
         var baseGlimmerAdd = _robustRandom.Next(component.BaseGlimmerAddMin, component.BaseGlimmerAddMax);
-        var glimmerSeverityMod = 1 + (component.GlimmerSeverityCoefficient * (GetSeverityModifier() - 1f));
-        var glimmerAdded = (int) Math.Round(baseGlimmerAdd * glimmerSeverityMod);
+        //var glimmerSeverityMod = 1 + (component.GlimmerSeverityCoefficient * (GetSeverityModifier() - 1f));
+        var glimmerAdded = (int) baseGlimmerAdd; // Math.Round(baseGlimmerAdd * glimmerSeverityMod);
 
         _glimmerSystem.Glimmer += glimmerAdded;
     }
diff --git a/Content.Server/Objectives/Systems/ObjectiveLimitSystem.cs b/Content.Server/Objectives/Systems/ObjectiveLimitSystem.cs
index 0102304668..1954f2bdc1 100644
--- a/Content.Server/Objectives/Systems/ObjectiveLimitSystem.cs
+++ b/Content.Server/Objectives/Systems/ObjectiveLimitSystem.cs
@@ -53,7 +53,7 @@ public bool HasObjective(EntityUid mindId, string proto, MindComponent? mind = n
         if (!Resolve(mindId, ref mind))
             return false;
 
-        foreach (var objective in mind.AllObjectives)
+        foreach (var objective in mind.Objectives)
         {
             if (Prototype(objective)?.ID == proto)
                 return true;
diff --git a/Content.Server/PDA/PdaSystem.cs b/Content.Server/PDA/PdaSystem.cs
index 4418f24884..a343607196 100644
--- a/Content.Server/PDA/PdaSystem.cs
+++ b/Content.Server/PDA/PdaSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server.AlertLevel;
 using Content.Server.CartridgeLoader;
+using Content.Server.Chat.Managers;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.Instruments;
 using Content.Server.Light.EntitySystems;
@@ -10,10 +11,14 @@
 using Content.Server.Store.Systems;
 using Content.Shared.Access.Components;
 using Content.Shared.CartridgeLoader;
+using Content.Shared.Chat;
 using Content.Shared.Light.Components;
 using Content.Shared.PDA;
+using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
+using Robust.Shared.Player;
+using Robust.Shared.Utility;
 
 namespace Content.Server.PDA
 {
@@ -24,8 +29,10 @@ public sealed class PdaSystem : SharedPdaSystem
         [Dependency] private readonly RingerSystem _ringer = default!;
         [Dependency] private readonly StationSystem _station = default!;
         [Dependency] private readonly StoreSystem _store = default!;
+        [Dependency] private readonly IChatManager _chatManager = default!;
         [Dependency] private readonly UserInterfaceSystem _ui = default!;
         [Dependency] private readonly UnpoweredFlashlightSystem _unpoweredFlashlight = default!;
+        [Dependency] private readonly ContainerSystem _containerSystem = default!;
 
         public override void Initialize()
         {
@@ -41,6 +48,8 @@ public override void Initialize()
             SubscribeLocalEvent<PdaComponent, PdaShowUplinkMessage>(OnUiMessage);
             SubscribeLocalEvent<PdaComponent, PdaLockUplinkMessage>(OnUiMessage);
 
+            SubscribeLocalEvent<PdaComponent, CartridgeLoaderNotificationSentEvent>(OnNotification);
+
             SubscribeLocalEvent<StationRenamedEvent>(OnStationRenamed);
             SubscribeLocalEvent<AlertLevelChangedEvent>(OnAlertLevelChanged);
         }
@@ -106,6 +115,28 @@ private void UpdateAllPdaUisOnStation()
             }
         }
 
+        private void OnNotification(Entity<PdaComponent> ent, ref CartridgeLoaderNotificationSentEvent args)
+        {
+            _ringer.RingerPlayRingtone(ent.Owner);
+
+            if (!_containerSystem.TryGetContainingContainer(ent, out var container)
+                || !TryComp<ActorComponent>(container.Owner, out var actor))
+                return;
+
+            var message = FormattedMessage.EscapeText(args.Message);
+            var wrappedMessage = Loc.GetString("pda-notification-message",
+                ("header", args.Header),
+                ("message", message));
+
+            _chatManager.ChatMessageToOne(
+                ChatChannel.Notifications,
+                message,
+                wrappedMessage,
+                EntityUid.Invalid,
+                false,
+                actor.PlayerSession.Channel);
+        }
+
         /// <summary>
         /// Send new UI state to clients, call if you modify something like uplink.
         /// </summary>
diff --git a/Content.Server/PDA/Ringer/RingerSystem.cs b/Content.Server/PDA/Ringer/RingerSystem.cs
index f8aadac461..f95725873a 100644
--- a/Content.Server/PDA/Ringer/RingerSystem.cs
+++ b/Content.Server/PDA/Ringer/RingerSystem.cs
@@ -13,7 +13,6 @@
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using System.Linq;
 using Robust.Server.Audio;
 
 namespace Content.Server.PDA.Ringer
@@ -63,13 +62,16 @@ private void RingerPlayRingtone(EntityUid uid, RingerComponent ringer, RingerPla
             UpdateRingerUserInterface(uid, ringer, true);
         }
 
-        public void RingerPlayRingtone(EntityUid uid, RingerComponent ringer)
+        public void RingerPlayRingtone(Entity<RingerComponent?> ent)
         {
-            EnsureComp<ActiveRingerComponent>(uid);
+            if (!Resolve(ent, ref ent.Comp))
+                return;
 
-            _popupSystem.PopupEntity(Loc.GetString("comp-ringer-vibration-popup"), uid, Filter.Pvs(uid, 0.05f), false, PopupType.Small);
+            EnsureComp<ActiveRingerComponent>(ent);
 
-            UpdateRingerUserInterface(uid, ringer, true);
+            _popupSystem.PopupEntity(Loc.GetString("comp-ringer-vibration-popup"), ent, Filter.Pvs(ent, 0.05f), false, PopupType.Medium);
+
+            UpdateRingerUserInterface(ent, ent.Comp, true);
         }
 
         private void UpdateRingerUserInterfaceDriver(EntityUid uid, RingerComponent ringer, RingerRequestUpdateInterfaceMessage args)
diff --git a/Content.Server/Paper/PaperSystem.cs b/Content.Server/Paper/PaperSystem.cs
index 80cc8fa4ae..27c94313b2 100644
--- a/Content.Server/Paper/PaperSystem.cs
+++ b/Content.Server/Paper/PaperSystem.cs
@@ -160,6 +160,8 @@ private void OnInputTextMessage(EntityUid uid, PaperComponent paperComp, PaperIn
                 if (args.Session.AttachedEntity != null)
                     _adminLogger.Add(LogType.Chat, LogImpact.Low,
                         $"{ToPrettyString(args.Session.AttachedEntity.Value):player} has written on {ToPrettyString(uid):entity} the following text: {args.Text}");
+
+                _audio.PlayPvs(paperComp.Sound, uid);
             }
 
             paperComp.Mode = PaperAction.Read;
diff --git a/Content.Server/Parallax/BiomeSystem.cs b/Content.Server/Parallax/BiomeSystem.cs
index f4514ac228..c4c2300870 100644
--- a/Content.Server/Parallax/BiomeSystem.cs
+++ b/Content.Server/Parallax/BiomeSystem.cs
@@ -29,6 +29,7 @@
 using Robust.Shared.Random;
 using Robust.Shared.Threading;
 using Robust.Shared.Utility;
+using ChunkIndicesEnumerator = Robust.Shared.Map.Enumerators.ChunkIndicesEnumerator;
 
 namespace Content.Server.Parallax;
 
@@ -83,17 +84,11 @@ public override void Initialize()
         SubscribeLocalEvent<BiomeComponent, MapInitEvent>(OnBiomeMapInit);
         SubscribeLocalEvent<FTLStartedEvent>(OnFTLStarted);
         SubscribeLocalEvent<ShuttleFlattenEvent>(OnShuttleFlatten);
-        _configManager.OnValueChanged(CVars.NetMaxUpdateRange, SetLoadRange, true);
+        Subs.CVar(_configManager, CVars.NetMaxUpdateRange, SetLoadRange, true);
         InitializeCommands();
         SubscribeLocalEvent<PrototypesReloadedEventArgs>(ProtoReload);
     }
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        _configManager.UnsubValueChanged(CVars.NetMaxUpdateRange, SetLoadRange);
-    }
-
     private void ProtoReload(PrototypesReloadedEventArgs obj)
     {
         if (!obj.ByType.TryGetValue(typeof(BiomeTemplatePrototype), out var reloads))
diff --git a/Content.Server/Physics/Components/ChasingWalkComponent.cs b/Content.Server/Physics/Components/ChasingWalkComponent.cs
index ca7a027544..222c9d64db 100644
--- a/Content.Server/Physics/Components/ChasingWalkComponent.cs
+++ b/Content.Server/Physics/Components/ChasingWalkComponent.cs
@@ -8,13 +8,14 @@ namespace Content.Server.Physics.Components;
 /// <summary>
 /// A component which makes its entity chasing entity with selected component.
 /// </summary>
-[RegisterComponent, Access(typeof(ChasingWalkSystem))]
+[RegisterComponent, Access(typeof(ChasingWalkSystem)), AutoGenerateComponentPause]
 public sealed partial class ChasingWalkComponent : Component
 {
     /// <summary>
     /// The next moment in time when the entity is pushed toward its goal
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [AutoPausedField]
     public TimeSpan NextImpulseTime;
 
     /// <summary>
@@ -57,6 +58,7 @@ public sealed partial class ChasingWalkComponent : Component
     /// The next change of direction time.
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    [AutoPausedField]
     public TimeSpan NextChangeVectorTime;
 
     /// <summary>
diff --git a/Content.Server/Physics/Controllers/ChasingWalkSystem.cs b/Content.Server/Physics/Controllers/ChasingWalkSystem.cs
index 8835b44ab7..215e7e3124 100644
--- a/Content.Server/Physics/Controllers/ChasingWalkSystem.cs
+++ b/Content.Server/Physics/Controllers/ChasingWalkSystem.cs
@@ -27,7 +27,6 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<ChasingWalkComponent, MapInitEvent>(OnChasingMapInit);
-        SubscribeLocalEvent<ChasingWalkComponent, EntityUnpausedEvent>(OnChasingUnpaused);
     }
 
     private void OnChasingMapInit(EntityUid uid, ChasingWalkComponent component, MapInitEvent args)
@@ -36,12 +35,6 @@ private void OnChasingMapInit(EntityUid uid, ChasingWalkComponent component, Map
         component.NextChangeVectorTime = _gameTiming.CurTime;
     }
 
-    private void OnChasingUnpaused(EntityUid uid, ChasingWalkComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextImpulseTime += args.PausedTime;
-        component.NextChangeVectorTime += args.PausedTime;
-    }
-
     public override void UpdateBeforeSolve(bool prediction, float frameTime)
     {
         base.UpdateBeforeSolve(prediction, frameTime);
diff --git a/Content.Server/Pinpointer/PinpointerSystem.cs b/Content.Server/Pinpointer/PinpointerSystem.cs
index 63b39b388c..be9a715d5d 100644
--- a/Content.Server/Pinpointer/PinpointerSystem.cs
+++ b/Content.Server/Pinpointer/PinpointerSystem.cs
@@ -24,7 +24,7 @@ public override void Initialize()
         SubscribeLocalEvent<FTLCompletedEvent>(OnLocateTarget);
     }
 
-    public bool TogglePinpointer(EntityUid uid, PinpointerComponent? pinpointer = null)
+    public override bool TogglePinpointer(EntityUid uid, PinpointerComponent? pinpointer = null)
     {
         if (!Resolve(uid, ref pinpointer))
             return false;
@@ -128,26 +128,13 @@ public override void Update(float frameTime)
     }
 
     /// <summary>
-    ///     Set pinpointers target to track
+    ///     Update direction from pinpointer to selected target (if it was set)
     /// </summary>
-    public void SetTarget(EntityUid uid, EntityUid? target, PinpointerComponent? pinpointer = null)
+    protected override void UpdateDirectionToTarget(EntityUid uid, PinpointerComponent? pinpointer = null)
     {
         if (!Resolve(uid, ref pinpointer))
             return;
 
-        if (pinpointer.Target == target)
-            return;
-
-        pinpointer.Target = target;
-        if (pinpointer.IsActive)
-            UpdateDirectionToTarget(uid, pinpointer);
-    }
-
-    /// <summary>
-    ///     Update direction from pinpointer to selected target (if it was set)
-    /// </summary>
-    private void UpdateDirectionToTarget(EntityUid uid, PinpointerComponent pinpointer)
-    {
         if (!pinpointer.IsActive)
             return;
 
diff --git a/Content.Server/Popups/PopupSystem.cs b/Content.Server/Popups/PopupSystem.cs
index 4d9a9f3bf5..c5eb3819b5 100644
--- a/Content.Server/Popups/PopupSystem.cs
+++ b/Content.Server/Popups/PopupSystem.cs
@@ -18,7 +18,7 @@ public override void PopupCursor(string? message, PopupType type = PopupType.Sma
             // No local user.
         }
 
-        public override void PopupCursor(string? message, ICommonSession recipient, PopupType type=PopupType.Small)
+        public override void PopupCursor(string? message, ICommonSession recipient, PopupType type = PopupType.Small)
         {
             if (message == null)
                 return;
@@ -75,11 +75,11 @@ public override void PopupEntity(string? message, EntityUid uid, PopupType type
             if (message == null)
                 return;
 
-            var filter = Filter.Empty().AddPlayersByPvs(uid, entityManager:EntityManager, playerMan: _player, cfgMan: _cfg);
+            var filter = Filter.Empty().AddPlayersByPvs(uid, entityManager: EntityManager, playerMan: _player, cfgMan: _cfg);
             RaiseNetworkEvent(new PopupEntityEvent(message, type, GetNetEntity(uid)), filter);
         }
 
-        public override void PopupEntity(string? message, EntityUid uid, EntityUid recipient, PopupType type=PopupType.Small)
+        public override void PopupEntity(string? message, EntityUid uid, EntityUid recipient, PopupType type = PopupType.Small)
         {
             if (message == null)
                 return;
@@ -108,5 +108,23 @@ public override void PopupEntity(string? message, EntityUid uid, Filter filter,
 
             RaiseNetworkEvent(new PopupEntityEvent(message, type, GetNetEntity(uid)), filter, recordReplay);
         }
+
+        public override void PopupPredicted(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small)
+        {
+            if (message == null)
+                return;
+
+            if (recipient != null)
+            {
+                // Don't send to recipient, since they predicted it locally
+                var filter = Filter.PvsExcept(recipient.Value, entityManager: EntityManager);
+                RaiseNetworkEvent(new PopupEntityEvent(message, type, GetNetEntity(uid)), filter);
+            }
+            else
+            {
+                // With no recipient, send to everyone (in PVS range)
+                RaiseNetworkEvent(new PopupEntityEvent(message, type, GetNetEntity(uid)));
+            }
+        }
     }
 }
diff --git a/Content.Server/Power/Components/BatteryComponent.cs b/Content.Server/Power/Components/BatteryComponent.cs
index 0fbee9aa34..113106ed18 100644
--- a/Content.Server/Power/Components/BatteryComponent.cs
+++ b/Content.Server/Power/Components/BatteryComponent.cs
@@ -7,56 +7,34 @@ namespace Content.Server.Power.Components
     /// </summary>
     [RegisterComponent]
     [Virtual]
+    [Access(typeof(BatterySystem))]
     public partial class BatteryComponent : Component
     {
-        [Dependency] private readonly IEntityManager _entMan = default!;
         public string SolutionName = "battery";
 
         /// <summary>
         /// Maximum charge of the battery in joules (ie. watt seconds)
         /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float MaxCharge
-        {
-            get => _maxCharge;
-            [Obsolete("Use system method")]
-            set => _entMan.System<BatterySystem>().SetMaxCharge(Owner, value, this);
-        }
-
-        [DataField("maxCharge")]
-        [Access(typeof(BatterySystem))]
-        public float _maxCharge;
+        [DataField]
+        public float MaxCharge;
 
         /// <summary>
         /// Current charge of the battery in joules (ie. watt seconds)
         /// </summary>
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float CurrentCharge
-        {
-            get => Charge;
-            [Obsolete("Use system method")]
-            set => _entMan.System<BatterySystem>().SetCharge(Owner, value, this);
-        }
-
         [DataField("startingCharge")]
-        [Access(typeof(BatterySystem))]
-        public float Charge;
+        public float CurrentCharge;
 
         /// <summary>
         /// True if the battery is fully charged.
         /// </summary>
-        [ViewVariables] public bool IsFullyCharged => MathHelper.CloseToPercent(CurrentCharge, MaxCharge);
+        [ViewVariables]
+        public bool IsFullyCharged => MathHelper.CloseToPercent(CurrentCharge, MaxCharge);
 
         /// <summary>
         /// The price per one joule. Default is 1 credit for 10kJ.
         /// </summary>
-        [DataField("pricePerJoule")]
-        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
         public float PricePerJoule = 0.0001f;
-
-        [Obsolete("Use system method")]
-        public bool TryUseCharge(float value)
-            => _entMan.System<BatterySystem>().TryUseCharge(Owner, value, this);
     }
 
     /// <summary>
diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs
index c844988b06..0a0f2068b5 100644
--- a/Content.Server/Power/EntitySystems/BatterySystem.cs
+++ b/Content.Server/Power/EntitySystems/BatterySystem.cs
@@ -62,9 +62,9 @@ private void PreSync(NetworkBatteryPreSync ev)
             var enumerator = AllEntityQuery<PowerNetworkBatteryComponent, BatteryComponent>();
             while (enumerator.MoveNext(out var netBat, out var bat))
             {
-                DebugTools.Assert(bat.Charge <= bat.MaxCharge && bat.Charge >= 0);
+                DebugTools.Assert(bat.CurrentCharge <= bat.MaxCharge && bat.CurrentCharge >= 0);
                 netBat.NetworkBattery.Capacity = bat.MaxCharge;
-                netBat.NetworkBattery.CurrentStorage = bat.Charge;
+                netBat.NetworkBattery.CurrentStorage = bat.CurrentCharge;
             }
         }
 
@@ -108,10 +108,10 @@ public float UseCharge(EntityUid uid, float value, BatteryComponent? battery = n
             if (value <= 0 ||  !Resolve(uid, ref battery) || battery.CurrentCharge == 0)
                 return 0;
 
-            var newValue = Math.Clamp(0, battery.CurrentCharge - value, battery._maxCharge);
-            var delta = newValue - battery.Charge;
-            battery.Charge = newValue;
-            var ev = new ChargeChangedEvent(battery.CurrentCharge, battery._maxCharge);
+            var newValue = Math.Clamp(0, battery.CurrentCharge - value, battery.MaxCharge);
+            var delta = newValue - battery.CurrentCharge;
+            battery.CurrentCharge = newValue;
+            var ev = new ChargeChangedEvent(battery.CurrentCharge, battery.MaxCharge);
             RaiseLocalEvent(uid, ref ev);
             return delta;
         }
@@ -121,13 +121,13 @@ public void SetMaxCharge(EntityUid uid, float value, BatteryComponent? battery =
             if (!Resolve(uid, ref battery))
                 return;
 
-            var old = battery._maxCharge;
-            battery._maxCharge = Math.Max(value, 0);
-            battery.Charge = Math.Min(battery.Charge, battery._maxCharge);
-            if (MathHelper.CloseTo(battery._maxCharge, old))
+            var old = battery.MaxCharge;
+            battery.MaxCharge = Math.Max(value, 0);
+            battery.CurrentCharge = Math.Min(battery.CurrentCharge, battery.MaxCharge);
+            if (MathHelper.CloseTo(battery.MaxCharge, old))
                 return;
 
-            var ev = new ChargeChangedEvent(battery.CurrentCharge, battery._maxCharge);
+            var ev = new ChargeChangedEvent(battery.CurrentCharge, battery.MaxCharge);
             RaiseLocalEvent(uid, ref ev);
         }
 
@@ -136,12 +136,12 @@ public void SetCharge(EntityUid uid, float value, BatteryComponent? battery = nu
             if (!Resolve(uid, ref battery))
                 return;
 
-            var old = battery.Charge;
-            battery.Charge = MathHelper.Clamp(value, 0, battery._maxCharge);
-            if (MathHelper.CloseTo(battery.Charge, old))
+            var old = battery.CurrentCharge;
+            battery.CurrentCharge = MathHelper.Clamp(value, 0, battery.MaxCharge);
+            if (MathHelper.CloseTo(battery.CurrentCharge, old))
                 return;
 
-            var ev = new ChargeChangedEvent(battery.CurrentCharge, battery._maxCharge);
+            var ev = new ChargeChangedEvent(battery.CurrentCharge, battery.MaxCharge);
             RaiseLocalEvent(uid, ref ev);
         }
 
@@ -150,7 +150,7 @@ public void SetCharge(EntityUid uid, float value, BatteryComponent? battery = nu
         /// </summary>
         public bool TryUseCharge(EntityUid uid, float value, BatteryComponent? battery = null)
         {
-            if (!Resolve(uid, ref battery, false) || value > battery.Charge)
+            if (!Resolve(uid, ref battery, false) || value > battery.CurrentCharge)
                 return false;
 
             UseCharge(uid, value, battery);
diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs
index 6feba0d52a..b6b718455d 100644
--- a/Content.Server/Power/EntitySystems/ChargerSystem.cs
+++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs
@@ -17,6 +17,7 @@ internal sealed class ChargerSystem : EntitySystem
 {
     [Dependency] private readonly ContainerSystem _container = default!;
     [Dependency] private readonly PowerCellSystem _powerCell = default!;
+    [Dependency] private readonly BatterySystem _battery = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
 
     public override void Initialize()
@@ -201,11 +202,11 @@ private void TransferPower(EntityUid uid, EntityUid targetEntity, ChargerCompone
         if (!SearchForBattery(targetEntity, out var heldBattery))
             return;
 
-        heldBattery.CurrentCharge += component.ChargeRate * frameTime;
+        _battery.SetCharge(targetEntity, heldBattery.CurrentCharge + component.ChargeRate * frameTime, heldBattery);
         // Just so the sprite won't be set to 99.99999% visibility
         if (heldBattery.MaxCharge - heldBattery.CurrentCharge < 0.01)
         {
-            heldBattery.CurrentCharge = heldBattery.MaxCharge;
+            _battery.SetCharge(targetEntity, heldBattery.MaxCharge, heldBattery);
         }
 
         UpdateStatus(uid, component);
diff --git a/Content.Server/Power/Generation/Teg/TegSystem.cs b/Content.Server/Power/Generation/Teg/TegSystem.cs
index 54f40a1bf3..3510a3da45 100644
--- a/Content.Server/Power/Generation/Teg/TegSystem.cs
+++ b/Content.Server/Power/Generation/Teg/TegSystem.cs
@@ -7,6 +7,7 @@
 using Content.Server.NodeContainer;
 using Content.Server.NodeContainer.Nodes;
 using Content.Server.Power.Components;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Examine;
 using Content.Shared.Power.Generation.Teg;
 using Content.Shared.Rounding;
diff --git a/Content.Server/Power/SetBatteryPercentCommand.cs b/Content.Server/Power/SetBatteryPercentCommand.cs
index 775ca412d3..b73cf63069 100644
--- a/Content.Server/Power/SetBatteryPercentCommand.cs
+++ b/Content.Server/Power/SetBatteryPercentCommand.cs
@@ -1,5 +1,6 @@
 using Content.Server.Administration;
 using Content.Server.Power.Components;
+using Content.Server.Power.EntitySystems;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 
@@ -39,7 +40,8 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
                 shell.WriteLine($"No battery found with id {id}.");
                 return;
             }
-            battery.CurrentCharge = (battery.MaxCharge * percent) / 100;
+            var system = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<BatterySystem>();
+            system.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 c6d8e1e709..8e960357b7 100644
--- a/Content.Server/PowerCell/PowerCellSystem.Draw.cs
+++ b/Content.Server/PowerCell/PowerCellSystem.Draw.cs
@@ -39,11 +39,6 @@ public override void Update(float frameTime)
         }
     }
 
-    private void OnUnpaused(EntityUid uid, PowerCellDrawComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextUpdateTime += args.PausedTime;
-    }
-
     private void OnDrawChargeChanged(EntityUid uid, PowerCellDrawComponent component, ref ChargeChangedEvent args)
     {
         // Update the bools for client prediction.
diff --git a/Content.Server/PowerCell/PowerCellSystem.cs b/Content.Server/PowerCell/PowerCellSystem.cs
index b424f34de5..d4c1faa4c9 100644
--- a/Content.Server/PowerCell/PowerCellSystem.cs
+++ b/Content.Server/PowerCell/PowerCellSystem.cs
@@ -35,7 +35,6 @@ public override void Initialize()
         SubscribeLocalEvent<PowerCellComponent, ExaminedEvent>(OnCellExamined);
         SubscribeLocalEvent<PowerCellComponent, EmpAttemptEvent>(OnCellEmpAttempt);
 
-        SubscribeLocalEvent<PowerCellDrawComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<PowerCellDrawComponent, ChargeChangedEvent>(OnDrawChargeChanged);
         SubscribeLocalEvent<PowerCellDrawComponent, PowerCellChangedEvent>(OnDrawCellChanged);
 
@@ -180,7 +179,7 @@ public bool TryUseCharge(EntityUid uid, float charge, PowerCellSlotComponent? co
             return false;
         }
 
-        _sharedAppearanceSystem.SetData(uid, PowerCellSlotVisuals.Enabled, battery.Charge > 0);
+        _sharedAppearanceSystem.SetData(uid, PowerCellSlotVisuals.Enabled, battery.CurrentCharge > 0);
         return true;
     }
 
diff --git a/Content.Server/PowerSink/PowerSinkComponent.cs b/Content.Server/PowerSink/PowerSinkComponent.cs
index f1df042179..a55d368c6e 100644
--- a/Content.Server/PowerSink/PowerSinkComponent.cs
+++ b/Content.Server/PowerSink/PowerSinkComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Server.PowerSink
     /// <summary>
     /// Absorbs power up to its capacity when anchored then explodes.
     /// </summary>
-    [RegisterComponent]
+    [RegisterComponent, AutoGenerateComponentPause]
     public sealed partial class PowerSinkComponent : Component
     {
         /// <summary>
@@ -21,6 +21,7 @@ public sealed partial class PowerSinkComponent : Component
         /// If explosion has been triggered, time at which to explode.
         /// </summary>
         [DataField("explosionTime", customTypeSerializer:typeof(TimeOffsetSerializer))]
+        [AutoPausedField]
         public System.TimeSpan? ExplosionTime = null;
 
         /// <summary>
diff --git a/Content.Server/PowerSink/PowerSinkSystem.cs b/Content.Server/PowerSink/PowerSinkSystem.cs
index deb6693500..298e35db46 100644
--- a/Content.Server/PowerSink/PowerSinkSystem.cs
+++ b/Content.Server/PowerSink/PowerSinkSystem.cs
@@ -7,6 +7,7 @@
 using Robust.Shared.Timing;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Content.Server.Power.EntitySystems;
 
 namespace Content.Server.PowerSink
 {
@@ -31,13 +32,13 @@ public sealed class PowerSinkSystem : EntitySystem
         [Dependency] private readonly ExplosionSystem _explosionSystem = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly StationSystem _station = default!;
+        [Dependency] private readonly BatterySystem _battery = default!;
 
         public override void Initialize()
         {
             base.Initialize();
 
             SubscribeLocalEvent<PowerSinkComponent, ExaminedEvent>(OnExamine);
-            SubscribeLocalEvent<PowerSinkComponent, EntityUnpausedEvent>(OnUnpaused);
         }
 
         private void OnExamine(EntityUid uid, PowerSinkComponent component, ExaminedEvent args)
@@ -54,14 +55,6 @@ private void OnExamine(EntityUid uid, PowerSinkComponent component, ExaminedEven
             );
         }
 
-        private void OnUnpaused(EntityUid uid, PowerSinkComponent component, ref EntityUnpausedEvent args)
-        {
-            if (component.ExplosionTime == null)
-                return;
-
-            component.ExplosionTime = component.ExplosionTime + args.PausedTime;
-        }
-
         public override void Update(float frameTime)
         {
             var toRemove = new RemQueue<(EntityUid Entity, PowerSinkComponent Sink)>();
@@ -73,7 +66,7 @@ public override void Update(float frameTime)
                 if (!transform.Anchored)
                     continue;
 
-                battery.CurrentCharge += networkLoad.NetworkLoad.ReceivingPower / 1000;
+                _battery.SetCharge(entity, battery.CurrentCharge + networkLoad.NetworkLoad.ReceivingPower / 1000, battery);
 
                 var currentBatteryThreshold = battery.CurrentCharge / battery.MaxCharge;
 
diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
index bcbe99edf5..e489ae28d5 100644
--- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -99,7 +99,7 @@ private async void HandleUpdateCharacterMessage(MsgUpdateCharacter message)
 
             var curPrefs = prefsData.Prefs!;
 
-            profile.EnsureValid();
+            profile.EnsureValid(_cfg, _protos);
 
             var profiles = new Dictionary<int, ICharacterProfile>(curPrefs.Characters)
             {
@@ -270,34 +270,7 @@ private PlayerPreferences SanitizePreferences(PlayerPreferences prefs)
 
             return new PlayerPreferences(prefs.Characters.Select(p =>
             {
-                ICharacterProfile newProf;
-                switch (p.Value)
-                {
-                    case HumanoidCharacterProfile hp:
-                    {
-                        var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-                        var selectedSpecies = HumanoidAppearanceSystem.DefaultSpecies;
-
-                        if (prototypeManager.TryIndex<SpeciesPrototype>(hp.Species, out var species) && species.RoundStart)
-                        {
-                            selectedSpecies = hp.Species;
-                        }
-
-                        newProf = hp
-                            .WithJobPriorities(
-                                hp.JobPriorities.Where(job =>
-                                    _protos.HasIndex<JobPrototype>(job.Key)))
-                            .WithAntagPreferences(
-                                hp.AntagPreferences.Where(antag =>
-                                    _protos.HasIndex<AntagPrototype>(antag)))
-                            .WithSpecies(selectedSpecies);
-                        break;
-                    }
-                    default:
-                        throw new NotSupportedException();
-                }
-
-                return new KeyValuePair<int, ICharacterProfile>(p.Key, newProf);
+                return new KeyValuePair<int, ICharacterProfile>(p.Key, p.Value.Validated(_cfg, _protos));
             }), prefs.SelectedCharacterIndex, prefs.AdminOOCColor);
         }
 
diff --git a/Content.Server/Procedural/DungeonJob.PostGen.cs b/Content.Server/Procedural/DungeonJob.PostGen.cs
index ffbb9454dc..9674cb5fae 100644
--- a/Content.Server/Procedural/DungeonJob.PostGen.cs
+++ b/Content.Server/Procedural/DungeonJob.PostGen.cs
@@ -173,7 +173,7 @@ private async Task PostGen(AutoCablingPostGen gen, Dungeon dungeon, EntityUid gr
             if (found)
                 continue;
 
-            _entManager.SpawnEntity("CableApcExtension", _grid.GridTileToLocal(tile));
+            _entManager.SpawnEntity(gen.Entity, _grid.GridTileToLocal(tile));
         }
     }
 
@@ -854,11 +854,11 @@ private async Task PostGen(CorridorPostGen gen, Dungeon dungeon, EntityUid gridU
         }
 
         var setTiles = new List<(Vector2i, Tile)>();
-        var tileDef = _tileDefManager["FloorSteel"];
+        var tileDef = _prototype.Index(gen.Tile);
 
         foreach (var tile in corridorTiles)
         {
-            setTiles.Add((tile, _tile.GetVariantTile((ContentTileDefinition) tileDef, random)));
+            setTiles.Add((tile, _tile.GetVariantTile(tileDef, random)));
         }
 
         grid.SetTiles(setTiles);
diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
index 15ea5936e1..0061b16e47 100644
--- a/Content.Server/Projectiles/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -69,9 +69,6 @@ private void OnStartCollide(EntityUid uid, ProjectileComponent component, ref St
 
         component.DamagedEntity = true;
 
-        var afterProjectileHitEvent = new AfterProjectileHitEvent(component.Damage, target, args.OtherFixture);
-        RaiseLocalEvent(uid, ref afterProjectileHitEvent);
-
         if (component.DeleteOnCollide)
             QueueDel(uid);
 
diff --git a/Content.Server/Puppet/VentriloquistPuppetSystem.cs b/Content.Server/Puppet/VentriloquistPuppetSystem.cs
index 68d660fd1b..3e15a1a06c 100644
--- a/Content.Server/Puppet/VentriloquistPuppetSystem.cs
+++ b/Content.Server/Puppet/VentriloquistPuppetSystem.cs
@@ -5,6 +5,7 @@
 using Content.Server.Speech.Muting;
 using Content.Shared.CombatMode;
 using Content.Shared.Hands;
+using Content.Shared.Speech.Muting;
 
 namespace Content.Server.Puppet
 {
diff --git a/Content.Server/Radiation/Systems/RadiationSystem.Cvar.cs b/Content.Server/Radiation/Systems/RadiationSystem.Cvar.cs
index ffe533f9a6..cd19367f38 100644
--- a/Content.Server/Radiation/Systems/RadiationSystem.Cvar.cs
+++ b/Content.Server/Radiation/Systems/RadiationSystem.Cvar.cs
@@ -12,37 +12,9 @@ public partial class RadiationSystem
 
     private void SubscribeCvars()
     {
-        _cfg.OnValueChanged(CCVars.RadiationMinIntensity, SetMinRadiationIntensity, true);
-        _cfg.OnValueChanged(CCVars.RadiationGridcastUpdateRate, SetGridcastUpdateRate, true);
-        _cfg.OnValueChanged(CCVars.RadiationGridcastSimplifiedSameGrid, SetGridcastSimplifiedSameGrid, true);
-        _cfg.OnValueChanged(CCVars.RadiationGridcastMaxDistance, SetGridcastMaxDistance, true);
-    }
-
-    private void UnsubscribeCvars()
-    {
-        _cfg.UnsubValueChanged(CCVars.RadiationMinIntensity, SetMinRadiationIntensity);
-        _cfg.UnsubValueChanged(CCVars.RadiationGridcastUpdateRate, SetGridcastUpdateRate);
-        _cfg.UnsubValueChanged(CCVars.RadiationGridcastSimplifiedSameGrid, SetGridcastSimplifiedSameGrid);
-        _cfg.UnsubValueChanged(CCVars.RadiationGridcastMaxDistance, SetGridcastMaxDistance);
-    }
-
-    private void SetMinRadiationIntensity(float radiationMinIntensity)
-    {
-        MinIntensity = radiationMinIntensity;
-    }
-
-    private void SetGridcastUpdateRate(float updateRate)
-    {
-        GridcastUpdateRate = updateRate;
-    }
-
-    private void SetGridcastSimplifiedSameGrid(bool simplifiedSameGrid)
-    {
-        GridcastSimplifiedSameGrid = simplifiedSameGrid;
-    }
-
-    private void SetGridcastMaxDistance(float maxDistance)
-    {
-        GridcastMaxDistance = maxDistance;
+        Subs.CVar(_cfg, CCVars.RadiationMinIntensity, radiationMinIntensity => MinIntensity = radiationMinIntensity, true);
+        Subs.CVar(_cfg, CCVars.RadiationGridcastUpdateRate, updateRate => GridcastUpdateRate = updateRate, true);
+        Subs.CVar(_cfg, CCVars.RadiationGridcastSimplifiedSameGrid, simplifiedSameGrid => GridcastSimplifiedSameGrid = simplifiedSameGrid, true);
+        Subs.CVar(_cfg, CCVars.RadiationGridcastMaxDistance, maxDistance => GridcastMaxDistance = maxDistance, true);
     }
 }
diff --git a/Content.Server/Radiation/Systems/RadiationSystem.cs b/Content.Server/Radiation/Systems/RadiationSystem.cs
index ffb7ab1a11..e184c022f2 100644
--- a/Content.Server/Radiation/Systems/RadiationSystem.cs
+++ b/Content.Server/Radiation/Systems/RadiationSystem.cs
@@ -21,12 +21,6 @@ public override void Initialize()
         InitRadBlocking();
     }
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        UnsubscribeCvars();
-    }
-
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
diff --git a/Content.Server/Radio/Components/RadioJammerComponent.cs b/Content.Server/Radio/Components/RadioJammerComponent.cs
index 69837200ac..93504ef957 100644
--- a/Content.Server/Radio/Components/RadioJammerComponent.cs
+++ b/Content.Server/Radio/Components/RadioJammerComponent.cs
@@ -16,5 +16,5 @@ public sealed partial class RadioJammerComponent : Component
     /// Power usage per second when enabled
     /// </summary>
     [DataField("wattage"), ViewVariables(VVAccess.ReadWrite)]
-    public float Wattage = 6f;
+    public float Wattage = 2f;
 }
diff --git a/Content.Server/Radio/EntitySystems/JammerSystem.cs b/Content.Server/Radio/EntitySystems/JammerSystem.cs
index b5a0c645d3..dc6f476416 100644
--- a/Content.Server/Radio/EntitySystems/JammerSystem.cs
+++ b/Content.Server/Radio/EntitySystems/JammerSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Popups;
+using Content.Server.Power.EntitySystems;
 using Content.Server.PowerCell;
 using Content.Server.Radio.Components;
 using Content.Shared.Examine;
@@ -10,6 +11,7 @@ namespace Content.Server.Radio.EntitySystems;
 public sealed class JammerSystem : EntitySystem
 {
     [Dependency] private readonly PowerCellSystem _powerCell = default!;
+    [Dependency] private readonly BatterySystem _battery = default!;
     [Dependency] private readonly PopupSystem _popup = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
@@ -28,8 +30,8 @@ public override void Update(float frameTime)
         var query = EntityQueryEnumerator<ActiveRadioJammerComponent, RadioJammerComponent>();
         while (query.MoveNext(out var uid, out var _, out var jam))
         {
-            if (_powerCell.TryGetBatteryFromSlot(uid, out var battery) &&
-                !battery.TryUseCharge(jam.Wattage * frameTime))
+            if (_powerCell.TryGetBatteryFromSlot(uid, out var batteryUid, out var battery) &&
+                !_battery.TryUseCharge(batteryUid.Value, jam.Wattage * frameTime, battery))
             {
                 RemComp<ActiveRadioJammerComponent>(uid);
             }
@@ -38,7 +40,7 @@ public override void Update(float frameTime)
 
     private void OnActivate(EntityUid uid, RadioJammerComponent comp, ActivateInWorldEvent args)
     {
-        var activated = !HasComp<ActiveRadioJammerComponent>(uid) && 
+        var activated = !HasComp<ActiveRadioJammerComponent>(uid) &&
             _powerCell.TryGetBatteryFromSlot(uid, out var battery) &&
             battery.CurrentCharge > comp.Wattage;
         if (activated)
diff --git a/Content.Server/RandomAppearance/RandomAppearanceComponent.cs b/Content.Server/RandomAppearance/RandomAppearanceComponent.cs
index 8560eebb57..4631abc13c 100644
--- a/Content.Server/RandomAppearance/RandomAppearanceComponent.cs
+++ b/Content.Server/RandomAppearance/RandomAppearanceComponent.cs
@@ -1,11 +1,10 @@
-using Robust.Shared.Reflection;
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations;
 
 namespace Content.Server.RandomAppearance;
 
 [RegisterComponent]
 [Access(typeof(RandomAppearanceSystem))]
-public sealed partial class RandomAppearanceComponent : Component, ISerializationHooks
+public sealed partial class RandomAppearanceComponent : Component
 {
     [DataField("spriteStates")]
     public string[] SpriteStates = { "0", "1", "2", "3", "4" };
@@ -13,23 +12,6 @@ public sealed partial class RandomAppearanceComponent : Component, ISerializatio
     /// <summary>
     ///     What appearance enum key should be set to the random sprite state?
     /// </summary>
-    [DataField("key", required: true)]
-    public string EnumKeyRaw = default!;
-
-    /// <summary>
-    ///     The actual enum after reflection.
-    /// </summary>
+    [DataField(required: true, customTypeSerializer: typeof(EnumSerializer))]
     public Enum? EnumKey;
-
-    void ISerializationHooks.AfterDeserialization()
-    {
-        if (IoCManager.Resolve<IReflectionManager>().TryParseEnumReference(EnumKeyRaw, out var @enum))
-        {
-            EnumKey = @enum;
-        }
-        else
-        {
-            Logger.Error($"RandomAppearance enum key {EnumKeyRaw} could not be parsed!");
-        }
-    }
 }
diff --git a/Content.Server/Remotes/DoorRemoteSystem.cs b/Content.Server/Remotes/DoorRemoteSystem.cs
index c63b2295c1..9be7e5e96b 100644
--- a/Content.Server/Remotes/DoorRemoteSystem.cs
+++ b/Content.Server/Remotes/DoorRemoteSystem.cs
@@ -10,6 +10,7 @@
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.Interaction.Events;
+using Content.Shared.Examine;
 using static Content.Server.Remotes.DoorRemoteComponent;
 
 namespace Content.Server.Remotes
@@ -17,7 +18,6 @@ namespace Content.Server.Remotes
     public sealed class DoorRemoteSystem : EntitySystem
     {
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly DoorBoltSystem _bolts = default!;
         [Dependency] private readonly AirlockSystem _airlock = default!;
         [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
         [Dependency] private readonly DoorSystem _doorSystem = default!;
@@ -65,10 +65,9 @@ private void OnBeforeInteract(EntityUid uid, DoorRemoteComponent component, Befo
             if (args.Handled
                 || args.Target == null
                 || !TryComp<DoorComponent>(args.Target, out var doorComp) // If it isn't a door we don't use it
-                // The remote can be used anywhere the user can see the door.
-                // This doesn't work that well, but I don't know of an alternative
-                || !_interactionSystem.InRangeUnobstructed(args.User, args.Target.Value,
-                    SharedInteractionSystem.MaxRaycastRange, CollisionGroup.Opaque))
+                // Only able to control doors if they are within your vision and within your max range.
+                // Not affected by mobs or machines anymore.
+                || !ExamineSystemShared.InRangeUnOccluded(args.User, args.Target.Value, SharedInteractionSystem.MaxRaycastRange, null))
             {
                 return;
             }
@@ -105,7 +104,7 @@ private void OnBeforeInteract(EntityUid uid, DoorRemoteComponent component, Befo
                     {
                         if (!boltsComp.BoltWireCut)
                         {
-                            _bolts.SetBoltsWithAudio(args.Target.Value, boltsComp, !boltsComp.BoltsDown);
+                            _doorSystem.SetBoltsDown((args.Target.Value, boltsComp), !boltsComp.BoltsDown, args.User);
                             _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/RequiresGrid/RequiresGridComponent.cs b/Content.Server/RequiresGrid/RequiresGridComponent.cs
new file mode 100644
index 0000000000..0e956c9ad9
--- /dev/null
+++ b/Content.Server/RequiresGrid/RequiresGridComponent.cs
@@ -0,0 +1,11 @@
+namespace Content.Server.RequiresGrid;
+
+/// <summary>
+/// Destroys an entity when they no longer are part of a Grid
+/// </summary>
+[RegisterComponent]
+[Access(typeof(RequiresGridSystem))]
+public sealed partial class RequiresGridComponent : Component
+{
+
+}
diff --git a/Content.Server/RequiresGrid/RequiresGridSystem.cs b/Content.Server/RequiresGrid/RequiresGridSystem.cs
new file mode 100644
index 0000000000..16a20c9a8a
--- /dev/null
+++ b/Content.Server/RequiresGrid/RequiresGridSystem.cs
@@ -0,0 +1,29 @@
+using Content.Server.Destructible;
+
+namespace Content.Server.RequiresGrid;
+
+public sealed class RequiresGridSystem : EntitySystem
+{
+    [Dependency] private readonly DestructibleSystem _destructible = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RequiresGridComponent, EntParentChangedMessage>(OnEntParentChanged);
+    }
+
+    private void OnEntParentChanged(EntityUid owner, RequiresGridComponent component, EntParentChangedMessage args)
+    {
+        if (args.OldParent == null)
+            return;
+
+        if (args.Transform.GridUid != null)
+            return;
+
+        if (TerminatingOrDeleted(owner))
+            return;
+
+        _destructible.DestroyEntity(owner);
+    }
+}
diff --git a/Content.Server/Research/Systems/ResearchSystem.Client.cs b/Content.Server/Research/Systems/ResearchSystem.Client.cs
index 135ef8fe88..6bd5300d8f 100644
--- a/Content.Server/Research/Systems/ResearchSystem.Client.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.Client.cs
@@ -82,12 +82,11 @@ private void UpdateClientInterface(EntityUid uid, ResearchClientComponent? compo
         if (!Resolve(uid, ref component, false))
             return;
 
-        if (!TryGetClientServer(uid, out _, out var serverComponent, component))
-            return;
+        TryGetClientServer(uid, out _, out var serverComponent, component);
 
         var names = GetServerNames();
         var state = new ResearchClientBoundInterfaceState(names.Length, names,
-            GetServerIds(), component.ConnectedToServer ? serverComponent.Id : -1);
+            GetServerIds(), serverComponent?.Id ?? -1);
 
         _uiSystem.TrySetUiState(uid, ResearchClientUiKey.Key, state);
     }
diff --git a/Content.Server/Resist/EscapeInventorySystem.cs b/Content.Server/Resist/EscapeInventorySystem.cs
index 4012e92d56..127db7d2b3 100644
--- a/Content.Server/Resist/EscapeInventorySystem.cs
+++ b/Content.Server/Resist/EscapeInventorySystem.cs
@@ -1,4 +1,3 @@
-using Content.Server.Contests;
 using Content.Server.Popups;
 using Content.Shared.Storage;
 using Content.Server.Carrying; // Carrying system from Nyanotrasen.
@@ -11,7 +10,6 @@
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;
 using Content.Shared.Movement.Events;
-using Content.Shared.Movement.Systems;
 using Content.Shared.Resist;
 using Content.Shared.Storage;
 using Robust.Shared.Containers;
@@ -25,7 +23,6 @@ public sealed class EscapeInventorySystem : EntitySystem
     [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
     [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
     [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
-    [Dependency] private readonly ContestsSystem _contests = default!;
     [Dependency] private readonly CarryingSystem _carryingSystem = default!; // Carrying system from Nyanotrasen.
 
     /// <summary>
@@ -58,23 +55,9 @@ private void OnRelayMovement(EntityUid uid, CanEscapeInventoryComponent componen
         }
 
         // Contested
-        if (_handsSystem.IsHolding(container.Owner, uid, out var inHand))
+        if (_handsSystem.IsHolding(container.Owner, uid, out _))
         {
-            var contestResults = _contests.MassContest(uid, container.Owner);
-
-            // Inverse if we aren't going to divide by 0, otherwise just use a default multiplier of 1.
-            if (contestResults != 0)
-                contestResults = 1 / contestResults;
-            else
-                contestResults = 1;
-
-            if (contestResults >= MaximumMassDisadvantage)
-            {
-                _popupSystem.PopupEntity(Loc.GetString("escape-inventory-component-failed-resisting"), uid, uid);
-                return;
-            }
-
-            AttemptEscape(uid, container.Owner, component, contestResults);
+            AttemptEscape(uid, container.Owner, component);
             return;
         }
 
@@ -109,7 +92,7 @@ private void OnEscape(EntityUid uid, CanEscapeInventoryComponent component, Esca
 
         if (args.Handled || args.Cancelled)
             return;
-        
+
         if (TryComp<BeingCarriedComponent>(uid, out var carried)) // Start of carrying system of nyanotrasen.
         {
             _carryingSystem.DropCarried(carried.Carrier, uid);
diff --git a/Content.Server/Roles/DragonRoleComponent.cs b/Content.Server/Roles/DragonRoleComponent.cs
index 77fd97acb2..b85fd53eb0 100644
--- a/Content.Server/Roles/DragonRoleComponent.cs
+++ b/Content.Server/Roles/DragonRoleComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Server.Roles;
 /// <summary>
 /// Role used to keep track of space dragons for antag purposes.
 /// </summary>
-[RegisterComponent, Access(typeof(DragonSystem))]
+[RegisterComponent, Access(typeof(DragonSystem)), ExclusiveAntagonist]
 public sealed partial class DragonRoleComponent : AntagonistRoleComponent
 {
 }
diff --git a/Content.Server/Roles/InitialInfectedRoleComponent.cs b/Content.Server/Roles/InitialInfectedRoleComponent.cs
index d8cc5fd04b..52d3db4164 100644
--- a/Content.Server/Roles/InitialInfectedRoleComponent.cs
+++ b/Content.Server/Roles/InitialInfectedRoleComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.Roles;
+using Content.Shared.Roles;
 
 namespace Content.Server.Roles;
 
-[RegisterComponent]
+[RegisterComponent, ExclusiveAntagonist]
 public sealed partial class InitialInfectedRoleComponent : AntagonistRoleComponent
 {
 
diff --git a/Content.Server/Roles/NinjaRoleComponent.cs b/Content.Server/Roles/NinjaRoleComponent.cs
index 0fa2e5395e..cb60e5bdf0 100644
--- a/Content.Server/Roles/NinjaRoleComponent.cs
+++ b/Content.Server/Roles/NinjaRoleComponent.cs
@@ -2,7 +2,7 @@
 
 namespace Content.Server.Roles;
 
-[RegisterComponent]
+[RegisterComponent, ExclusiveAntagonist]
 public sealed partial class NinjaRoleComponent : AntagonistRoleComponent
 {
 }
diff --git a/Content.Server/Roles/NukeopsRoleComponent.cs b/Content.Server/Roles/NukeopsRoleComponent.cs
index 5ae893566c..a6ff0b71b0 100644
--- a/Content.Server/Roles/NukeopsRoleComponent.cs
+++ b/Content.Server/Roles/NukeopsRoleComponent.cs
@@ -1,11 +1,11 @@
-using Content.Shared.Roles;
+using Content.Shared.Roles;
 
 namespace Content.Server.Roles;
 
 /// <summary>
 ///     Added to mind entities to tag that they are a nuke operative.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, ExclusiveAntagonist]
 public sealed partial class NukeopsRoleComponent : AntagonistRoleComponent
 {
 }
diff --git a/Content.Server/Roles/RevolutionaryRoleComponent.cs b/Content.Server/Roles/RevolutionaryRoleComponent.cs
index 821364c738..bf56b96008 100644
--- a/Content.Server/Roles/RevolutionaryRoleComponent.cs
+++ b/Content.Server/Roles/RevolutionaryRoleComponent.cs
@@ -5,7 +5,7 @@ namespace Content.Server.Roles;
 /// <summary>
 ///     Added to mind entities to tag that they are a Revolutionary.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, ExclusiveAntagonist]
 public sealed partial class RevolutionaryRoleComponent : AntagonistRoleComponent
 {
     /// <summary>
diff --git a/Content.Server/Roles/TerminatorRoleComponent.cs b/Content.Server/Roles/TerminatorRoleComponent.cs
index 4154e8ab69..31deb9fb82 100644
--- a/Content.Server/Roles/TerminatorRoleComponent.cs
+++ b/Content.Server/Roles/TerminatorRoleComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.Roles;
+using Content.Shared.Roles;
 
 namespace Content.Server.Roles;
 
-[RegisterComponent]
+[RegisterComponent, ExclusiveAntagonist]
 public sealed partial class TerminatorRoleComponent : AntagonistRoleComponent
 {
 }
diff --git a/Content.Server/Roles/TraitorRoleComponent.cs b/Content.Server/Roles/TraitorRoleComponent.cs
index 6c436e76ac..96bfe8dd80 100644
--- a/Content.Server/Roles/TraitorRoleComponent.cs
+++ b/Content.Server/Roles/TraitorRoleComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.Roles;
+using Content.Shared.Roles;
 
 namespace Content.Server.Roles;
 
-[RegisterComponent]
+[RegisterComponent, ExclusiveAntagonist]
 public sealed partial class TraitorRoleComponent : AntagonistRoleComponent
 {
 }
diff --git a/Content.Server/Roles/ZombieRoleComponent.cs b/Content.Server/Roles/ZombieRoleComponent.cs
index 8c0354afc4..2f9948022b 100644
--- a/Content.Server/Roles/ZombieRoleComponent.cs
+++ b/Content.Server/Roles/ZombieRoleComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.Roles;
+using Content.Shared.Roles;
 
 namespace Content.Server.Roles;
 
-[RegisterComponent]
+[RegisterComponent, ExclusiveAntagonist]
 public sealed partial class ZombieRoleComponent : AntagonistRoleComponent
 {
 }
diff --git a/Content.Server/RoundEnd/RoundEndSystem.cs b/Content.Server/RoundEnd/RoundEndSystem.cs
index 10d4bea8b5..3a8331f3f7 100644
--- a/Content.Server/RoundEnd/RoundEndSystem.cs
+++ b/Content.Server/RoundEnd/RoundEndSystem.cs
@@ -14,6 +14,7 @@
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.Database;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.GameTicking;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
diff --git a/Content.Server/Salvage/Expeditions/SalvageExpeditionComponent.cs b/Content.Server/Salvage/Expeditions/SalvageExpeditionComponent.cs
index 0a7108c776..20d4be2d90 100644
--- a/Content.Server/Salvage/Expeditions/SalvageExpeditionComponent.cs
+++ b/Content.Server/Salvage/Expeditions/SalvageExpeditionComponent.cs
@@ -12,7 +12,7 @@ namespace Content.Server.Salvage.Expeditions;
 /// <summary>
 /// Designates this entity as holding a salvage expedition.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, AutoGenerateComponentPause]
 public sealed partial class SalvageExpeditionComponent : SharedSalvageExpeditionComponent
 {
     public SalvageMissionParams MissionParams = default!;
@@ -27,6 +27,7 @@ public sealed partial class SalvageExpeditionComponent : SharedSalvageExpedition
     /// When the expeditions ends.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("endTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan EndTime;
 
     /// <summary>
diff --git a/Content.Server/Salvage/SalvageSystem.Expeditions.cs b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
index f0d4661a07..7e4a9c9310 100644
--- a/Content.Server/Salvage/SalvageSystem.Expeditions.cs
+++ b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
@@ -31,16 +31,13 @@ private void InitializeExpeditions()
         SubscribeLocalEvent<SalvageExpeditionConsoleComponent, EntParentChangedMessage>(OnSalvageConsoleParent);
         SubscribeLocalEvent<SalvageExpeditionConsoleComponent, ClaimSalvageMessage>(OnSalvageClaimMessage);
 
-        SubscribeLocalEvent<SalvageExpeditionDataComponent, EntityUnpausedEvent>(OnDataUnpaused);
-
         SubscribeLocalEvent<SalvageExpeditionComponent, ComponentShutdown>(OnExpeditionShutdown);
-        SubscribeLocalEvent<SalvageExpeditionComponent, EntityUnpausedEvent>(OnExpeditionUnpaused);
         SubscribeLocalEvent<SalvageExpeditionComponent, ComponentGetState>(OnExpeditionGetState);
 
         SubscribeLocalEvent<SalvageStructureComponent, ExaminedEvent>(OnStructureExamine);
 
         _cooldown = _configurationManager.GetCVar(CCVars.SalvageExpeditionCooldown);
-        _configurationManager.OnValueChanged(CCVars.SalvageExpeditionCooldown, SetCooldownChange);
+        Subs.CVar(_configurationManager, CCVars.SalvageExpeditionCooldown, SetCooldownChange);
     }
 
     private void OnExpeditionGetState(EntityUid uid, SalvageExpeditionComponent component, ref ComponentGetState args)
@@ -51,11 +48,6 @@ private void OnExpeditionGetState(EntityUid uid, SalvageExpeditionComponent comp
         };
     }
 
-    private void ShutdownExpeditions()
-    {
-        _configurationManager.UnsubValueChanged(CCVars.SalvageExpeditionCooldown, SetCooldownChange);
-    }
-
     private void SetCooldownChange(float obj)
     {
         // Update the active cooldowns if we change it.
@@ -94,16 +86,6 @@ private void OnExpeditionShutdown(EntityUid uid, SalvageExpeditionComponent comp
         }
     }
 
-    private void OnDataUnpaused(EntityUid uid, SalvageExpeditionDataComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextOffer += args.PausedTime;
-    }
-
-    private void OnExpeditionUnpaused(EntityUid uid, SalvageExpeditionComponent component, ref EntityUnpausedEvent args)
-    {
-        component.EndTime += args.PausedTime;
-    }
-
     private void UpdateExpeditions()
     {
         var currentTime = _timing.CurTime;
diff --git a/Content.Server/Salvage/SalvageSystem.Runner.cs b/Content.Server/Salvage/SalvageSystem.Runner.cs
index 3b89135c58..8a1498cbe9 100644
--- a/Content.Server/Salvage/SalvageSystem.Runner.cs
+++ b/Content.Server/Salvage/SalvageSystem.Runner.cs
@@ -10,6 +10,7 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Salvage.Expeditions;
+using Content.Shared.Shuttles.Components;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
@@ -186,7 +187,7 @@ private void UpdateRunner()
                             if (shuttleXform.MapUid != uid || HasComp<FTLComponent>(shuttleUid))
                                 continue;
 
-                            _shuttle.FTLTravel(shuttleUid, shuttle, member, ftlTime);
+                            _shuttle.FTLToDock(shuttleUid, shuttle, member, ftlTime);
                         }
 
                         break;
diff --git a/Content.Server/Salvage/SalvageSystem.cs b/Content.Server/Salvage/SalvageSystem.cs
index 545a385bff..a1a3b686b2 100644
--- a/Content.Server/Salvage/SalvageSystem.cs
+++ b/Content.Server/Salvage/SalvageSystem.cs
@@ -73,12 +73,6 @@ public override void Initialize()
             InitializeRunner();
         }
 
-        public override void Shutdown()
-        {
-            base.Shutdown();
-            ShutdownExpeditions();
-        }
-
         private void Report(EntityUid source, string channelName, string messageKey, params (string, object)[] args)
         {
             var message = args.Length == 0 ? Loc.GetString(messageKey) : Loc.GetString(messageKey, args);
diff --git a/Content.Server/Salvage/SpawnSalvageMissionJob.cs b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
index eb370aa112..2776db2283 100644
--- a/Content.Server/Salvage/SpawnSalvageMissionJob.cs
+++ b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
@@ -24,6 +24,7 @@
 using Content.Shared.Salvage;
 using Content.Shared.Salvage.Expeditions;
 using Content.Shared.Salvage.Expeditions.Modifiers;
+using Content.Shared.Shuttles.Components;
 using Content.Shared.Storage;
 using Robust.Shared.Collections;
 using Robust.Shared.Map;
@@ -91,6 +92,8 @@ protected override async Task<bool> Process()
         MetaDataComponent? metadata = null;
         var grid = _entManager.EnsureComponent<MapGridComponent>(mapUid);
         var random = new Random(_missionParams.Seed);
+        var destComp = _entManager.AddComponent<FTLDestinationComponent>(mapUid);
+        destComp.BeaconsOnly = true;
 
         // Setup mission configs
         // As we go through the config the rating will deplete so we'll go for most important to least important.
diff --git a/Content.Server/SensorMonitoring/BatterySensorSystem.cs b/Content.Server/SensorMonitoring/BatterySensorSystem.cs
index 20e990b14c..501b094c89 100644
--- a/Content.Server/SensorMonitoring/BatterySensorSystem.cs
+++ b/Content.Server/SensorMonitoring/BatterySensorSystem.cs
@@ -1,6 +1,7 @@
 using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Power.Components;
+using Content.Shared.DeviceNetwork;
 
 namespace Content.Server.SensorMonitoring;
 
@@ -30,7 +31,7 @@ private void PacketReceived(EntityUid uid, BatterySensorComponent component, Dev
                 {
                     [DeviceNetworkConstants.Command] = DeviceNetworkCommandSyncData,
                     [DeviceNetworkCommandSyncData] = new BatterySensorData(
-                        battery.Charge,
+                        battery.CurrentCharge,
                         battery.MaxCharge,
                         netBattery.CurrentReceiving,
                         netBattery.MaxChargeRate,
diff --git a/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.cs b/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.cs
index fdd340ba0a..ddd7812394 100644
--- a/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.cs
+++ b/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.cs
@@ -10,13 +10,13 @@
 using Content.Shared.Atmos.Monitor;
 using Content.Shared.Atmos.Piping.Binary.Components;
 using Content.Shared.Atmos.Piping.Unary.Components;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.DeviceNetwork.Systems;
 using Content.Shared.SensorMonitoring;
 using Robust.Server.GameObjects;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using ConsoleUIState = Content.Shared.SensorMonitoring.SensorMonitoringConsoleBoundInterfaceState;
 
 namespace Content.Server.SensorMonitoring;
 
diff --git a/Content.Server/Shuttles/Commands/DockCommand.cs b/Content.Server/Shuttles/Commands/DockCommand.cs
index 5f287e0397..62634af2bc 100644
--- a/Content.Server/Shuttles/Commands/DockCommand.cs
+++ b/Content.Server/Shuttles/Commands/DockCommand.cs
@@ -47,7 +47,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         }
 
         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)
         {
diff --git a/Content.Server/Shuttles/Components/ArrivalsShuttleComponent.cs b/Content.Server/Shuttles/Components/ArrivalsShuttleComponent.cs
index 99cdcbc3b6..b9ff375507 100644
--- a/Content.Server/Shuttles/Components/ArrivalsShuttleComponent.cs
+++ b/Content.Server/Shuttles/Components/ArrivalsShuttleComponent.cs
@@ -3,13 +3,14 @@
 
 namespace Content.Server.Shuttles.Components;
 
-[RegisterComponent, Access(typeof(ArrivalsSystem))]
+[RegisterComponent, Access(typeof(ArrivalsSystem)), AutoGenerateComponentPause]
 public sealed partial class ArrivalsShuttleComponent : Component
 {
     [DataField("station")]
     public EntityUid Station;
 
     [DataField("nextTransfer", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan NextTransfer;
 
     [DataField("nextArrivalsTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
diff --git a/Content.Server/Shuttles/Components/AutoDockComponent.cs b/Content.Server/Shuttles/Components/AutoDockComponent.cs
deleted file mode 100644
index fa4cd4dfaf..0000000000
--- a/Content.Server/Shuttles/Components/AutoDockComponent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Content.Server.Shuttles.Components;
-
-/// <summary>
-/// Added to entities when they are actively trying to dock with something else.
-/// We track it because checking every dock constantly would be expensive.
-/// </summary>
-[RegisterComponent]
-public sealed partial class AutoDockComponent : Component
-{
-    /// <summary>
-    /// Track who has requested autodocking so we can know when to be removed.
-    /// </summary>
-    public HashSet<EntityUid> Requesters = new();
-}
diff --git a/Content.Server/Shuttles/Components/EscapePodComponent.cs b/Content.Server/Shuttles/Components/EscapePodComponent.cs
index d68065fc00..72c8024e12 100644
--- a/Content.Server/Shuttles/Components/EscapePodComponent.cs
+++ b/Content.Server/Shuttles/Components/EscapePodComponent.cs
@@ -6,9 +6,10 @@ namespace Content.Server.Shuttles.Components;
 /// <summary>
 /// If added to a grid gets launched when the emergency shuttle launches.
 /// </summary>
-[RegisterComponent, Access(typeof(EmergencyShuttleSystem))]
+[RegisterComponent, Access(typeof(EmergencyShuttleSystem)), AutoGenerateComponentPause]
 public sealed partial class EscapePodComponent : Component
 {
     [DataField("launchTime", customTypeSerializer:typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan? LaunchTime;
 }
diff --git a/Content.Server/Shuttles/Components/FTLBeaconComponent.cs b/Content.Server/Shuttles/Components/FTLBeaconComponent.cs
new file mode 100644
index 0000000000..06606336e3
--- /dev/null
+++ b/Content.Server/Shuttles/Components/FTLBeaconComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Server.Shuttles.Components;
+
+/// <summary>
+/// Shows up on a shuttle's map as an FTL target.
+/// </summary>
+[RegisterComponent]
+public sealed partial class FTLBeaconComponent : Component
+{
+
+}
diff --git a/Content.Server/Shuttles/Components/FTLComponent.cs b/Content.Server/Shuttles/Components/FTLComponent.cs
index 105b9eae6d..077fe08748 100644
--- a/Content.Server/Shuttles/Components/FTLComponent.cs
+++ b/Content.Server/Shuttles/Components/FTLComponent.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Tag;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.Shuttles.Components;
@@ -25,31 +26,26 @@ public sealed partial class FTLComponent : Component
     public float Accumulator = 0f;
 
     /// <summary>
-    /// Target Uid to dock with at the end of FTL.
+    /// Coordinates to arrive it: May be relative to another grid (for docking) or map coordinates.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("targetUid")]
-    public EntityUid? TargetUid;
-
-    [ViewVariables(VVAccess.ReadWrite), DataField("targetCoordinates")]
+    [ViewVariables(VVAccess.ReadWrite), DataField]
     public EntityCoordinates TargetCoordinates;
 
-    /// <summary>
-    /// Should we dock with the target when arriving or show up nearby.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("dock")]
-    public bool Dock;
+    [DataField]
+    public Angle TargetAngle;
 
     /// <summary>
     /// If we're docking after FTL what is the prioritised dock tag (if applicable).
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("priorityTag", customTypeSerializer:typeof(PrototypeIdSerializer<TagPrototype>))]
-    public string? PriorityTag;
+    [ViewVariables(VVAccess.ReadWrite), DataField]
+    public ProtoId<TagPrototype>? PriorityTag;
 
     [ViewVariables(VVAccess.ReadWrite), DataField("soundTravel")]
-    public SoundSpecifier? TravelSound = new SoundPathSpecifier("/Audio/Effects/Shuttle/hyperspace_progress.ogg")
+    public SoundSpecifier? TravelSound = new SoundPathSpecifier("/Audio/DeltaV/Effects/Shuttle/hyperspace_progress.ogg") // DeltaV - Replace FTL sound
     {
         Params = AudioParams.Default.WithVolume(-3f).WithLoop(true)
     };
 
+    [DataField]
     public EntityUid? TravelStream;
 }
diff --git a/Content.Server/Shuttles/Components/FTLDestinationComponent.cs b/Content.Server/Shuttles/Components/FTLDestinationComponent.cs
deleted file mode 100644
index 6eedcbd8ce..0000000000
--- a/Content.Server/Shuttles/Components/FTLDestinationComponent.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Content.Shared.Whitelist;
-
-namespace Content.Server.Shuttles.Components;
-
-[RegisterComponent]
-public sealed partial class FTLDestinationComponent : Component
-{
-    /// <summary>
-    /// Should this destination be restricted in some form from console visibility.
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("whitelist")]
-    public EntityWhitelist? Whitelist;
-
-    /// <summary>
-    /// Is this destination visible but available to be warped to?
-    /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("enabled")]
-    public bool Enabled = true;
-}
diff --git a/Content.Server/Shuttles/Components/FTLExclusionComponent.cs b/Content.Server/Shuttles/Components/FTLExclusionComponent.cs
new file mode 100644
index 0000000000..db6538462d
--- /dev/null
+++ b/Content.Server/Shuttles/Components/FTLExclusionComponent.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Shuttles.Systems;
+
+namespace Content.Server.Shuttles.Components;
+
+/// <summary>
+/// Prevents FTL from occuring around this entity.
+/// </summary>
+[RegisterComponent, Access(typeof(SharedShuttleSystem))]
+public sealed partial class FTLExclusionComponent : Component
+{
+    [DataField]
+    public bool Enabled = true;
+
+    [DataField(required: true)]
+    public float Range = 32f;
+}
diff --git a/Content.Server/Shuttles/Components/GridFillComponent.cs b/Content.Server/Shuttles/Components/GridFillComponent.cs
index 5f0a9113f3..7cce6a4b2f 100644
--- a/Content.Server/Shuttles/Components/GridFillComponent.cs
+++ b/Content.Server/Shuttles/Components/GridFillComponent.cs
@@ -1,4 +1,5 @@
 using Content.Server.Shuttles.Systems;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Shuttles.Components;
@@ -9,5 +10,12 @@ namespace Content.Server.Shuttles.Components;
 [RegisterComponent, Access(typeof(ShuttleSystem))]
 public sealed partial class GridFillComponent : Component
 {
-    [DataField("path")] public ResPath Path = new("/Maps/Shuttles/escape_pod_small.yml");
+    [DataField]
+    public ResPath Path = new("/Maps/Shuttles/escape_pod_small.yml");
+
+    /// <summary>
+    /// Components to be added to any spawned grids.
+    /// </summary>
+    [DataField]
+    public ComponentRegistry AddComponents = new();
 }
diff --git a/Content.Server/Shuttles/Components/GridSpawnComponent.cs b/Content.Server/Shuttles/Components/GridSpawnComponent.cs
index 1ddfb8c244..5f0fa7dd62 100644
--- a/Content.Server/Shuttles/Components/GridSpawnComponent.cs
+++ b/Content.Server/Shuttles/Components/GridSpawnComponent.cs
@@ -1,4 +1,5 @@
 using Content.Server.Shuttles.Systems;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Shuttles.Components;
@@ -23,6 +24,11 @@ public record struct GridSpawnGroup
     public int MinCount = 1;
     public int MaxCount = 1;
 
+    /// <summary>
+    /// Components to be added to any spawned grids.
+    /// </summary>
+    public ComponentRegistry AddComponents = new();
+
     /// <summary>
     /// Hide the IFF label of the grid.
     /// </summary>
diff --git a/Content.Server/Shuttles/Components/RecentlyDockedComponent.cs b/Content.Server/Shuttles/Components/RecentlyDockedComponent.cs
deleted file mode 100644
index 6b0667d1e6..0000000000
--- a/Content.Server/Shuttles/Components/RecentlyDockedComponent.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Content.Server.Shuttles.Components;
-
-/// <summary>
-/// Added to <see cref="DockingComponent"/> that have recently undocked.
-/// This checks for whether they've left the specified radius before allowing them to automatically dock again.
-/// </summary>
-[RegisterComponent]
-public sealed partial class RecentlyDockedComponent : Component
-{
-    [DataField("lastDocked")]
-    public EntityUid LastDocked;
-
-    [ViewVariables(VVAccess.ReadWrite), DataField("radius")]
-    public float Radius = 1.5f;
-}
diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index 6503e4bf51..f4dd502b37 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -16,6 +16,7 @@
 using Content.Server.Station.Systems;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Components;
 using Content.Shared.Parallax.Biomes;
@@ -84,7 +85,6 @@ public override void Initialize()
         SubscribeLocalEvent<StationArrivalsComponent, ComponentStartup>(OnArrivalsStartup);
 
         SubscribeLocalEvent<ArrivalsShuttleComponent, ComponentStartup>(OnShuttleStartup);
-        SubscribeLocalEvent<ArrivalsShuttleComponent, EntityUnpausedEvent>(OnShuttleUnpaused);
         SubscribeLocalEvent<ArrivalsShuttleComponent, FTLTagEvent>(OnShuttleTag);
 
         SubscribeLocalEvent<RoundStartingEvent>(OnRoundStarting);
@@ -97,7 +97,7 @@ public override void Initialize()
 
         // Don't invoke immediately as it will get set in the natural course of things.
         Enabled = _cfgManager.GetCVar(CCVars.ArrivalsShuttles);
-        _cfgManager.OnValueChanged(CCVars.ArrivalsShuttles, SetArrivals);
+        Subs.CVar(_cfgManager, CCVars.ArrivalsShuttles, SetArrivals);
 
         // Command so admins can set these for funsies
         _console.RegisterCommand("arrivals", ArrivalsCommand, ArrivalsCompletion);
@@ -181,12 +181,6 @@ private void ArrivalsCommand(IConsoleShell shell, string argstr, string[] args)
         }
     }
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        _cfgManager.UnsubValueChanged(CCVars.ArrivalsShuttles, SetArrivals);
-    }
-
     /// <summary>
     ///     First sends shuttle timer data, then kicks people off the shuttle if it isn't leaving the arrivals terminal
     /// </summary>
@@ -389,11 +383,6 @@ private void OnShuttleStartup(EntityUid uid, ArrivalsShuttleComponent component,
         EnsureComp<PreventPilotComponent>(uid);
     }
 
-    private void OnShuttleUnpaused(EntityUid uid, ArrivalsShuttleComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextTransfer += args.PausedTime;
-    }
-
     private bool TryGetArrivals(out EntityUid uid)
     {
         var arrivalsQuery = EntityQueryEnumerator<ArrivalsSourceComponent>();
@@ -428,13 +417,6 @@ public override void Update(float frameTime)
         var curTime = _timing.CurTime;
         TryGetArrivals(out var arrivals);
 
-        // TODO: FTL fucker, if on an edge tile every N seconds check for wall or w/e
-        // TODO: Docking should be per-grid rather than per dock and bump off when undocking.
-
-        // TODO: Stop dispatch if emergency shuttle has arrived.
-        // TODO: Need maps
-        // TODO: Need emergency suits on shuttle probs
-        // TODO: Need some kind of comp to shunt people off if they try to get on?
         if (TryComp<TransformComponent>(arrivals, out var arrivalsXform))
         {
             while (query.MoveNext(out var uid, out var comp, out var shuttle, out var xform))
@@ -448,7 +430,7 @@ public override void Update(float frameTime)
                 if (xform.MapUid != arrivalsXform.MapUid)
                 {
                     if (arrivals.IsValid())
-                        _shuttles.FTLTravel(uid, shuttle, arrivals, dock: true);
+                        _shuttles.FTLToDock(uid, shuttle, arrivals);
 
                     comp.NextArrivalsTime = _timing.CurTime + TimeSpan.FromSeconds(tripTime);
                 }
@@ -458,7 +440,7 @@ public override void Update(float frameTime)
                     var targetGrid = _station.GetLargestGrid(data);
 
                     if (targetGrid != null)
-                        _shuttles.FTLTravel(uid, shuttle, targetGrid.Value, dock: true);
+                        _shuttles.FTLToDock(uid, shuttle, targetGrid.Value);
 
                     // The ArrivalsCooldown includes the trip there, so we only need to add the time taken for
                     // the trip back.
@@ -578,7 +560,7 @@ private void SetupShuttle(EntityUid uid, StationArrivalsComponent component)
             var arrivalsComp = EnsureComp<ArrivalsShuttleComponent>(component.Shuttle);
             arrivalsComp.Station = uid;
             EnsureComp<ProtectedGridComponent>(uid);
-            _shuttles.FTLTravel(component.Shuttle, shuttleComp, arrivals, hyperspaceTime: RoundStartFTLDuration, dock: true);
+            _shuttles.FTLToDock(component.Shuttle, shuttleComp, arrivals, hyperspaceTime: RoundStartFTLDuration);
             arrivalsComp.NextTransfer = _timing.CurTime + TimeSpan.FromSeconds(_cfgManager.GetCVar(CCVars.ArrivalsCooldown));
         }
 
diff --git a/Content.Server/Shuttles/Systems/DockingSystem.AutoDock.cs b/Content.Server/Shuttles/Systems/DockingSystem.AutoDock.cs
deleted file mode 100644
index a09fff5189..0000000000
--- a/Content.Server/Shuttles/Systems/DockingSystem.AutoDock.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using Content.Server.Shuttles.Components;
-using Content.Shared.Shuttles.Components;
-using Content.Shared.Shuttles.Events;
-
-namespace Content.Server.Shuttles.Systems;
-
-public sealed partial class DockingSystem
-{
-    private void UpdateAutodock()
-    {
-        // Work out what we can autodock with, what we shouldn't, and when we should stop tracking.
-        // Autodocking only stops when the client closes that dock viewport OR they lose pilotcomponent.
-        var dockingQuery = GetEntityQuery<DockingComponent>();
-        var xformQuery = GetEntityQuery<TransformComponent>();
-        var recentQuery = GetEntityQuery<RecentlyDockedComponent>();
-        var query = EntityQueryEnumerator<AutoDockComponent>();
-
-        while (query.MoveNext(out var dockUid, out var comp))
-        {
-            if (comp.Requesters.Count == 0 || !dockingQuery.TryGetComponent(dockUid, out var dock))
-            {
-                RemComp<AutoDockComponent>(dockUid);
-                continue;
-            }
-
-            // Don't re-dock if we're already docked or recently were.
-            if (dock.Docked || recentQuery.HasComponent(dockUid))
-                continue;
-
-            var dockable = GetDockable(dockUid, xformQuery.GetComponent(dockUid));
-
-            if (dockable == null)
-                continue;
-
-            TryDock(dockUid, dock, dockable.Value);
-        }
-
-        // Work out recent docks that have gone past their designated threshold.
-        var checkedRecent = new HashSet<EntityUid>();
-        var recentQueryEnumerator = EntityQueryEnumerator<RecentlyDockedComponent, TransformComponent>();
-
-        while (recentQueryEnumerator.MoveNext(out var uid, out var comp, out var xform))
-        {
-            if (!checkedRecent.Add(uid))
-                continue;
-
-            if (!dockingQuery.HasComponent(uid))
-            {
-                RemCompDeferred<RecentlyDockedComponent>(uid);
-                continue;
-            }
-
-            if (!xformQuery.TryGetComponent(comp.LastDocked, out var otherXform))
-            {
-                RemCompDeferred<RecentlyDockedComponent>(uid);
-                continue;
-            }
-
-            var worldPos = _transform.GetWorldPosition(xform, xformQuery);
-            var otherWorldPos = _transform.GetWorldPosition(otherXform, xformQuery);
-
-            if ((worldPos - otherWorldPos).Length() < comp.Radius)
-                continue;
-
-            Log.Debug($"Removed RecentlyDocked from {ToPrettyString(uid)} and {ToPrettyString(comp.LastDocked)}");
-            RemComp<RecentlyDockedComponent>(uid);
-            RemComp<RecentlyDockedComponent>(comp.LastDocked);
-        }
-    }
-
-    private void OnRequestUndock(EntityUid uid, ShuttleConsoleComponent component, UndockRequestMessage args)
-    {
-        var dork = GetEntity(args.DockEntity);
-
-        Log.Debug($"Received undock request for {ToPrettyString(dork)}");
-
-        // TODO: Validation
-        if (!TryComp<DockingComponent>(dork, out var dock) ||
-            !dock.Docked ||
-            HasComp<PreventPilotComponent>(Transform(uid).GridUid))
-        {
-            return;
-        }
-
-        Undock(dork, dock);
-    }
-
-    private void OnRequestAutodock(EntityUid uid, ShuttleConsoleComponent component, AutodockRequestMessage args)
-    {
-        var dork = GetEntity(args.DockEntity);
-        Log.Debug($"Received autodock request for {ToPrettyString(dork)}");
-        var player = args.Session.AttachedEntity;
-
-        if (player == null ||
-            !HasComp<DockingComponent>(dork) ||
-            HasComp<PreventPilotComponent>(Transform(uid).GridUid))
-        {
-            return;
-        }
-
-        // TODO: Validation
-        var comp = EnsureComp<AutoDockComponent>(dork);
-        comp.Requesters.Add(player.Value);
-    }
-
-    private void OnRequestStopAutodock(EntityUid uid, ShuttleConsoleComponent component, StopAutodockRequestMessage args)
-    {
-        var dork = GetEntity(args.DockEntity);
-        Log.Debug($"Received stop autodock request for {ToPrettyString(dork)}");
-
-        var player = args.Session.AttachedEntity;
-
-        // TODO: Validation
-        if (player == null || !TryComp<AutoDockComponent>(dork, out var comp))
-            return;
-
-        comp.Requesters.Remove(player.Value);
-
-        if (comp.Requesters.Count == 0)
-            RemComp<AutoDockComponent>(dork);
-    }
-}
diff --git a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
index 0fa82c303f..7bc1be02e3 100644
--- a/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
+++ b/Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
@@ -19,13 +19,13 @@ public sealed partial class DockingSystem
 
     public Angle GetAngle(EntityUid uid, TransformComponent xform, EntityUid targetUid, TransformComponent targetXform, EntityQuery<TransformComponent> xformQuery)
    {
-       var (shuttlePos, shuttleRot) = _transform.GetWorldPositionRotation(xform, xformQuery);
-       var (targetPos, targetRot) = _transform.GetWorldPositionRotation(targetXform, xformQuery);
+       var (shuttlePos, shuttleRot) = _transform.GetWorldPositionRotation(xform);
+       var (targetPos, targetRot) = _transform.GetWorldPositionRotation(targetXform);
 
        var shuttleCOM = Robust.Shared.Physics.Transform.Mul(new Transform(shuttlePos, shuttleRot),
-           Comp<PhysicsComponent>(uid).LocalCenter);
+           _physicsQuery.GetComponent(uid).LocalCenter);
        var targetCOM = Robust.Shared.Physics.Transform.Mul(new Transform(targetPos, targetRot),
-           Comp<PhysicsComponent>(targetUid).LocalCenter);
+           _physicsQuery.GetComponent(targetUid).LocalCenter);
 
        var mapDiff = shuttleCOM - targetCOM;
        var angle = mapDiff.ToWorldAngle();
@@ -36,7 +36,7 @@ public Angle GetAngle(EntityUid uid, TransformComponent xform, EntityUid targetU
    /// <summary>
    /// Checks if 2 docks can be connected by moving the shuttle directly onto docks.
    /// </summary>
-   public bool CanDock(
+   private bool CanDock(
        DockingComponent shuttleDock,
        TransformComponent shuttleDockXform,
        DockingComponent gridDock,
@@ -94,12 +94,12 @@ public bool CanDock(
        EntityUid gridDockUid,
        DockingComponent gridDock)
    {
-       var shuttleDocks = new List<(EntityUid, DockingComponent)>(1)
+       var shuttleDocks = new List<Entity<DockingComponent>>(1)
        {
            (shuttleDockUid, shuttleDock)
        };
 
-       var gridDocks = new List<(EntityUid, DockingComponent)>(1)
+       var gridDocks = new List<Entity<DockingComponent>>(1)
        {
            (gridDockUid, gridDock)
        };
@@ -119,37 +119,63 @@ public bool CanDock(
        return GetDockingConfigPrivate(shuttleUid, targetGrid, shuttleDocks, gridDocks, priorityTag);
    }
 
-   private DockingConfig? GetDockingConfigPrivate(
+   /// <summary>
+   /// Tries to get a docking config at the specified coordinates and angle.
+   /// </summary>
+   public DockingConfig? GetDockingConfigAt(EntityUid shuttleUid,
+       EntityUid targetGrid,
+       EntityCoordinates coordinates,
+       Angle angle)
+   {
+       var gridDocks = GetDocks(targetGrid);
+       var shuttleDocks = GetDocks(shuttleUid);
+
+       var configs = GetDockingConfigs(shuttleUid, targetGrid, shuttleDocks, gridDocks);
+
+       foreach (var config in configs)
+       {
+           if (config.Coordinates.Equals(coordinates) && config.Angle.EqualsApprox(angle, 0.01))
+           {
+               return config;
+           }
+       }
+
+       return null;
+   }
+
+   /// <summary>
+   /// Gets all docking configs between the 2 grids.
+   /// </summary>
+   private List<DockingConfig> GetDockingConfigs(
        EntityUid shuttleUid,
        EntityUid targetGrid,
-       List<(EntityUid, DockingComponent)> shuttleDocks,
-       List<(EntityUid, DockingComponent)> gridDocks,
-       string? priorityTag = null)
-    {
-        if (gridDocks.Count <= 0)
-            return null;
+       List<Entity<DockingComponent>> shuttleDocks,
+       List<Entity<DockingComponent>> gridDocks)
+   {
+       var validDockConfigs = new List<DockingConfig>();
 
-        var xformQuery = GetEntityQuery<TransformComponent>();
-        var targetGridGrid = Comp<MapGridComponent>(targetGrid);
-        var targetGridXform = xformQuery.GetComponent(targetGrid);
+       if (gridDocks.Count <= 0)
+            return validDockConfigs;
+
+        var targetGridGrid = _gridQuery.GetComponent(targetGrid);
+        var targetGridXform = _xformQuery.GetComponent(targetGrid);
         var targetGridAngle = _transform.GetWorldRotation(targetGridXform).Reduced();
         var shuttleFixturesComp = Comp<FixturesComponent>(shuttleUid);
-        var shuttleAABB = Comp<MapGridComponent>(shuttleUid).LocalAABB;
+        var shuttleAABB = _gridQuery.GetComponent(shuttleUid).LocalAABB;
 
         var isMap = HasComp<MapComponent>(targetGrid);
 
-        var validDockConfigs = new List<DockingConfig>();
         var grids = new List<Entity<MapGridComponent>>();
         if (shuttleDocks.Count > 0)
         {
            // We'll try all combinations of shuttle docks and see which one is most suitable
            foreach (var (dockUid, shuttleDock) in shuttleDocks)
            {
-               var shuttleDockXform = xformQuery.GetComponent(dockUid);
+               var shuttleDockXform = _xformQuery.GetComponent(dockUid);
 
                foreach (var (gridDockUid, gridDock) in gridDocks)
                {
-                   var gridXform = xformQuery.GetComponent(gridDockUid);
+                   var gridXform = _xformQuery.GetComponent(gridDockUid);
 
                    if (!CanDock(
                            shuttleDock, shuttleDockXform,
@@ -167,15 +193,15 @@ public bool CanDock(
                    }
 
                    // Can't just use the AABB as we want to get bounds as tight as possible.
-                   var spawnPosition = new EntityCoordinates(targetGrid, matty.Transform(Vector2.Zero));
-                   spawnPosition = new EntityCoordinates(targetGridXform.MapUid!.Value, spawnPosition.ToMapPos(EntityManager, _transform));
+                   var gridPosition = new EntityCoordinates(targetGrid, matty.Transform(Vector2.Zero));
+                   var spawnPosition = new EntityCoordinates(targetGridXform.MapUid!.Value, gridPosition.ToMapPos(EntityManager, _transform));
 
                    // TODO: use tight bounds
                    var dockedBounds = new Box2Rotated(shuttleAABB.Translated(spawnPosition.Position), targetAngle, spawnPosition.Position);
 
                    // Check if there's no intersecting grids (AKA oh god it's docking at cargo).
                    grids.Clear();
-                   _mapManager.FindGridsIntersecting(targetGridXform.MapID, dockedBounds, ref grids);
+                   _mapManager.FindGridsIntersecting(targetGridXform.MapID, dockedBounds, ref grids, includeMap: false);
                    if (grids.Any(o => o.Owner != targetGrid && o.Owner != targetGridXform.MapUid))
                    {
                        continue;
@@ -204,9 +230,9 @@ public bool CanDock(
 
                            if (!CanDock(
                                    other,
-                                   xformQuery.GetComponent(otherUid),
+                                   _xformQuery.GetComponent(otherUid),
                                    otherGrid,
-                                   xformQuery.GetComponent(otherGridUid),
+                                   _xformQuery.GetComponent(otherGridUid),
                                    shuttleAABB,
                                    targetGridAngle,
                                    shuttleFixturesComp, targetGridGrid,
@@ -234,7 +260,7 @@ public bool CanDock(
                    validDockConfigs.Add(new DockingConfig()
                    {
                        Docks = dockedPorts,
-                       Coordinates = spawnPosition,
+                       Coordinates = gridPosition,
                        Area = dockedAABB,
                        Angle = targetAngle,
                    });
@@ -242,9 +268,23 @@ public bool CanDock(
            }
         }
 
+        return validDockConfigs;
+   }
+
+   private DockingConfig? GetDockingConfigPrivate(
+       EntityUid shuttleUid,
+       EntityUid targetGrid,
+       List<Entity<DockingComponent>> shuttleDocks,
+       List<Entity<DockingComponent>> gridDocks,
+       string? priorityTag = null)
+   {
+       var validDockConfigs = GetDockingConfigs(shuttleUid, targetGrid, shuttleDocks, gridDocks);
+
         if (validDockConfigs.Count <= 0)
             return null;
 
+        var targetGridAngle = _transform.GetWorldRotation(targetGrid).Reduced();
+
         // Prioritise by priority docks, then by maximum connected ports, then by most similar angle.
         validDockConfigs = validDockConfigs
            .OrderByDescending(x => x.Docks.Any(docks =>
@@ -305,19 +345,11 @@ private bool ValidSpawn(MapGridComponent grid, Matrix3 matty, Angle angle, Fixtu
        return true;
    }
 
-   public List<(EntityUid Uid, DockingComponent Component)> GetDocks(EntityUid uid)
+   public List<Entity<DockingComponent>> GetDocks(EntityUid uid)
    {
-       var result = new List<(EntityUid Uid, DockingComponent Component)>();
-       var query = AllEntityQuery<DockingComponent, TransformComponent>();
-
-       while (query.MoveNext(out var dockUid, out var dock, out var xform))
-       {
-           if (xform.ParentUid != uid || !dock.Enabled)
-               continue;
-
-           result.Add((dockUid, dock));
-       }
+       _dockingSet.Clear();
+       _lookup.GetChildEntities(uid, _dockingSet);
 
-       return result;
+       return _dockingSet.ToList();
    }
 }
diff --git a/Content.Server/Shuttles/Systems/DockingSystem.cs b/Content.Server/Shuttles/Systems/DockingSystem.cs
index 778d244376..59a030e83c 100644
--- a/Content.Server/Shuttles/Systems/DockingSystem.cs
+++ b/Content.Server/Shuttles/Systems/DockingSystem.cs
@@ -5,7 +5,10 @@
 using Content.Server.Shuttles.Events;
 using Content.Shared.Doors;
 using Content.Shared.Doors.Components;
+using Content.Shared.Popups;
+using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Events;
+using Content.Shared.Shuttles.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
@@ -17,28 +20,32 @@
 
 namespace Content.Server.Shuttles.Systems
 {
-    public sealed partial class DockingSystem : EntitySystem
+    public sealed partial class DockingSystem : SharedDockingSystem
     {
         [Dependency] private readonly IMapManager _mapManager = default!;
-        [Dependency] private readonly DoorBoltSystem _bolts = default!;
         [Dependency] private readonly DoorSystem _doorSystem = default!;
-        [Dependency] private readonly FixtureSystem _fixtureSystem = default!;
+        [Dependency] private readonly EntityLookupSystem _lookup = default!;
         [Dependency] private readonly PathfindingSystem _pathfinding = default!;
         [Dependency] private readonly ShuttleConsoleSystem _console = default!;
         [Dependency] private readonly SharedJointSystem _jointSystem = default!;
-        [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+        [Dependency] private readonly SharedPopupSystem _popup = default!;
         [Dependency] private readonly SharedTransformSystem _transform = default!;
 
-        private const string DockingFixture = "docking";
         private const string DockingJoint = "docking";
-        private const float DockingRadius = 0.20f;
 
+        private EntityQuery<MapGridComponent> _gridQuery;
         private EntityQuery<PhysicsComponent> _physicsQuery;
+        private EntityQuery<TransformComponent> _xformQuery;
+
+        private readonly HashSet<Entity<DockingComponent>> _dockingSet = new();
+        private readonly HashSet<Entity<DockingComponent, DoorBoltComponent>> _dockingBoltSet = new();
 
         public override void Initialize()
         {
             base.Initialize();
+            _gridQuery = GetEntityQuery<MapGridComponent>();
             _physicsQuery = GetEntityQuery<PhysicsComponent>();
+            _xformQuery = GetEntityQuery<TransformComponent>();
 
             SubscribeLocalEvent<DockingComponent, ComponentStartup>(OnStartup);
             SubscribeLocalEvent<DockingComponent, ComponentShutdown>(OnShutdown);
@@ -49,95 +56,38 @@ public override void Initialize()
 
             // Yes this isn't in shuttle console; it may be used by other systems technically.
             // in which case I would also add their subs here.
-            SubscribeLocalEvent<ShuttleConsoleComponent, AutodockRequestMessage>(OnRequestAutodock);
-            SubscribeLocalEvent<ShuttleConsoleComponent, StopAutodockRequestMessage>(OnRequestStopAutodock);
+            SubscribeLocalEvent<ShuttleConsoleComponent, DockRequestMessage>(OnRequestDock);
             SubscribeLocalEvent<ShuttleConsoleComponent, UndockRequestMessage>(OnRequestUndock);
         }
 
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-            UpdateAutodock();
-        }
-
-        private void OnAutoClose(EntityUid uid, DockingComponent component, BeforeDoorAutoCloseEvent args)
-        {
-            // We'll just pin the door open when docked.
-            if (component.Docked)
-                args.Cancel();
-        }
-
-        private Entity<DockingComponent>? GetDockable(EntityUid uid, TransformComponent dockingXform)
+        public void UndockDocks(EntityUid gridUid)
         {
-            // Did you know Saltern is the most dockable station?
-
-            // Assume the docking port itself (and its body) is valid
-
-            if (!HasComp<ShuttleComponent>(dockingXform.GridUid))
-            {
-                return null;
-            }
-
-            var transform = _physics.GetPhysicsTransform(uid, dockingXform);
-            var dockingFixture = _fixtureSystem.GetFixtureOrNull(uid, DockingFixture);
-
-            if (dockingFixture == null)
-                return null;
-
-            Box2? aabb = null;
+            _dockingSet.Clear();
+            _lookup.GetChildEntities(gridUid, _dockingSet);
 
-            for (var i = 0; i < dockingFixture.Shape.ChildCount; i++)
+            foreach (var dock in _dockingSet)
             {
-                aabb = aabb?.Union(dockingFixture.Shape.ComputeAABB(transform, i)) ?? dockingFixture.Shape.ComputeAABB(transform, i);
+                Undock(dock);
             }
+        }
 
-            if (aabb == null)
-                return null;
-
-            var enlargedAABB = aabb.Value.Enlarged(DockingRadius * 1.5f);
+        public void SetDockBolts(EntityUid gridUid, bool enabled)
+        {
+            _dockingBoltSet.Clear();
+            _lookup.GetChildEntities(gridUid, _dockingBoltSet);
 
-            // Get any docking ports in range on other grids.
-            var grids = new List<Entity<MapGridComponent>>();
-            _mapManager.FindGridsIntersecting(dockingXform.MapID, enlargedAABB, ref grids);
-            foreach (var otherGrid in grids)
+            foreach (var entity in _dockingBoltSet)
             {
-                if (otherGrid.Owner == dockingXform.GridUid)
-                    continue;
-
-                foreach (var ent in otherGrid.Comp.GetAnchoredEntities(enlargedAABB))
-                {
-                    if (!TryComp(ent, out DockingComponent? otherDocking) ||
-                        !otherDocking.Enabled ||
-                        !TryComp(ent, out FixturesComponent? otherBody))
-                    {
-                        continue;
-                    }
-
-                    var otherTransform = _physics.GetPhysicsTransform(ent);
-                    var otherDockingFixture = _fixtureSystem.GetFixtureOrNull(ent, DockingFixture, manager: otherBody);
-
-                    if (otherDockingFixture == null)
-                    {
-                        DebugTools.Assert(false);
-                        Log.Error($"Found null docking fixture on {ent}");
-                        continue;
-                    }
-
-                    for (var i = 0; i < otherDockingFixture.Shape.ChildCount; i++)
-                    {
-                        var otherAABB = otherDockingFixture.Shape.ComputeAABB(otherTransform, i);
-
-                        if (!aabb.Value.Intersects(otherAABB))
-                            continue;
-
-                        // TODO: Need CollisionManager's GJK for accurate bounds
-                        // Realistically I want 2 fixtures anyway but I'll deal with that later.
-                        return (ent, otherDocking);
-                    }
-                }
+                _doorSystem.TryClose(entity);
+                _doorSystem.SetBoltsDown((entity.Owner, entity.Comp2), enabled);
             }
+        }
 
-            return null;
+        private void OnAutoClose(EntityUid uid, DockingComponent component, BeforeDoorAutoCloseEvent args)
+        {
+            // We'll just pin the door open when docked.
+            if (component.Docked)
+                args.Cancel();
         }
 
         private void OnShutdown(EntityUid uid, DockingComponent component, ComponentShutdown args)
@@ -148,6 +98,13 @@ private void OnShutdown(EntityUid uid, DockingComponent component, ComponentShut
                 return;
             }
 
+            var gridUid = Transform(uid).GridUid;
+
+            if (gridUid != null && !Terminating(gridUid.Value))
+            {
+                _console.RefreshShuttleConsoles();
+            }
+
             Cleanup(uid, component);
         }
 
@@ -167,12 +124,6 @@ private void Cleanup(EntityUid dockAUid, DockingComponent dockA)
                 Log.Error($"Tried to cleanup {dockAUid} but not docked?");
 
                 dockA.DockedWith = null;
-                if (dockA.DockJoint != null)
-                {
-                    // We'll still cleanup the dock joint on release at least
-                    _jointSystem.RemoveJoint(dockA.DockJoint);
-                }
-
                 return;
             }
 
@@ -201,12 +152,14 @@ private void Cleanup(EntityUid dockAUid, DockingComponent dockA)
             RaiseLocalEvent(msg);
         }
 
-        private void OnStartup(EntityUid uid, DockingComponent component, ComponentStartup args)
+        private void OnStartup(Entity<DockingComponent> entity, ref ComponentStartup args)
         {
-            // Use startup so transform already initialized
-            if (!EntityManager.GetComponent<TransformComponent>(uid).Anchored) return;
+            var uid = entity.Owner;
+            var component = entity.Comp;
 
-            EnableDocking(uid, component);
+            // Use startup so transform already initialized
+            if (!EntityManager.GetComponent<TransformComponent>(uid).Anchored)
+                return;
 
             // This little gem is for docking deserialization
             if (component.DockedWith != null)
@@ -218,75 +171,43 @@ private void OnStartup(EntityUid uid, DockingComponent component, ComponentStart
                 var otherDock = EntityManager.GetComponent<DockingComponent>(component.DockedWith.Value);
                 DebugTools.Assert(otherDock.DockedWith != null);
 
-                Dock(uid, component, component.DockedWith.Value, otherDock);
+                Dock((uid, component), (component.DockedWith.Value, otherDock));
                 DebugTools.Assert(component.Docked && otherDock.Docked);
             }
         }
 
-        private void OnAnchorChange(EntityUid uid, DockingComponent component, ref AnchorStateChangedEvent args)
+        private void OnAnchorChange(Entity<DockingComponent> entity, ref AnchorStateChangedEvent args)
         {
-            if (args.Anchored)
-            {
-                EnableDocking(uid, component);
-            }
-            else
+            if (!args.Anchored)
             {
-                DisableDocking(uid, component);
+                Undock(entity);
             }
-
-            _console.RefreshShuttleConsoles();
         }
 
-        private void OnDockingReAnchor(EntityUid uid, DockingComponent component, ref ReAnchorEvent args)
+        private void OnDockingReAnchor(Entity<DockingComponent> entity, ref ReAnchorEvent args)
         {
+            var uid = entity.Owner;
+            var component = entity.Comp;
+
             if (!component.Docked)
                 return;
 
             var otherDock = component.DockedWith;
             var other = Comp<DockingComponent>(otherDock!.Value);
 
-            Undock(uid, component);
-            Dock(uid, component, otherDock.Value, other);
+            Undock(entity);
+            Dock((uid, component), (otherDock.Value, other));
             _console.RefreshShuttleConsoles();
         }
 
-        private void DisableDocking(EntityUid uid, DockingComponent component)
-        {
-            if (!component.Enabled)
-                return;
-
-            component.Enabled = false;
-
-            if (component.DockedWith != null)
-            {
-                Undock(uid, component);
-            }
-        }
-
-        private void EnableDocking(EntityUid uid, DockingComponent component)
-        {
-            if (component.Enabled)
-                return;
-
-            if (!TryComp(uid, out PhysicsComponent? physicsComponent))
-                return;
-
-            component.Enabled = true;
-
-            var shape = new PhysShapeCircle(DockingRadius, new Vector2(0f, -0.5f));
-
-            // Listen it makes intersection tests easier; you can probably dump this but it requires a bunch more boilerplate
-            // TODO: I want this to ideally be 2 fixtures to force them to have some level of alignment buuuttt
-            // I also need collisionmanager for that yet again so they get dis.
-            // TODO: CollisionManager is fine so get to work sloth chop chop.
-            _fixtureSystem.TryCreateFixture(uid, shape, DockingFixture, hard: false, body: physicsComponent);
-        }
-
         /// <summary>
         /// Docks 2 ports together and assumes it is valid.
         /// </summary>
-        public void Dock(EntityUid dockAUid, DockingComponent dockA, EntityUid dockBUid, DockingComponent dockB)
+        public void Dock(Entity<DockingComponent> dockA, Entity<DockingComponent> dockB)
         {
+            var dockAUid = dockA.Owner;
+            var dockBUid = dockB.Owner;
+
             if (dockBUid.GetHashCode() < dockAUid.GetHashCode())
             {
                 (dockA, dockB) = (dockB, dockA);
@@ -323,10 +244,10 @@ public void Dock(EntityUid dockAUid, DockingComponent dockA, EntityUid dockBUid,
                 WeldJoint joint;
 
                 // Pre-existing joint so use that.
-                if (dockA.DockJointId != null)
+                if (dockA.Comp.DockJointId != null)
                 {
-                    DebugTools.Assert(dockB.DockJointId == dockA.DockJointId);
-                    joint = _jointSystem.GetOrCreateWeldJoint(gridA, gridB, dockA.DockJointId);
+                    DebugTools.Assert(dockB.Comp.DockJointId == dockA.Comp.DockJointId);
+                    joint = _jointSystem.GetOrCreateWeldJoint(gridA, gridB, dockA.Comp.DockJointId);
                 }
                 else
                 {
@@ -346,15 +267,15 @@ public void Dock(EntityUid dockAUid, DockingComponent dockA, EntityUid dockBUid,
                 joint.Stiffness = stiffness;
                 joint.Damping = damping;
 
-                dockA.DockJoint = joint;
-                dockA.DockJointId = joint.ID;
+                dockA.Comp.DockJoint = joint;
+                dockA.Comp.DockJointId = joint.ID;
 
-                dockB.DockJoint = joint;
-                dockB.DockJointId = joint.ID;
+                dockB.Comp.DockJoint = joint;
+                dockB.Comp.DockJointId = joint.ID;
             }
 
-            dockA.DockedWith = dockBUid;
-            dockB.DockedWith = dockAUid;
+            dockA.Comp.DockedWith = dockBUid;
+            dockB.Comp.DockedWith = dockAUid;
 
             if (TryComp(dockAUid, out DoorComponent? doorA))
             {
@@ -363,7 +284,7 @@ public void Dock(EntityUid dockAUid, DockingComponent dockA, EntityUid dockBUid,
                     doorA.ChangeAirtight = false;
                     if (TryComp<DoorBoltComponent>(dockAUid, out var airlockA))
                     {
-                        _bolts.SetBoltsWithAudio(dockAUid, airlockA, true);
+                        _doorSystem.SetBoltsDown((dockAUid, airlockA), true);
                     }
                 }
             }
@@ -375,15 +296,15 @@ public void Dock(EntityUid dockAUid, DockingComponent dockA, EntityUid dockBUid,
                     doorB.ChangeAirtight = false;
                     if (TryComp<DoorBoltComponent>(dockBUid, out var airlockB))
                     {
-                        _bolts.SetBoltsWithAudio(dockBUid, airlockB, true);
+                        _doorSystem.SetBoltsDown((dockBUid, airlockB), true);
                     }
                 }
             }
 
             if (_pathfinding.TryCreatePortal(dockAXform.Coordinates, dockBXform.Coordinates, out var handle))
             {
-                dockA.PathfindHandle = handle;
-                dockB.PathfindHandle = handle;
+                dockA.Comp.PathfindHandle = handle;
+                dockB.Comp.PathfindHandle = handle;
             }
 
             var msg = new DockEvent
@@ -394,89 +315,145 @@ public void Dock(EntityUid dockAUid, DockingComponent dockA, EntityUid dockBUid,
                 GridBUid = gridB,
             };
 
+            _console.RefreshShuttleConsoles();
             RaiseLocalEvent(dockAUid, msg);
             RaiseLocalEvent(dockBUid, msg);
             RaiseLocalEvent(msg);
         }
 
-        private bool CanDock(EntityUid dockAUid, EntityUid dockBUid, DockingComponent dockA, DockingComponent dockB)
+        /// <summary>
+        /// Attempts to dock 2 ports together and will return early if it's not possible.
+        /// </summary>
+        private void TryDock(Entity<DockingComponent> dockA, Entity<DockingComponent> dockB)
+        {
+            if (!CanDock(dockA, dockB))
+                return;
+
+            Dock(dockA, dockB);
+        }
+
+        public void Undock(Entity<DockingComponent> dock)
+        {
+            if (dock.Comp.DockedWith == null)
+                return;
+
+            OnUndock(dock.Owner);
+            OnUndock(dock.Comp.DockedWith.Value);
+            Cleanup(dock.Owner, dock);
+            _console.RefreshShuttleConsoles();
+        }
+
+        private void OnUndock(EntityUid dockUid)
+        {
+            if (TerminatingOrDeleted(dockUid))
+                return;
+
+            if (TryComp<DoorBoltComponent>(dockUid, out var airlock))
+                _doorSystem.SetBoltsDown((dockUid, airlock), false);
+
+            if (TryComp(dockUid, out DoorComponent? door) && _doorSystem.TryClose(dockUid, door))
+                door.ChangeAirtight = true;
+        }
+
+        private void OnRequestUndock(EntityUid uid, ShuttleConsoleComponent component, UndockRequestMessage args)
         {
-            if (!dockA.Enabled ||
-                !dockB.Enabled ||
-                dockA.DockedWith != null ||
-                dockB.DockedWith != null)
+            if (!TryGetEntity(args.DockEntity, out var dockEnt) ||
+                !TryComp(dockEnt, out DockingComponent? dockComp))
             {
-                return false;
+                _popup.PopupCursor(Loc.GetString("shuttle-console-undock-fail"));
+                return;
             }
 
-            var fixtureA = _fixtureSystem.GetFixtureOrNull(dockAUid, DockingFixture);
-            var fixtureB = _fixtureSystem.GetFixtureOrNull(dockBUid, DockingFixture);
+            var dock = (dockEnt.Value, dockComp);
 
-            if (fixtureA == null || fixtureB == null)
+            if (!CanUndock(dock))
             {
-                return false;
+                _popup.PopupCursor(Loc.GetString("shuttle-console-undock-fail"));
+                return;
             }
 
-            var transformA = _physics.GetPhysicsTransform(dockAUid);
-            var transformB = _physics.GetPhysicsTransform(dockBUid);
-            var intersect = false;
+            Undock(dock);
+        }
+
+        private void OnRequestDock(EntityUid uid, ShuttleConsoleComponent component, DockRequestMessage args)
+        {
+            var console = _console.GetDroneConsole(uid);
 
-            for (var i = 0; i < fixtureA.Shape.ChildCount; i++)
+            if (console == null)
             {
-                var aabb = fixtureA.Shape.ComputeAABB(transformA, i);
+                _popup.PopupCursor(Loc.GetString("shuttle-console-dock-fail"));
+                return;
+            }
 
-                for (var j = 0; j < fixtureB.Shape.ChildCount; j++)
-                {
-                    var otherAABB = fixtureB.Shape.ComputeAABB(transformB, j);
-                    if (!aabb.Intersects(otherAABB))
-                        continue;
+            var shuttleUid = Transform(console.Value).GridUid;
 
-                    // TODO: Need collisionmanager's GJK for accurate checks don't @ me son
-                    intersect = true;
-                    break;
-                }
+            if (!CanShuttleDock(shuttleUid))
+            {
+                _popup.PopupCursor(Loc.GetString("shuttle-console-dock-fail"));
+                return;
+            }
 
-                if (intersect)
-                    break;
+            if (!TryGetEntity(args.DockEntity, out var ourDock) ||
+                !TryGetEntity(args.TargetDockEntity, out var targetDock) ||
+                !TryComp(ourDock, out DockingComponent? ourDockComp) ||
+                !TryComp(targetDock, out DockingComponent? targetDockComp))
+            {
+                _popup.PopupCursor(Loc.GetString("shuttle-console-dock-fail"));
+                return;
             }
 
-            return intersect;
-        }
+            // Cheating?
+            if (!TryComp(ourDock, out TransformComponent? xformA) ||
+                xformA.GridUid != shuttleUid)
+            {
+                _popup.PopupCursor(Loc.GetString("shuttle-console-dock-fail"));
+                return;
+            }
 
-        /// <summary>
-        /// Attempts to dock 2 ports together and will return early if it's not possible.
-        /// </summary>
-        private void TryDock(EntityUid dockAUid, DockingComponent dockA, Entity<DockingComponent> dockB)
-        {
-            if (!CanDock(dockAUid, dockB, dockA, dockB))
+            // TODO: Move the CanDock stuff to the port state and also validate that stuff
+            // Also need to check preventpilot + enabled / dockedwith
+            if (!CanDock((ourDock.Value, ourDockComp), (targetDock.Value, targetDockComp)))
+            {
+                _popup.PopupCursor(Loc.GetString("shuttle-console-dock-fail"));
                 return;
+            }
 
-            Dock(dockAUid, dockA, dockB, dockB);
+            Dock((ourDock.Value, ourDockComp), (targetDock.Value, targetDockComp));
         }
 
-        public void Undock(EntityUid dockUid, DockingComponent dock)
+        public bool CanUndock(Entity<DockingComponent?> dock)
         {
-            if (dock.DockedWith == null)
-                return;
+            if (!Resolve(dock, ref dock.Comp) ||
+                !dock.Comp.Docked)
+            {
+                return false;
+            }
 
-            OnUndock(dockUid, dock.DockedWith.Value);
-            OnUndock(dock.DockedWith.Value, dockUid);
-            Cleanup(dockUid, dock);
+            return true;
         }
 
-        private void OnUndock(EntityUid dockUid, EntityUid other)
+        /// <summary>
+        /// Returns true if both docks can connect. Does not consider whether the shuttle allows it.
+        /// </summary>
+        public bool CanDock(Entity<DockingComponent> dockA, Entity<DockingComponent> dockB)
         {
-            if (TerminatingOrDeleted(dockUid))
-                return;
+            if (dockA.Comp.DockedWith != null ||
+                dockB.Comp.DockedWith != null)
+            {
+                return false;
+            }
 
-            if (TryComp<DoorBoltComponent>(dockUid, out var airlock))
-                _bolts.SetBoltsWithAudio(dockUid, airlock, false);
+            var xformA = Transform(dockA);
+            var xformB = Transform(dockB);
 
-            if (TryComp(dockUid, out DoorComponent? door) && _doorSystem.TryClose(dockUid, door))
-                door.ChangeAirtight = true;
+            if (!xformA.Anchored || !xformB.Anchored)
+                return false;
+
+            var (worldPosA, worldRotA) = XformSystem.GetWorldPositionRotation(xformA);
+            var (worldPosB, worldRotB) = XformSystem.GetWorldPositionRotation(xformB);
 
-            var recentlyDocked = EnsureComp<RecentlyDockedComponent>(dockUid);
-            recentlyDocked.LastDocked = other;
+            return CanDock(new MapCoordinates(worldPosA, xformA.MapID), worldRotA,
+                new MapCoordinates(worldPosB, xformB.MapID), worldRotB);
         }
     }
 }
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
index 37c70c4e48..6d2c28edcf 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Access;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Popups;
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Events;
@@ -84,16 +85,14 @@ public sealed partial class EmergencyShuttleSystem
 
     private void InitializeEmergencyConsole()
     {
-        _configManager.OnValueChanged(CCVars.EmergencyShuttleMinTransitTime, SetMinTransitTime, true);
-        _configManager.OnValueChanged(CCVars.EmergencyShuttleMaxTransitTime, SetMaxTransitTime, true);
-        _configManager.OnValueChanged(CCVars.EmergencyShuttleAuthorizeTime, SetAuthorizeTime, true);
+        Subs.CVar(_configManager, CCVars.EmergencyShuttleMinTransitTime, SetMinTransitTime, true);
+        Subs.CVar(_configManager, CCVars.EmergencyShuttleMaxTransitTime, SetMaxTransitTime, true);
+        Subs.CVar(_configManager, CCVars.EmergencyShuttleAuthorizeTime, SetAuthorizeTime, true);
         SubscribeLocalEvent<EmergencyShuttleConsoleComponent, ComponentStartup>(OnEmergencyStartup);
         SubscribeLocalEvent<EmergencyShuttleConsoleComponent, EmergencyShuttleAuthorizeMessage>(OnEmergencyAuthorize);
         SubscribeLocalEvent<EmergencyShuttleConsoleComponent, EmergencyShuttleRepealMessage>(OnEmergencyRepeal);
         SubscribeLocalEvent<EmergencyShuttleConsoleComponent, EmergencyShuttleRepealAllMessage>(OnEmergencyRepealAll);
         SubscribeLocalEvent<EmergencyShuttleConsoleComponent, ActivatableUIOpenAttemptEvent>(OnEmergencyOpenAttempt);
-
-        SubscribeLocalEvent<EscapePodComponent, EntityUnpausedEvent>(OnEscapeUnpaused);
     }
 
     private void OnEmergencyOpenAttempt(EntityUid uid, EmergencyShuttleConsoleComponent component, ActivatableUIOpenAttemptEvent args)
@@ -122,13 +121,6 @@ private void SetMaxTransitTime(float obj)
         MaximumTransitTime = Math.Max(MinimumTransitTime, obj);
     }
 
-    private void ShutdownEmergencyConsole()
-    {
-        _configManager.UnsubValueChanged(CCVars.EmergencyShuttleAuthorizeTime, SetAuthorizeTime);
-        _configManager.UnsubValueChanged(CCVars.EmergencyShuttleMinTransitTime, SetMinTransitTime);
-        _configManager.UnsubValueChanged(CCVars.EmergencyShuttleMaxTransitTime, SetMaxTransitTime);
-    }
-
     private void OnEmergencyStartup(EntityUid uid, EmergencyShuttleConsoleComponent component, ComponentStartup args)
     {
         UpdateConsoleState(uid, component);
@@ -171,28 +163,26 @@ private void UpdateEmergencyConsole(float frameTime)
 
                 if (!Deleted(centcomm.Entity))
                 {
-                    _shuttle.FTLTravel(comp.EmergencyShuttle.Value, shuttle,
-                        centcomm.Entity.Value, _consoleAccumulator, TransitTime, true);
+                    _shuttle.FTLToDock(comp.EmergencyShuttle.Value, shuttle,
+                        centcomm.Entity.Value, _consoleAccumulator, TransitTime);
                     continue;
                 }
 
                 if (!Deleted(centcomm.MapEntity))
                 {
                     // TODO: Need to get non-overlapping positions.
-                    _shuttle.FTLTravel(comp.EmergencyShuttle.Value, shuttle,
+                    _shuttle.FTLToCoordinates(comp.EmergencyShuttle.Value, shuttle,
                         new EntityCoordinates(centcomm.MapEntity.Value,
                             _random.NextVector2(1000f)), _consoleAccumulator, TransitTime);
                 }
             }
 
             var podQuery = AllEntityQuery<EscapePodComponent>();
-            var podLaunchOffset = 0.5f;
 
             // Stagger launches coz funny
             while (podQuery.MoveNext(out _, out var pod))
             {
-                pod.LaunchTime = _timing.CurTime + TimeSpan.FromSeconds(podLaunchOffset);
-                podLaunchOffset += _random.NextFloat(0.5f, 2.5f);
+                pod.LaunchTime = _timing.CurTime + TimeSpan.FromSeconds(_random.NextFloat(0.05f, 0.75f));
             }
         }
 
@@ -203,13 +193,15 @@ private void UpdateEmergencyConsole(float frameTime)
             var stationUid = _station.GetOwningStation(uid);
 
             if (!TryComp<StationCentcommComponent>(stationUid, out var centcomm) ||
-                Deleted(centcomm.Entity) || pod.LaunchTime == null || pod.LaunchTime < _timing.CurTime)
+                Deleted(centcomm.Entity) ||
+                pod.LaunchTime == null ||
+                pod.LaunchTime > _timing.CurTime)
             {
                 continue;
             }
 
             // Don't dock them. If you do end up doing this then stagger launch.
-            _shuttle.FTLTravel(uid, shuttle, centcomm.Entity.Value, hyperspaceTime: TransitTime);
+            _shuttle.FTLToDock(uid, shuttle, centcomm.Entity.Value, hyperspaceTime: TransitTime);
             RemCompDeferred<EscapePodComponent>(uid);
         }
 
@@ -225,15 +217,18 @@ private void UpdateEmergencyConsole(float frameTime)
         // All the others.
         if (_consoleAccumulator < minTime)
         {
-            var query = AllEntityQuery<StationCentcommComponent>();
+            var query = AllEntityQuery<StationCentcommComponent, TransformComponent>();
 
             // Guarantees that emergency shuttle arrives first before anyone else can FTL.
-            while (query.MoveNext(out var comp))
+            while (query.MoveNext(out var comp, out var centcommXform))
             {
                 if (Deleted(comp.Entity))
                     continue;
 
-                _shuttle.AddFTLDestination(comp.Entity.Value, true);
+                if (_shuttle.TryAddFTLDestination(centcommXform.MapID, true, out var ftlComp))
+                {
+                    _shuttle.SetFTLWhitelist((centcommXform.MapUid!.Value, ftlComp), null);
+                }
             }
         }
     }
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
index d984c72737..a7df41d887 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
@@ -5,7 +5,6 @@
 using Content.Server.Administration.Managers;
 using Content.Server.Chat.Systems;
 using Content.Server.Communications;
-using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.GameTicking.Events;
@@ -19,6 +18,7 @@
 using Content.Shared.Access.Systems;
 using Content.Shared.CCVar;
 using Content.Shared.Database;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Events;
 using Content.Shared.Tag;
@@ -77,7 +77,7 @@ public override void Initialize()
         _sawmill = Logger.GetSawmill("shuttle.emergency");
         _emergencyShuttleEnabled = _configManager.GetCVar(CCVars.EmergencyShuttleEnabled);
         // Don't immediately invoke as roundstart will just handle it.
-        _configManager.OnValueChanged(CCVars.EmergencyShuttleEnabled, SetEmergencyShuttleEnabled);
+        Subs.CVar(_configManager, CCVars.EmergencyShuttleEnabled, SetEmergencyShuttleEnabled);
 
         SubscribeLocalEvent<RoundStartingEvent>(OnRoundStart);
         SubscribeLocalEvent<StationEmergencyShuttleComponent, ComponentStartup>(OnStationStartup);
@@ -152,12 +152,6 @@ public override void Update(float frameTime)
         UpdateEmergencyConsole(frameTime);
     }
 
-    public override void Shutdown()
-    {
-        _configManager.UnsubValueChanged(CCVars.EmergencyShuttleEnabled, SetEmergencyShuttleEnabled);
-        ShutdownEmergencyConsole();
-    }
-
     /// <summary>
     ///     If the client is requesting debug info on where an emergency shuttle would dock.
     /// </summary>
@@ -451,7 +445,7 @@ private void AddCentcomm(StationCentcommComponent component)
 
         component.MapEntity = map;
         component.Entity = grid;
-        _shuttle.AddFTLDestination(grid.Value, false);
+        _shuttle.TryAddFTLDestination(mapId, false, out _);
     }
 
     public HashSet<EntityUid> GetCentcommMaps()
@@ -513,14 +507,6 @@ private void AddEmergencyShuttle(EntityUid uid, StationEmergencyShuttleComponent
         EnsureComp<EmergencyShuttleComponent>(shuttle.Value);
     }
 
-    private void OnEscapeUnpaused(EntityUid uid, EscapePodComponent component, ref EntityUnpausedEvent args)
-    {
-        if (component.LaunchTime == null)
-            return;
-
-        component.LaunchTime = component.LaunchTime.Value + args.PausedTime;
-    }
-
     /// <summary>
     /// Returns whether a target is escaping on the emergency shuttle, but only if evac has arrived.
     /// </summary>
diff --git a/Content.Server/Shuttles/Systems/RadarConsoleSystem.cs b/Content.Server/Shuttles/Systems/RadarConsoleSystem.cs
index a8d380541b..b7f08b4b34 100644
--- a/Content.Server/Shuttles/Systems/RadarConsoleSystem.cs
+++ b/Content.Server/Shuttles/Systems/RadarConsoleSystem.cs
@@ -3,6 +3,8 @@
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Systems;
+using Content.Shared.PowerCell;
+using Content.Shared.Movement.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Map;
 
@@ -10,6 +12,7 @@ namespace Content.Server.Shuttles.Systems;
 
 public sealed class RadarConsoleSystem : SharedRadarConsoleSystem
 {
+    [Dependency] private readonly ShuttleConsoleSystem _console = default!;
     [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
 
     public override void Initialize()
@@ -30,26 +33,27 @@ protected override void UpdateState(EntityUid uid, RadarConsoleComponent compone
         EntityCoordinates? coordinates = onGrid ? xform.Coordinates : null;
         Angle? angle = onGrid ? xform.LocalRotation : null;
 
-        // Use ourself I guess.
-        if (TryComp<IntrinsicUIComponent>(uid, out var intrinsic))
+        if (component.FollowEntity)
         {
-            foreach (var uiKey in intrinsic.UIs)
-            {
-                if (uiKey.Key?.Equals(RadarConsoleUiKey.Key) == true)
-                {
-                    coordinates = new EntityCoordinates(uid, Vector2.Zero);
-                    angle = Angle.Zero;
-                    break;
-                }
-            }
+            coordinates = new EntityCoordinates(uid, Vector2.Zero);
+            angle = Angle.Zero;
         }
 
         if (_uiSystem.TryGetUi(uid, RadarConsoleUiKey.Key, out var bui))
-            _uiSystem.SetUiState(bui, new RadarConsoleBoundInterfaceState(
-                component.MaxRange,
-                GetNetCoordinates(coordinates),
-                angle,
-                new List<DockingInterfaceState>()
-            ));
+        {
+            NavInterfaceState state;
+            var docks = _console.GetAllDocks();
+
+            if (coordinates != null && angle != null)
+            {
+                state = _console.GetNavState(uid, docks, coordinates.Value, angle.Value);
+            }
+            else
+            {
+                state = _console.GetNavState(uid, docks);
+            }
+
+            _uiSystem.SetUiState(bui, new NavBoundUserInterfaceState(state));
+        }
     }
 }
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.Drone.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.Drone.cs
index 99ab54f9af..3af461beda 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.Drone.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.Drone.cs
@@ -7,6 +7,20 @@ namespace Content.Server.Shuttles.Systems;
 
 public sealed partial class ShuttleConsoleSystem
 {
+    /// <summary>
+    /// Gets the drone console target if applicable otherwise returns itself.
+    /// </summary>
+    public EntityUid? GetDroneConsole(EntityUid consoleUid)
+    {
+        var getShuttleEv = new ConsoleShuttleEvent
+        {
+            Console = consoleUid,
+        };
+
+        RaiseLocalEvent(consoleUid, ref getShuttleEv);
+        return getShuttleEv.Console;
+    }
+
     /// <summary>
     /// Refreshes all drone console entities.
     /// </summary>
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
new file mode 100644
index 0000000000..7606d190a4
--- /dev/null
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
@@ -0,0 +1,160 @@
+using Content.Server.Shuttles.Components;
+using Content.Server.Shuttles.Events;
+using Content.Shared.Shuttles.BUIStates;
+using Content.Shared.Shuttles.Components;
+using Content.Shared.Shuttles.Events;
+using Content.Shared.Shuttles.UI.MapObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Physics.Components;
+
+namespace Content.Server.Shuttles.Systems;
+
+public sealed partial class ShuttleConsoleSystem
+{
+    private void InitializeFTL()
+    {
+        SubscribeLocalEvent<FTLBeaconComponent, ComponentStartup>(OnBeaconStartup);
+        SubscribeLocalEvent<FTLBeaconComponent, AnchorStateChangedEvent>(OnBeaconAnchorChanged);
+
+        SubscribeLocalEvent<FTLExclusionComponent, ComponentStartup>(OnExclusionStartup);
+    }
+
+    private void OnExclusionStartup(Entity<FTLExclusionComponent> ent, ref ComponentStartup args)
+    {
+        RefreshShuttleConsoles();
+    }
+
+    private void OnBeaconStartup(Entity<FTLBeaconComponent> ent, ref ComponentStartup args)
+    {
+        RefreshShuttleConsoles();
+    }
+
+    private void OnBeaconAnchorChanged(Entity<FTLBeaconComponent> ent, ref AnchorStateChangedEvent args)
+    {
+        RefreshShuttleConsoles();
+    }
+
+    private void OnBeaconFTLMessage(Entity<ShuttleConsoleComponent> ent, ref ShuttleConsoleFTLBeaconMessage args)
+    {
+        var beaconEnt = GetEntity(args.Beacon);
+        if (!_xformQuery.TryGetComponent(beaconEnt, out var targetXform))
+        {
+            return;
+        }
+
+        var nCoordinates = new NetCoordinates(GetNetEntity(targetXform.ParentUid), targetXform.LocalPosition);
+
+        // Check target exists
+        if (!_shuttle.CanFTLBeacon(nCoordinates))
+        {
+            return;
+        }
+
+        var angle = args.Angle.Reduced();
+        var targetCoordinates = new EntityCoordinates(targetXform.MapUid!.Value, _transform.GetWorldPosition(targetXform));
+
+        ConsoleFTL(ent, targetCoordinates, angle, targetXform.MapID);
+    }
+
+    private void OnPositionFTLMessage(Entity<ShuttleConsoleComponent> entity, ref ShuttleConsoleFTLPositionMessage args)
+    {
+        var mapUid = _mapManager.GetMapEntityId(args.Coordinates.MapId);
+
+        // If it's beacons only block all position messages.
+        if (!Exists(mapUid) || _shuttle.IsBeaconMap(mapUid))
+        {
+            return;
+        }
+
+        var targetCoordinates = new EntityCoordinates(mapUid, args.Coordinates.Position);
+        var angle = args.Angle.Reduced();
+        ConsoleFTL(entity, targetCoordinates, angle, args.Coordinates.MapId);
+    }
+
+    private void GetBeacons(ref List<ShuttleBeaconObject>? beacons)
+    {
+        var beaconQuery = AllEntityQuery<FTLBeaconComponent>();
+
+        while (beaconQuery.MoveNext(out var destUid, out _))
+        {
+            var meta = _metaQuery.GetComponent(destUid);
+            var name = meta.EntityName;
+
+            if (string.IsNullOrEmpty(name))
+                name = Loc.GetString("shuttle-console-unknown");
+
+            // Can't travel to same map (yet)
+            var destXform = _xformQuery.GetComponent(destUid);
+            beacons ??= new List<ShuttleBeaconObject>();
+            beacons.Add(new ShuttleBeaconObject(GetNetEntity(destUid), GetNetCoordinates(destXform.Coordinates), name));
+        }
+    }
+
+    private void GetExclusions(ref List<ShuttleExclusionObject>? exclusions)
+    {
+        var query = AllEntityQuery<FTLExclusionComponent, TransformComponent>();
+
+        while (query.MoveNext(out var comp, out var xform))
+        {
+            if (!comp.Enabled)
+                continue;
+
+            exclusions ??= new List<ShuttleExclusionObject>();
+            exclusions.Add(new ShuttleExclusionObject(GetNetCoordinates(xform.Coordinates), comp.Range, Loc.GetString("shuttle-console-exclusion")));
+        }
+    }
+
+    /// <summary>
+    /// Handles shuttle console FTLs.
+    /// </summary>
+    private void ConsoleFTL(Entity<ShuttleConsoleComponent> ent, EntityCoordinates targetCoordinates, Angle targetAngle, MapId targetMap)
+    {
+        var consoleUid = GetDroneConsole(ent.Owner);
+
+        if (consoleUid == null)
+            return;
+
+        var shuttleUid = _xformQuery.GetComponent(consoleUid.Value).GridUid;
+
+        if (!TryComp(shuttleUid, out ShuttleComponent? shuttleComp))
+            return;
+
+        // Check shuttle can even FTL
+        if (!_shuttle.CanFTL(shuttleUid.Value, out var reason))
+        {
+            // TODO: Session popup
+            return;
+        }
+
+        // Check shuttle can FTL to this target.
+        if (!_shuttle.CanFTLTo(shuttleUid.Value, targetMap))
+        {
+            return;
+        }
+
+        List<ShuttleExclusionObject>? exclusions = null;
+        GetExclusions(ref exclusions);
+
+        if (!_shuttle.FTLFree(shuttleUid.Value, targetCoordinates, targetAngle, exclusions))
+        {
+            return;
+        }
+
+        if (!TryComp(shuttleUid.Value, out PhysicsComponent? shuttlePhysics))
+        {
+            return;
+        }
+
+        // Client sends the "adjusted" coordinates and we adjust it back to get the actual transform coordinates.
+        var adjustedCoordinates = targetCoordinates.Offset(targetAngle.RotateVec(-shuttlePhysics.LocalCenter));
+
+        var tagEv = new FTLTagEvent();
+        RaiseLocalEvent(shuttleUid.Value, ref tagEv);
+
+        var ev = new ShuttleConsoleFTLTravelStartEvent(ent.Owner);
+        RaiseLocalEvent(ref ev);
+
+        _shuttle.FTLToCoordinates(shuttleUid.Value, shuttleComp, adjustedCoordinates, targetAngle);
+    }
+}
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
index 18dd3b0baf..c47c519d5d 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
@@ -3,7 +3,6 @@
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
 using Content.Server.Station.Systems;
-using Content.Server.UserInterface;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Alert;
 using Content.Shared.Popups;
@@ -13,12 +12,11 @@
 using Content.Shared.Shuttles.Systems;
 using Content.Shared.Tag;
 using Content.Shared.Movement.Systems;
+using Content.Shared.Shuttles.UI.MapObjects;
 using Robust.Server.GameObjects;
 using Robust.Shared.Collections;
 using Robust.Shared.GameStates;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Timing;
+using Robust.Shared.Map;
 using Robust.Shared.Utility;
 using Content.Shared.UserInterface;
 
@@ -26,27 +24,38 @@ namespace Content.Server.Shuttles.Systems;
 
 public sealed partial class ShuttleConsoleSystem : SharedShuttleConsoleSystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly ActionBlockerSystem _blocker = default!;
     [Dependency] private readonly AlertsSystem _alertsSystem = default!;
+    [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly ShuttleSystem _shuttle = default!;
     [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly TagSystem _tags = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
     [Dependency] private readonly SharedContentEyeSystem _eyeSystem = default!;
 
+    private EntityQuery<MetaDataComponent> _metaQuery;
+    private EntityQuery<TransformComponent> _xformQuery;
+
+    private readonly HashSet<Entity<ShuttleConsoleComponent>> _consoles = new();
+
     public override void Initialize()
     {
         base.Initialize();
 
+        _metaQuery = GetEntityQuery<MetaDataComponent>();
+        _xformQuery = GetEntityQuery<TransformComponent>();
+
         SubscribeLocalEvent<ShuttleConsoleComponent, ComponentShutdown>(OnConsoleShutdown);
         SubscribeLocalEvent<ShuttleConsoleComponent, PowerChangedEvent>(OnConsolePowerChange);
         SubscribeLocalEvent<ShuttleConsoleComponent, AnchorStateChangedEvent>(OnConsoleAnchorChange);
         SubscribeLocalEvent<ShuttleConsoleComponent, ActivatableUIOpenAttemptEvent>(OnConsoleUIOpenAttempt);
         Subs.BuiEvents<ShuttleConsoleComponent>(ShuttleConsoleUiKey.Key, subs =>
         {
-            subs.Event<ShuttleConsoleFTLRequestMessage>(OnDestinationMessage);
+            subs.Event<ShuttleConsoleFTLBeaconMessage>(OnBeaconFTLMessage);
+            subs.Event<ShuttleConsoleFTLPositionMessage>(OnPositionFTLMessage);
             subs.Event<BoundUIClosedEvent>(OnConsoleUIClose);
         });
 
@@ -60,11 +69,12 @@ public override void Initialize()
         SubscribeLocalEvent<DockEvent>(OnDock);
         SubscribeLocalEvent<UndockEvent>(OnUndock);
 
-        SubscribeLocalEvent<PilotComponent, MoveEvent>(HandlePilotMove);
         SubscribeLocalEvent<PilotComponent, ComponentGetState>(OnGetState);
 
         SubscribeLocalEvent<FTLDestinationComponent, ComponentStartup>(OnFtlDestStartup);
         SubscribeLocalEvent<FTLDestinationComponent, ComponentShutdown>(OnFtlDestShutdown);
+
+        InitializeFTL();
     }
 
     private void OnFtlDestStartup(EntityUid uid, FTLDestinationComponent component, ComponentStartup args)
@@ -77,65 +87,6 @@ private void OnFtlDestShutdown(EntityUid uid, FTLDestinationComponent component,
         RefreshShuttleConsoles();
     }
 
-    private void OnDestinationMessage(EntityUid uid, ShuttleConsoleComponent component,
-        ShuttleConsoleFTLRequestMessage args)
-    {
-        var destination = GetEntity(args.Destination);
-
-        if (!TryComp<FTLDestinationComponent>(destination, out var dest))
-        {
-            return;
-        }
-
-        if (!dest.Enabled)
-            return;
-
-        EntityUid? entity = uid;
-
-        var getShuttleEv = new ConsoleShuttleEvent
-        {
-            Console = uid,
-        };
-
-        RaiseLocalEvent(entity.Value, ref getShuttleEv);
-        entity = getShuttleEv.Console;
-
-        if (!TryComp<TransformComponent>(entity, out var xform) ||
-            !TryComp<ShuttleComponent>(xform.GridUid, out var shuttle))
-        {
-            return;
-        }
-
-        if (dest.Whitelist?.IsValid(entity.Value, EntityManager) == false &&
-            dest.Whitelist?.IsValid(xform.GridUid.Value, EntityManager) == false)
-        {
-            return;
-        }
-
-        var shuttleUid = xform.GridUid.Value;
-
-        if (HasComp<FTLComponent>(shuttleUid))
-        {
-            _popup.PopupCursor(Loc.GetString("shuttle-console-in-ftl"), args.Session);
-            return;
-        }
-
-        if (!_shuttle.CanFTL(xform.GridUid, out var reason))
-        {
-            _popup.PopupCursor(reason, args.Session);
-            return;
-        }
-
-        var dock = HasComp<MapComponent>(destination) && HasComp<MapGridComponent>(destination);
-        var tagEv = new FTLTagEvent();
-        RaiseLocalEvent(xform.GridUid.Value, ref tagEv);
-
-        var ev = new ShuttleConsoleFTLTravelStartEvent(uid);
-        RaiseLocalEvent(ref ev);
-
-        _shuttle.FTLTravel(xform.GridUid.Value, shuttle, destination, dock: dock, priorityTag: tagEv.Tag);
-    }
-
     private void OnDock(DockEvent ev)
     {
         RefreshShuttleConsoles();
@@ -146,10 +97,21 @@ private void OnUndock(UndockEvent ev)
         RefreshShuttleConsoles();
     }
 
-    public void RefreshShuttleConsoles(EntityUid _)
+    /// <summary>
+    /// Refreshes all the shuttle console data for a particular grid.
+    /// </summary>
+    public void RefreshShuttleConsoles(EntityUid gridUid)
     {
-        // TODO: Should really call this per shuttle in some instances.
-        RefreshShuttleConsoles();
+        var exclusions = new List<ShuttleExclusionObject>();
+        GetExclusions(ref exclusions);
+        _consoles.Clear();
+        _lookup.GetChildEntities(gridUid, _consoles);
+        DockingInterfaceState? dockState = null;
+
+        foreach (var entity in _consoles)
+        {
+            UpdateState(entity, ref dockState);
+        }
     }
 
     /// <summary>
@@ -157,12 +119,14 @@ public void RefreshShuttleConsoles(EntityUid _)
     /// </summary>
     public void RefreshShuttleConsoles()
     {
-        var docks = GetAllDocks();
+        var exclusions = new List<ShuttleExclusionObject>();
+        GetExclusions(ref exclusions);
         var query = AllEntityQuery<ShuttleConsoleComponent>();
+        DockingInterfaceState? dockState = null;
 
-        while (query.MoveNext(out var uid, out var _))
+        while (query.MoveNext(out var uid, out _))
         {
-            UpdateState(uid, docks);
+            UpdateState(uid,ref dockState);
         }
     }
 
@@ -177,12 +141,6 @@ private void OnConsoleUIClose(EntityUid uid, ShuttleConsoleComponent component,
             return;
         }
 
-        // In case they D/C should still clean them up.
-        foreach (var comp in EntityQuery<AutoDockComponent>(true))
-        {
-            comp.Requesters.Remove(user);
-        }
-
         RemovePilot(user);
     }
 
@@ -196,12 +154,14 @@ private void OnConsoleUIOpenAttempt(EntityUid uid, ShuttleConsoleComponent compo
     private void OnConsoleAnchorChange(EntityUid uid, ShuttleConsoleComponent component,
         ref AnchorStateChangedEvent args)
     {
-        UpdateState(uid);
+        DockingInterfaceState? dockState = null;
+        UpdateState(uid, ref dockState);
     }
 
     private void OnConsolePowerChange(EntityUid uid, ShuttleConsoleComponent component, ref PowerChangedEvent args)
     {
-        UpdateState(uid);
+        DockingInterfaceState? dockState = null;
+        UpdateState(uid, ref dockState);
     }
 
     private bool TryPilot(EntityUid user, EntityUid uid)
@@ -239,33 +199,38 @@ private void OnGetState(EntityUid uid, PilotComponent component, ref ComponentGe
     /// <summary>
     /// Returns the position and angle of all dockingcomponents.
     /// </summary>
-    private List<DockingInterfaceState> GetAllDocks()
+    public Dictionary<NetEntity, List<DockingPortState>> GetAllDocks()
     {
         // TODO: NEED TO MAKE SURE THIS UPDATES ON ANCHORING CHANGES!
-        var result = new List<DockingInterfaceState>();
-        var query = AllEntityQuery<DockingComponent, TransformComponent>();
+        var result = new Dictionary<NetEntity, List<DockingPortState>>();
+        var query = AllEntityQuery<DockingComponent, TransformComponent, MetaDataComponent>();
 
-        while (query.MoveNext(out var uid, out var comp, out var xform))
+        while (query.MoveNext(out var uid, out var comp, out var xform, out var metadata))
         {
             if (xform.ParentUid != xform.GridUid)
                 continue;
 
-            var state = new DockingInterfaceState()
+            var gridDocks = result.GetOrNew(GetNetEntity(xform.GridUid.Value));
+
+            var state = new DockingPortState()
             {
+                Name = metadata.EntityName,
                 Coordinates = GetNetCoordinates(xform.Coordinates),
                 Angle = xform.LocalRotation,
                 Entity = GetNetEntity(uid),
-                Connected = comp.Docked,
-                Color = comp.RadarColor,
-                HighlightedColor = comp.HighlightedRadarColor,
+                GridDockedWith =
+                    _xformQuery.TryGetComponent(comp.DockedWith, out var otherDockXform) ?
+                    GetNetEntity(otherDockXform.GridUid) :
+                    null,
             };
-            result.Add(state);
+
+            gridDocks.Add(state);
         }
 
         return result;
     }
 
-    private void UpdateState(EntityUid consoleUid, List<DockingInterfaceState>? docks = null)
+    private void UpdateState(EntityUid consoleUid, ref DockingInterfaceState? dockState)
     {
         EntityUid? entity = consoleUid;
 
@@ -278,77 +243,26 @@ private void UpdateState(EntityUid consoleUid, List<DockingInterfaceState>? dock
         entity = getShuttleEv.Console;
 
         TryComp<TransformComponent>(entity, out var consoleXform);
-        TryComp<RadarConsoleComponent>(entity, out var radar);
-        var range = radar?.MaxRange ?? SharedRadarConsoleSystem.DefaultMaxRange;
-
         var shuttleGridUid = consoleXform?.GridUid;
 
-        var destinations = new List<(NetEntity, string, bool)>();
-        var ftlState = FTLState.Available;
-        var ftlTime = TimeSpan.Zero;
+        NavInterfaceState navState;
+        ShuttleMapInterfaceState mapState;
+        dockState ??= GetDockState();
 
-        if (TryComp<FTLComponent>(shuttleGridUid, out var shuttleFtl))
+        if (shuttleGridUid != null && entity != null)
         {
-            ftlState = shuttleFtl.State;
-            ftlTime = _timing.CurTime + TimeSpan.FromSeconds(shuttleFtl.Accumulator);
+            navState = GetNavState(entity.Value, dockState.Docks);
+            mapState = GetMapState(shuttleGridUid.Value);
         }
-
-        // Mass too large
-        if (entity != null && shuttleGridUid != null &&
-            (!TryComp<PhysicsComponent>(shuttleGridUid, out var shuttleBody) || shuttleBody.Mass < 1000f))
+        else
         {
-            var metaQuery = GetEntityQuery<MetaDataComponent>();
-
-            // Can't go anywhere when in FTL.
-            var locked = shuttleFtl != null || Paused(shuttleGridUid.Value);
-
-            // Can't cache it because it may have a whitelist for the particular console.
-            // Include paused as we still want to show CentCom.
-            var destQuery = AllEntityQuery<FTLDestinationComponent>();
-
-            while (destQuery.MoveNext(out var destUid, out var comp))
-            {
-                // Can't warp to itself or if it's not on the whitelist (console or shuttle).
-                if (destUid == shuttleGridUid ||
-                    comp.Whitelist?.IsValid(entity.Value) == false &&
-                    (shuttleGridUid == null || comp.Whitelist?.IsValid(shuttleGridUid.Value, EntityManager) == false))
-                {
-                    continue;
-                }
-
-                var meta = metaQuery.GetComponent(destUid);
-                var name = meta.EntityName;
-
-                if (string.IsNullOrEmpty(name))
-                    name = Loc.GetString("shuttle-console-unknown");
-
-                var canTravel = !locked &&
-                                comp.Enabled &&
-                                (!TryComp<FTLComponent>(destUid, out var ftl) || ftl.State == FTLState.Cooldown);
-
-                // Can't travel to same map (yet)
-                if (canTravel && consoleXform?.MapUid == Transform(destUid).MapUid)
-                {
-                    canTravel = false;
-                }
-
-                destinations.Add((GetNetEntity(destUid), name, canTravel));
-            }
+            navState = new NavInterfaceState(0f, null, null, new Dictionary<NetEntity, List<DockingPortState>>());
+            mapState = new ShuttleMapInterfaceState(FTLState.Invalid, 0f, new List<ShuttleBeaconObject>(), new List<ShuttleExclusionObject>());
         }
 
-        docks ??= GetAllDocks();
-
         if (_ui.TryGetUi(consoleUid, ShuttleConsoleUiKey.Key, out var bui))
         {
-            _ui.SetUiState(bui, new ShuttleConsoleBoundInterfaceState(
-                ftlState,
-                ftlTime,
-                destinations,
-                range,
-                GetNetCoordinates(consoleXform?.Coordinates),
-                consoleXform?.LocalRotation,
-                docks
-            ));
+            _ui.SetUiState(bui, new ShuttleBoundUserInterfaceState(navState, mapState, dockState));
         }
     }
 
@@ -376,27 +290,6 @@ public override void Update(float frameTime)
         }
     }
 
-    /// <summary>
-    /// If pilot is moved then we'll stop them from piloting.
-    /// </summary>
-    private void HandlePilotMove(EntityUid uid, PilotComponent component, ref MoveEvent args)
-    {
-        if (component.Console == null || component.Position == null)
-        {
-            DebugTools.Assert(component.Position == null && component.Console == null);
-            EntityManager.RemoveComponent<PilotComponent>(uid);
-            return;
-        }
-
-        if (args.NewPosition.TryDistance(EntityManager, component.Position.Value, out var distance) &&
-            distance < PilotComponent.BreakDistance)
-        {
-            return;
-        }
-
-        RemovePilot(uid, component);
-    }
-
     protected override void HandlePilotShutdown(EntityUid uid, PilotComponent component, ComponentShutdown args)
     {
         base.HandlePilotShutdown(uid, component, args);
@@ -467,4 +360,70 @@ public void ClearPilots(ShuttleConsoleComponent component)
                 RemovePilot(pilot, pilotComponent);
         }
     }
+
+    /// <summary>
+    /// Specific for a particular shuttle.
+    /// </summary>
+    public NavInterfaceState GetNavState(Entity<RadarConsoleComponent?, TransformComponent?> entity, Dictionary<NetEntity, List<DockingPortState>> docks)
+    {
+        if (!Resolve(entity, ref entity.Comp1, ref entity.Comp2))
+            return new NavInterfaceState(SharedRadarConsoleSystem.DefaultMaxRange, null, null, docks);
+
+        return GetNavState(
+            entity,
+            docks,
+            entity.Comp2.Coordinates,
+            entity.Comp2.LocalRotation);
+    }
+
+    public NavInterfaceState GetNavState(
+        Entity<RadarConsoleComponent?, TransformComponent?> entity,
+        Dictionary<NetEntity, List<DockingPortState>> docks,
+        EntityCoordinates coordinates,
+        Angle angle)
+    {
+        if (!Resolve(entity, ref entity.Comp1, ref entity.Comp2))
+            return new NavInterfaceState(SharedRadarConsoleSystem.DefaultMaxRange, GetNetCoordinates(coordinates), angle, docks);
+
+        return new NavInterfaceState(
+            entity.Comp1.MaxRange,
+            GetNetCoordinates(coordinates),
+            angle,
+            docks);
+    }
+
+    /// <summary>
+    /// Global for all shuttles.
+    /// </summary>
+    /// <returns></returns>
+    public DockingInterfaceState GetDockState()
+    {
+        var docks = GetAllDocks();
+        return new DockingInterfaceState(docks);
+    }
+
+    /// <summary>
+    /// Specific to a particular shuttle.
+    /// </summary>
+    public ShuttleMapInterfaceState GetMapState(Entity<FTLComponent?> shuttle)
+    {
+        FTLState ftlState = FTLState.Available;
+        float stateDuration = 0f;
+
+        if (Resolve(shuttle, ref shuttle.Comp, false) && shuttle.Comp.LifeStage < ComponentLifeStage.Stopped)
+        {
+            ftlState = shuttle.Comp.State;
+            stateDuration = _shuttle.GetStateDuration(shuttle.Comp);
+        }
+
+        List<ShuttleBeaconObject>? beacons = null;
+        List<ShuttleExclusionObject>? exclusions = null;
+        GetBeacons(ref beacons);
+        GetExclusions(ref exclusions);
+
+        return new ShuttleMapInterfaceState(
+            ftlState, stateDuration,
+            beacons ?? new List<ShuttleBeaconObject>(),
+            exclusions ?? new List<ShuttleExclusionObject>());
+    }
 }
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index 2602e9392e..f9ceab8f7b 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -3,16 +3,16 @@
 using System.Numerics;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
-using Content.Server.Station.Systems;
+using Content.Server.Station.Events;
 using Content.Shared.Body.Components;
 using Content.Shared.Buckle.Components;
-using Content.Shared.Doors.Components;
 using Content.Shared.Ghost;
 using Content.Shared.Maps;
 using Content.Shared.Parallax;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Systems;
 using Content.Shared.StatusEffect;
+using Content.Shared.Whitelist;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Components;
@@ -21,8 +21,8 @@
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
-using Robust.Shared.Player;
 using Robust.Shared.Utility;
+using FTLMapComponent = Content.Shared.Shuttles.Components.FTLMapComponent;
 
 namespace Content.Server.Shuttles.Systems;
 
@@ -32,18 +32,11 @@ public sealed partial class ShuttleSystem
      * This is a way to move a shuttle from one location to another, via an intermediate map for fanciness.
      */
 
-    private MapId? _hyperSpaceMap;
-
     public const float DefaultStartupTime = 5.5f;
     public const float DefaultTravelTime = 20f;
     public const float DefaultArrivalTime = 5f;
     private const float FTLCooldown = 10f;
-    private const float ShuttleFTLRange = 100f;
-
-    /// <summary>
-    /// Minimum mass a grid needs to be to block a shuttle recall.
-    /// </summary>
-    public const float ShuttleFTLMassThreshold = 300f;
+    public const float FTLMassLimit = 300f;
 
     // I'm too lazy to make CVars.
 
@@ -51,7 +44,7 @@ public sealed partial class ShuttleSystem
     {
         Params = AudioParams.Default.WithVolume(-5f),
     };
-    // private SoundSpecifier _travelSound = new SoundPathSpecifier();
+
     private readonly SoundSpecifier _arrivalSound = new SoundPathSpecifier("/Audio/Effects/Shuttle/hyperspace_end.ogg")
     {
         Params = AudioParams.Default.WithVolume(-5f),
@@ -59,7 +52,9 @@ public sealed partial class ShuttleSystem
 
     private readonly TimeSpan _hyperspaceKnockdownTime = TimeSpan.FromSeconds(5);
 
+    /// <summary>
     /// Left-side of the station we're allowed to use
+    /// </summary>
     private float _index;
 
     /// <summary>
@@ -72,15 +67,12 @@ public sealed partial class ShuttleSystem
     /// </summary>
     private const int FTLProximityIterations = 3;
 
-    /// <summary>
-    /// Minimum mass for an FTL destination
-    /// </summary>
-    public const float FTLDestinationMass = 500f;
-
-    private HashSet<EntityUid> _lookupEnts = new();
+    private readonly HashSet<EntityUid> _lookupEnts = new();
+    private readonly HashSet<EntityUid> _immuneEnts = new();
 
     private EntityQuery<BodyComponent> _bodyQuery;
     private EntityQuery<BuckleComponent> _buckleQuery;
+    private EntityQuery<FTLBeaconComponent> _beaconQuery;
     private EntityQuery<GhostComponent> _ghostQuery;
     private EntityQuery<PhysicsComponent> _physicsQuery;
     private EntityQuery<StatusEffectsComponent> _statusQuery;
@@ -88,68 +80,113 @@ public sealed partial class ShuttleSystem
 
     private void InitializeFTL()
     {
+        SubscribeLocalEvent<StationPostInitEvent>(OnStationPostInit);
         _bodyQuery = GetEntityQuery<BodyComponent>();
         _buckleQuery = GetEntityQuery<BuckleComponent>();
+        _beaconQuery = GetEntityQuery<FTLBeaconComponent>();
         _ghostQuery = GetEntityQuery<GhostComponent>();
         _physicsQuery = GetEntityQuery<PhysicsComponent>();
         _statusQuery = GetEntityQuery<StatusEffectsComponent>();
         _xformQuery = GetEntityQuery<TransformComponent>();
-
-        SubscribeLocalEvent<StationGridAddedEvent>(OnStationGridAdd);
     }
 
-    private void OnStationGridAdd(StationGridAddedEvent ev)
+    private void OnStationPostInit(ref StationPostInitEvent ev)
     {
-        if (HasComp<MapComponent>(ev.GridId) ||
-            TryComp<PhysicsComponent>(ev.GridId, out var body) &&
-            body.Mass > FTLDestinationMass)
+        // Add all grid maps as ftl destinations that anyone can FTL to.
+        foreach (var gridUid in ev.Station.Comp.Grids)
         {
-            AddFTLDestination(ev.GridId, true);
+            var gridXform = _xformQuery.GetComponent(gridUid);
+
+            if (gridXform.MapUid == null)
+            {
+                continue;
+            }
+
+            TryAddFTLDestination(gridXform.MapID, true, out _);
         }
     }
 
-    public bool CanFTL(EntityUid? uid, [NotNullWhen(false)] out string? reason)
+    /// <summary>
+    /// Ensures the FTL map exists and returns it.
+    /// </summary>
+    private EntityUid EnsureFTLMap()
     {
-        if (HasComp<PreventPilotComponent>(uid))
+        var query = AllEntityQuery<FTLMapComponent>();
+
+        while (query.MoveNext(out var uid, out _))
         {
-            reason = Loc.GetString("shuttle-console-prevent");
-            return false;
+            return uid;
         }
 
-        if (uid != null)
-        {
-            var ev = new ConsoleFTLAttemptEvent(uid.Value, false, string.Empty);
-            RaiseLocalEvent(uid.Value, ref ev, true);
+        var mapId = _mapManager.CreateMap();
+        var mapUid = _mapManager.GetMapEntityId(mapId);
+        var ftlMap = AddComp<FTLMapComponent>(mapUid);
 
-            if (ev.Cancelled)
-            {
-                reason = ev.Reason;
-                return false;
-            }
+        _metadata.SetEntityName(mapUid, "FTL");
+        Log.Debug($"Setup hyperspace map at {mapUid}");
+        DebugTools.Assert(!_mapManager.IsMapPaused(mapId));
+        var parallax = EnsureComp<ParallaxComponent>(mapUid);
+        parallax.Parallax = ftlMap.Parallax;
+
+        return mapUid;
+    }
+
+    public float GetStateDuration(FTLComponent component)
+    {
+        var state = component.State;
+
+        switch (state)
+        {
+            case FTLState.Starting:
+            case FTLState.Travelling:
+            case FTLState.Arriving:
+            case FTLState.Cooldown:
+                return component.Accumulator;
+            case FTLState.Available:
+                return 0f;
+            default:
+                throw new NotImplementedException();
         }
+    }
 
-        reason = null;
-        return true;
+    /// <summary>
+    /// Updates the whitelist for this FTL destination.
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <param name="whitelist"></param>
+    public void SetFTLWhitelist(Entity<FTLDestinationComponent?> entity, EntityWhitelist? whitelist)
+    {
+        if (!Resolve(entity, ref entity.Comp))
+            return;
+
+        if (entity.Comp.Whitelist == whitelist)
+            return;
+
+        entity.Comp.Whitelist = whitelist;
+        _console.RefreshShuttleConsoles();
+        Dirty(entity);
     }
 
     /// <summary>
-    /// Adds a target for hyperspace to every shuttle console.
+    /// Adds the target map as available for FTL.
     /// </summary>
-    public FTLDestinationComponent AddFTLDestination(EntityUid uid, bool enabled)
+    public bool TryAddFTLDestination(MapId mapId, bool enabled, [NotNullWhen(true)] out FTLDestinationComponent? component)
     {
-        if (TryComp<FTLDestinationComponent>(uid, out var destination) && destination.Enabled == enabled)
-            return destination;
+        var mapUid = _mapManager.GetMapEntityId(mapId);
+        component = null;
 
-        destination = EnsureComp<FTLDestinationComponent>(uid);
+        if (!Exists(mapUid))
+            return false;
 
-        if (HasComp<FTLComponent>(uid))
-        {
-            enabled = false;
-        }
+        component = EnsureComp<FTLDestinationComponent>(mapUid);
+
+        if (component.Enabled == enabled)
+            return true;
 
-        destination.Enabled = enabled;
+        component.Enabled = enabled;
         _console.RefreshShuttleConsoles();
-        return destination;
+        Dirty(mapUid, component);
+        return true;
     }
 
     [PublicAPI]
@@ -162,52 +199,111 @@ public void RemoveFTLDestination(EntityUid uid)
     }
 
     /// <summary>
-    /// Moves a shuttle from its current position to the target one. Goes through the hyperspace map while the timer is running.
+    /// Returns true if the grid can FTL. Used to block protected shuttles like the emergency shuttle.
+    /// </summary>
+    public bool CanFTL(EntityUid shuttleUid, [NotNullWhen(false)] out string? reason)
+    {
+        if (HasComp<FTLComponent>(shuttleUid))
+        {
+            reason = Loc.GetString("shuttle-console-in-ftl");
+            return false;
+        }
+
+        if (TryComp(shuttleUid, out PhysicsComponent? shuttlePhysics) && shuttlePhysics.Mass > FTLMassLimit)
+        {
+            reason = Loc.GetString("shuttle-console-mass");
+            return false;
+        }
+
+        if (HasComp<PreventPilotComponent>(shuttleUid))
+        {
+            reason = Loc.GetString("shuttle-console-prevent");
+            return false;
+        }
+
+        var ev = new ConsoleFTLAttemptEvent(shuttleUid, false, string.Empty);
+        RaiseLocalEvent(shuttleUid, ref ev, true);
+
+        if (ev.Cancelled)
+        {
+            reason = ev.Reason;
+            return false;
+        }
+
+        reason = null;
+        return true;
+    }
+
+    /// <summary>
+    /// Moves a shuttle from its current position to the target one without any checks. Goes through the hyperspace map while the timer is running.
     /// </summary>
-    public void FTLTravel(
+    public void FTLToCoordinates(
         EntityUid shuttleUid,
         ShuttleComponent component,
         EntityCoordinates coordinates,
+        Angle angle,
         float startupTime = DefaultStartupTime,
         float hyperspaceTime = DefaultTravelTime,
         string? priorityTag = null)
     {
         if (!TrySetupFTL(shuttleUid, component, out var hyperspace))
-           return;
+            return;
 
         hyperspace.StartupTime = startupTime;
         hyperspace.TravelTime = hyperspaceTime;
         hyperspace.Accumulator = hyperspace.StartupTime;
         hyperspace.TargetCoordinates = coordinates;
-        hyperspace.Dock = false;
+        hyperspace.TargetAngle = angle;
         hyperspace.PriorityTag = priorityTag;
-        _console.RefreshShuttleConsoles();
-        var ev = new FTLRequestEvent(_mapManager.GetMapEntityId(coordinates.ToMap(EntityManager, _transform).MapId));
+
+        _console.RefreshShuttleConsoles(shuttleUid);
+
+        var mapId = coordinates.GetMapId(EntityManager);
+        var mapUid = _mapManager.GetMapEntityId(mapId);
+        var ev = new FTLRequestEvent(mapUid);
         RaiseLocalEvent(shuttleUid, ref ev, true);
     }
 
     /// <summary>
-    /// Moves a shuttle from its current position to docked on the target one. Goes through the hyperspace map while the timer is running.
+    /// Moves a shuttle from its current position to docked on the target one.
+    /// If no docks are free when FTLing it will arrive in proximity
     /// </summary>
-    public void FTLTravel(
+    public void FTLToDock(
         EntityUid shuttleUid,
         ShuttleComponent component,
         EntityUid target,
         float startupTime = DefaultStartupTime,
         float hyperspaceTime = DefaultTravelTime,
-        bool dock = false,
         string? priorityTag = null)
     {
         if (!TrySetupFTL(shuttleUid, component, out var hyperspace))
             return;
 
+        var config = _dockSystem.GetDockingConfig(shuttleUid, target, priorityTag);
         hyperspace.StartupTime = startupTime;
         hyperspace.TravelTime = hyperspaceTime;
         hyperspace.Accumulator = hyperspace.StartupTime;
-        hyperspace.TargetUid = target;
-        hyperspace.Dock = dock;
         hyperspace.PriorityTag = priorityTag;
-        _console.RefreshShuttleConsoles();
+
+        _console.RefreshShuttleConsoles(shuttleUid);
+
+        // Valid dock for now time so just use that as the target.
+        if (config != null)
+        {
+            hyperspace.TargetCoordinates = config.Coordinates;
+            hyperspace.TargetAngle = config.Angle;
+        }
+        else if (TryGetFTLProximity(shuttleUid, target, out var coords, out var targAngle))
+        {
+            hyperspace.TargetCoordinates = coords;
+            hyperspace.TargetAngle = targAngle;
+        }
+        else
+        {
+            // FTL back to its own position.
+            hyperspace.TargetCoordinates = Transform(shuttleUid).Coordinates;
+            Log.Error($"Unable to FTL grid {ToPrettyString(shuttleUid)} to target properly?");
+        }
     }
 
     private bool TrySetupFTL(EntityUid uid, ShuttleComponent shuttle, [NotNullWhen(true)] out FTLComponent? component)
@@ -216,228 +312,251 @@ private bool TrySetupFTL(EntityUid uid, ShuttleComponent shuttle, [NotNullWhen(t
 
         if (HasComp<FTLComponent>(uid))
         {
-            Log.Warning($"Tried queuing {ToPrettyString(uid)} which already has HyperspaceComponent?");
+            Log.Warning($"Tried queuing {ToPrettyString(uid)} which already has {nameof(FTLComponent)}?");
             return false;
         }
 
-        if (TryComp<FTLDestinationComponent>(uid, out var dest))
-        {
-            dest.Enabled = false;
-        }
-
         _thruster.DisableLinearThrusters(shuttle);
         _thruster.EnableLinearThrustDirection(shuttle, DirectionFlag.North);
         _thruster.SetAngularThrust(shuttle, false);
-        // TODO: Maybe move this to docking instead?
-        SetDocks(uid, false);
+        _dockSystem.UndockDocks(uid);
 
         component = AddComp<FTLComponent>(uid);
         component.State = FTLState.Starting;
         var audio = _audio.PlayPvs(_startupSound, uid);
         audio.Value.Component.Flags |= AudioFlags.GridAudio;
+
+        if (_physicsQuery.TryGetComponent(uid, out var gridPhysics))
+        {
+            _transform.SetLocalPosition(audio.Value.Entity, gridPhysics.LocalCenter);
+        }
+
+        // TODO: Play previs here for docking arrival.
+
         // Make sure the map is setup before we leave to avoid pop-in (e.g. parallax).
-        SetupHyperspace();
+        EnsureFTLMap();
         return true;
     }
 
+    /// <summary>
+    /// Transitions shuttle to FTL map.
+    /// </summary>
+    private void UpdateFTLStarting(Entity<FTLComponent, ShuttleComponent> entity)
+    {
+        var uid = entity.Owner;
+        var comp = entity.Comp1;
+        var xform = _xformQuery.GetComponent(entity);
+        DoTheDinosaur(xform);
+
+        comp.State = FTLState.Travelling;
+        var fromMapUid = xform.MapUid;
+        var fromMatrix = _transform.GetWorldMatrix(xform);
+        var fromRotation = _transform.GetWorldRotation(xform);
+
+        var width = Comp<MapGridComponent>(uid).LocalAABB.Width;
+        var ftlMap = EnsureFTLMap();
+        var body = _physicsQuery.GetComponent(entity);
+        var shuttleCenter = body.LocalCenter;
+
+        // Offset the start by buffer range just to avoid overlap.
+        var ftlStart = new EntityCoordinates(ftlMap, new Vector2(_index + width / 2f, 0f) - shuttleCenter);
+
+        _transform.SetCoordinates(entity.Owner, ftlStart);
+
+        // Reset rotation so they always face the same direction.
+        xform.LocalRotation = Angle.Zero;
+        _index += width + Buffer;
+        comp.Accumulator += comp.TravelTime - DefaultArrivalTime;
+
+        Enable(uid, component: body);
+        _physics.SetLinearVelocity(uid, new Vector2(0f, 20f), body: body);
+        _physics.SetAngularVelocity(uid, 0f, body: body);
+        _physics.SetLinearDamping(body, 0f);
+        _physics.SetAngularDamping(body, 0f);
+
+        _dockSystem.SetDockBolts(uid, true);
+        _console.RefreshShuttleConsoles(uid);
+
+        var ev = new FTLStartedEvent(uid, comp.TargetCoordinates, fromMapUid, fromMatrix, fromRotation);
+        RaiseLocalEvent(uid, ref ev, true);
+
+        // Audio
+        var wowdio = _audio.PlayPvs(comp.TravelSound, uid);
+        comp.TravelStream = wowdio?.Entity;
+        if (wowdio?.Component != null)
+        {
+            wowdio.Value.Component.Flags |= AudioFlags.GridAudio;
+
+            if (_physicsQuery.TryGetComponent(uid, out var gridPhysics))
+            {
+                _transform.SetLocalPosition(wowdio.Value.Entity, gridPhysics.LocalCenter);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Shuttle arriving.
+    /// </summary>
+    private void UpdateFTLTravelling(Entity<FTLComponent, ShuttleComponent> entity)
+    {
+        var shuttle = entity.Comp2;
+        var comp = entity.Comp1;
+        comp.Accumulator += DefaultArrivalTime;
+        comp.State = FTLState.Arriving;
+        // TODO: Arrival effects
+        // For now we'll just use the ss13 bubbles but we can do fancier.
+
+        _thruster.DisableLinearThrusters(shuttle);
+        _thruster.EnableLinearThrustDirection(shuttle, DirectionFlag.South);
+
+        _console.RefreshShuttleConsoles(entity.Owner);
+    }
+
+    /// <summary>
+    ///  Shuttle arrived.
+    /// </summary>
+    private void UpdateFTLArriving(Entity<FTLComponent, ShuttleComponent> entity)
+    {
+        var uid = entity.Owner;
+        var xform = _xformQuery.GetComponent(uid);
+        var body = _physicsQuery.GetComponent(uid);
+        var comp = entity.Comp1;
+        DoTheDinosaur(xform);
+        _dockSystem.SetDockBolts(entity, false);
+
+        _physics.SetLinearVelocity(uid, Vector2.Zero, body: body);
+        _physics.SetAngularVelocity(uid, 0f, body: body);
+        _physics.SetLinearDamping(body, entity.Comp2.LinearDamping);
+        _physics.SetAngularDamping(body, entity.Comp2.AngularDamping);
+
+        var target = entity.Comp1.TargetCoordinates;
+
+        MapId mapId;
+
+        if (!Exists(entity.Comp1.TargetCoordinates.EntityId))
+        {
+            // Uhh good luck
+            // Pick earliest map?
+            var maps = EntityQuery<MapComponent>().Select(o => o.MapId).ToList();
+            var map = maps.Min(o => o.GetHashCode());
+
+            mapId = new MapId(map);
+            TryFTLProximity(uid, _mapManager.GetMapEntityId(mapId));
+        }
+        // Docking FTL
+        else if (HasComp<MapGridComponent>(target.EntityId) &&
+                 !HasComp<MapComponent>(target.EntityId))
+        {
+            var config = _dockSystem.GetDockingConfigAt(uid, target.EntityId, target, entity.Comp1.TargetAngle);
+            var mapCoordinates = _transform.ToMapCoordinates(target);
+
+            // Couldn't dock somehow so just fallback to regular position FTL.
+            if (config == null)
+            {
+                TryFTLProximity(uid, target.EntityId);
+            }
+            else
+            {
+                FTLDock((uid, xform), config);
+            }
+
+            mapId = mapCoordinates.MapId;
+        }
+        // Position ftl
+        else
+        {
+            mapId = target.GetMapId(EntityManager);
+            _transform.SetCoordinates(uid, xform, target, rotation: entity.Comp1.TargetAngle);
+        }
+
+        if (_physicsQuery.TryGetComponent(uid, out body))
+        {
+            _physics.SetLinearVelocity(uid, Vector2.Zero, body: body);
+            _physics.SetAngularVelocity(uid, 0f, body: body);
+
+            // Disable shuttle if it's on a planet; unfortunately can't do this in parent change messages due
+            // to event ordering and awake body shenanigans (at least for now).
+            if (HasComp<MapGridComponent>(xform.MapUid))
+            {
+                Disable(uid, component: body);
+            }
+            else
+            {
+                Enable(uid, component: body, shuttle: entity.Comp2);
+            }
+        }
+
+        _thruster.DisableLinearThrusters(entity.Comp2);
+
+        comp.TravelStream = _audio.Stop(comp.TravelStream);
+        var audio = _audio.PlayPvs(_arrivalSound, uid);
+        audio.Value.Component.Flags |= AudioFlags.GridAudio;
+        // TODO: Shitcode til engine fix
+
+        if (_physicsQuery.TryGetComponent(uid, out var gridPhysics))
+        {
+            _transform.SetLocalPosition(audio.Value.Entity, gridPhysics.LocalCenter);
+        }
+
+        if (TryComp<FTLDestinationComponent>(uid, out var dest))
+        {
+            dest.Enabled = true;
+        }
+
+        comp.State = FTLState.Cooldown;
+        comp.Accumulator += FTLCooldown;
+        _console.RefreshShuttleConsoles(uid);
+        _mapManager.SetMapPaused(mapId, false);
+        Smimsh(uid, xform: xform);
+
+        var ftlEvent = new FTLCompletedEvent(uid, _mapManager.GetMapEntityId(mapId));
+        RaiseLocalEvent(uid, ref ftlEvent, true);
+    }
+
+    private void UpdateFTLCooldown(Entity<FTLComponent, ShuttleComponent> entity)
+    {
+        RemCompDeferred<FTLComponent>(entity);
+        _console.RefreshShuttleConsoles(entity);
+    }
+
     private void UpdateHyperspace(float frameTime)
     {
-        var query = EntityQueryEnumerator<FTLComponent>();
+        var query = EntityQueryEnumerator<FTLComponent, ShuttleComponent>();
 
-        while (query.MoveNext(out var uid, out var comp))
+        while (query.MoveNext(out var uid, out var comp, out var shuttle))
         {
             comp.Accumulator -= frameTime;
 
             if (comp.Accumulator > 0f)
                 continue;
 
-            var xform = Transform(uid);
-            PhysicsComponent? body;
-            ShuttleComponent? shuttle;
-            TryComp(uid, out shuttle);
+            var entity = (uid, comp, shuttle);
 
             switch (comp.State)
             {
                 // Startup time has elapsed and in hyperspace.
                 case FTLState.Starting:
-                    DoTheDinosaur(xform);
-
-                    comp.State = FTLState.Travelling;
-                    var fromMapUid = xform.MapUid;
-                    var fromMatrix = _transform.GetWorldMatrix(xform);
-                    var fromRotation = _transform.GetWorldRotation(xform);
-
-                    var width = Comp<MapGridComponent>(uid).LocalAABB.Width;
-                    xform.Coordinates = new EntityCoordinates(_mapManager.GetMapEntityId(_hyperSpaceMap!.Value), new Vector2(_index + width / 2f, 0f));
-                    xform.LocalRotation = Angle.Zero;
-                    _index += width + Buffer;
-                    comp.Accumulator += comp.TravelTime - DefaultArrivalTime;
-
-                    if (TryComp(uid, out body))
-                    {
-                        if (shuttle != null)
-                            Enable(uid, component: body, shuttle: shuttle);
-                        _physics.SetLinearVelocity(uid, new Vector2(0f, 20f), body: body);
-                        _physics.SetAngularVelocity(uid, 0f, body: body);
-                        _physics.SetLinearDamping(body, 0f);
-                        _physics.SetAngularDamping(body, 0f);
-                    }
-
-                    SetDockBolts(uid, true);
-                    _console.RefreshShuttleConsoles(uid);
-                    var target = comp.TargetUid != null ? new EntityCoordinates(comp.TargetUid.Value, Vector2.Zero) : comp.TargetCoordinates;
-
-                    var ev = new FTLStartedEvent(uid, target, fromMapUid, fromMatrix, fromRotation);
-                    RaiseLocalEvent(uid, ref ev, true);
-
-                    var wowdio = _audio.PlayPvs(comp.TravelSound, uid);
-                    comp.TravelStream = wowdio?.Entity;
-                    if (wowdio?.Component != null)
-                        wowdio.Value.Component.Flags |= AudioFlags.GridAudio;
-
+                    UpdateFTLStarting(entity);
                     break;
                 // Arriving, play effects
                 case FTLState.Travelling:
-                    comp.Accumulator += DefaultArrivalTime;
-                    comp.State = FTLState.Arriving;
-                    // TODO: Arrival effects
-                    // For now we'll just use the ss13 bubbles but we can do fancier.
-
-                    if (shuttle != null)
-                    {
-                        _thruster.DisableLinearThrusters(shuttle);
-                        _thruster.EnableLinearThrustDirection(shuttle, DirectionFlag.South);
-                    }
-
-                    _console.RefreshShuttleConsoles(uid);
+                    UpdateFTLTravelling(entity);
                     break;
                 // Arrived
                 case FTLState.Arriving:
-                    DoTheDinosaur(xform);
-                    SetDockBolts(uid, false);
-                    SetDocks(uid, true);
-
-                    if (TryComp(uid, out body))
-                    {
-                        _physics.SetLinearVelocity(uid, Vector2.Zero, body: body);
-                        _physics.SetAngularVelocity(uid, 0f, body: body);
-                        if (shuttle != null)
-                        {
-                            _physics.SetLinearDamping(body, shuttle.LinearDamping);
-                            _physics.SetAngularDamping(body, shuttle.AngularDamping);
-                        }
-                    }
-
-                    MapId mapId;
-
-                    if (comp.TargetUid != null && shuttle != null)
-                    {
-                        if (!Deleted(comp.TargetUid))
-                        {
-                            if (comp.Dock)
-                                TryFTLDock(uid, shuttle, comp.TargetUid.Value, comp.PriorityTag);
-                            else
-                                TryFTLProximity(uid, shuttle, comp.TargetUid.Value);
-
-                            mapId = Transform(comp.TargetUid.Value).MapID;
-                        }
-                        // oh boy, fallback time
-                        else
-                        {
-                            // Pick earliest map?
-                            var maps = EntityQuery<MapComponent>().Select(o => o.MapId).ToList();
-                            var map = maps.Min(o => o.GetHashCode());
-
-                            mapId = new MapId(map);
-                            TryFTLProximity(uid, shuttle, _mapManager.GetMapEntityId(mapId));
-                        }
-                    }
-                    else
-                    {
-                        xform.Coordinates = comp.TargetCoordinates;
-                        mapId = comp.TargetCoordinates.GetMapId(EntityManager);
-                    }
-
-                    if (TryComp(uid, out body))
-                    {
-                        _physics.SetLinearVelocity(uid, Vector2.Zero, body: body);
-                        _physics.SetAngularVelocity(uid, 0f, body: body);
-
-                        // Disable shuttle if it's on a planet; unfortunately can't do this in parent change messages due
-                        // to event ordering and awake body shenanigans (at least for now).
-                        if (HasComp<MapGridComponent>(xform.MapUid))
-                        {
-                            Disable(uid, component: body);
-                        }
-                        else if (shuttle != null)
-                        {
-                            Enable(uid, component: body, shuttle: shuttle);
-                        }
-                    }
-
-                    if (shuttle != null)
-                    {
-                        _thruster.DisableLinearThrusters(shuttle);
-                    }
-
-                    comp.TravelStream = _audio.Stop(comp.TravelStream);
-                    var audio = _audio.PlayPvs(_arrivalSound, uid);
-                    audio.Value.Component.Flags |= AudioFlags.GridAudio;
-
-                    if (TryComp<FTLDestinationComponent>(uid, out var dest))
-                    {
-                        dest.Enabled = true;
-                    }
-
-                    comp.State = FTLState.Cooldown;
-                    comp.Accumulator += FTLCooldown;
-                    _console.RefreshShuttleConsoles(uid);
-                    _mapManager.SetMapPaused(mapId, false);
-                    Smimsh(uid, xform: xform);
-
-                    var ftlEvent = new FTLCompletedEvent(uid, _mapManager.GetMapEntityId(mapId));
-                    RaiseLocalEvent(uid, ref ftlEvent, true);
+                    UpdateFTLArriving(entity);
                     break;
                 case FTLState.Cooldown:
-                    RemComp<FTLComponent>(uid);
-                    _console.RefreshShuttleConsoles(uid);
+                    UpdateFTLCooldown(entity);
                     break;
                 default:
                     Log.Error($"Found invalid FTL state {comp.State} for {uid}");
-                    RemComp<FTLComponent>(uid);
+                    RemCompDeferred<FTLComponent>(uid);
                     break;
             }
         }
     }
 
-    private void SetDocks(EntityUid uid, bool enabled)
-    {
-        var query = AllEntityQuery<DockingComponent, TransformComponent>();
-
-        while (query.MoveNext(out var dockUid, out var dock, out var xform))
-        {
-            if (xform.ParentUid != uid || dock.Enabled == enabled)
-                continue;
-
-            _dockSystem.Undock(dockUid, dock);
-            dock.Enabled = enabled;
-        }
-    }
-
-    private void SetDockBolts(EntityUid uid, bool enabled)
-    {
-        var query = AllEntityQuery<DockingComponent, DoorBoltComponent, TransformComponent>();
-
-        while (query.MoveNext(out var doorUid, out _, out var door, out var xform))
-        {
-            if (xform.ParentUid != uid)
-                continue;
-
-            _doors.TryClose(doorUid);
-            _bolts.SetBoltsWithAudio(doorUid, door, enabled);
-        }
-    }
-
     private float GetSoundRange(EntityUid uid)
     {
         if (!_mapManager.TryGetGrid(uid, out var grid))
@@ -446,31 +565,6 @@ private float GetSoundRange(EntityUid uid)
         return MathF.Max(grid.LocalAABB.Width, grid.LocalAABB.Height) + 12.5f;
     }
 
-    private void SetupHyperspace()
-    {
-        if (_hyperSpaceMap != null)
-            return;
-
-        _hyperSpaceMap = _mapManager.CreateMap();
-        _metadata.SetEntityName(_mapManager.GetMapEntityId(_hyperSpaceMap.Value), "FTL");
-        Log.Debug($"Setup hyperspace map at {_hyperSpaceMap.Value}");
-        DebugTools.Assert(!_mapManager.IsMapPaused(_hyperSpaceMap.Value));
-        var parallax = EnsureComp<ParallaxComponent>(_mapManager.GetMapEntityId(_hyperSpaceMap.Value));
-        parallax.Parallax = "FastSpace";
-    }
-
-    private void CleanupHyperspace()
-    {
-        _index = 0f;
-        if (_hyperSpaceMap == null || !_mapManager.MapExists(_hyperSpaceMap.Value))
-        {
-            _hyperSpaceMap = null;
-            return;
-        }
-        _mapManager.DeleteMap(_hyperSpaceMap.Value);
-        _hyperSpaceMap = null;
-    }
-
     /// <summary>
     /// Puts everyone unbuckled on the floor, paralyzed.
     /// </summary>
@@ -534,11 +628,12 @@ private void TossIfSpaced(MapGridComponent shuttleGrid, PhysicsComponent shuttle
 
     /// <summary>
     /// Tries to dock with the target grid, otherwise falls back to proximity.
+    /// This bypasses FTL travel time.
     /// </summary>
     public bool TryFTLDock(EntityUid shuttleUid, ShuttleComponent component, EntityUid targetUid, string? priorityTag = null)
     {
-        if (!TryComp<TransformComponent>(shuttleUid, out var shuttleXform) ||
-            !TryComp<TransformComponent>(targetUid, out var targetXform) ||
+        if (!_xformQuery.TryGetComponent(shuttleUid, out var shuttleXform) ||
+            !_xformQuery.TryGetComponent(targetUid, out var targetXform) ||
             targetXform.MapUid == null ||
             !targetXform.MapUid.Value.IsValid())
         {
@@ -549,35 +644,41 @@ public bool TryFTLDock(EntityUid shuttleUid, ShuttleComponent component, EntityU
 
         if (config != null)
         {
-            FTLDock(config, shuttleXform);
+            FTLDock((shuttleUid, shuttleXform), config);
             return true;
         }
 
-        TryFTLProximity(shuttleUid, component, targetUid, shuttleXform, targetXform);
+        TryFTLProximity(shuttleUid, targetUid, shuttleXform, targetXform);
         return false;
     }
 
     /// <summary>
     /// Forces an FTL dock.
     /// </summary>
-    public void FTLDock(DockingConfig config, TransformComponent shuttleXform)
+    public void FTLDock(Entity<TransformComponent> shuttle, DockingConfig config)
     {
         // Set position
-        shuttleXform.Coordinates = config.Coordinates;
-        _transform.SetWorldRotation(shuttleXform, config.Angle);
+        var mapCoordinates = _transform.ToMapCoordinates(config.Coordinates);
+        var mapUid = _mapManager.GetMapEntityId(mapCoordinates.MapId);
+        _transform.SetCoordinates(shuttle.Owner, shuttle.Comp, new EntityCoordinates(mapUid, mapCoordinates.Position), rotation: config.Angle);
 
         // Connect everything
         foreach (var (dockAUid, dockBUid, dockA, dockB) in config.Docks)
         {
-            _dockSystem.Dock(dockAUid, dockA, dockBUid, dockB);
+            _dockSystem.Dock((dockAUid, dockA), (dockBUid, dockB));
         }
     }
 
     /// <summary>
-    /// Tries to arrive nearby without overlapping with other grids.
+    /// Tries to get the target position to FTL near to another grid.
     /// </summary>
-    public bool TryFTLProximity(EntityUid shuttleUid, ShuttleComponent component, EntityUid targetUid, TransformComponent? xform = null, TransformComponent? targetXform = null)
+    private bool TryGetFTLProximity(EntityUid shuttleUid, EntityUid targetUid,
+        out EntityCoordinates coordinates, out Angle angle,
+        TransformComponent? xform = null, TransformComponent? targetXform = null)
     {
+        coordinates = EntityCoordinates.Invalid;
+        angle = Angle.Zero;
+
         if (!Resolve(targetUid, ref targetXform) ||
             targetXform.MapUid == null ||
             !targetXform.MapUid.Value.IsValid() ||
@@ -586,6 +687,7 @@ public bool TryFTLProximity(EntityUid shuttleUid, ShuttleComponent component, En
             return false;
         }
 
+
         var xformQuery = GetEntityQuery<TransformComponent>();
         var shuttleAABB = Comp<MapGridComponent>(shuttleUid).LocalAABB;
         Box2 targetLocalAABB;
@@ -677,17 +779,36 @@ public bool TryFTLProximity(EntityUid shuttleUid, ShuttleComponent component, En
             spawnPos = _transform.GetWorldPosition(targetXform, xformQuery);
         }
 
-        xform.Coordinates = new EntityCoordinates(targetXform.MapUid.Value, spawnPos);
-
         if (!HasComp<MapComponent>(targetXform.GridUid))
         {
-            _transform.SetLocalRotation(xform, _random.NextAngle());
+            angle = _random.NextAngle();
         }
         else
         {
-            _transform.SetLocalRotation(xform, Angle.Zero);
+            angle = Angle.Zero;
+        }
+
+        coordinates = new EntityCoordinates(targetXform.MapUid.Value, spawnPos);
+        return true;
+    }
+
+    /// <summary>
+    /// Tries to arrive nearby without overlapping with other grids.
+    /// </summary>
+    public bool TryFTLProximity(EntityUid shuttleUid, EntityUid targetUid, TransformComponent? xform = null, TransformComponent? targetXform = null)
+    {
+        if (!Resolve(targetUid, ref targetXform) ||
+            targetXform.MapUid == null ||
+            !targetXform.MapUid.Value.IsValid() ||
+            !Resolve(shuttleUid, ref xform))
+        {
+            return false;
         }
 
+        if (!TryGetFTLProximity(shuttleUid, targetUid, out var coords, out var angle, xform, targetXform))
+            return false;
+
+        _transform.SetCoordinates(shuttleUid, xform, coords, rotation: angle);
         return true;
     }
 
@@ -702,7 +823,6 @@ private void Smimsh(EntityUid uid, FixturesComponent? manager = null, MapGridCom
         // Flatten anything not parented to a grid.
         var transform = _physics.GetPhysicsTransform(uid, xform);
         var aabbs = new List<Box2>(manager.Fixtures.Count);
-        var immune = new HashSet<EntityUid>();
         var tileSet = new List<(Vector2i, Tile)>();
 
         foreach (var fixture in manager.Fixtures.Values)
@@ -711,6 +831,9 @@ private void Smimsh(EntityUid uid, FixturesComponent? manager = null, MapGridCom
                 continue;
 
             var aabb = fixture.Shape.ComputeAABB(transform, 0);
+
+            // Shift it slightly
+            aabb = aabb.Translated(-grid.TileSizeHalfVector);
             // Create a small border around it.
             aabb = aabb.Enlarged(0.2f);
             aabbs.Add(aabb);
@@ -719,16 +842,17 @@ private void Smimsh(EntityUid uid, FixturesComponent? manager = null, MapGridCom
             tileSet.Clear();
             _biomes.ReserveTiles(xform.MapUid.Value, aabb, tileSet);
             _lookupEnts.Clear();
+            _immuneEnts.Clear();
             _lookup.GetEntitiesIntersecting(xform.MapUid.Value, aabb, _lookupEnts, LookupFlags.Uncontained);
 
             foreach (var ent in _lookupEnts)
             {
-                if (ent == uid || immune.Contains(ent))
+                if (ent == uid || _immuneEnts.Contains(ent))
                 {
                     continue;
                 }
 
-                if (_ghostQuery.HasComponent(ent))
+                if (_ghostQuery.HasComponent(ent) || _beaconQuery.HasComponent(ent))
                 {
                     continue;
                 }
@@ -736,10 +860,13 @@ private void Smimsh(EntityUid uid, FixturesComponent? manager = null, MapGridCom
                 if (_bodyQuery.TryGetComponent(ent, out var mob))
                 {
                     var gibs = _bobby.GibBody(ent, body: mob);
-                    immune.UnionWith(gibs);
+                    _immuneEnts.UnionWith(gibs);
                     continue;
                 }
 
+                if (HasComp<FTLBeaconComponent>(ent))
+                    continue;
+
                 QueueDel(ent);
             }
         }
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
index 5958bf0ebd..c4cf2820e2 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
@@ -18,12 +18,7 @@ private void InitializeGridFills()
 
         SubscribeLocalEvent<GridFillComponent, MapInitEvent>(OnGridFillMapInit);
 
-        _cfg.OnValueChanged(CCVars.GridFill, OnGridFillChange);
-    }
-
-    private void ShutdownGridFills()
-    {
-        _cfg.UnsubValueChanged(CCVars.GridFill, OnGridFillChange);
+        Subs.CVar(_cfg, CCVars.GridFill, OnGridFillChange);
     }
 
     private void OnGridFillChange(bool obj)
@@ -76,7 +71,7 @@ private void CargoSpawn(EntityUid uid, StationCargoShuttleComponent component)
         {
             if (TryComp<ShuttleComponent>(ent[0], out var shuttle))
             {
-                TryFTLProximity(ent[0], shuttle, targetGrid.Value);
+                TryFTLProximity(ent[0], targetGrid.Value);
             }
 
             _station.AddGridToStation(uid, ent[0]);
@@ -132,7 +127,7 @@ private void GridSpawns(EntityUid uid, GridSpawnComponent component)
                 {
                     if (TryComp<ShuttleComponent>(ent[0], out var shuttle))
                     {
-                        TryFTLProximity(ent[0], shuttle, targetGrid.Value);
+                        TryFTLProximity(ent[0], targetGrid.Value);
                     }
                     else
                     {
@@ -156,6 +151,17 @@ private void GridSpawns(EntityUid uid, GridSpawnComponent component)
                         var name = path.FilenameWithoutExtension;
                         _metadata.SetEntityName(ent[0], name);
                     }
+
+                    foreach (var compReg in group.AddComponents.Values)
+                    {
+                        var compType = compReg.Component.GetType();
+
+                        if (HasComp(ent[0], compType))
+                            continue;
+
+                        var comp = _factory.GetComponent(compType);
+                        AddComp(ent[0], comp, true);
+                    }
                 }
                 else
                 {
@@ -200,7 +206,7 @@ private void OnGridFillMapInit(EntityUid uid, GridFillComponent component, MapIn
 
                 if (config != null)
                 {
-                    FTLDock(config, shuttleXform);
+                    FTLDock((ent[0], shuttleXform), config);
 
                     if (TryComp<StationMemberComponent>(xform.GridUid, out var stationMember))
                     {
@@ -210,6 +216,17 @@ private void OnGridFillMapInit(EntityUid uid, GridFillComponent component, MapIn
                     valid = true;
                 }
             }
+
+            foreach (var compReg in component.AddComponents.Values)
+            {
+                var compType = compReg.Component.GetType();
+
+                if (HasComp(ent[0], compType))
+                    continue;
+
+                var comp = _factory.GetComponent(compType);
+                AddComp(ent[0], comp, true);
+            }
         }
 
         if (!valid)
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
index 3e941e67b4..8d44dae4b2 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs
@@ -25,6 +25,7 @@ namespace Content.Server.Shuttles.Systems;
 [UsedImplicitly]
 public sealed partial class ShuttleSystem : SharedShuttleSystem
 {
+    [Dependency] private readonly IComponentFactory _factory = default!;
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
@@ -32,14 +33,11 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
     [Dependency] private readonly BiomeSystem _biomes = default!;
     [Dependency] private readonly BodySystem _bobby = default!;
     [Dependency] private readonly DockingSystem _dockSystem = default!;
-    [Dependency] private readonly DoorSystem _doors = default!;
-    [Dependency] private readonly DoorBoltSystem _bolts = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly FixtureSystem _fixtures = default!;
     [Dependency] private readonly MapLoaderSystem _loader = default!;
     [Dependency] private readonly MetaDataSystem _metadata = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedMapSystem _maps = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly ShuttleConsoleSystem _console = default!;
@@ -63,30 +61,16 @@ public override void Initialize()
         SubscribeLocalEvent<ShuttleComponent, ComponentStartup>(OnShuttleStartup);
         SubscribeLocalEvent<ShuttleComponent, ComponentShutdown>(OnShuttleShutdown);
 
-        SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
-
         SubscribeLocalEvent<GridInitializeEvent>(OnGridInit);
         SubscribeLocalEvent<FixturesComponent, GridFixtureChangeEvent>(OnGridFixtureChange);
     }
 
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        ShutdownGridFills();
-    }
-
-
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
         UpdateHyperspace(frameTime);
     }
 
-    private void OnRoundRestart(RoundRestartCleanupEvent ev)
-    {
-        CleanupHyperspace();
-    }
-
     private void OnGridFixtureChange(EntityUid uid, FixturesComponent manager, GridFixtureChangeEvent args)
     {
         foreach (var fixture in args.NewFixtures)
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
index a89a101845..cc57c34c47 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Modules.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Silicons.Borgs.Components;
diff --git a/Content.Server/Silicons/Borgs/BorgSystem.Ui.cs b/Content.Server/Silicons/Borgs/BorgSystem.Ui.cs
index 8af682114c..3dcdd78aff 100644
--- a/Content.Server/Silicons/Borgs/BorgSystem.Ui.cs
+++ b/Content.Server/Silicons/Borgs/BorgSystem.Ui.cs
@@ -107,7 +107,7 @@ public void UpdateUI(EntityUid uid, BorgChassisComponent? component = null)
         if (_powerCell.TryGetBatteryFromSlot(uid, out var battery))
         {
             hasBattery = true;
-            chargePercent = battery.Charge / battery.MaxCharge;
+            chargePercent = battery.CurrentCharge / battery.MaxCharge;
         }
 
         var state = new BorgBuiState(chargePercent, hasBattery);
diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
index 202734d243..7784db015d 100644
--- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
@@ -42,7 +42,6 @@ public override void Initialize()
         SubscribeLocalEvent<TelegnosticProjectionComponent, EventHorizonAttemptConsumeEntityEvent>(PreventConsume); ///Nyano - Summary: the telegnositic projection has the same trait as ghosts. 
         SubscribeLocalEvent<StationDataComponent, EventHorizonAttemptConsumeEntityEvent>(PreventConsume);
         SubscribeLocalEvent<EventHorizonComponent, MapInitEvent>(OnHorizonMapInit);
-        SubscribeLocalEvent<EventHorizonComponent, EntityUnpausedEvent>(OnHorizonUnpaused);
         SubscribeLocalEvent<EventHorizonComponent, StartCollideEvent>(OnStartCollide);
         SubscribeLocalEvent<EventHorizonComponent, EntGotInsertedIntoContainerMessage>(OnEventHorizonContained);
         SubscribeLocalEvent<EventHorizonContainedEvent>(OnEventHorizonContained);
@@ -59,11 +58,6 @@ private void OnHorizonMapInit(EntityUid uid, EventHorizonComponent component, Ma
         component.NextConsumeWaveTime = _timing.CurTime;
     }
 
-    private void OnHorizonUnpaused(EntityUid uid, EventHorizonComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextConsumeWaveTime += args.PausedTime;
-    }
-
     public override void Shutdown()
     {
         var vvHandle = Vvm.GetTypeHandler<EventHorizonComponent>();
diff --git a/Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs b/Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs
index 9782becc27..5c8e3c4186 100644
--- a/Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs
+++ b/Content.Server/Spawners/Components/ContainerSpawnPointComponent.cs
@@ -8,7 +8,7 @@ namespace Content.Server.Spawners.Components;
 /// </summary>
 [RegisterComponent]
 [Access(typeof(ContainerSpawnPointSystem))]
-public sealed partial class ContainerSpawnPointComponent : Component
+public sealed partial class ContainerSpawnPointComponent : Component, ISpawnPoint
 {
     /// <summary>
     /// The ID of the container that this entity will spawn players into
@@ -26,5 +26,5 @@ public sealed partial class ContainerSpawnPointComponent : Component
     /// The type of spawn point
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public SpawnPointType SpawnType = SpawnPointType.Unset;
+    public SpawnPointType SpawnType { get; set; } = SpawnPointType.Unset;
 }
diff --git a/Content.Server/Spawners/Components/ISpawnPoint.cs b/Content.Server/Spawners/Components/ISpawnPoint.cs
new file mode 100644
index 0000000000..e01841ef99
--- /dev/null
+++ b/Content.Server/Spawners/Components/ISpawnPoint.cs
@@ -0,0 +1,7 @@
+namespace Content.Server.Spawners.Components;
+
+public interface ISpawnPoint
+{
+    SpawnPointType SpawnType { get; set; }
+}
+
diff --git a/Content.Server/Spawners/Components/SpawnPointComponent.cs b/Content.Server/Spawners/Components/SpawnPointComponent.cs
index 5a86175a1d..5cf231f224 100644
--- a/Content.Server/Spawners/Components/SpawnPointComponent.cs
+++ b/Content.Server/Spawners/Components/SpawnPointComponent.cs
@@ -4,7 +4,7 @@
 namespace Content.Server.Spawners.Components;
 
 [RegisterComponent]
-public sealed partial class SpawnPointComponent : Component
+public sealed partial class SpawnPointComponent : Component, ISpawnPoint
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
@@ -12,9 +12,11 @@ public sealed partial class SpawnPointComponent : Component
     [DataField("job_id")]
     private string? _jobId;
 
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField("spawn_type")]
-    public SpawnPointType SpawnType { get; private set; } = SpawnPointType.Unset;
+    /// <summary>
+    /// The type of spawn point
+    /// </summary>
+    [DataField("spawn_type"), ViewVariables(VVAccess.ReadWrite)]
+    public SpawnPointType SpawnType { get; set; } = SpawnPointType.Unset;
 
     public JobPrototype? Job => string.IsNullOrEmpty(_jobId) ? null : _prototypeManager.Index<JobPrototype>(_jobId);
 
diff --git a/Content.Server/Species/Systems/NymphSystem.cs b/Content.Server/Species/Systems/NymphSystem.cs
new file mode 100644
index 0000000000..b7751afbf1
--- /dev/null
+++ b/Content.Server/Species/Systems/NymphSystem.cs
@@ -0,0 +1,50 @@
+using Content.Server.Mind;
+using Content.Shared.Species.Components;
+using Content.Shared.Body.Events;
+using Content.Shared.Zombies;
+using Content.Server.Zombies;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Server.Species.Systems;
+
+public sealed partial class NymphSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _protoManager= default!;
+    [Dependency] private readonly MindSystem _mindSystem = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly ZombieSystem _zombie = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<NymphComponent, RemovedFromPartInBodyEvent>(OnRemovedFromPart);
+    }
+
+    private void OnRemovedFromPart(EntityUid uid, NymphComponent comp, RemovedFromPartInBodyEvent args)
+    {
+        if (!_timing.IsFirstTimePredicted)
+            return;
+
+        if (TerminatingOrDeleted(uid) || TerminatingOrDeleted(args.OldBody))
+            return;
+
+        if (!_protoManager.TryIndex<EntityPrototype>(comp.EntityPrototype, out var entityProto))
+            return;
+
+        // Get the organs' position & spawn a nymph there
+        var coords = Transform(uid).Coordinates;
+        var nymph = EntityManager.SpawnAtPosition(entityProto.ID, coords);
+
+        if (HasComp<ZombieComponent>(args.OldBody)) // Zombify the new nymph if old one is a zombie
+            _zombie.ZombifyEntity(nymph);
+
+        // Move the mind if there is one and it's supposed to be transferred
+        if (comp.TransferMind == true && _mindSystem.TryGetMind(args.OldBody, out var mindId, out var mind))
+            _mindSystem.TransferTo(mindId, nymph, mind: mind);
+
+        // Delete the old organ
+        QueueDel(uid);
+    }
+}
diff --git a/Content.Server/Speech/Components/FrenchAccentComponent.cs b/Content.Server/Speech/Components/FrenchAccentComponent.cs
new file mode 100644
index 0000000000..f696c35ea0
--- /dev/null
+++ b/Content.Server/Speech/Components/FrenchAccentComponent.cs
@@ -0,0 +1,11 @@
+using Content.Server.Speech.EntitySystems;
+
+namespace Content.Server.Speech.Components;
+
+/// <summary>
+/// French accent replaces spoken letters. "th" becomes "z" and "H" at the start of a word becomes "'".
+/// </summary>
+[RegisterComponent]
+[Access(typeof(FrenchAccentSystem))]
+public sealed partial class FrenchAccentComponent : Component
+{ }
diff --git a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
new file mode 100644
index 0000000000..5637288732
--- /dev/null
+++ b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
@@ -0,0 +1,45 @@
+using Content.Server.Speech.Components;
+using System.Text.RegularExpressions;
+
+namespace Content.Server.Speech.EntitySystems;
+
+/// <summary>
+/// System that gives the speaker a faux-French accent.
+/// </summary>
+public sealed class FrenchAccentSystem : EntitySystem
+{
+    [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<FrenchAccentComponent, AccentGetEvent>(OnAccentGet);
+    }
+
+    public string Accentuate(string message, FrenchAccentComponent component)
+    {
+        var msg = message;
+
+        msg = _replacement.ApplyReplacements(msg, "french");
+
+        // replaces th with dz 
+        msg = Regex.Replace(msg, @"th", "'z", RegexOptions.IgnoreCase);
+
+        // removes the letter h from the start of words.
+        msg = Regex.Replace(msg, @"(?<!\w)[h]", "'", RegexOptions.IgnoreCase);
+
+        // spaces out ! ? : and ;.
+        msg = Regex.Replace(msg, @"(?<=\w\w)!(?!\w)", " !", RegexOptions.IgnoreCase);
+        msg = Regex.Replace(msg, @"(?<=\w\w)[?](?!\w)", " ?", RegexOptions.IgnoreCase);
+        msg = Regex.Replace(msg, @"(?<=\w\w)[;](?!\w)", " ;", RegexOptions.IgnoreCase);
+        msg = Regex.Replace(msg, @"(?<=\w\w)[:](?!\w)", " :", RegexOptions.IgnoreCase);
+
+        return msg;
+    }
+
+    private void OnAccentGet(EntityUid uid, FrenchAccentComponent component, AccentGetEvent args)
+    {
+        args.Message = Accentuate(args.Message, component);
+    }
+}
diff --git a/Content.Server/Speech/Muting/MutedComponent.cs b/Content.Server/Speech/Muting/MutedComponent.cs
deleted file mode 100644
index 5b3ae83992..0000000000
--- a/Content.Server/Speech/Muting/MutedComponent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Server.Speech.Muting
-{
-    [RegisterComponent]
-    public sealed partial class MutedComponent : Component
-    {}
-}
diff --git a/Content.Server/Speech/Muting/MutingSystem.cs b/Content.Server/Speech/Muting/MutingSystem.cs
index b743d9eda8..238d501e24 100644
--- a/Content.Server/Speech/Muting/MutingSystem.cs
+++ b/Content.Server/Speech/Muting/MutingSystem.cs
@@ -6,6 +6,7 @@
 using Content.Shared.Chat.Prototypes;
 using Content.Shared.Puppet;
 using Content.Shared.Speech;
+using Content.Shared.Speech.Muting;
 
 namespace Content.Server.Speech.Muting
 {
diff --git a/Content.Server/Spreader/GrowingKudzuComponent.cs b/Content.Server/Spreader/GrowingKudzuComponent.cs
index d2cd6d6404..8cda21234f 100644
--- a/Content.Server/Spreader/GrowingKudzuComponent.cs
+++ b/Content.Server/Spreader/GrowingKudzuComponent.cs
@@ -2,12 +2,13 @@
 
 namespace Content.Server.Spreader;
 
-[RegisterComponent, Access(typeof(KudzuSystem))]
+[RegisterComponent, Access(typeof(KudzuSystem)), AutoGenerateComponentPause]
 public sealed partial class GrowingKudzuComponent : Component
 {
     /// <summary>
     /// The next time kudzu will try to tick its growth level.
     /// </summary>
     [DataField("nextTick", customTypeSerializer:typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan NextTick = TimeSpan.Zero;
 }
diff --git a/Content.Server/Spreader/KudzuSystem.cs b/Content.Server/Spreader/KudzuSystem.cs
index d15a2c667f..dc176ebc2a 100644
--- a/Content.Server/Spreader/KudzuSystem.cs
+++ b/Content.Server/Spreader/KudzuSystem.cs
@@ -10,6 +10,7 @@ public sealed class KudzuSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
 
@@ -21,7 +22,6 @@ public override void Initialize()
     {
         SubscribeLocalEvent<KudzuComponent, ComponentStartup>(SetupKudzu);
         SubscribeLocalEvent<KudzuComponent, SpreadNeighborsEvent>(OnKudzuSpread);
-        SubscribeLocalEvent<GrowingKudzuComponent, EntityUnpausedEvent>(OnKudzuUnpaused);
         SubscribeLocalEvent<KudzuComponent, DamageChangedEvent>(OnDamageChanged);
     }
 
@@ -29,15 +29,12 @@ private void OnDamageChanged(EntityUid uid, KudzuComponent component, DamageChan
     {
         // Every time we take any damage, we reduce growth depending on all damage over the growth impact
         //   So the kudzu gets slower growing the more it is hurt.
-        int growthDamage = (int) (args.Damageable.TotalDamage / component.GrowthHealth);
+        var growthDamage = (int) (args.Damageable.TotalDamage / component.GrowthHealth);
         if (growthDamage > 0)
         {
-            GrowingKudzuComponent? growing;
-            if (!TryComp(uid, out growing))
-            {
-                growing = AddComp<GrowingKudzuComponent>(uid);
+            if (!EnsureComp<GrowingKudzuComponent>(uid, out _))
                 component.GrowthLevel = 3;
-            }
+
             component.GrowthLevel = Math.Max(1, component.GrowthLevel - growthDamage);
             if (EntityManager.TryGetComponent<AppearanceComponent>(uid, out var appearance))
             {
@@ -70,7 +67,7 @@ private void OnKudzuSpread(EntityUid uid, KudzuComponent component, ref SpreadNe
 
         foreach (var neighbor in args.NeighborFreeTiles)
         {
-            var neighborUid = Spawn(prototype, neighbor.Grid.GridTileToLocal(neighbor.Tile));
+            var neighborUid = Spawn(prototype, _map.GridTileToLocal(neighbor.Tile.GridUid, neighbor.Grid, neighbor.Tile.GridIndices));
             DebugTools.Assert(HasComp<EdgeSpreaderComponent>(neighborUid));
             DebugTools.Assert(HasComp<ActiveEdgeSpreaderComponent>(neighborUid));
             DebugTools.Assert(Comp<EdgeSpreaderComponent>(neighborUid).Id == KudzuGroup);
@@ -80,11 +77,6 @@ private void OnKudzuSpread(EntityUid uid, KudzuComponent component, ref SpreadNe
         }
     }
 
-    private void OnKudzuUnpaused(EntityUid uid, GrowingKudzuComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextTick += args.PausedTime;
-    }
-
     private void SetupKudzu(EntityUid uid, KudzuComponent component, ComponentStartup args)
     {
         if (!EntityManager.TryGetComponent<AppearanceComponent>(uid, out var appearance))
diff --git a/Content.Server/Spreader/SpreadNeighborsEvent.cs b/Content.Server/Spreader/SpreadNeighborsEvent.cs
index 0cee55b588..022ef49f33 100644
--- a/Content.Server/Spreader/SpreadNeighborsEvent.cs
+++ b/Content.Server/Spreader/SpreadNeighborsEvent.cs
@@ -1,4 +1,5 @@
 using Robust.Shared.Collections;
+using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 
 namespace Content.Server.Spreader;
@@ -10,7 +11,7 @@ namespace Content.Server.Spreader;
 [ByRefEvent]
 public record struct SpreadNeighborsEvent
 {
-    public ValueList<(MapGridComponent Grid, Vector2i Tile)> NeighborFreeTiles;
+    public ValueList<(MapGridComponent Grid, TileRef Tile)> NeighborFreeTiles;
     public ValueList<EntityUid> Neighbors;
 
     /// <summary>
diff --git a/Content.Server/Spreader/SpreaderSystem.cs b/Content.Server/Spreader/SpreaderSystem.cs
index ad3033a14b..269d35d12f 100644
--- a/Content.Server/Spreader/SpreaderSystem.cs
+++ b/Content.Server/Spreader/SpreaderSystem.cs
@@ -18,9 +18,9 @@ namespace Content.Server.Spreader;
 /// </summary>
 public sealed class SpreaderSystem : EntitySystem
 {
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
 
     /// <summary>
     /// Cached maximum number of updates per spreader prototype. This is applied per-grid.
@@ -31,7 +31,7 @@ public sealed class SpreaderSystem : EntitySystem
     /// Remaining number of updates per grid & prototype.
     /// </summary>
     // TODO PERFORMANCE Assign each prototype to an index and convert dictionary to array
-    private Dictionary<EntityUid, Dictionary<string, int>> _gridUpdates = new();
+    private readonly Dictionary<EntityUid, Dictionary<string, int>> _gridUpdates = [];
 
     public const float SpreadCooldownSeconds = 1;
 
@@ -57,7 +57,7 @@ private void OnPrototypeReload(PrototypesReloadedEventArgs obj)
 
     private void SetupPrototypes()
     {
-        _prototypeUpdates = new Dictionary<string, int>();
+        _prototypeUpdates = [];
         foreach (var proto in _prototype.EnumeratePrototypes<EdgeSpreaderPrototype>())
         {
             _prototypeUpdates.Add(proto.ID, proto.UpdatesPerSecond);
@@ -80,9 +80,9 @@ private void OnGridInit(GridInitializeEvent ev)
         EnsureComp<SpreaderGridComponent>(ev.EntityUid);
     }
 
-    private void OnTerminating(EntityUid uid, EdgeSpreaderComponent component, ref EntityTerminatingEvent args)
+    private void OnTerminating(Entity<EdgeSpreaderComponent> entity, ref EntityTerminatingEvent args)
     {
-        var neighbors = GetSpreadableNeighbors(uid);
+        var neighbors = GetSpreadableNeighbors(entity);
 
         foreach (var neighbor in neighbors)
         {
@@ -163,7 +163,7 @@ public override void Update(float frameTime)
         }
     }
 
-    private void Spread(EntityUid uid, TransformComponent xform, string prototype, ref int updates)
+    private void Spread(EntityUid uid, TransformComponent xform, ProtoId<EdgeSpreaderPrototype> prototype, ref int updates)
     {
         GetNeighbors(uid, xform, prototype, out var freeTiles, out _, out var neighbors);
 
@@ -181,18 +181,18 @@ private void Spread(EntityUid uid, TransformComponent xform, string prototype, r
     /// <summary>
     /// Gets the neighboring node data for the specified entity and the specified node group.
     /// </summary>
-    public void GetNeighbors(EntityUid uid, TransformComponent transform, string prototype, out ValueList<(MapGridComponent Grid, Vector2i Tile)> freeTiles, out ValueList<Vector2i> occupiedTiles, out ValueList<EntityUid> neighbors)
+    public void GetNeighbors(EntityUid uid, TransformComponent comp, ProtoId<EdgeSpreaderPrototype> prototype, out ValueList<(MapGridComponent, TileRef)> freeTiles, out ValueList<Vector2i> occupiedTiles, out ValueList<EntityUid> neighbors)
     {
         // TODO remove occupiedTiles -- its currently unused and just slows this method down.
-        DebugTools.Assert(_prototype.HasIndex<EdgeSpreaderPrototype>(prototype));
-        freeTiles = new ValueList<(MapGridComponent Grid, Vector2i Tile)>();
-        occupiedTiles = new ValueList<Vector2i>();
-        neighbors = new ValueList<EntityUid>();
+        DebugTools.Assert(_prototype.HasIndex(prototype));
+        freeTiles = [];
+        occupiedTiles = [];
+        neighbors = [];
 
-        if (!_mapManager.TryGetGrid(transform.GridUid, out var grid))
+        if (!TryComp<MapGridComponent>(comp.GridUid, out var grid))
             return;
 
-        var tile = grid.TileIndicesFor(transform.Coordinates);
+        var tile = _map.TileIndicesFor(comp.GridUid.Value, grid, comp.Coordinates);
         var spreaderQuery = GetEntityQuery<EdgeSpreaderComponent>();
         var airtightQuery = GetEntityQuery<AirtightComponent>();
         var dockQuery = GetEntityQuery<DockingComponent>();
@@ -201,10 +201,10 @@ public void GetNeighbors(EntityUid uid, TransformComponent transform, string pro
         var blockedAtmosDirs = AtmosDirection.Invalid;
 
         // Due to docking ports they may not necessarily be opposite directions.
-        var neighborTiles = new ValueList<(MapGridComponent grid, Vector2i Indices, AtmosDirection OtherDir, AtmosDirection OurDir)>();
+        var neighborTiles = new ValueList<(EntityUid entity, MapGridComponent grid, Vector2i Indices, AtmosDirection OtherDir, AtmosDirection OurDir)>();
 
         // Check if anything on our own tile blocking that direction.
-        var ourEnts = grid.GetAnchoredEntitiesEnumerator(tile);
+        var ourEnts = _map.GetAnchoredEntitiesEnumerator(comp.GridUid.Value, grid, tile);
 
         while (ourEnts.MoveNext(out var ent))
         {
@@ -215,7 +215,7 @@ public void GetNeighbors(EntityUid uid, TransformComponent transform, string pro
                 xformQuery.TryGetComponent(dock.DockedWith, out var dockedXform) &&
                 TryComp<MapGridComponent>(dockedXform.GridUid, out var dockedGrid))
             {
-                neighborTiles.Add((dockedGrid, dockedGrid.CoordinatesToTile(dockedXform.Coordinates), xform.LocalRotation.ToAtmosDirection(), dockedXform.LocalRotation.ToAtmosDirection()));
+                neighborTiles.Add((ent.Value, dockedGrid, _map.CoordinatesToTile(ent.Value, dockedGrid, dockedXform.Coordinates), xform.LocalRotation.ToAtmosDirection(), dockedXform.LocalRotation.ToAtmosDirection()));
             }
 
             // If we're on a blocked tile work out which directions we can go.
@@ -225,7 +225,7 @@ public void GetNeighbors(EntityUid uid, TransformComponent transform, string pro
                 continue;
             }
 
-            foreach (var value in new[] { AtmosDirection.North, AtmosDirection.East, AtmosDirection.South, AtmosDirection.West})
+            foreach (var value in new[] { AtmosDirection.North, AtmosDirection.East, AtmosDirection.South, AtmosDirection.West })
             {
                 if ((value & airtight.AirBlockedDirection) == 0x0)
                     continue;
@@ -242,20 +242,20 @@ public void GetNeighbors(EntityUid uid, TransformComponent transform, string pro
             var direction = (Direction) (i * 2);
             var atmosDir = direction.ToAtmosDirection();
             var neighborPos = SharedMapSystem.GetDirection(tile, direction);
-            neighborTiles.Add((grid, neighborPos, atmosDir, atmosDir.GetOpposite()));
+            neighborTiles.Add((comp.GridUid.Value, grid, neighborPos, atmosDir, atmosDir.GetOpposite()));
         }
 
-        foreach (var (neighborGrid, neighborPos, ourAtmosDir, otherAtmosDir) in neighborTiles)
+        foreach (var (neighborEnt, neighborGrid, neighborPos, ourAtmosDir, otherAtmosDir) in neighborTiles)
         {
             // This tile is blocked to that direction.
             if ((blockedAtmosDirs & ourAtmosDir) != 0x0)
                 continue;
 
-            if (!neighborGrid.TryGetTileRef(neighborPos, out var tileRef) || tileRef.Tile.IsEmpty)
+            if (!_map.TryGetTileRef(neighborEnt, neighborGrid, neighborPos, out var tileRef) || tileRef.Tile.IsEmpty)
                 continue;
 
             var directionEnumerator =
-                neighborGrid.GetAnchoredEntitiesEnumerator(neighborPos);
+                _map.GetAnchoredEntitiesEnumerator(neighborEnt, neighborGrid, neighborPos);
             var occupied = false;
 
             while (directionEnumerator.MoveNext(out var ent))
@@ -278,7 +278,7 @@ public void GetNeighbors(EntityUid uid, TransformComponent transform, string pro
 
             var oldCount = occupiedTiles.Count;
             directionEnumerator =
-                neighborGrid.GetAnchoredEntitiesEnumerator(neighborPos);
+                _map.GetAnchoredEntitiesEnumerator(neighborEnt, neighborGrid, neighborPos);
 
             while (directionEnumerator.MoveNext(out var ent))
             {
@@ -294,7 +294,7 @@ public void GetNeighbors(EntityUid uid, TransformComponent transform, string pro
             }
 
             if (oldCount == occupiedTiles.Count)
-                freeTiles.Add((neighborGrid, neighborPos));
+                freeTiles.Add((neighborGrid, tileRef));
         }
     }
 
@@ -308,20 +308,23 @@ public List<EntityUid> GetSpreadableNeighbors(EntityUid uid, AirtightComponent?
         var neighbors = new List<EntityUid>();
 
         Vector2i tile;
+        EntityUid ent;
         MapGridComponent? grid;
 
         if (position == null)
         {
             var transform = Transform(uid);
-            if (!_mapManager.TryGetGrid(transform.GridUid, out grid) || TerminatingOrDeleted(transform.GridUid.Value))
+            if (!TryComp(transform.GridUid, out grid) || TerminatingOrDeleted(transform.GridUid.Value))
                 return neighbors;
-            tile = grid.TileIndicesFor(transform.Coordinates);
+            tile = _map.TileIndicesFor(transform.GridUid.Value, grid, transform.Coordinates);
+            ent = transform.GridUid.Value;
         }
         else
         {
-            if (!_mapManager.TryGetGrid(position.Value.Grid, out grid))
+            if (!TryComp(position.Value.Grid, out grid))
                 return neighbors;
             tile = position.Value.Tile;
+            ent = position.Value.Grid;
         }
 
         var spreaderQuery = GetEntityQuery<EdgeSpreaderComponent>();
@@ -333,13 +336,13 @@ public List<EntityUid> GetSpreadableNeighbors(EntityUid uid, AirtightComponent?
                 continue;
 
             var directionEnumerator =
-                grid.GetAnchoredEntitiesEnumerator(SharedMapSystem.GetDirection(tile, direction.ToDirection()));
+                _map.GetAnchoredEntitiesEnumerator(ent, grid, SharedMapSystem.GetDirection(tile, direction.ToDirection()));
 
-            while (directionEnumerator.MoveNext(out var ent))
+            while (directionEnumerator.MoveNext(out var entity))
             {
-                DebugTools.Assert(Transform(ent.Value).Anchored);
-                if (spreaderQuery.HasComponent(ent) && !TerminatingOrDeleted(ent.Value))
-                    neighbors.Add(ent.Value);
+                DebugTools.Assert(Transform(entity.Value).Anchored);
+                if (spreaderQuery.HasComponent(entity) && !TerminatingOrDeleted(entity.Value))
+                    neighbors.Add(entity.Value);
             }
         }
 
diff --git a/Content.Server/Station/Systems/StationJobsSystem.cs b/Content.Server/Station/Systems/StationJobsSystem.cs
index 7bfc496dea..a3b7a57354 100644
--- a/Content.Server/Station/Systems/StationJobsSystem.cs
+++ b/Content.Server/Station/Systems/StationJobsSystem.cs
@@ -35,7 +35,7 @@ public override void Initialize()
         SubscribeLocalEvent<StationJobsComponent, StationRenamedEvent>(OnStationRenamed);
         SubscribeLocalEvent<StationJobsComponent, ComponentShutdown>(OnStationDeletion);
         SubscribeLocalEvent<PlayerJoinedLobbyEvent>(OnPlayerJoinedLobby);
-        _configurationManager.OnValueChanged(CCVars.GameDisallowLateJoins, _ => UpdateJobsAvailable(), true);
+        Subs.CVar(_configurationManager, CCVars.GameDisallowLateJoins, _ => UpdateJobsAvailable(), true);
     }
 
     public override void Update(float _)
diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
index 2e684e23a1..b7b7192f40 100644
--- a/Content.Server/Station/Systems/StationSpawningSystem.cs
+++ b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -57,7 +57,7 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
     /// <inheritdoc/>
     public override void Initialize()
     {
-        _configurationManager.OnValueChanged(CCVars.ICRandomCharacters, e => _randomizeCharacters = e, true);
+        Subs.CVar(_configurationManager, CCVars.ICRandomCharacters, e => _randomizeCharacters = e, true);
 
         _spawnerCallbacks = new Dictionary<SpawnPriorityPreference, Action<PlayerSpawningEvent>>()
         {
diff --git a/Content.Server/Station/Systems/StationSystem.cs b/Content.Server/Station/Systems/StationSystem.cs
index be3fc57967..4647392665 100644
--- a/Content.Server/Station/Systems/StationSystem.cs
+++ b/Content.Server/Station/Systems/StationSystem.cs
@@ -57,9 +57,9 @@ public override void Initialize()
         SubscribeLocalEvent<StationMemberComponent, ComponentShutdown>(OnStationGridDeleted);
         SubscribeLocalEvent<StationMemberComponent, PostGridSplitEvent>(OnStationSplitEvent);
 
-        _configurationManager.OnValueChanged(CCVars.StationOffset, x => _randomStationOffset = x, true);
-        _configurationManager.OnValueChanged(CCVars.MaxStationOffset, x => _maxRandomStationOffset = x, true);
-        _configurationManager.OnValueChanged(CCVars.StationRotation, x => _randomStationRotation = x, true);
+        Subs.CVar(_configurationManager, CCVars.StationOffset, x => _randomStationOffset = x, true);
+        Subs.CVar(_configurationManager, CCVars.MaxStationOffset, x => _maxRandomStationOffset = x, true);
+        Subs.CVar(_configurationManager, CCVars.StationRotation, x => _randomStationRotation = x, true);
 
         _player.PlayerStatusChanged += OnPlayerStatusChanged;
     }
diff --git a/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs b/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs
index f92da0af19..171aca12c2 100644
--- a/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs
@@ -13,6 +13,7 @@ public sealed partial class GasLeakRuleComponent : Component
         Gas.Plasma,
         Gas.Tritium,
         Gas.Frezon,
+        Gas.WaterVapor, // the fog
     };
 
     /// <summary>
@@ -33,14 +34,14 @@ public sealed partial class GasLeakRuleComponent : Component
     public bool FoundTile;
     public Gas LeakGas;
     public float MolesPerSecond;
-    public readonly int MinimumMolesPerSecond = 20;
+    public readonly int MinimumMolesPerSecond = 80;
 
     /// <summary>
     ///     Don't want to make it too fast to give people time to flee.
     /// </summary>
-    public int MaximumMolesPerSecond = 50;
+    public int MaximumMolesPerSecond = 200;
 
-    public int MinimumGas = 250;
-    public int MaximumGas = 1000;
+    public int MinimumGas = 1000;
+    public int MaximumGas = 4000;
     public float SparkChance = 0.05f;
 }
diff --git a/Content.Server/StationEvents/Components/StationEventComponent.cs b/Content.Server/StationEvents/Components/StationEventComponent.cs
index de0dc1c28a..b4456a4b5b 100644
--- a/Content.Server/StationEvents/Components/StationEventComponent.cs
+++ b/Content.Server/StationEvents/Components/StationEventComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Server.StationEvents.Components;
 /// <summary>
 ///     Defines basic data for a station event
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, AutoGenerateComponentPause]
 public sealed partial class StationEventComponent : Component
 {
     public const float WeightVeryLow = 0.0f;
@@ -79,11 +79,13 @@ public sealed partial class StationEventComponent : Component
     /// When the station event starts.
     /// </summary>
     [DataField("startTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan StartTime;
 
     /// <summary>
     /// When the station event ends.
     /// </summary>
     [DataField("endTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan? EndTime;
 }
diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs
index c4b21f3aa8..8942bdaf50 100644
--- a/Content.Server/StationEvents/EventManagerSystem.cs
+++ b/Content.Server/StationEvents/EventManagerSystem.cs
@@ -30,22 +30,7 @@ public override void Initialize()
 
         _sawmill = Logger.GetSawmill("events");
 
-        _configurationManager.OnValueChanged(CCVars.EventsEnabled, SetEnabled, true);
-
-        SubscribeLocalEvent<StationEventComponent, EntityUnpausedEvent>(OnUnpaused);
-    }
-
-    private void OnUnpaused(EntityUid uid, StationEventComponent component, ref EntityUnpausedEvent args)
-    {
-        component.StartTime += args.PausedTime;
-        if (component.EndTime != null)
-            component.EndTime = component.EndTime.Value + args.PausedTime;
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-        _configurationManager.UnsubValueChanged(CCVars.EventsEnabled, SetEnabled);
+        Subs.CVar(_configurationManager, CCVars.EventsEnabled, SetEnabled, true);
     }
 
     /// <summary>
diff --git a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
index a59af52f6d..48a3b900c4 100644
--- a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
+++ b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs
@@ -33,7 +33,7 @@ protected override void Started(EntityUid uid, AnomalySpawnRuleComponent compone
         if (grid is null)
             return;
 
-        var amountToSpawn = Math.Max(1, (int) MathF.Round(GetSeverityModifier() / 2));
+        var amountToSpawn = 1;
         for (var i = 0; i < amountToSpawn; i++)
         {
             _anomaly.SpawnOnRandomGridLocation(grid.Value, component.AnomalySpawnerPrototype);
diff --git a/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs b/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
index 306b735b84..0eed77f154 100644
--- a/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
+++ b/Content.Server/StationEvents/Events/BluespaceArtifactRule.cs
@@ -19,7 +19,7 @@ protected override void Started(EntityUid uid, BluespaceArtifactRuleComponent co
     {
         base.Started(uid, component, gameRule, args);
 
-        var amountToSpawn = Math.Max(1, (int) MathF.Round(GetSeverityModifier() / 1.5f));
+        var amountToSpawn = 1;
         for (var i = 0; i < amountToSpawn; i++)
         {
             if (!TryFindRandomTile(out _, out _, out _, out var coords))
diff --git a/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs b/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs
index 6415aa4c2a..feb88d9b84 100644
--- a/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs
+++ b/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs
@@ -25,11 +25,9 @@ protected override void Started(EntityUid uid, BureaucraticErrorRuleComponent co
         if (jobList.Count == 0)
             return;
 
-        var mod = GetSeverityModifier();
-
         // Low chance to completely change up the late-join landscape by closing all positions except infinite slots.
         // Lower chance than the /tg/ equivalent of this event.
-        if (RobustRandom.Prob(Math.Min(0.25f * MathF.Sqrt(mod), 1.0f)))
+        if (RobustRandom.Prob(0.25f))
         {
             var chosenJob = RobustRandom.PickAndTake(jobList);
             _stationJobs.MakeJobUnlimited(chosenStation.Value, chosenJob); // INFINITE chaos.
@@ -44,8 +42,8 @@ protected override void Started(EntityUid uid, BureaucraticErrorRuleComponent co
         }
         else
         {
-            var lower = (int) (jobList.Count * Math.Min(1.0f, 0.20 * mod));
-            var upper = (int) (jobList.Count * Math.Min(1.0f, 0.30 * mod));
+            var lower = (int) (jobList.Count * 0.20);
+            var upper = (int) (jobList.Count * 0.30);
             // Changing every role is maybe a bit too chaotic so instead change 20-30% of them.
             var num = RobustRandom.Next(lower, upper);
             for (var i = 0; i < num; i++)
diff --git a/Content.Server/StationEvents/Events/CargoGiftsRule.cs b/Content.Server/StationEvents/Events/CargoGiftsRule.cs
index 4d3ffa005d..c174cc48c0 100644
--- a/Content.Server/StationEvents/Events/CargoGiftsRule.cs
+++ b/Content.Server/StationEvents/Events/CargoGiftsRule.cs
@@ -3,6 +3,7 @@
 using Content.Server.Cargo.Systems;
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Rules.Components;
+using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
 using Robust.Shared.Prototypes;
 
@@ -39,7 +40,8 @@ protected override void ActiveTick(EntityUid uid, CargoGiftsRuleComponent compon
 
         component.TimeUntilNextGifts += 30f;
 
-        if (!TryGetRandomStation(out var station, HasComp<StationCargoOrderDatabaseComponent>))
+        if (!TryGetRandomStation(out var station, HasComp<StationCargoOrderDatabaseComponent>) ||
+                !TryComp<StationDataComponent>(station, out var stationData))
             return;
 
         if (!TryComp<StationCargoOrderDatabaseComponent>(station, out var cargoDb))
@@ -65,7 +67,8 @@ protected override void ActiveTick(EntityUid uid, CargoGiftsRuleComponent compon
                     Loc.GetString(component.Sender),
                     Loc.GetString(component.Description),
                     Loc.GetString(component.Dest),
-                    cargoDb
+                    cargoDb,
+                    stationData!
             ))
             {
                 break;
diff --git a/Content.Server/StationEvents/Events/GasLeakRule.cs b/Content.Server/StationEvents/Events/GasLeakRule.cs
index b10db0e5b7..68544e416c 100644
--- a/Content.Server/StationEvents/Events/GasLeakRule.cs
+++ b/Content.Server/StationEvents/Events/GasLeakRule.cs
@@ -19,8 +19,6 @@ protected override void Started(EntityUid uid, GasLeakRuleComponent component, G
             if (!TryComp<StationEventComponent>(uid, out var stationEvent))
                 return;
 
-            var mod = MathF.Sqrt(GetSeverityModifier());
-
             // Essentially we'll pick out a target amount of gas to leak, then a rate to leak it at, then work out the duration from there.
             if (TryFindRandomTile(out component.TargetTile, out var target, out component.TargetGrid, out component.TargetCoords))
             {
@@ -29,7 +27,7 @@ protected override void Started(EntityUid uid, GasLeakRuleComponent component, G
 
                 component.LeakGas = RobustRandom.Pick(component.LeakableGases);
                 // Was 50-50 on using normal distribution.
-                var totalGas = RobustRandom.Next(component.MinimumGas, component.MaximumGas) * mod;
+                var totalGas = RobustRandom.Next(component.MinimumGas, component.MaximumGas);
                 var startAfter = stationEvent.StartDelay;
                 component.MolesPerSecond = RobustRandom.Next(component.MinimumMolesPerSecond, component.MaximumMolesPerSecond);
 
diff --git a/Content.Server/StationEvents/Events/LoneOpsSpawnRule.cs b/Content.Server/StationEvents/Events/LoneOpsSpawnRule.cs
index ce5f826d0c..4b15e59099 100644
--- a/Content.Server/StationEvents/Events/LoneOpsSpawnRule.cs
+++ b/Content.Server/StationEvents/Events/LoneOpsSpawnRule.cs
@@ -1,8 +1,5 @@
 using Robust.Server.GameObjects;
 using Robust.Server.Maps;
-using Robust.Shared.Map;
-using Content.Server.GameTicking;
-using Content.Server.GameTicking.Rules;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.StationEvents.Components;
 using Content.Server.RoundEnd;
@@ -11,22 +8,20 @@ namespace Content.Server.StationEvents.Events;
 
 public sealed class LoneOpsSpawnRule : StationEventSystem<LoneOpsSpawnRuleComponent>
 {
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly MapLoaderSystem _map = default!;
-    [Dependency] private readonly GameTicker _gameTicker = default!;
-    [Dependency] private readonly NukeopsRuleSystem _nukeopsRuleSystem = default!;
 
     protected override void Started(EntityUid uid, LoneOpsSpawnRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
         base.Started(uid, component, gameRule, args);
 
-        if (!_nukeopsRuleSystem.CheckLoneOpsSpawn())
+        // Loneops can only spawn if there is no nukeops active
+        if (GameTicker.IsGameRuleAdded<NukeopsRuleComponent>())
         {
             ForceEndSelf(uid, gameRule);
             return;
         }
 
-        var shuttleMap = _mapManager.CreateMap();
+        var shuttleMap = MapManager.CreateMap();
         var options = new MapLoadOptions
         {
             LoadMap = true,
@@ -34,12 +29,12 @@ protected override void Started(EntityUid uid, LoneOpsSpawnRuleComponent compone
 
         _map.TryLoad(shuttleMap, component.LoneOpsShuttlePath, out _, options);
 
-        var nukeopsEntity = _gameTicker.AddGameRule(component.GameRuleProto);
+        var nukeopsEntity = GameTicker.AddGameRule(component.GameRuleProto);
         component.AdditionalRule = nukeopsEntity;
-        var nukeopsComp = EntityManager.GetComponent<NukeopsRuleComponent>(nukeopsEntity);
+        var nukeopsComp = Comp<NukeopsRuleComponent>(nukeopsEntity);
         nukeopsComp.SpawnOutpost = false;
         nukeopsComp.RoundEndBehavior = RoundEndBehavior.Nothing;
-        _gameTicker.StartGameRule(nukeopsEntity);
+        GameTicker.StartGameRule(nukeopsEntity);
     }
 
     protected override void Ended(EntityUid uid, LoneOpsSpawnRuleComponent component, GameRuleComponent gameRule, GameRuleEndedEvent args)
@@ -50,4 +45,3 @@ protected override void Ended(EntityUid uid, LoneOpsSpawnRuleComponent component
             GameTicker.EndGameRule(component.AdditionalRule.Value);
     }
 }
-
diff --git a/Content.Server/StationEvents/Events/MeteorSwarmRule.cs b/Content.Server/StationEvents/Events/MeteorSwarmRule.cs
index ef84d0a9ae..192a620c9f 100644
--- a/Content.Server/StationEvents/Events/MeteorSwarmRule.cs
+++ b/Content.Server/StationEvents/Events/MeteorSwarmRule.cs
@@ -17,8 +17,7 @@ protected override void Started(EntityUid uid, MeteorSwarmRuleComponent componen
         {
             base.Started(uid, component, gameRule, args);
 
-            var mod = Math.Sqrt(GetSeverityModifier());
-            component.WaveCounter = (int) (RobustRandom.Next(component.MinimumWaves, component.MaximumWaves) * mod);
+            component.WaveCounter = RobustRandom.Next(component.MinimumWaves, component.MaximumWaves);
         }
 
         protected override void ActiveTick(EntityUid uid, MeteorSwarmRuleComponent component, GameRuleComponent gameRule, float frameTime)
@@ -29,8 +28,6 @@ protected override void ActiveTick(EntityUid uid, MeteorSwarmRuleComponent compo
                 return;
             }
 
-            var mod = GetSeverityModifier();
-
             component.Cooldown -= frameTime;
 
             if (component.Cooldown > 0f)
@@ -38,7 +35,7 @@ protected override void ActiveTick(EntityUid uid, MeteorSwarmRuleComponent compo
 
             component.WaveCounter--;
 
-            component.Cooldown += (component.MaximumCooldown - component.MinimumCooldown) * RobustRandom.NextFloat() / mod + component.MinimumCooldown;
+            component.Cooldown += (component.MaximumCooldown - component.MinimumCooldown) * RobustRandom.NextFloat() + component.MinimumCooldown;
 
             Box2? playableArea = null;
             var mapId = GameTicker.DefaultMap;
diff --git a/Content.Server/StationEvents/Events/RandomSentienceRule.cs b/Content.Server/StationEvents/Events/RandomSentienceRule.cs
index d90361fe96..4b7606d01f 100644
--- a/Content.Server/StationEvents/Events/RandomSentienceRule.cs
+++ b/Content.Server/StationEvents/Events/RandomSentienceRule.cs
@@ -11,7 +11,6 @@ protected override void Started(EntityUid uid, RandomSentienceRuleComponent comp
     {
         HashSet<EntityUid> stationsToNotify = new();
 
-        var mod = GetSeverityModifier();
         var targetList = new List<Entity<SentienceTargetComponent>>();
         var query = EntityQueryEnumerator<SentienceTargetComponent>();
         while (query.MoveNext(out var targetUid, out var target))
@@ -21,7 +20,7 @@ protected override void Started(EntityUid uid, RandomSentienceRuleComponent comp
 
         RobustRandom.Shuffle(targetList);
 
-        var toMakeSentient = (int) (RobustRandom.Next(2, 5) * Math.Sqrt(mod));
+        var toMakeSentient = RobustRandom.Next(2, 5);
         var groups = new HashSet<string>();
 
         foreach (var target in targetList)
diff --git a/Content.Server/StationEvents/Events/StationEventSystem.cs b/Content.Server/StationEvents/Events/StationEventSystem.cs
index 221beccee7..7f05f8940d 100644
--- a/Content.Server/StationEvents/Events/StationEventSystem.cs
+++ b/Content.Server/StationEvents/Events/StationEventSystem.cs
@@ -1,38 +1,27 @@
-using System.Diagnostics.CodeAnalysis;
 using Content.Server.Administration.Logs;
-using Content.Server.Atmos.EntitySystems;
 using Content.Server.Chat.Systems;
 using Content.Server.GameTicking.Rules;
 using Content.Server.GameTicking.Rules.Components;
-using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Database;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Collections;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
 
 namespace Content.Server.StationEvents.Events;
 
 /// <summary>
 ///     An abstract entity system inherited by all station events for their behavior.
 /// </summary>
-public abstract partial class StationEventSystem<T> : GameRuleSystem<T> where T : IComponent
+public abstract class StationEventSystem<T> : GameRuleSystem<T> where T : IComponent
 {
     [Dependency] protected readonly IAdminLogManager AdminLogManager = default!;
-    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] protected readonly IMapManager MapManager = default!;
     [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
-    [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
     [Dependency] protected readonly ChatSystem ChatSystem = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] protected readonly StationSystem StationSystem = default!;
 
     protected ISawmill Sawmill = default!;
@@ -60,7 +49,7 @@ protected override void Added(EntityUid uid, T component, GameRuleComponent game
         }
 
         Audio.PlayGlobal(stationEvent.StartAudio, Filter.Broadcast(), true);
-        stationEvent.StartTime = _timing.CurTime + stationEvent.StartDelay;
+        stationEvent.StartTime = Timing.CurTime + stationEvent.StartDelay;
     }
 
     /// <inheritdoc/>
@@ -79,7 +68,7 @@ protected override void Started(EntityUid uid, T component, GameRuleComponent ga
                 ? stationEvent.Duration
                 : TimeSpan.FromSeconds(RobustRandom.NextDouble(stationEvent.Duration.Value.TotalSeconds,
                     stationEvent.MaxDuration.Value.TotalSeconds));
-            stationEvent.EndTime = _timing.CurTime + duration;
+            stationEvent.EndTime = Timing.CurTime + duration;
         }
     }
 
@@ -116,11 +105,11 @@ public override void Update(float frameTime)
             if (!GameTicker.IsGameRuleAdded(uid, ruleData))
                 continue;
 
-            if (!GameTicker.IsGameRuleActive(uid, ruleData) && _timing.CurTime >= stationEvent.StartTime)
+            if (!GameTicker.IsGameRuleActive(uid, ruleData) && Timing.CurTime >= stationEvent.StartTime)
             {
                 GameTicker.StartGameRule(uid, ruleData);
             }
-            else if (stationEvent.EndTime != null && _timing.CurTime >= stationEvent.EndTime && GameTicker.IsGameRuleActive(uid, ruleData))
+            else if (stationEvent.EndTime != null && Timing.CurTime >= stationEvent.EndTime && GameTicker.IsGameRuleActive(uid, ruleData))
             {
                 GameTicker.EndGameRule(uid, ruleData);
             }
@@ -134,25 +123,5 @@ protected void ForceEndSelf(EntityUid uid, GameRuleComponent? component = null)
         GameTicker.EndGameRule(uid, component);
     }
 
-    public float GetSeverityModifier()
-    {
-        var ev = new GetSeverityModifierEvent();
-        RaiseLocalEvent(ev);
-        return ev.Modifier;
-    }
-
     #endregion
 }
-
-/// <summary>
-///     Raised broadcast to determine what the severity modifier should be for an event, some positive number that can be multiplied with various things.
-///     Handled by usually other game rules (like the ramping scheduler).
-///     Most events should try and make use of this if possible.
-/// </summary>
-public sealed class GetSeverityModifierEvent : EntityEventArgs
-{
-    /// <summary>
-    ///     Should be multiplied/added to rather than set, for commutativity.
-    /// </summary>
-    public float Modifier = 1.0f;
-}
diff --git a/Content.Server/StationEvents/Events/VentClogRule.cs b/Content.Server/StationEvents/Events/VentClogRule.cs
index f378aec3fb..e263a5f4f6 100644
--- a/Content.Server/StationEvents/Events/VentClogRule.cs
+++ b/Content.Server/StationEvents/Events/VentClogRule.cs
@@ -28,9 +28,6 @@ protected override void Started(EntityUid uid, VentClogRuleComponent component,
             .Where(x => !x.Abstract)
             .Select(x => x.ID).ToList();
 
-        // TODO: This is gross, but not much can be done until event refactor, which needs Dynamic.
-        var mod = (float) Math.Sqrt(GetSeverityModifier());
-
         foreach (var (_, transform) in EntityManager.EntityQuery<GasVentPumpComponent, TransformComponent>())
         {
             if (CompOrNull<StationMemberComponent>(transform.GridUid)?.Station != chosenStation)
@@ -40,14 +37,14 @@ protected override void Started(EntityUid uid, VentClogRuleComponent component,
 
             var solution = new Solution();
 
-            if (!RobustRandom.Prob(Math.Min(0.33f * mod, 1.0f)))
+            if (!RobustRandom.Prob(0.33f))
                 continue;
 
-            var pickAny = RobustRandom.Prob(Math.Min(0.05f * mod, 1.0f));
+            var pickAny = RobustRandom.Prob(0.05f);
             var reagent = RobustRandom.Pick(pickAny ? allReagents : component.SafeishVentChemicals);
 
             var weak = component.WeakReagents.Contains(reagent);
-            var quantity = (weak ? component.WeakReagentQuantity : component.ReagentQuantity) * mod;
+            var quantity = weak ? component.WeakReagentQuantity : component.ReagentQuantity;
             solution.AddReagent(reagent, quantity);
 
             var foamEnt = Spawn("Foam", transform.Coordinates);
diff --git a/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs b/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
index 5c972df52e..ef3b5cf18a 100644
--- a/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
+++ b/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
@@ -25,13 +25,6 @@ public float GetChaosModifier(EntityUid uid, RampingStationEventSchedulerCompone
         return component.MaxChaos / component.EndTime * roundTime + component.StartingChaos;
     }
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<GetSeverityModifierEvent>(OnGetSeverityModifier);
-    }
-
     protected override void Started(EntityUid uid, RampingStationEventSchedulerComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
         base.Started(uid, component, gameRule, args);
@@ -73,19 +66,6 @@ public override void Update(float frameTime)
         }
     }
 
-    private void OnGetSeverityModifier(GetSeverityModifierEvent ev)
-    {
-        var query = EntityQueryEnumerator<RampingStationEventSchedulerComponent, GameRuleComponent>();
-        while (query.MoveNext(out var uid, out var scheduler, out var gameRule))
-        {
-            if (!GameTicker.IsGameRuleActive(uid, gameRule))
-                return;
-
-            ev.Modifier *= GetChaosModifier(uid, scheduler);
-            Logger.Info($"Ramping set modifier to {ev.Modifier}");
-        }
-    }
-
     private void PickNextEventTime(EntityUid uid, RampingStationEventSchedulerComponent component)
     {
         var mod = GetChaosModifier(uid, component);
diff --git a/Content.Server/StationRecords/Systems/StationRecordsSystem.cs b/Content.Server/StationRecords/Systems/StationRecordsSystem.cs
index 09a00e5967..67f50d7a4e 100644
--- a/Content.Server/StationRecords/Systems/StationRecordsSystem.cs
+++ b/Content.Server/StationRecords/Systems/StationRecordsSystem.cs
@@ -129,7 +129,7 @@ public void CreateGeneralRecord(
             JobPrototype = jobId,
             Species = species,
             Gender = gender,
-            DisplayPriority = jobPrototype.Weight,
+            DisplayPriority = jobPrototype.RealDisplayWeight,
             Fingerprint = mobFingerprint,
             DNA = dna
         };
diff --git a/Content.Server/Storage/EntitySystems/CursedEntityStorageSystem.cs b/Content.Server/Storage/EntitySystems/CursedEntityStorageSystem.cs
index 7c58bcccca..9b65daf461 100644
--- a/Content.Server/Storage/EntitySystems/CursedEntityStorageSystem.cs
+++ b/Content.Server/Storage/EntitySystems/CursedEntityStorageSystem.cs
@@ -2,11 +2,7 @@
 using Content.Server.Storage.Components;
 using Content.Shared.Audio;
 using Content.Shared.Storage.Components;
-using Robust.Shared.Audio;
-using Robust.Shared.Player;
 using Robust.Shared.Random;
-using System.Linq;
-using Content.Shared.Storage.Components;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 
diff --git a/Content.Server/Store/Conditions/BuyerSpeciesCondition.cs b/Content.Server/Store/Conditions/BuyerSpeciesCondition.cs
index 3a3df725c4..1df4fce177 100644
--- a/Content.Server/Store/Conditions/BuyerSpeciesCondition.cs
+++ b/Content.Server/Store/Conditions/BuyerSpeciesCondition.cs
@@ -1,9 +1,7 @@
-using Content.Server.Humanoid;
 using Content.Shared.Humanoid;
 using Content.Shared.Store;
 using Content.Shared.Humanoid.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
-using Content.Shared.Humanoid;
 
 namespace Content.Server.Store.Conditions;
 
diff --git a/Content.Server/Strip/StrippableSystem.cs b/Content.Server/Strip/StrippableSystem.cs
index 89eb202b25..50a9cb9b69 100644
--- a/Content.Server/Strip/StrippableSystem.cs
+++ b/Content.Server/Strip/StrippableSystem.cs
@@ -238,7 +238,8 @@ bool Check()
                 _popup.PopupEntity(message, target, target, PopupType.Large);
             }
 
-            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):user} is trying to place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
+            var prefix = ev.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");
 
             var result = await _doAfter.WaitDoAfter(doAfterArgs);
             if (result != DoAfterStatus.Finished)
@@ -250,7 +251,7 @@ bool Check()
             {
                 _inventorySystem.TryEquip(user, target, held, slot);
 
-                _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):user} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
+                _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s {slot} slot");
             }
         }
 
@@ -305,14 +306,15 @@ bool Check()
                 DuplicateCondition = DuplicateConditions.SameTool
             };
 
-            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):user} is trying to place the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
+            var prefix = ev.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");
 
             var result = await _doAfter.WaitDoAfter(doAfterArgs);
             if (result != DoAfterStatus.Finished) return;
 
             _handsSystem.TryDrop(user, checkActionBlocker: false, handsComp: userHands);
             _handsSystem.TryPickup(target, held, handName, checkActionBlocker: false, animateUser: !ev.Stealth, animate: !ev.Stealth, handsComp: hands);
-            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):user} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
+            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has placed the item {ToPrettyString(held):item} in {ToPrettyString(target):target}'s hands");
             // hand update will trigger strippable update
         }
 
@@ -381,7 +383,8 @@ bool Check()
                 }
             }
 
-            _adminLogger.Add(LogType.Stripping, LogImpact.Low, $"{ToPrettyString(user):user} is trying to strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}");
+            var prefix = ev.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 {slot} slot");
 
             var result = await _doAfter.WaitDoAfter(doAfterArgs);
             if (result != DoAfterStatus.Finished)
@@ -394,7 +397,7 @@ bool Check()
             RaiseLocalEvent(item, new DroppedEvent(user), true);
 
             _handsSystem.PickupOrDrop(user, item, animateUser: !ev.Stealth, animate: !ev.Stealth);
-            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):user} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}");
+            _adminLogger.Add(LogType.Stripping, LogImpact.Medium, $"{ToPrettyString(user):actor} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s {slot} slot");
 
         }
 
@@ -453,8 +456,9 @@ bool Check()
                     strippable.Owner);
             }
 
+            var prefix = ev.Stealth ? "stealthily " : "";
             _adminLogger.Add(LogType.Stripping, LogImpact.Low,
-                $"{ToPrettyString(user):user} is trying to strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}");
+                $"{ToPrettyString(user):actor} is trying to {prefix}strip the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s hands");
 
             var result = await _doAfter.WaitDoAfter(doAfterArgs);
             if (result != DoAfterStatus.Finished)
@@ -464,7 +468,7 @@ bool Check()
             _handsSystem.PickupOrDrop(user, item, animateUser: !ev.Stealth, animate: !ev.Stealth, handsComp: userHands);
             // hand update will trigger strippable update
             _adminLogger.Add(LogType.Stripping, LogImpact.Medium,
-                $"{ToPrettyString(user):user} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}");
+                $"{ToPrettyString(user):actor} has stripped the item {ToPrettyString(item):item} from {ToPrettyString(target):target}'s hands");
         }
     }
 }
diff --git a/Content.Server/Stunnable/Systems/StunbatonSystem.cs b/Content.Server/Stunnable/Systems/StunbatonSystem.cs
index 027259495c..5f019490b5 100644
--- a/Content.Server/Stunnable/Systems/StunbatonSystem.cs
+++ b/Content.Server/Stunnable/Systems/StunbatonSystem.cs
@@ -48,6 +48,12 @@ private void OnExamined(Entity<StunbatonComponent> entity, ref ExaminedEvent arg
             ? Loc.GetString("comp-stunbaton-examined-on")
             : Loc.GetString("comp-stunbaton-examined-off");
             args.PushMarkup(onMsg);
+
+            if (TryComp<BatteryComponent>(entity.Owner, out var battery))
+            {
+                var count = (int) (battery.CurrentCharge / entity.Comp.EnergyPerUse);
+                args.PushMarkup(Loc.GetString("melee-battery-examine", ("color", "yellow"), ("count", count)));
+            }
         }
 
         private void ToggleDone(Entity<StunbatonComponent> entity, ref ItemToggledEvent args)
diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
index cbc2f6d31e..f258fbe89c 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Systems;
 using Content.Server.Power.Components;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.UserInterface;
 using Content.Shared.SurveillanceCamera;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs
index 9f7057d9b6..aef4b89d50 100644
--- a/Content.Server/Temperature/Systems/TemperatureSystem.cs
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs
@@ -293,7 +293,10 @@ private void ChangeDamage(EntityUid uid, TemperatureComponent temperature)
     private void OnTemperatureChangeAttempt(EntityUid uid, TemperatureProtectionComponent component,
         InventoryRelayedEvent<ModifyChangedTemperatureEvent> args)
     {
-        args.Args.TemperatureDelta *= component.Coefficient;
+        var ev = new GetTemperatureProtectionEvent(component.Coefficient);
+        RaiseLocalEvent(uid, ref ev);
+
+        args.Args.TemperatureDelta *= ev.Coefficient;
     }
 
     private void OnParentChange(EntityUid uid, TemperatureComponent component,
diff --git a/Content.Server/Tesla/Components/LightningArcShooterComponent.cs b/Content.Server/Tesla/Components/LightningArcShooterComponent.cs
index 641dc59e8c..add7bf88e4 100644
--- a/Content.Server/Tesla/Components/LightningArcShooterComponent.cs
+++ b/Content.Server/Tesla/Components/LightningArcShooterComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Server.Tesla.Components;
 /// <summary>
 /// Periodically fires electric arcs at surrounding objects.
 /// </summary>
-[RegisterComponent, Access(typeof(LightningArcShooterSystem))]
+[RegisterComponent, Access(typeof(LightningArcShooterSystem)), AutoGenerateComponentPause]
 public sealed partial class LightningArcShooterComponent : Component
 {
     /// <summary>
@@ -45,6 +45,7 @@ public sealed partial class LightningArcShooterComponent : Component
     /// The time, upon reaching which the next batch of lightning bolts will be fired.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [AutoPausedField]
     public TimeSpan NextShootTime;
 
     /// <summary>
diff --git a/Content.Server/Tesla/Components/LightningSparkingComponent.cs b/Content.Server/Tesla/Components/LightningSparkingComponent.cs
index bb954de89a..e56c59f196 100644
--- a/Content.Server/Tesla/Components/LightningSparkingComponent.cs
+++ b/Content.Server/Tesla/Components/LightningSparkingComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Server.Tesla.Components;
 /// <summary>
 /// The component changes the visual of an object after it is struck by lightning
 /// </summary>
-[RegisterComponent, Access(typeof(LightningSparkingSystem))]
+[RegisterComponent, Access(typeof(LightningSparkingSystem)), AutoGenerateComponentPause]
 public sealed partial class LightningSparkingComponent : Component
 {
     /// <summary>
@@ -20,6 +20,7 @@ public sealed partial class LightningSparkingComponent : Component
     /// When the spark visual should turn off.
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan LightningEndTime;
 
     [DataField, ViewVariables(VVAccess.ReadWrite)]
diff --git a/Content.Server/Tesla/EntitySystem/LightningArcShooterSystem.cs b/Content.Server/Tesla/EntitySystem/LightningArcShooterSystem.cs
index e901a93288..9948537c3c 100644
--- a/Content.Server/Tesla/EntitySystem/LightningArcShooterSystem.cs
+++ b/Content.Server/Tesla/EntitySystem/LightningArcShooterSystem.cs
@@ -18,7 +18,6 @@ public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<LightningArcShooterComponent, MapInitEvent>(OnShooterMapInit);
-        SubscribeLocalEvent<LightningArcShooterComponent, EntityUnpausedEvent>(OnShooterUnpaused);
     }
 
     private void OnShooterMapInit(EntityUid uid, LightningArcShooterComponent component, ref MapInitEvent args)
@@ -26,11 +25,6 @@ private void OnShooterMapInit(EntityUid uid, LightningArcShooterComponent compon
         component.NextShootTime = _gameTiming.CurTime + TimeSpan.FromSeconds(component.ShootMaxInterval);
     }
 
-    private void OnShooterUnpaused(EntityUid uid, LightningArcShooterComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextShootTime += args.PausedTime;
-    }
-
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
diff --git a/Content.Server/Tesla/EntitySystem/LightningSparkingSystem.cs b/Content.Server/Tesla/EntitySystem/LightningSparkingSystem.cs
index 7b569e66b3..c07472c8b3 100644
--- a/Content.Server/Tesla/EntitySystem/LightningSparkingSystem.cs
+++ b/Content.Server/Tesla/EntitySystem/LightningSparkingSystem.cs
@@ -18,12 +18,6 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<LightningSparkingComponent, HitByLightningEvent>(OnHitByLightning);
-        SubscribeLocalEvent<LightningSparkingComponent, EntityUnpausedEvent>(OnLightningUnpaused);
-    }
-
-    private void OnLightningUnpaused(EntityUid uid, LightningSparkingComponent component, ref EntityUnpausedEvent args)
-    {
-        component.LightningEndTime += args.PausedTime;
     }
 
     private void OnHitByLightning(Entity<LightningSparkingComponent> uid, ref HitByLightningEvent args)
diff --git a/Content.Server/Tips/TipsSystem.cs b/Content.Server/Tips/TipsSystem.cs
index 1c342fcadf..cc45a3a1d5 100644
--- a/Content.Server/Tips/TipsSystem.cs
+++ b/Content.Server/Tips/TipsSystem.cs
@@ -36,10 +36,10 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<GameRunLevelChangedEvent>(OnGameRunLevelChanged);
-        _cfg.OnValueChanged(CCVars.TipFrequencyOutOfRound, SetOutOfRound, true);
-        _cfg.OnValueChanged(CCVars.TipFrequencyInRound, SetInRound, true);
-        _cfg.OnValueChanged(CCVars.TipsEnabled, SetEnabled, true);
-        _cfg.OnValueChanged(CCVars.TipsDataset, SetDataset, true);
+        Subs.CVar(_cfg, CCVars.TipFrequencyOutOfRound, SetOutOfRound, true);
+        Subs.CVar(_cfg, CCVars.TipFrequencyInRound, SetInRound, true);
+        Subs.CVar(_cfg, CCVars.TipsEnabled, SetEnabled, true);
+        Subs.CVar(_cfg, CCVars.TipsDataset, SetDataset, true);
 
         RecalculateNextTipTime();
     }
diff --git a/Content.Server/Tools/Innate/InnateToolComponent.cs b/Content.Server/Tools/Innate/InnateToolComponent.cs
index bfe7c21342..d3afca3059 100644
--- a/Content.Server/Tools/Innate/InnateToolComponent.cs
+++ b/Content.Server/Tools/Innate/InnateToolComponent.cs
@@ -7,5 +7,6 @@ public sealed partial class InnateToolComponent : Component
     {
         [DataField("tools")] public List<EntitySpawnEntry> Tools = new();
         public List<EntityUid> ToolUids = new();
+        public List<string> ToSpawn = new();
     }
 }
diff --git a/Content.Server/Tools/Innate/InnateToolSystem.cs b/Content.Server/Tools/Innate/InnateToolSystem.cs
index d0109138ad..e7e5be38c4 100644
--- a/Content.Server/Tools/Innate/InnateToolSystem.cs
+++ b/Content.Server/Tools/Innate/InnateToolSystem.cs
@@ -1,90 +1,99 @@
+using System.Linq;
+using Content.Shared.Body.Part;
 using Content.Shared.Destructible;
+using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction.Components;
 using Content.Shared.Storage;
 using Content.Shared.Tag;
+using Robust.Shared.Network;
 using Robust.Shared.Random;
 
-namespace Content.Server.Tools.Innate
+namespace Content.Server.Tools.Innate;
+
+/// <summary>
+///     Spawns a list unremovable tools in hands if possible. Used for drones,
+///     borgs, or maybe even stuff like changeling armblades!
+/// </summary>
+public sealed class InnateToolSystem : EntitySystem
 {
-    /// <summary>
-    ///     Spawns a list unremovable tools in hands if possible. Used for drones,
-    ///     borgs, or maybe even stuff like changeling armblades!
-    /// </summary>
-    public sealed class InnateToolSystem : EntitySystem
+    [Dependency] private readonly IRobustRandom _robustRandom = default!;
+    [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!;
+    [Dependency] private readonly TagSystem _tagSystem = default!;
+
+    public override void Initialize()
     {
-        [Dependency] private readonly IRobustRandom _robustRandom = default!;
-        [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!;
-        [Dependency] private readonly TagSystem _tagSystem = default!;
-        public override void Initialize()
-        {
-            base.Initialize();
-            SubscribeLocalEvent<InnateToolComponent, ComponentStartup>(OnStartup);
-            SubscribeLocalEvent<InnateToolComponent, ComponentShutdown>(OnShutdown);
-            SubscribeLocalEvent<InnateToolComponent, DestructionEventArgs>(OnDestroyed);
-        }
+        base.Initialize();
+        SubscribeLocalEvent<InnateToolComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<InnateToolComponent, HandCountChangedEvent>(OnHandCountChanged);
+        SubscribeLocalEvent<InnateToolComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<InnateToolComponent, DestructionEventArgs>(OnDestroyed);
+    }
 
-        private void OnStartup(EntityUid uid, InnateToolComponent component, ComponentStartup args)
-        {
-            if (component.Tools.Count == 0)
-                return;
+    private void OnMapInit(EntityUid uid, InnateToolComponent component, MapInitEvent args)
+    {
+        if (component.Tools.Count == 0)
+            return;
 
-            var spawnCoord = Transform(uid).Coordinates;
+        component.ToSpawn = EntitySpawnCollection.GetSpawns(component.Tools, _robustRandom);
+    }
 
-            if (TryComp<HandsComponent>(uid, out var hands) && hands.Count >= component.Tools.Count)
-            {
-                var items = EntitySpawnCollection.GetSpawns(component.Tools, _robustRandom);
-                foreach (var entry in items)
-                {
-                    var item = Spawn(entry, spawnCoord);
-                    AddComp<UnremoveableComponent>(item);
-                    if (!_sharedHandsSystem.TryPickupAnyHand(uid, item, checkActionBlocker: false))
-                    {
-                        QueueDel(item);
-                        continue;
-                    }
-                    component.ToolUids.Add(item);
-                }
-            }
-        }
+    private void OnHandCountChanged(EntityUid uid, InnateToolComponent component, HandCountChangedEvent args)
+    {
+        if (component.ToSpawn.Count == 0)
+            return;
+
+        var spawnCoord = Transform(uid).Coordinates;
 
-        private void OnShutdown(EntityUid uid, InnateToolComponent component, ComponentShutdown args)
+        var toSpawn = component.ToSpawn.First();
+
+        var item = Spawn(toSpawn, spawnCoord);
+        AddComp<UnremoveableComponent>(item);
+        if (!_sharedHandsSystem.TryPickupAnyHand(uid, item, checkActionBlocker: false))
         {
-            foreach (var tool in component.ToolUids)
-            {
-                RemComp<UnremoveableComponent>(tool);
-            }
+            QueueDel(item);
+            component.ToSpawn.Clear();
         }
+        component.ToSpawn.Remove(toSpawn);
+        component.ToolUids.Add(item);
+    }
 
-        private void OnDestroyed(EntityUid uid, InnateToolComponent component, DestructionEventArgs args)
+    private void OnShutdown(EntityUid uid, InnateToolComponent component, ComponentShutdown args)
+    {
+        foreach (var tool in component.ToolUids)
         {
-            Cleanup(uid, component);
+            RemComp<UnremoveableComponent>(tool);
         }
+    }
 
-        public void Cleanup(EntityUid uid, InnateToolComponent component)
+    private void OnDestroyed(EntityUid uid, InnateToolComponent component, DestructionEventArgs args)
+    {
+        Cleanup(uid, component);
+    }
+
+    public void Cleanup(EntityUid uid, InnateToolComponent component)
+    {
+        foreach (var tool in component.ToolUids)
         {
-            foreach (var tool in component.ToolUids)
+            if (_tagSystem.HasTag(tool, "InnateDontDelete"))
             {
-                if (_tagSystem.HasTag(tool, "InnateDontDelete"))
-                {
-                    RemComp<UnremoveableComponent>(tool);
-                }
-                else
-                {
-                    Del(tool);
-                }
+                RemComp<UnremoveableComponent>(tool);
+            }
+            else
+            {
+                Del(tool);
+            }
 
-                if (TryComp<HandsComponent>(uid, out var hands))
+            if (TryComp<HandsComponent>(uid, out var hands))
+            {
+                foreach (var hand in hands.Hands)
                 {
-                    foreach (var hand in hands.Hands)
-                    {
-                        _sharedHandsSystem.TryDrop(uid, hand.Value, checkActionBlocker: false, handsComp: hands);
-                    }
+                    _sharedHandsSystem.TryDrop(uid, hand.Value, checkActionBlocker: false, handsComp: hands);
                 }
             }
-
-            component.ToolUids.Clear();
         }
+
+        component.ToolUids.Clear();
     }
 }
diff --git a/Content.Server/Traitor/Systems/AutoTraitorSystem.cs b/Content.Server/Traitor/Systems/AutoTraitorSystem.cs
index 70fefd4c90..15deae2552 100644
--- a/Content.Server/Traitor/Systems/AutoTraitorSystem.cs
+++ b/Content.Server/Traitor/Systems/AutoTraitorSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.GameTicking.Rules;
 using Content.Server.Traitor.Components;
-using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 
 namespace Content.Server.Traitor.Systems;
@@ -16,15 +15,9 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<AutoTraitorComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<AutoTraitorComponent, MindAddedMessage>(OnMindAdded);
     }
 
-    private void OnMapInit(EntityUid uid, AutoTraitorComponent comp, MapInitEvent args)
-    {
-        TryMakeTraitor(uid, comp);
-    }
-
     private void OnMindAdded(EntityUid uid, AutoTraitorComponent comp, MindAddedMessage args)
     {
         TryMakeTraitor(uid, comp);
@@ -60,15 +53,9 @@ public bool TryMakeTraitor(EntityUid uid, AutoTraitorComponent? comp = null)
         if (!Resolve(uid, ref comp))
             return false;
 
-        if (!TryComp<MindContainerComponent>(uid, out var mindContainer) || mindContainer.Mind == null)
-            return false;
-
-        var mindId = mindContainer.Mind.Value;
-        if (!TryComp<MindComponent>(mindId, out var mind) || mind.Session == null)
-            return false;
-
-        var session = mind.Session;
-        _traitorRule.MakeTraitor(session, giveUplink: comp.GiveUplink, giveObjectives: comp.GiveObjectives);
+        //Start the rule if it has not already been started
+        var traitorRuleComponent = _traitorRule.StartGameRule();
+        _traitorRule.MakeTraitor(uid, traitorRuleComponent, giveUplink: comp.GiveUplink, giveObjectives: comp.GiveObjectives);
         // prevent spamming anything if it fails
         RemComp<AutoTraitorComponent>(uid);
         return true;
diff --git a/Content.Server/UserInterface/ActivatableUIComponent.cs b/Content.Server/UserInterface/ActivatableUIComponent.cs
index 34f9c0f397..54639dd2b0 100644
--- a/Content.Server/UserInterface/ActivatableUIComponent.cs
+++ b/Content.Server/UserInterface/ActivatableUIComponent.cs
@@ -1,14 +1,12 @@
 using Robust.Shared.Player;
-using Robust.Shared.Reflection;
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations;
 
 namespace Content.Server.UserInterface
 {
     [RegisterComponent]
-    public sealed partial class ActivatableUIComponent : Component,
-            ISerializationHooks
+    public sealed partial class ActivatableUIComponent : Component
     {
-        [ViewVariables]
+        [DataField(required: true, customTypeSerializer:typeof(EnumSerializer))]
         public Enum? Key { get; set; }
 
         [ViewVariables(VVAccess.ReadWrite)]
@@ -22,9 +20,6 @@ public sealed partial class ActivatableUIComponent : Component,
         [DataField]
         public bool AdminOnly { get; set; } = false;
 
-        [DataField("key", required: true)]
-        private string _keyRaw = default!;
-
         [DataField]
         public LocId VerbText = "ui-verb-toggle-open";
 
@@ -66,13 +61,6 @@ public sealed partial class ActivatableUIComponent : Component,
         /// </summary>
         [ViewVariables]
         public ICommonSession? CurrentSingleUser;
-
-        void ISerializationHooks.AfterDeserialization()
-        {
-            var reflectionManager = IoCManager.Resolve<IReflectionManager>();
-            if (reflectionManager.TryParseEnumReference(_keyRaw, out var key))
-                Key = key;
-        }
     }
 }
 
diff --git a/Content.Server/Wagging/WaggingSystem.cs b/Content.Server/Wagging/WaggingSystem.cs
index c7478b5dfd..0a4ff8b4a1 100644
--- a/Content.Server/Wagging/WaggingSystem.cs
+++ b/Content.Server/Wagging/WaggingSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.Actions;
-using Content.Server.Chat.Systems;
 using Content.Server.Humanoid;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
@@ -16,7 +15,6 @@ namespace Content.Server.Wagging;
 public sealed class WaggingSystem : EntitySystem
 {
     [Dependency] private readonly ActionsSystem _actions = default!;
-    [Dependency] private readonly ChatSystem _chat = default!;
     [Dependency] private readonly HumanoidAppearanceSystem _humanoidAppearance = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
 
@@ -50,9 +48,6 @@ private void OnWaggingToggle(EntityUid uid, WaggingComponent component, ref Togg
 
     private void OnMobStateChanged(EntityUid uid, WaggingComponent component, MobStateChangedEvent args)
     {
-        if (args.NewMobState != MobState.Dead)
-            return;
-
         if (component.Wagging)
             TryToggleWagging(uid, wagging: component);
     }
@@ -139,9 +134,6 @@ public bool TryToggleWagging(EntityUid uid, WaggingComponent? wagging = null, Hu
         }
         // Parkstation-TailWag End
 
-        var emoteText = Loc.GetString(wagging.Wagging ? "wagging-emote-start" : "wagging-emote-stop", ("ent", uid));
-        _chat.TrySendInGameICMessage(uid, emoteText, InGameICChatType.Emote, ChatTransmitRange.Normal); // Ok while emotes dont have radial menu
-
         return true;
     }
 }
diff --git a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
index 1c672796c6..31c9b0d2b8 100644
--- a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
@@ -4,7 +4,6 @@
 using Content.Server.Chemistry.Components;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.CombatMode.Disarm;
-using Content.Server.Contests;
 using Content.Server.Movement.Systems;
 using Content.Shared.Actions.Events;
 using Content.Shared.Administration.Components;
@@ -37,7 +36,6 @@ public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
     [Dependency] private readonly ChatSystem _chat = default!;
-    [Dependency] private readonly ContestsSystem _contests = default!;
     [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly LagCompensationSystem _lag = default!;
@@ -207,9 +205,7 @@ private float CalculateDisarmChance(EntityUid disarmer, EntityUid disarmed, Enti
         if (HasComp<DisarmProneComponent>(disarmed))
             return 0.0f;
 
-        var contestResults = 1 - _contests.OverallStrengthContest(disarmer, disarmed);
-
-        float chance = (disarmerComp.BaseDisarmFailChance + contestResults);
+        var chance = disarmerComp.BaseDisarmFailChance;
 
         if (inTargetHand != null && TryComp<DisarmMalusComponent>(inTargetHand, out var malus))
         {
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
index f4deffd113..25010b2233 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
@@ -41,7 +41,7 @@ private void UpdateShots(EntityUid uid, BatteryAmmoProviderComponent component)
         if (!TryComp<BatteryComponent>(uid, out var battery))
             return;
 
-        UpdateShots(uid, component, battery.Charge, battery.MaxCharge);
+        UpdateShots(uid, component, battery.CurrentCharge, battery.MaxCharge);
     }
 
     private void UpdateShots(EntityUid uid, BatteryAmmoProviderComponent component, float charge, float maxCharge)
diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
index 756a4c9065..b8f8f12211 100644
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -87,8 +87,6 @@ public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid?
                     Audio.PlayPvs(clumsy.ClumsySound, gunUid);
 
                     PopupSystem.PopupEntity(Loc.GetString("gun-clumsy"), user.Value);
-                    _adminLogger.Add(LogType.EntityDelete, LogImpact.Medium, $"Clumsy fire by {ToPrettyString(user.Value)} deleted {ToPrettyString(gunUid)}");
-                    Del(gunUid);
                     userImpulse = false;
                     return;
                 }
diff --git a/Content.Server/Wires/WiresSystem.cs b/Content.Server/Wires/WiresSystem.cs
index 2b23b09360..0f9ee8b0f7 100644
--- a/Content.Server/Wires/WiresSystem.cs
+++ b/Content.Server/Wires/WiresSystem.cs
@@ -620,13 +620,6 @@ public IEnumerable<Wire> TryGetWires<T>(EntityUid uid, WiresComponent? wires = n
         }
     }
 
-    public void ChangePanelVisibility(EntityUid uid, WiresPanelComponent component, bool visible)
-    {
-        component.Visible = visible;
-        UpdateAppearance(uid, component);
-        Dirty(uid, component);
-    }
-
     public void SetWiresPanelSecurity(EntityUid uid, WiresPanelSecurityComponent component, WiresPanelSecurityEvent args)
     {
         component.Examine = args.Examine;
diff --git a/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs b/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs
index 70db152b4e..d3eeeb6037 100644
--- a/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs
+++ b/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs
@@ -34,8 +34,8 @@ public override void Initialize()
     {
         SubscribeLocalEvent<RoundStartingEvent>(OnLoadingMaps);
         _conHost.RegisterCommand("applyworldgenconfig", Loc.GetString("cmd-applyworldgenconfig-description"), Loc.GetString("cmd-applyworldgenconfig-help"), ApplyWorldgenConfigCommand);
-        _cfg.OnValueChanged(CCVars.WorldgenEnabled, b => _enabled = b, true);
-        _cfg.OnValueChanged(CCVars.WorldgenConfig, s => _worldgenConfig = s, true);
+        Subs.CVar(_cfg, CCVars.WorldgenEnabled, b => _enabled = b, true);
+        Subs.CVar(_cfg, CCVars.WorldgenConfig, s => _worldgenConfig = s, true);
     }
 
     [AdminCommand(AdminFlags.Mapping)]
diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
index 09fdc260d7..6606f28432 100644
--- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
+++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs
@@ -106,7 +106,7 @@ public void FinishCrushing(Entity<ArtifactCrusherComponent, EntityStorageCompone
             if (!TryComp<BodyComponent>(contained, out var body))
                 Del(contained);
 
-            var gibs = _body.GibBody(contained, body: body, gibOrgans: true, deleteBrain: true);
+            var gibs = _body.GibBody(contained, body: body, gibOrgans: true);
             foreach (var gib in gibs)
             {
                 ContainerSystem.Insert((gib, null, null, null), crusher.OutputContainer);
diff --git a/Content.Server/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs
index 1009e0a294..e515c377be 100644
--- a/Content.Server/Zombies/ZombieSystem.cs
+++ b/Content.Server/Zombies/ZombieSystem.cs
@@ -3,7 +3,6 @@
 using Content.Server.Chat;
 using Content.Server.Chat.Systems;
 using Content.Server.Cloning;
-using Content.Server.Drone.Components;
 using Content.Server.Emoting.Systems;
 using Content.Server.Inventory;
 using Content.Server.Speech.EntitySystems;
@@ -214,7 +213,7 @@ private void OnMeleeHit(EntityUid uid, ZombieComponent component, MeleeHitEvent
                 if (args.User == entity)
                     continue;
 
-                if (!TryComp<MobStateComponent>(entity, out var mobState) || HasComp<DroneComponent>(entity))
+                if (!TryComp<MobStateComponent>(entity, out var mobState))
                     continue;
 
                 if (HasComp<ZombieComponent>(entity))
diff --git a/Content.Shared/Access/Systems/SharedAccessSystem.cs b/Content.Shared/Access/Systems/SharedAccessSystem.cs
index eaacaf277b..965ccb2412 100644
--- a/Content.Shared/Access/Systems/SharedAccessSystem.cs
+++ b/Content.Shared/Access/Systems/SharedAccessSystem.cs
@@ -27,7 +27,7 @@ private void OnAccessInit(EntityUid uid, AccessComponent component, MapInitEvent
                     continue;
 
                 component.Tags.UnionWith(proto.Tags);
-                Dirty(component);
+                Dirty(uid, component);
             }
         }
 
@@ -58,7 +58,7 @@ public bool TrySetTags(EntityUid uid, IEnumerable<string> newTags, AccessCompone
 
             access.Tags.Clear();
             access.Tags.UnionWith(newTags);
-            Dirty(access);
+            Dirty(uid, access);
 
             return true;
         }
@@ -85,7 +85,7 @@ public bool TryAddGroups(EntityUid uid, IEnumerable<string> newGroups, AccessCom
                 access.Tags.UnionWith(proto.Tags);
             }
 
-            Dirty(access);
+            Dirty(uid, access);
             return true;
         }
 
@@ -107,7 +107,7 @@ public void SetAccessToJob(
 
             access.Tags.Clear();
             access.Tags.UnionWith(prototype.Access);
-            Dirty(access);
+            Dirty(uid, access);
 
             TryAddGroups(uid, prototype.AccessGroups, access);
 
diff --git a/Content.Shared/Actions/ActionContainerSystem.cs b/Content.Shared/Actions/ActionContainerSystem.cs
index 17bcf11bff..1c5a3ba0d9 100644
--- a/Content.Shared/Actions/ActionContainerSystem.cs
+++ b/Content.Shared/Actions/ActionContainerSystem.cs
@@ -37,7 +37,7 @@ public override void Initialize()
 
     private void OnMindAdded(EntityUid uid, ActionsContainerComponent component, MindAddedMessage args)
     {
-        if(!_mind.TryGetMind(uid, out var mindId, out _))
+        if (!_mind.TryGetMind(uid, out var mindId, out _))
             return;
         if (!TryComp<ActionsContainerComponent>(mindId, out var mindActionContainerComp))
             return;
@@ -143,20 +143,15 @@ public void TransferAction(
             return;
 
         DebugTools.AssertEqual(action.Container, newContainer);
-        DebugTools.AssertNull(action.AttachedEntity);
-
-        if (attached != null)
-            _actions.AddActionDirect(attached.Value, actionId, action: action);
-
         DebugTools.AssertEqual(action.AttachedEntity, attached);
     }
 
     /// <summary>
     /// Transfers all actions from one container to another, while keeping the attached entity the same.
     /// </summary>
-    /// &lt;remarks&gt;
+    /// <remarks>
     /// While the attached entity should be the same at the end, this will actually remove and then re-grant the action.
-    /// &lt;/remarks&gt;
+    /// </remarks>
     public void TransferAllActions(
         EntityUid from,
         EntityUid to,
@@ -305,11 +300,11 @@ private void OnEntityInserted(EntityUid uid, ActionsContainerComponent component
         if (!_actions.TryGetActionData(args.Entity, out var data))
             return;
 
-        DebugTools.Assert(data.AttachedEntity == null || data.Container != EntityUid.Invalid);
-        DebugTools.Assert(data.Container == null || data.Container == uid);
-
-        data.Container = uid;
-        Dirty(uid, component);
+        if (data.Container != uid)
+        {
+            data.Container = uid;
+            Dirty(args.Entity, data);
+        }
 
         var ev = new ActionAddedEvent(args.Entity, data);
         RaiseLocalEvent(uid, ref ev);
@@ -320,21 +315,17 @@ private void OnEntityRemoved(EntityUid uid, ActionsContainerComponent component,
         if (args.Container.ID != ActionsContainerComponent.ContainerId)
             return;
 
-        // Actions should only be getting removed while terminating or moving outside of PVS range.
-        DebugTools.Assert(Terminating(args.Entity)
-                          || _netMan.IsServer // I love gibbing code
-                          || _timing.ApplyingState);
-
         if (!_actions.TryGetActionData(args.Entity, out var data, false))
             return;
 
-        // No event - the only entity that should care about this is the entity that the action was provided to.
-        if (data.AttachedEntity != null)
-            _actions.RemoveAction(data.AttachedEntity.Value, args.Entity, null, data);
-
         var ev = new ActionRemovedEvent(args.Entity, data);
         RaiseLocalEvent(uid, ref ev);
+
+        if (data.Container == null)
+            return;
+
         data.Container = null;
+        Dirty(args.Entity, data);
     }
 
     private void OnActionAdded(EntityUid uid, ActionsContainerComponent component, ActionAddedEvent args)
diff --git a/Content.Shared/Actions/ActionsComponent.cs b/Content.Shared/Actions/ActionsComponent.cs
index b810e98d4d..a081a23867 100644
--- a/Content.Shared/Actions/ActionsComponent.cs
+++ b/Content.Shared/Actions/ActionsComponent.cs
@@ -26,8 +26,6 @@ public ActionsComponentState(HashSet<NetEntity> actions)
     }
 }
 
-public readonly record struct ActionMetaData(bool ClientExclusive);
-
 /// <summary>
 ///     Determines how the action icon appears in the hotbar for item actions.
 /// </summary>
diff --git a/Content.Shared/Actions/BaseActionComponent.cs b/Content.Shared/Actions/BaseActionComponent.cs
index 291d9a3ea2..cce7b912c7 100644
--- a/Content.Shared/Actions/BaseActionComponent.cs
+++ b/Content.Shared/Actions/BaseActionComponent.cs
@@ -4,7 +4,8 @@
 
 namespace Content.Shared.Actions;
 
-// TODO this should be an IncludeDataFields of each action component type, not use inheritance
+// TODO ACTIONS make this a seprate component and remove the inheritance stuff.
+// TODO ACTIONS convert to auto comp state?
 
 // TODO add access attribute. Need to figure out what to do with decal & mapping actions.
 // [Access(typeof(SharedActionsSystem))]
@@ -72,9 +73,9 @@ public abstract partial class BaseActionComponent : Component
     [DataField("charges")] public int? Charges;
 
     /// <summary>
-    ///     The max charges this action has, set automatically from <see cref="Charges"/>
+    ///     The max charges this action has. If null, this is set automatically from <see cref="Charges"/> on mapinit.
     /// </summary>
-    public int MaxCharges;
+    [DataField] public int? MaxCharges;
 
     /// <summary>
     ///     If enabled, charges will regenerate after a <see cref="Cooldown"/> is complete
@@ -130,7 +131,7 @@ public EntityUid? EntityIcon
     /// <summary>
     ///     What entity, if any, currently has this action in the actions component?
     /// </summary>
-    [ViewVariables] public EntityUid? AttachedEntity;
+    [DataField] public EntityUid? AttachedEntity;
 
     /// <summary>
     ///     If true, this will cause the the action event to always be raised directed at the action performer/user instead of the action's container/provider.
@@ -171,7 +172,7 @@ public abstract class BaseActionComponentState : ComponentState
     public (TimeSpan Start, TimeSpan End)? Cooldown;
     public TimeSpan? UseDelay;
     public int? Charges;
-    public int MaxCharges;
+    public int? MaxCharges;
     public bool RenewCharges;
     public NetEntity? Container;
     public NetEntity? EntityIcon;
diff --git a/Content.Shared/Actions/ConfirmableActionComponent.cs b/Content.Shared/Actions/ConfirmableActionComponent.cs
new file mode 100644
index 0000000000..6c208f47c6
--- /dev/null
+++ b/Content.Shared/Actions/ConfirmableActionComponent.cs
@@ -0,0 +1,48 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Actions;
+
+/// <summary>
+/// An action that must be confirmed before using it.
+/// Using it for the first time primes it, after a delay you can then confirm it.
+/// Used for dangerous actions that cannot be undone (unlike screaming).
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(ConfirmableActionSystem))]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
+public sealed partial class ConfirmableActionComponent : Component
+{
+    /// <summary>
+    /// Warning popup shown when priming the action.
+    /// </summary>
+    [DataField(required: true)]
+    public LocId Popup = string.Empty;
+
+    /// <summary>
+    /// If not null, this is when the action can be confirmed at.
+    /// This is the time of priming plus the delay.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan? NextConfirm;
+
+    /// <summary>
+    /// If not null, this is when the action will unprime at.
+    /// This is <c>NextConfirm> plus <c>PrimeTime</c>
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan? NextUnprime;
+
+    /// <summary>
+    /// Forced delay between priming and confirming to prevent accidents.
+    /// </summary>
+    [DataField]
+    public TimeSpan ConfirmDelay = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// Once you prime the action it will unprime after this length of time.
+    /// </summary>
+    [DataField]
+    public TimeSpan PrimeTime = TimeSpan.FromSeconds(5);
+}
diff --git a/Content.Shared/Actions/ConfirmableActionSystem.cs b/Content.Shared/Actions/ConfirmableActionSystem.cs
new file mode 100644
index 0000000000..26cc7111d2
--- /dev/null
+++ b/Content.Shared/Actions/ConfirmableActionSystem.cs
@@ -0,0 +1,80 @@
+using Content.Shared.Actions.Events;
+using Content.Shared.Popups;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Actions;
+
+/// <summary>
+/// Handles action priming, confirmation and automatic unpriming.
+/// </summary>
+public sealed class ConfirmableActionSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ConfirmableActionComponent, ActionAttemptEvent>(OnAttempt);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        // handle automatic unpriming
+        var now = _timing.CurTime;
+        var query = EntityQueryEnumerator<ConfirmableActionComponent>();
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            if (comp.NextUnprime is not {} time)
+                continue;
+
+            if (now >= time)
+                Unprime((uid, comp));
+        }
+    }
+
+    private void OnAttempt(Entity<ConfirmableActionComponent> ent, ref ActionAttemptEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        // if not primed, prime it and cancel the action
+        if (ent.Comp.NextConfirm is not {} confirm)
+        {
+            Prime(ent, args.User);
+            args.Cancelled = true;
+            return;
+        }
+
+        // primed but the delay isnt over, cancel the action
+        if (_timing.CurTime < confirm)
+        {
+            args.Cancelled = true;
+            return;
+        }
+
+        // primed and delay has passed, let the action go through
+        Unprime(ent);
+    }
+
+    private void Prime(Entity<ConfirmableActionComponent> ent, EntityUid user)
+    {
+        var (uid, comp) = ent;
+        comp.NextConfirm = _timing.CurTime + comp.ConfirmDelay;
+        comp.NextUnprime = comp.NextConfirm + comp.PrimeTime;
+        Dirty(uid, comp);
+
+        _popup.PopupClient(Loc.GetString(comp.Popup), user, user, PopupType.LargeCaution);
+    }
+
+    private void Unprime(Entity<ConfirmableActionComponent> ent)
+    {
+        var (uid, comp) = ent;
+        comp.NextConfirm = null;
+        comp.NextUnprime = null;
+        Dirty(uid, comp);
+    }
+}
diff --git a/Content.Shared/Actions/Events/ActionAttemptEvent.cs b/Content.Shared/Actions/Events/ActionAttemptEvent.cs
new file mode 100644
index 0000000000..26f23f9ec3
--- /dev/null
+++ b/Content.Shared/Actions/Events/ActionAttemptEvent.cs
@@ -0,0 +1,8 @@
+namespace Content.Shared.Actions.Events;
+
+/// <summary>
+/// Raised before an action is used and can be cancelled to prevent it.
+/// Allowed to have side effects like modifying the action component.
+/// </summary>
+[ByRefEvent]
+public record struct ActionAttemptEvent(EntityUid User, bool Cancelled = false);
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index 4eaa641eeb..a3bfa07130 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -8,7 +8,6 @@
 using Content.Shared.Interaction;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Mind;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
@@ -30,15 +29,18 @@ public abstract class SharedActionsSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
     [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
-    [Dependency] private readonly MetaDataSystem _metaData = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<InstantActionComponent, MapInitEvent>(OnInit);
-        SubscribeLocalEvent<EntityTargetActionComponent, MapInitEvent>(OnInit);
-        SubscribeLocalEvent<WorldTargetActionComponent, MapInitEvent>(OnInit);
+        SubscribeLocalEvent<InstantActionComponent, MapInitEvent>(OnActionMapInit);
+        SubscribeLocalEvent<EntityTargetActionComponent, MapInitEvent>(OnActionMapInit);
+        SubscribeLocalEvent<WorldTargetActionComponent, MapInitEvent>(OnActionMapInit);
+
+        SubscribeLocalEvent<InstantActionComponent, ComponentShutdown>(OnActionShutdown);
+        SubscribeLocalEvent<EntityTargetActionComponent, ComponentShutdown>(OnActionShutdown);
+        SubscribeLocalEvent<WorldTargetActionComponent, ComponentShutdown>(OnActionShutdown);
 
         SubscribeLocalEvent<ActionsComponent, DidEquipEvent>(OnDidEquip);
         SubscribeLocalEvent<ActionsComponent, DidEquipHandEvent>(OnHandEquipped);
@@ -61,10 +63,19 @@ public override void Initialize()
         SubscribeAllEvent<RequestPerformActionEvent>(OnActionRequest);
     }
 
-    private void OnInit(EntityUid uid, BaseActionComponent component, MapInitEvent args)
+    private void OnActionMapInit(EntityUid uid, BaseActionComponent component, MapInitEvent args)
+    {
+        if (component.Charges == null)
+            return;
+
+        component.MaxCharges ??= component.Charges.Value;
+        Dirty(uid, component);
+    }
+
+    private void OnActionShutdown(EntityUid uid, BaseActionComponent component, ComponentShutdown args)
     {
-        if (component.Charges != null)
-            component.MaxCharges = component.Charges.Value;
+        if (component.AttachedEntity != null && !TerminatingOrDeleted(component.AttachedEntity.Value))
+            RemoveAction(component.AttachedEntity.Value, uid, action: component);
     }
 
     private void OnShutdown(EntityUid uid, ActionsComponent component, ComponentShutdown args)
@@ -341,6 +352,13 @@ private void OnActionRequest(RequestPerformActionEvent ev, EntitySessionEventArg
         if (!action.Enabled)
             return;
 
+        // check for action use prevention
+        // TODO: make code below use this event with a dedicated component
+        var attemptEv = new ActionAttemptEvent(user);
+        RaiseLocalEvent(actionEnt, ref attemptEv);
+        if (attemptEv.Cancelled)
+            return;
+
         var curTime = GameTiming.CurTime;
         // TODO: Check for charge recovery timer
         if (action.Cooldown.HasValue && action.Cooldown.Value.End > curTime)
diff --git a/Content.Shared/Administration/AdminFlags.cs b/Content.Shared/Administration/AdminFlags.cs
index c33a6be86f..64cf522faa 100644
--- a/Content.Shared/Administration/AdminFlags.cs
+++ b/Content.Shared/Administration/AdminFlags.cs
@@ -89,10 +89,16 @@ public enum AdminFlags : uint
         /// </summary>
         EditNotes = 1 << 14,
 
+
+        /// <summary>
+        ///     Lets you Massban, on SS14.Admin
+        /// </summary>
+        MassBan = 1 << 15,
+
         /// <summary>
         ///     DeltaV - The ability to whitelist people. Either this permission or +BAN is required for remove.
         /// </summary>
-        Whitelist = 1 << 15,
+        Whitelist = 1 << 20,
 
         /// <summary>
         ///     Dangerous host permissions like scsi.
diff --git a/Content.Shared/Administration/Notes/SharedAdminNote.cs b/Content.Shared/Administration/Notes/SharedAdminNote.cs
index e209d3721e..09d4f3f947 100644
--- a/Content.Shared/Administration/Notes/SharedAdminNote.cs
+++ b/Content.Shared/Administration/Notes/SharedAdminNote.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Database;
+using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Administration.Notes;
@@ -6,7 +7,7 @@ namespace Content.Shared.Administration.Notes;
 [Serializable, NetSerializable]
 public sealed record SharedAdminNote(
     int Id, // Id of note, message, watchlist, ban or role ban. Should be paired with NoteType to uniquely identify a shared admin note.
-    Guid Player, // Notes player
+    NetUserId Player, // Notes player
     int? Round, // Which round was it added in?
     string? ServerName, // Which server was this added on?
     TimeSpan PlaytimeAtNote, // Playtime at the time of getting the note
diff --git a/Content.Shared/Administration/PlayerInfo.cs b/Content.Shared/Administration/PlayerInfo.cs
index 74fd7e9dc0..93f1aa0b39 100644
--- a/Content.Shared/Administration/PlayerInfo.cs
+++ b/Content.Shared/Administration/PlayerInfo.cs
@@ -4,7 +4,7 @@
 namespace Content.Shared.Administration
 {
     [Serializable, NetSerializable]
-    public record PlayerInfo(
+    public sealed record PlayerInfo(
         string Username,
         string CharacterName,
         string IdentityName,
@@ -20,5 +20,15 @@ public record PlayerInfo(
 
         public string PlaytimeString => _playtimeString ??=
             OverallPlaytime?.ToString("%d':'hh':'mm") ?? Loc.GetString("generic-unknown-title");
+
+        public bool Equals(PlayerInfo? other)
+        {
+            return other?.SessionId == SessionId;
+        }
+
+        public override int GetHashCode()
+        {
+            return SessionId.GetHashCode();
+        }
     }
 }
diff --git a/Content.Shared/Administration/SharedBwoinkSystem.cs b/Content.Shared/Administration/SharedBwoinkSystem.cs
index 944a1ecdd8..e74375300e 100644
--- a/Content.Shared/Administration/SharedBwoinkSystem.cs
+++ b/Content.Shared/Administration/SharedBwoinkSystem.cs
@@ -38,12 +38,15 @@ public sealed class BwoinkTextMessage : EntityEventArgs
             public NetUserId TrueSender { get; }
             public string Text { get; }
 
-            public BwoinkTextMessage(NetUserId userId, NetUserId trueSender, string text, DateTime? sentAt = default)
+            public bool PlaySound { get; }
+
+            public BwoinkTextMessage(NetUserId userId, NetUserId trueSender, string text, DateTime? sentAt = default, bool playSound = true)
             {
                 SentAt = sentAt ?? DateTime.Now;
                 UserId = userId;
                 TrueSender = trueSender;
                 Text = text;
+                PlaySound = playSound;
             }
         }
     }
diff --git a/Content.Shared/Alert/AlertAutoRemoveComponent.cs b/Content.Shared/Alert/AlertAutoRemoveComponent.cs
new file mode 100644
index 0000000000..44e2dc91dc
--- /dev/null
+++ b/Content.Shared/Alert/AlertAutoRemoveComponent.cs
@@ -0,0 +1,19 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Alert;
+
+/// <summary>
+///     Copy of the entity's alerts that are flagged for autoRemove, so that not all of the alerts need to be checked constantly
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class AlertAutoRemoveComponent : Component
+{
+    /// <summary>
+    ///     List of alerts that have to be checked on every tick for automatic removal at a specific time
+    /// </summary>
+    [AutoNetworkedField]
+    [DataField]
+    public List<AlertKey> AlertKeys = new();
+
+    public override bool SendOnlyToOwner => true;
+}
diff --git a/Content.Shared/Alert/AlertPrototype.cs b/Content.Shared/Alert/AlertPrototype.cs
index c24ac8582b..ac43cb45f3 100644
--- a/Content.Shared/Alert/AlertPrototype.cs
+++ b/Content.Shared/Alert/AlertPrototype.cs
@@ -1,5 +1,4 @@
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Alert
@@ -8,7 +7,7 @@ namespace Content.Shared.Alert
     /// An alert popup with associated icon, tooltip, and other data.
     /// </summary>
     [Prototype("alert")]
-    public sealed partial class AlertPrototype : IPrototype, ISerializationHooks
+    public sealed partial class AlertPrototype : IPrototype
     {
         [ViewVariables]
         string IPrototype.ID => AlertType.ToString();
@@ -52,7 +51,7 @@ public sealed partial class AlertPrototype : IPrototype, ISerializationHooks
         /// Key which is unique w.r.t category semantics (alerts with same category have equal keys,
         /// alerts with no category have different keys).
         /// </summary>
-        public AlertKey AlertKey { get; private set; }
+        public AlertKey AlertKey => new(AlertType, Category);
 
         /// <summary>
         /// -1 (no effect) unless MaxSeverity is specified. Defaults to 1. Minimum severity level supported by this state.
@@ -80,16 +79,6 @@ public sealed partial class AlertPrototype : IPrototype, ISerializationHooks
         [DataField("onClick", serverOnly: true)]
         public IAlertClick? OnClick { get; private set; }
 
-        void ISerializationHooks.AfterDeserialization()
-        {
-            if (AlertType == AlertType.Error)
-            {
-                Logger.ErrorS("alert", "missing or invalid alertType for alert with name {0}", Name);
-            }
-
-            AlertKey = new AlertKey(AlertType, Category);
-        }
-
         /// <param name="severity">severity level, if supported by this alert</param>
         /// <returns>the icon path to the texture for the provided severity level</returns>
         public SpriteSpecifier GetIcon(short? severity = null)
diff --git a/Content.Shared/Alert/AlertState.cs b/Content.Shared/Alert/AlertState.cs
index b7244d3d4e..effd952203 100644
--- a/Content.Shared/Alert/AlertState.cs
+++ b/Content.Shared/Alert/AlertState.cs
@@ -7,5 +7,7 @@ public struct AlertState
 {
     public short? Severity;
     public (TimeSpan, TimeSpan)? Cooldown;
+    public bool AutoRemove;
+    public bool ShowCooldown;
     public AlertType Type;
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Alert/AlertsSystem.cs b/Content.Shared/Alert/AlertsSystem.cs
index 424a4670ba..d8737a717a 100644
--- a/Content.Shared/Alert/AlertsSystem.cs
+++ b/Content.Shared/Alert/AlertsSystem.cs
@@ -2,12 +2,14 @@
 using System.Diagnostics.CodeAnalysis;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
 
 namespace Content.Shared.Alert;
 
 public abstract class AlertsSystem : EntitySystem
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
 
     private FrozenDictionary<AlertType, AlertPrototype> _typeToAlert = default!;
 
@@ -74,7 +76,9 @@ public bool TryGetAlertState(EntityUid euid, AlertKey key, out AlertState alertS
     /// <param name="severity">severity, if supported by the alert</param>
     /// <param name="cooldown">cooldown start and end, if null there will be no cooldown (and it will
     ///     be erased if there is currently a cooldown for the alert)</param>
-    public void ShowAlert(EntityUid euid, AlertType alertType, short? severity = null, (TimeSpan, TimeSpan)? cooldown = null)
+    /// <param name="autoRemove">if true, the alert will be removed at the end of the cooldown</param>
+    /// <param name="showCooldown">if true, the cooldown will be visibly shown over the alert icon</param>
+    public void ShowAlert(EntityUid euid, AlertType alertType, short? severity = null, (TimeSpan, TimeSpan)? cooldown = null, bool autoRemove = false, bool showCooldown = true )
     {
         if (!TryComp(euid, out AlertsComponent? alertsComponent))
             return;
@@ -86,7 +90,9 @@ public void ShowAlert(EntityUid euid, AlertType alertType, short? severity = nul
             if (alertsComponent.Alerts.TryGetValue(alert.AlertKey, out var alertStateCallback) &&
                 alertStateCallback.Type == alertType &&
                 alertStateCallback.Severity == severity &&
-                alertStateCallback.Cooldown == cooldown)
+                alertStateCallback.Cooldown == cooldown &&
+                alertStateCallback.AutoRemove == autoRemove &&
+                alertStateCallback.ShowCooldown == showCooldown)
             {
                 return;
             }
@@ -94,8 +100,17 @@ public void ShowAlert(EntityUid euid, AlertType alertType, short? severity = nul
             // In the case we're changing the alert type but not the category, we need to remove it first.
             alertsComponent.Alerts.Remove(alert.AlertKey);
 
-            alertsComponent.Alerts[alert.AlertKey] = new AlertState
-                { Cooldown = cooldown, Severity = severity, Type = alertType };
+            var state = new AlertState
+                { Cooldown = cooldown, Severity = severity, Type = alertType, AutoRemove = autoRemove, ShowCooldown = showCooldown};
+            alertsComponent.Alerts[alert.AlertKey] = state;
+
+            // Keeping a list of AutoRemove alerts, so Update() doesn't need to check every alert
+            if (autoRemove)
+            {
+                var autoComp = EnsureComp<AlertAutoRemoveComponent>(euid);
+                if (!autoComp.AlertKeys.Contains(alert.AlertKey))
+                    autoComp.AlertKeys.Add(alert.AlertKey);
+            }
 
             AfterShowAlert((euid, alertsComponent));
 
@@ -171,11 +186,81 @@ public override void Initialize()
         SubscribeLocalEvent<AlertsComponent, ComponentShutdown>(HandleComponentShutdown);
         SubscribeLocalEvent<AlertsComponent, PlayerAttachedEvent>(OnPlayerAttached);
 
+        SubscribeLocalEvent<AlertAutoRemoveComponent, EntityUnpausedEvent>(OnAutoRemoveUnPaused);
+
         SubscribeNetworkEvent<ClickAlertEvent>(HandleClickAlert);
         SubscribeLocalEvent<PrototypesReloadedEventArgs>(HandlePrototypesReloaded);
         LoadPrototypes();
     }
 
+    private void OnAutoRemoveUnPaused(EntityUid uid, AlertAutoRemoveComponent comp, EntityUnpausedEvent args)
+    {
+        if (!TryComp<AlertsComponent>(uid, out var alertComp))
+        {
+            return;
+        }
+
+        var dirty = false;
+
+        foreach (var alert in alertComp.Alerts)
+        {
+            if (alert.Value.Cooldown is null)
+                continue;
+
+            var cooldown = (alert.Value.Cooldown.Value.Item1, alert.Value.Cooldown.Value.Item2 + args.PausedTime);
+
+            var state = new AlertState
+            {
+                Severity = alert.Value.Severity,
+                Cooldown = cooldown,
+                ShowCooldown = alert.Value.ShowCooldown,
+                AutoRemove = alert.Value.AutoRemove,
+                Type = alert.Value.Type
+            };
+            alertComp.Alerts[alert.Key] = state;
+            dirty = true;
+        }
+
+        if (dirty)
+            Dirty(uid, comp);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<AlertAutoRemoveComponent>();
+        while (query.MoveNext(out var uid, out var autoComp))
+        {
+            var dirtyComp = false;
+            if (autoComp.AlertKeys.Count <= 0 || !TryComp<AlertsComponent>(uid, out var alertComp))
+            {
+                RemCompDeferred(uid, autoComp);
+                continue;
+            }
+
+            var removeList = new List<AlertKey>();
+            foreach (var alertKey in autoComp.AlertKeys)
+            {
+                alertComp.Alerts.TryGetValue(alertKey, out var alertState);
+
+                if (alertState.Cooldown is null || alertState.Cooldown.Value.Item2 >= _timing.CurTime)
+                    continue;
+                removeList.Add(alertKey);
+                alertComp.Alerts.Remove(alertKey);
+                dirtyComp = true;
+            }
+
+            foreach (var alertKey in removeList)
+            {
+                autoComp.AlertKeys.Remove(alertKey);
+            }
+
+            if (dirtyComp)
+                Dirty(uid, alertComp);
+        }
+    }
+
     protected virtual void HandleComponentShutdown(EntityUid uid, AlertsComponent component, ComponentShutdown args)
     {
         RaiseLocalEvent(uid, new AlertSyncEvent(uid), true);
@@ -200,7 +285,7 @@ protected virtual void LoadPrototypes()
             if (!dict.TryAdd(alert.AlertType, alert))
             {
                 Log.Error("Found alert with duplicate alertType {0} - all alerts must have" +
-                          " a unique alerttype, this one will be skipped", alert.AlertType);
+                          " a unique alertType, this one will be skipped", alert.AlertType);
             }
         }
 
diff --git a/Content.Shared/Ame/Components/AmeFuelContainerComponent.cs b/Content.Shared/Ame/Components/AmeFuelContainerComponent.cs
new file mode 100644
index 0000000000..757a3a515b
--- /dev/null
+++ b/Content.Shared/Ame/Components/AmeFuelContainerComponent.cs
@@ -0,0 +1,19 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Ame.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class AmeFuelContainerComponent : Component
+{
+    /// <summary>
+    /// The amount of fuel in the container.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public int FuelAmount = 1000;
+
+    /// <summary>
+    /// The maximum fuel capacity of the container.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public int FuelCapacity = 1000;
+}
diff --git a/Content.Shared/Ame/SharedAmeControllerComponent.cs b/Content.Shared/Ame/Components/SharedAmeControllerComponent.cs
similarity index 95%
rename from Content.Shared/Ame/SharedAmeControllerComponent.cs
rename to Content.Shared/Ame/Components/SharedAmeControllerComponent.cs
index 11925a82a0..d9f5d80c3e 100644
--- a/Content.Shared/Ame/SharedAmeControllerComponent.cs
+++ b/Content.Shared/Ame/Components/SharedAmeControllerComponent.cs
@@ -1,10 +1,11 @@
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Ame;
+namespace Content.Shared.Ame.Components;
 
 [Virtual]
 public partial class SharedAmeControllerComponent : Component
 {
+    public const string FuelSlotId = "fuelSlot";
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Ame/SharedAmeShieldComponent.cs b/Content.Shared/Ame/Components/SharedAmeShieldComponent.cs
similarity index 77%
rename from Content.Shared/Ame/SharedAmeShieldComponent.cs
rename to Content.Shared/Ame/Components/SharedAmeShieldComponent.cs
index 3057de7160..21278e0131 100644
--- a/Content.Shared/Ame/SharedAmeShieldComponent.cs
+++ b/Content.Shared/Ame/Components/SharedAmeShieldComponent.cs
@@ -1,6 +1,6 @@
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization;
 
-namespace Content.Shared.Ame;
+namespace Content.Shared.Ame.Components;
 
 [Virtual]
 public partial class SharedAmeShieldComponent : Component
diff --git a/Content.Shared/Ame/EntitySystems/AmeFuelContainerSystem.cs b/Content.Shared/Ame/EntitySystems/AmeFuelContainerSystem.cs
new file mode 100644
index 0000000000..10e5f78d0d
--- /dev/null
+++ b/Content.Shared/Ame/EntitySystems/AmeFuelContainerSystem.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Ame.Components;
+using Content.Shared.Examine;
+
+namespace Content.Shared.Ame.EntitySystems;
+
+/// <summary>
+/// Adds details about fuel level when examining antimatter engine fuel containers.
+/// </summary>
+public sealed class AmeFuelContainerSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AmeFuelContainerComponent, ExaminedEvent>(OnFuelExamined);
+    }
+
+    private void OnFuelExamined(EntityUid uid, AmeFuelContainerComponent comp, ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange)
+            return;
+
+        // less than 25%: amount < capacity / 4 = amount * 4 < capacity
+        var low = comp.FuelAmount * 4 < comp.FuelCapacity;
+        args.PushMarkup(Loc.GetString("ame-fuel-container-component-on-examine-detailed-message",
+            ("colorName", low ? "darkorange" : "orange"),
+            ("amount", comp.FuelAmount),
+            ("capacity", comp.FuelCapacity)));
+    }
+}
diff --git a/Content.Shared/Anomaly/Components/AnomalyComponent.cs b/Content.Shared/Anomaly/Components/AnomalyComponent.cs
index 89afbb0122..bafdf12360 100644
--- a/Content.Shared/Anomaly/Components/AnomalyComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalyComponent.cs
@@ -14,7 +14,7 @@ namespace Content.Shared.Anomaly.Components;
 ///
 /// Anomalies and their related components were designed here: https://hackmd.io/@ss14-design/r1sQbkJOs
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 [Access(typeof(SharedAnomalySystem))]
 public sealed partial class AnomalyComponent : Component
 {
@@ -86,7 +86,7 @@ public sealed partial class AnomalyComponent : Component
     /// <summary>
     /// The time at which the next artifact pulse will occur.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField, AutoPausedField]
     [ViewVariables(VVAccess.ReadWrite)]
     public TimeSpan NextPulseTime = TimeSpan.Zero;
 
diff --git a/Content.Shared/Anomaly/Components/AnomalyPulsingComponent.cs b/Content.Shared/Anomaly/Components/AnomalyPulsingComponent.cs
index 7326118b3c..a7fedb821b 100644
--- a/Content.Shared/Anomaly/Components/AnomalyPulsingComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalyPulsingComponent.cs
@@ -5,13 +5,14 @@ namespace Content.Shared.Anomaly.Components;
 /// <summary>
 /// This component tracks anomalies that are currently pulsing
 /// </summary>
-[RegisterComponent, Access(typeof(SharedAnomalySystem))]
+[RegisterComponent, Access(typeof(SharedAnomalySystem)), AutoGenerateComponentPause]
 public sealed partial class AnomalyPulsingComponent : Component
 {
     /// <summary>
     /// The time at which the pulse will be over.
     /// </summary>
     [DataField("endTime", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    [AutoPausedField]
     public TimeSpan EndTime;
 
     /// <summary>
diff --git a/Content.Shared/Anomaly/Components/AnomalySupercriticalComponent.cs b/Content.Shared/Anomaly/Components/AnomalySupercriticalComponent.cs
index bd8f40852d..00ea882ad2 100644
--- a/Content.Shared/Anomaly/Components/AnomalySupercriticalComponent.cs
+++ b/Content.Shared/Anomaly/Components/AnomalySupercriticalComponent.cs
@@ -8,6 +8,7 @@ namespace Content.Shared.Anomaly.Components;
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 [Access(typeof(SharedAnomalySystem))]
+[AutoGenerateComponentPause]
 public sealed partial class AnomalySupercriticalComponent : Component
 {
     /// <summary>
@@ -15,6 +16,7 @@ public sealed partial class AnomalySupercriticalComponent : Component
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]
     [ViewVariables(VVAccess.ReadWrite)]
+    [AutoPausedField]
     public TimeSpan EndTime;
 
     /// <summary>
diff --git a/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs b/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs
index eca71e6fd7..f4b7cc8bf4 100644
--- a/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs
+++ b/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs
@@ -5,16 +5,17 @@
 using Content.Shared.Throwing;
 using Robust.Shared.Map;
 using Content.Shared.Physics;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 
 namespace Content.Shared.Anomaly.Effects;
 
 public abstract class SharedGravityAnomalySystem : EntitySystem
 {
-    [Dependency] private readonly IMapManager _map = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly ThrowingSystem _throwing = default!;
     [Dependency] private readonly SharedTransformSystem _xform = default!;
+    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -47,13 +48,18 @@ private void OnAnomalyPulse(EntityUid uid, GravityAnomalyComponent component, re
     private void OnSupercritical(EntityUid uid, GravityAnomalyComponent component, ref AnomalySupercriticalEvent args)
     {
         var xform = Transform(uid);
-        if (!_map.TryGetGrid(xform.GridUid, out var grid))
+        if (!TryComp(xform.GridUid, out MapGridComponent? grid))
             return;
 
         var worldPos = _xform.GetWorldPosition(xform);
-        var tileref = grid.GetTilesIntersecting(new Circle(worldPos, component.SpaceRange)).ToArray();
+        var tileref = _mapSystem.GetTilesIntersecting(
+                xform.GridUid.Value,
+                grid,
+                new Circle(worldPos, component.SpaceRange))
+            .ToArray();
+
         var tiles = tileref.Select(t => (t.GridIndices, Tile.Empty)).ToList();
-        grid.SetTiles(tiles);
+        _mapSystem.SetTiles(xform.GridUid.Value, grid, tiles);
 
         var range = component.MaxThrowRange * 2;
         var strength = component.MaxThrowStrength * 2;
diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs
index 711f9d1493..6cdcdf305b 100644
--- a/Content.Shared/Anomaly/SharedAnomalySystem.cs
+++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs
@@ -27,7 +27,7 @@ public abstract class SharedAnomalySystem : EntitySystem
     [Dependency] protected readonly IGameTiming Timing = default!;
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] protected readonly IRobustRandom Random = default!;
-    [Dependency] protected readonly ISharedAdminLogManager Log = default!;
+    [Dependency] protected readonly ISharedAdminLogManager AdminLog = default!;
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
     [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
@@ -46,10 +46,6 @@ public override void Initialize()
         SubscribeLocalEvent<AnomalyComponent, MeleeThrowOnHitStartEvent>(OnAnomalyThrowStart);
         SubscribeLocalEvent<AnomalyComponent, MeleeThrowOnHitEndEvent>(OnAnomalyThrowEnd);
 
-        SubscribeLocalEvent<AnomalyComponent, EntityUnpausedEvent>(OnAnomalyUnpause);
-        SubscribeLocalEvent<AnomalyPulsingComponent, EntityUnpausedEvent>(OnPulsingUnpause);
-        SubscribeLocalEvent<AnomalySupercriticalComponent, EntityUnpausedEvent>(OnSupercriticalUnpause);
-
         _sawmill = Logger.GetSawmill("anomaly");
     }
 
@@ -89,23 +85,6 @@ public void DoAnomalyBurnDamage(EntityUid source, EntityUid target, AnomalyCompo
         Popup.PopupEntity(Loc.GetString("anomaly-component-contact-damage"), target, target);
     }
 
-    private void OnAnomalyUnpause(EntityUid uid, AnomalyComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextPulseTime += args.PausedTime;
-        Dirty(component);
-    }
-
-    private void OnPulsingUnpause(EntityUid uid, AnomalyPulsingComponent component, ref EntityUnpausedEvent args)
-    {
-        component.EndTime += args.PausedTime;
-    }
-
-    private void OnSupercriticalUnpause(EntityUid uid, AnomalySupercriticalComponent component, ref EntityUnpausedEvent args)
-    {
-        component.EndTime += args.PausedTime;
-        Dirty(component);
-    }
-
     public void DoAnomalyPulse(EntityUid uid, AnomalyComponent? component = null)
     {
         if (!Resolve(uid, ref component))
@@ -132,7 +111,7 @@ public void DoAnomalyPulse(EntityUid uid, AnomalyComponent? component = null)
         var stability = Random.NextFloat(minStability, maxStability);
         ChangeAnomalyStability(uid, stability, component);
 
-        Log.Add(LogType.Anomaly, LogImpact.Medium, $"Anomaly {ToPrettyString(uid)} pulsed with severity {component.Severity}.");
+        AdminLog.Add(LogType.Anomaly, LogImpact.Medium, $"Anomaly {ToPrettyString(uid)} pulsed with severity {component.Severity}.");
         if (_net.IsServer)
             Audio.PlayPvs(component.PulseSound, uid);
 
@@ -154,14 +133,14 @@ public void StartSupercriticalEvent(EntityUid uid)
         if (HasComp<AnomalySupercriticalComponent>(uid))
             return;
 
-        Log.Add(LogType.Anomaly, LogImpact.High, $"Anomaly {ToPrettyString(uid)} began to go supercritical.");
+        AdminLog.Add(LogType.Anomaly, LogImpact.High, $"Anomaly {ToPrettyString(uid)} began to go supercritical.");
         if (_net.IsServer)
             _sawmill.Info($"Anomaly is going supercritical. Entity: {ToPrettyString(uid)}");
 
-        var super = EnsureComp<AnomalySupercriticalComponent>(uid);
+        var super = AddComp<AnomalySupercriticalComponent>(uid);
         super.EndTime = Timing.CurTime + super.SupercriticalDuration;
         Appearance.SetData(uid, AnomalyVisuals.Supercritical, true);
-        Dirty(super);
+        Dirty(uid, super);
     }
 
     /// <summary>
@@ -201,7 +180,7 @@ public void EndAnomaly(EntityUid uid, AnomalyComponent? component = null, bool s
         // Logging before resolve, in case the anomaly has deleted itself.
         if (_net.IsServer)
             _sawmill.Info($"Ending anomaly. Entity: {ToPrettyString(uid)}");
-        Log.Add(LogType.Anomaly, LogImpact.Extreme, $"Anomaly {ToPrettyString(uid)} went supercritical.");
+        AdminLog.Add(LogType.Anomaly, LogImpact.Extreme, $"Anomaly {ToPrettyString(uid)} went supercritical.");
 
         if (!Resolve(uid, ref component))
             return;
@@ -231,7 +210,7 @@ public void ChangeAnomalyStability(EntityUid uid, float change, AnomalyComponent
         var newVal = component.Stability + change;
 
         component.Stability = Math.Clamp(newVal, 0, 1);
-        Dirty(component);
+        Dirty(uid, component);
 
         var ev = new AnomalyStabilityChangedEvent(uid, component.Stability, component.Severity);
         RaiseLocalEvent(uid, ref ev, true);
@@ -254,7 +233,7 @@ public void ChangeAnomalySeverity(EntityUid uid, float change, AnomalyComponent?
             StartSupercriticalEvent(uid);
 
         component.Severity = Math.Clamp(newVal, 0, 1);
-        Dirty(component);
+        Dirty(uid, component);
 
         var ev = new AnomalySeverityChangedEvent(uid, component.Stability, component.Severity);
         RaiseLocalEvent(uid, ref ev, true);
@@ -280,7 +259,7 @@ public void ChangeAnomalyHealth(EntityUid uid, float change, AnomalyComponent? c
         }
 
         component.Health = Math.Clamp(newVal, 0, 1);
-        Dirty(component);
+        Dirty(uid, component);
 
         var ev = new AnomalyHealthChangedEvent(uid, component.Health);
         RaiseLocalEvent(uid, ref ev, true);
diff --git a/Content.Shared/Antag/AntagAcceptability.cs b/Content.Shared/Antag/AntagAcceptability.cs
new file mode 100644
index 0000000000..98abe713eb
--- /dev/null
+++ b/Content.Shared/Antag/AntagAcceptability.cs
@@ -0,0 +1,22 @@
+namespace Content.Shared.Antag;
+
+/// <summary>
+/// Used by AntagSelectionSystem to indicate which types of antag roles are allowed to choose the same entity
+/// For example, Thief HeadRev
+/// </summary>
+public enum AntagAcceptability
+{
+    /// <summary>
+    /// Dont choose anyone who already has an antag role
+    /// </summary>
+    None,
+    /// <summary>
+    /// Dont choose anyone who has an exclusive antag role
+    /// </summary>
+    NotExclusive,
+    /// <summary>
+    /// Choose anyone
+    /// </summary>
+    All
+}
+
diff --git a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs
index 23300cb2a0..1203639e09 100644
--- a/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs
+++ b/Content.Shared/Atmos/Piping/Binary/Components/SharedGasCanisterComponent.cs
@@ -21,8 +21,7 @@ public enum GasCanisterUiKey
     public enum GasCanisterVisuals
     {
         PressureState,
-        TankInserted,
-        Locked
+        TankInserted
     }
 
     #endregion
diff --git a/Content.Shared/Atmos/Portable/Components/SharedSpaceHeaterComponent.cs b/Content.Shared/Atmos/Portable/Components/SharedSpaceHeaterComponent.cs
new file mode 100644
index 0000000000..731631b221
--- /dev/null
+++ b/Content.Shared/Atmos/Portable/Components/SharedSpaceHeaterComponent.cs
@@ -0,0 +1,90 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Atmos.Piping.Portable.Components;
+
+[Serializable]
+[NetSerializable]
+public enum SpaceHeaterUiKey
+{
+    Key
+}
+
+[Serializable]
+[NetSerializable]
+public sealed class SpaceHeaterToggleMessage : BoundUserInterfaceMessage
+{
+}
+
+[Serializable]
+[NetSerializable]
+public sealed class SpaceHeaterChangeTemperatureMessage : BoundUserInterfaceMessage
+{
+    public float Temperature { get; }
+
+    public SpaceHeaterChangeTemperatureMessage(float temperature)
+    {
+        Temperature = temperature;
+    }
+}
+
+[Serializable]
+[NetSerializable]
+public sealed class SpaceHeaterChangePowerLevelMessage : BoundUserInterfaceMessage
+{
+    public SpaceHeaterPowerLevel PowerLevel { get; }
+
+    public SpaceHeaterChangePowerLevelMessage(SpaceHeaterPowerLevel powerLevel)
+    {
+        PowerLevel = powerLevel;
+    }
+}
+
+[Serializable]
+[NetSerializable]
+public sealed class SpaceHeaterChangeModeMessage : BoundUserInterfaceMessage
+{
+    public SpaceHeaterMode Mode { get; }
+
+    public SpaceHeaterChangeModeMessage(SpaceHeaterMode mode)
+    {
+        Mode = mode;
+    }
+}
+
+[Serializable]
+[NetSerializable]
+public sealed class SpaceHeaterBoundUserInterfaceState : BoundUserInterfaceState
+{
+    public float MinTemperature { get; }
+    public float MaxTemperature { get; }
+    public float TargetTemperature { get; }
+    public bool Enabled { get; }
+    public SpaceHeaterMode Mode { get; }
+    public SpaceHeaterPowerLevel PowerLevel { get; }
+
+    public SpaceHeaterBoundUserInterfaceState(float minTemperature, float maxTemperature, float temperature, bool enabled, SpaceHeaterMode mode, SpaceHeaterPowerLevel powerLevel)
+    {
+        MinTemperature = minTemperature;
+        MaxTemperature = maxTemperature;
+        TargetTemperature = temperature;
+        Enabled = enabled;
+        Mode = mode;
+        PowerLevel = powerLevel;
+    }
+}
+
+[Serializable, NetSerializable]
+public enum SpaceHeaterMode : byte
+{
+    Auto,
+    Heat,
+    Cool
+}
+
+[Serializable, NetSerializable]
+public enum SpaceHeaterPowerLevel : byte
+{
+    Low,
+    Medium,
+    High
+}
diff --git a/Content.Shared/Atmos/Rotting/PerishableComponent.cs b/Content.Shared/Atmos/Rotting/PerishableComponent.cs
index 1c5c4bc4ae..6983b872b8 100644
--- a/Content.Shared/Atmos/Rotting/PerishableComponent.cs
+++ b/Content.Shared/Atmos/Rotting/PerishableComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Shared.Atmos.Rotting;
 /// This makes mobs eventually start rotting when they die.
 /// It may be expanded to food at some point, but it's just for mobs right now.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 [Access(typeof(SharedRottingSystem))]
 public sealed partial class PerishableComponent : Component
 {
@@ -27,6 +27,7 @@ public sealed partial class PerishableComponent : Component
     /// Gasses are released, this is when the next gas release update will be.
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan RotNextUpdate = TimeSpan.Zero;
 
     /// <summary>
diff --git a/Content.Shared/Atmos/Rotting/RottingComponent.cs b/Content.Shared/Atmos/Rotting/RottingComponent.cs
index d4ba79bb89..d21fac88a2 100644
--- a/Content.Shared/Atmos/Rotting/RottingComponent.cs
+++ b/Content.Shared/Atmos/Rotting/RottingComponent.cs
@@ -8,7 +8,7 @@ namespace Content.Shared.Atmos.Rotting;
 /// Tracking component for stuff that has started to rot.
 /// Only the current stage is networked to the client.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
 [Access(typeof(SharedRottingSystem))]
 public sealed partial class RottingComponent : Component
 {
@@ -22,6 +22,7 @@ public sealed partial class RottingComponent : Component
     /// When the next check will happen for rot progression + effects like damage and ammonia
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan NextRotUpdate = TimeSpan.Zero;
 
     /// <summary>
diff --git a/Content.Shared/Atmos/Visuals/SpaceHeaterVisuals.cs b/Content.Shared/Atmos/Visuals/SpaceHeaterVisuals.cs
new file mode 100644
index 0000000000..0cbdb919a0
--- /dev/null
+++ b/Content.Shared/Atmos/Visuals/SpaceHeaterVisuals.cs
@@ -0,0 +1,27 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Atmos.Visuals;
+
+/// <summary>
+///     Used for the visualizer
+/// </summary>
+[Serializable, NetSerializable]
+public enum SpaceHeaterVisualLayers : byte
+{
+    Main
+}
+
+[Serializable, NetSerializable]
+public enum SpaceHeaterVisuals : byte
+{
+    State,
+}
+
+[Serializable, NetSerializable]
+public enum SpaceHeaterState : byte
+{
+    Off,
+    StandBy,
+    Heating,
+    Cooling,
+}
diff --git a/Content.Shared/Audio/Events/LobbyPlaylistChangedEvent.cs b/Content.Shared/Audio/Events/LobbyPlaylistChangedEvent.cs
new file mode 100644
index 0000000000..87f4e7d446
--- /dev/null
+++ b/Content.Shared/Audio/Events/LobbyPlaylistChangedEvent.cs
@@ -0,0 +1,29 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Audio.Events;
+
+/// <summary>
+/// Event of changing lobby music playlist (on server).
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class LobbyPlaylistChangedEvent : EntityEventArgs
+{
+    /// <inheritdoc />
+    public LobbyPlaylistChangedEvent(string[] playlist)
+    {
+        Playlist = playlist;
+    }
+
+    /// <summary>
+    /// List of soundtrack filenames for lobby playlist.
+    /// </summary>
+    public string[] Playlist;
+}
+
+/// <summary>
+/// Event of stopping lobby music.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class LobbyMusicStopEvent : EntityEventArgs
+{
+}
diff --git a/Content.Shared/Bed/Cryostorage/CryostorageContainedComponent.cs b/Content.Shared/Bed/Cryostorage/CryostorageContainedComponent.cs
index 5ab639bd3c..9c73b59e9a 100644
--- a/Content.Shared/Bed/Cryostorage/CryostorageContainedComponent.cs
+++ b/Content.Shared/Bed/Cryostorage/CryostorageContainedComponent.cs
@@ -8,7 +8,7 @@ namespace Content.Shared.Bed.Cryostorage;
 /// This is used to track an entity that is currently being held in Cryostorage.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentState]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class CryostorageContainedComponent : Component
 {
     /// <summary>
@@ -22,6 +22,7 @@ public sealed partial class CryostorageContainedComponent : Component
     /// The time at which the cryostorage grace period ends.
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [AutoPausedField]
     public TimeSpan? GracePeriodEndTime;
 
     /// <summary>
diff --git a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
index 14a76ee45c..f14dc21c48 100644
--- a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
+++ b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs
@@ -37,19 +37,11 @@ public override void Initialize()
         SubscribeLocalEvent<CryostorageComponent, CanDropTargetEvent>(OnCanDropTarget);
 
         SubscribeLocalEvent<CryostorageContainedComponent, EntGotRemovedFromContainerMessage>(OnRemovedContained);
-        SubscribeLocalEvent<CryostorageContainedComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<CryostorageContainedComponent, ComponentShutdown>(OnShutdownContained);
 
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
 
-        _configuration.OnValueChanged(CCVars.GameCryoSleepRejoining, OnCvarChanged, true);
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-
-        _configuration.UnsubValueChanged(CCVars.GameCryoSleepRejoining, OnCvarChanged);
+        Subs.CVar(_configuration, CCVars.GameCryoSleepRejoining, OnCvarChanged, true);
     }
 
     private void OnCvarChanged(bool value)
@@ -137,13 +129,6 @@ private void OnRemovedContained(Entity<CryostorageContainedComponent> ent, ref E
             RemCompDeferred(ent, comp);
     }
 
-    private void OnUnpaused(Entity<CryostorageContainedComponent> ent, ref EntityUnpausedEvent args)
-    {
-        var comp = ent.Comp;
-        if (comp.GracePeriodEndTime != null)
-            comp.GracePeriodEndTime = comp.GracePeriodEndTime.Value + args.PausedTime;
-    }
-
     private void OnShutdownContained(Entity<CryostorageContainedComponent> ent, ref ComponentShutdown args)
     {
         var comp = ent.Comp;
diff --git a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs b/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
index 505b2a18e7..4e4bc2c574 100644
--- a/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
+++ b/Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
@@ -13,7 +13,6 @@ namespace Content.Server.Bed.Sleep
     public abstract class SharedSleepingSystem : EntitySystem
     {
         [Dependency] private readonly IGameTiming _gameTiming = default!;
-        [Dependency] private readonly INetManager _net = default!;
         [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
         [Dependency] private readonly BlindableSystem _blindableSystem = default!;
 
@@ -27,14 +26,8 @@ public override void Initialize()
             SubscribeLocalEvent<SleepingComponent, SpeakAttemptEvent>(OnSpeakAttempt);
             SubscribeLocalEvent<SleepingComponent, CanSeeAttemptEvent>(OnSeeAttempt);
             SubscribeLocalEvent<SleepingComponent, PointAttemptEvent>(OnPointAttempt);
-            SubscribeLocalEvent<SleepingComponent, EntityUnpausedEvent>(OnSleepUnpaused);
         }
 
-        private void OnSleepUnpaused(EntityUid uid, SleepingComponent component, ref EntityUnpausedEvent args)
-        {
-            component.CoolDownEnd += args.PausedTime;
-            Dirty(uid, component);
-        }
 
         private void OnMapInit(EntityUid uid, SleepingComponent component, MapInitEvent args)
         {
diff --git a/Content.Shared/Bed/Sleep/SleepingComponent.cs b/Content.Shared/Bed/Sleep/SleepingComponent.cs
index 94838b658f..cd468440f4 100644
--- a/Content.Shared/Bed/Sleep/SleepingComponent.cs
+++ b/Content.Shared/Bed/Sleep/SleepingComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Shared.Bed.Sleep;
 /// <summary>
 /// Added to entities when they go to sleep.
 /// </summary>
-[NetworkedComponent, RegisterComponent]
+[NetworkedComponent, RegisterComponent, AutoGenerateComponentPause(Dirty = true)]
 public sealed partial class SleepingComponent : Component
 {
     /// <summary>
@@ -24,6 +24,7 @@ public sealed partial class SleepingComponent : Component
     public TimeSpan Cooldown = TimeSpan.FromSeconds(1f);
 
     [DataField("cooldownEnd", customTypeSerializer:typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan CoolDownEnd;
 
     [DataField("wakeAction")] public EntityUid? WakeAction;
diff --git a/Content.Shared/Blocking/BlockingSystem.cs b/Content.Shared/Blocking/BlockingSystem.cs
index f2d41e5be9..3e1ff4284c 100644
--- a/Content.Shared/Blocking/BlockingSystem.cs
+++ b/Content.Shared/Blocking/BlockingSystem.cs
@@ -26,7 +26,6 @@ namespace Content.Shared.Blocking;
 
 public sealed partial class BlockingSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
     [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
     [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
index e5e4edddb0..bc7cf63124 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Body.cs
@@ -5,8 +5,13 @@
 using Content.Shared.Body.Part;
 using Content.Shared.Body.Prototypes;
 using Content.Shared.DragDrop;
+using Content.Shared.Gibbing.Components;
+using Content.Shared.Gibbing.Events;
+using Content.Shared.Gibbing.Systems;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
+using Robust.Shared.Audio;
+using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Utility;
@@ -23,7 +28,10 @@ public partial class SharedBodySystem
      */
 
     [Dependency] private readonly InventorySystem _inventory = default!;
-
+    [Dependency] private readonly GibbingSystem _gibbingSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+    private const float GibletLaunchImpulse = 8;
+    private const float GibletLaunchImpulseVariance = 3;
     private void InitializeBody()
     {
         // Body here to handle root body parts.
@@ -263,29 +271,44 @@ public IEnumerable<BodyPartSlot> GetBodyAllSlots(EntityUid bodyId, BodyComponent
         }
     }
 
-    public virtual HashSet<EntityUid> GibBody(EntityUid bodyId, bool gibOrgans = false,
-        BodyComponent? body = null, bool deleteItems = false, bool deleteBrain = false)
+    public virtual HashSet<EntityUid> GibBody(
+        EntityUid bodyId,
+        bool gibOrgans = false,
+        BodyComponent? body = null,
+        bool launchGibs = true,
+        Vector2? splatDirection = null,
+        float splatModifier = 1,
+        Angle splatCone = default,
+        SoundSpecifier? gibSoundOverride = null
+        )
     {
         var gibs = new HashSet<EntityUid>();
 
         if (!Resolve(bodyId, ref body, false))
             return gibs;
 
+        var root = GetRootPartOrNull(bodyId, body);
+        if (root != null && TryComp(root.Value.Entity, out GibbableComponent? gibbable))
+        {
+            gibSoundOverride ??= gibbable.GibSound;
+        }
         var parts = GetBodyChildren(bodyId, body).ToArray();
         gibs.EnsureCapacity(parts.Length);
-
         foreach (var part in parts)
         {
-            SharedTransform.AttachToGridOrMap(part.Id);
-            gibs.Add(part.Id);
+
+            _gibbingSystem.TryGibEntityWithRef(bodyId, part.Id, GibType.Gib, GibContentsOption.Skip, ref gibs,
+                playAudio: false, launchGibs:true, launchDirection:splatDirection, launchImpulse: GibletLaunchImpulse * splatModifier,
+                launchImpulseVariance:GibletLaunchImpulseVariance, launchCone: splatCone);
 
             if (!gibOrgans)
                 continue;
 
             foreach (var organ in GetPartOrgans(part.Id, part.Component))
             {
-                SharedTransform.AttachToGridOrMap(organ.Id);
-                gibs.Add(organ.Id);
+                _gibbingSystem.TryGibEntityWithRef(bodyId, organ.Id, GibType.Drop, GibContentsOption.Skip,
+                    ref gibs, playAudio: false, launchImpulse: GibletLaunchImpulse * splatModifier,
+                    launchImpulseVariance:GibletLaunchImpulseVariance, launchCone: splatCone);
             }
         }
         if(TryComp<InventoryComponent>(bodyId, out var inventory))
@@ -296,6 +319,7 @@ public virtual HashSet<EntityUid> GibBody(EntityUid bodyId, bool gibOrgans = fal
                 gibs.Add(item);
             }
         }
+        _audioSystem.PlayPredicted(gibSoundOverride, Transform(bodyId).Coordinates, null);
         return gibs;
     }
 }
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index b6b72843f6..6427faa113 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -369,6 +369,12 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<string> SecretWeightPrototype =
             CVarDef.Create("game.secret_weight_prototype", "Secret", CVar.SERVERONLY);
 
+        /// <summary>
+        /// The id of the sound collection to randomly choose a sound from and play when the round ends.
+        /// </summary>
+        public static readonly CVarDef<string> RoundEndSoundCollection =
+            CVarDef.Create("game.round_end_sound_collection", "RoundEnd", CVar.SERVERONLY);
+
         /*
          * Discord
          */
@@ -487,6 +493,13 @@ public static readonly CVarDef<bool>
         public static readonly CVarDef<int> PiratesPlayersPerOp =
             CVarDef.Create("pirates.players_per_pirate", 5);
 
+        /*
+         * Nukeops
+         */
+
+        public static readonly CVarDef<bool> NukeopsSpawnGhostRoles =
+            CVarDef.Create("nukeops.spawn_ghost_roles", false);
+
         /*
          * Tips
          */
@@ -794,7 +807,7 @@ public static readonly CVarDef<bool>
         /// Default severity for server bans
         /// </summary>
         public static readonly CVarDef<string> ServerBanDefaultSeverity =
-            CVarDef.Create("admin.server_ban_default_severity", "high", CVar.ARCHIVE | CVar.SERVER);
+            CVarDef.Create("admin.server_ban_default_severity", "High", CVar.ARCHIVE | CVar.SERVER);
 
         /// <summary>
         ///     Minimum explosion intensity to create an admin alert message. -1 to disable the alert.
@@ -1479,15 +1492,6 @@ public static readonly CVarDef<int>
         public static readonly CVarDef<bool> CrewManifestUnsecure =
             CVarDef.Create("crewmanifest.unsecure", true, CVar.REPLICATED);
 
-        /// <summary>
-        ///     Dictates the order the crew manifest will appear in, in terms of its sections.
-        ///     Sections not in this list will appear at the end of the list, in no
-        ///     specific order.
-        /// </summary>
-        public static readonly CVarDef<string> CrewManifestOrdering =
-            CVarDef.Create("crewmanifest.ordering", "Command,Security,Science,Medical,Engineering,Cargo,Civilian,Unknown",
-                CVar.REPLICATED);
-
         /*
          * Biomass
          */
@@ -1564,6 +1568,9 @@ public static readonly CVarDef<int>
         public static readonly CVarDef<bool> ReducedMotion =
             CVarDef.Create("accessibility.reduced_motion", false, CVar.CLIENTONLY | CVar.ARCHIVE);
 
+        public static readonly CVarDef<bool> ChatEnableColorName =
+            CVarDef.Create("accessibility.enable_color_name", true, CVar.CLIENTONLY | CVar.ARCHIVE, "Toggles displaying names with individual colors.");
+
         /// <summary>
         /// Screen shake intensity slider, controlling the intensity of the CameraRecoilSystem.
         /// Goes from 0 (no recoil at all) to 1 (regular amounts of recoil)
@@ -1833,7 +1840,7 @@ public static readonly CVarDef<string>
         /// The time you must spend reading the rules, before the "Request" button is enabled
         /// </summary>
         public static readonly CVarDef<float> GhostRoleTime =
-            CVarDef.Create("ghost.role_time", 8f, CVar.REPLICATED);
+            CVarDef.Create("ghost.role_time", 8f, CVar.REPLICATED | CVar.SERVER);
 
         /*
          * Fire alarm
@@ -2009,6 +2016,16 @@ public static readonly CVarDef<float>
         public static readonly CVarDef<bool> GatewayGeneratorEnabled =
             CVarDef.Create("gateway.generator_enabled", true);
 
+        /*
+         * DEBUG
+         */
+
+        /// <summary>
+        /// A simple toggle to test <c>OptionsVisualizerComponent</c>.
+        /// </summary>
+        public static readonly CVarDef<bool> DebugOptionVisualizerTest =
+            CVarDef.Create("debug.option_visualizer_test", false, CVar.CLIENTONLY);
+
         /// DELTA-V CCVARS
         /*
          * Glimmer
diff --git a/Content.Shared/Cargo/Components/CargoShuttleComponent.cs b/Content.Shared/Cargo/Components/CargoShuttleComponent.cs
index eaa78ce8d3..388e213943 100644
--- a/Content.Shared/Cargo/Components/CargoShuttleComponent.cs
+++ b/Content.Shared/Cargo/Components/CargoShuttleComponent.cs
@@ -10,10 +10,7 @@ namespace Content.Shared.Cargo.Components;
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedCargoSystem))]
 public sealed partial class CargoShuttleComponent : Component
 {
-    /// <summary>
-    ///     The paper-type prototype to spawn with the order information.
-    /// </summary>
-    [DataField("printerOutput", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string PrinterOutput = "PaperCargoInvoice";
-
+    /*
+     * Still needed for drone console for now.
+     */
 }
diff --git a/Content.Shared/CartridgeLoader/CartridgeComponent.cs b/Content.Shared/CartridgeLoader/CartridgeComponent.cs
index 56debb48f4..207e0244de 100644
--- a/Content.Shared/CartridgeLoader/CartridgeComponent.cs
+++ b/Content.Shared/CartridgeLoader/CartridgeComponent.cs
@@ -10,6 +10,9 @@ namespace Content.Shared.CartridgeLoader;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class CartridgeComponent : Component
 {
+    [DataField]
+    public EntityUid? LoaderUid;
+
     [DataField(required: true)]
     public LocId ProgramName = "default-program-name";
 
diff --git a/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs b/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs
index 5ff5fdd9a3..c9cd710c52 100644
--- a/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs
+++ b/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs
@@ -8,7 +8,7 @@ public sealed partial class CartridgeLoaderComponent : Component
 {
     public const string CartridgeSlotId = "Cartridge-Slot";
 
-    [DataField("cartridgeSlot")]
+    [DataField]
     public ItemSlot CartridgeSlot = new();
 
     /// <summary>
@@ -32,9 +32,16 @@ public sealed partial class CartridgeLoaderComponent : Component
     /// <summary>
     /// The maximum amount of programs that can be installed on the cartridge loader entity
     /// </summary>
-    [DataField("diskSpace")]
+    [DataField]
     public int DiskSpace = 5;
 
-    [DataField("uiKey", required: true)]
+    /// <summary>
+    /// Controls whether the cartridge loader will play notifications if it supports it at all
+    /// TODO: Add an option for this to the PDA
+    /// </summary>
+    [DataField]
+    public bool NotificationsEnabled = true;
+
+    [DataField(required: true)]
     public Enum UiKey = default!;
 }
diff --git a/Content.Shared/CartridgeLoader/Cartridges/NewsReadUiMessageEvent.cs b/Content.Shared/CartridgeLoader/Cartridges/NewsReadUiMessageEvent.cs
deleted file mode 100644
index 323ee17a11..0000000000
--- a/Content.Shared/CartridgeLoader/Cartridges/NewsReadUiMessageEvent.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.CartridgeLoader.Cartridges;
-
-[Serializable, NetSerializable]
-public sealed class NewsReadUiMessageEvent : CartridgeMessageEvent
-{
-    public readonly NewsReadUiAction Action;
-
-    public NewsReadUiMessageEvent(NewsReadUiAction action)
-    {
-        Action = action;
-    }
-}
-
-[Serializable, NetSerializable]
-public enum NewsReadUiAction
-{
-    Next,
-    Prev,
-    NotificationSwith
-}
diff --git a/Content.Shared/CartridgeLoader/Cartridges/NewsReadUiState.cs b/Content.Shared/CartridgeLoader/Cartridges/NewsReadUiState.cs
deleted file mode 100644
index f0a973b014..0000000000
--- a/Content.Shared/CartridgeLoader/Cartridges/NewsReadUiState.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Robust.Shared.Serialization;
-using Content.Shared.MassMedia.Systems;
-
-namespace Content.Shared.CartridgeLoader.Cartridges;
-
-[Serializable, NetSerializable]
-public sealed class NewsReadBoundUserInterfaceState : BoundUserInterfaceState
-{
-    public NewsArticle Article;
-    public int TargetNum;
-    public int TotalNum;
-    public bool NotificationOn;
-
-    public NewsReadBoundUserInterfaceState(NewsArticle article, int targetNum, int totalNum, bool notificationOn)
-    {
-        Article = article;
-        TargetNum = targetNum;
-        TotalNum = totalNum;
-        NotificationOn = notificationOn;
-    }
-}
-
-[Serializable, NetSerializable]
-public sealed class NewsReadEmptyBoundUserInterfaceState : BoundUserInterfaceState
-{
-    public bool NotificationOn;
-
-    public NewsReadEmptyBoundUserInterfaceState(bool notificationOn)
-    {
-        NotificationOn = notificationOn;
-    }
-}
diff --git a/Content.Shared/CartridgeLoader/Cartridges/NewsReaderUiMessageEvent.cs b/Content.Shared/CartridgeLoader/Cartridges/NewsReaderUiMessageEvent.cs
new file mode 100644
index 0000000000..bab10c01c4
--- /dev/null
+++ b/Content.Shared/CartridgeLoader/Cartridges/NewsReaderUiMessageEvent.cs
@@ -0,0 +1,22 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.CartridgeLoader.Cartridges;
+
+[Serializable, NetSerializable]
+public sealed class NewsReaderUiMessageEvent : CartridgeMessageEvent
+{
+    public readonly NewsReaderUiAction Action;
+
+    public NewsReaderUiMessageEvent(NewsReaderUiAction action)
+    {
+        Action = action;
+    }
+}
+
+[Serializable, NetSerializable]
+public enum NewsReaderUiAction
+{
+    Next,
+    Prev,
+    NotificationSwitch
+}
diff --git a/Content.Shared/CartridgeLoader/Cartridges/NewsReaderUiState.cs b/Content.Shared/CartridgeLoader/Cartridges/NewsReaderUiState.cs
new file mode 100644
index 0000000000..8f7345b4c2
--- /dev/null
+++ b/Content.Shared/CartridgeLoader/Cartridges/NewsReaderUiState.cs
@@ -0,0 +1,32 @@
+using Robust.Shared.Serialization;
+using Content.Shared.MassMedia.Systems;
+
+namespace Content.Shared.CartridgeLoader.Cartridges;
+
+[Serializable, NetSerializable]
+public sealed class NewsReaderBoundUserInterfaceState : BoundUserInterfaceState
+{
+    public NewsArticle Article;
+    public int TargetNum;
+    public int TotalNum;
+    public bool NotificationOn;
+
+    public NewsReaderBoundUserInterfaceState(NewsArticle article, int targetNum, int totalNum, bool notificationOn)
+    {
+        Article = article;
+        TargetNum = targetNum;
+        TotalNum = totalNum;
+        NotificationOn = notificationOn;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class NewsReaderEmptyBoundUserInterfaceState : BoundUserInterfaceState
+{
+    public bool NotificationOn;
+
+    public NewsReaderEmptyBoundUserInterfaceState(bool notificationOn)
+    {
+        NotificationOn = notificationOn;
+    }
+}
diff --git a/Content.Shared/CartridgeLoader/SharedCartridgeLoaderSystem.cs b/Content.Shared/CartridgeLoader/SharedCartridgeLoaderSystem.cs
index ac12c5e791..f276274941 100644
--- a/Content.Shared/CartridgeLoader/SharedCartridgeLoaderSystem.cs
+++ b/Content.Shared/CartridgeLoader/SharedCartridgeLoaderSystem.cs
@@ -1,6 +1,5 @@
 using Content.Shared.Containers.ItemSlots;
 using Robust.Shared.Containers;
-using Robust.Shared.Network;
 
 namespace Content.Shared.CartridgeLoader;
 
@@ -11,7 +10,6 @@ public abstract class SharedCartridgeLoaderSystem : EntitySystem
     [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
-    [Dependency] private readonly INetManager _netMan = default!;
 
     public override void Initialize()
     {
@@ -125,3 +123,11 @@ public CartridgeUiReadyEvent(EntityUid loader)
         Loader = loader;
     }
 }
+
+/// <summary>
+/// Gets sent by the cartridge loader system to the cartridge loader entity so another system
+/// can handle displaying the notification
+/// </summary>
+/// <param name="Message">The message to be displayed</param>
+[ByRefEvent]
+public record struct CartridgeLoaderNotificationSentEvent(string Header, string Message);
diff --git a/Content.Shared/Charges/Systems/SharedChargesSystem.cs b/Content.Shared/Charges/Systems/SharedChargesSystem.cs
index 653a7f22a5..021191ac26 100644
--- a/Content.Shared/Charges/Systems/SharedChargesSystem.cs
+++ b/Content.Shared/Charges/Systems/SharedChargesSystem.cs
@@ -38,7 +38,7 @@ public void AddCharges(EntityUid uid, int change, LimitedChargesComponent? comp
         var old = comp.Charges;
         comp.Charges = Math.Clamp(comp.Charges + change, 0, comp.MaxCharges);
         if (comp.Charges != old)
-            Dirty(comp);
+            Dirty(uid, comp);
     }
 
     /// <summary>
diff --git a/Content.Shared/Chasm/ChasmFallingComponent.cs b/Content.Shared/Chasm/ChasmFallingComponent.cs
index 69b1c8e308..09377864c4 100644
--- a/Content.Shared/Chasm/ChasmFallingComponent.cs
+++ b/Content.Shared/Chasm/ChasmFallingComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Shared.Chasm;
 /// <summary>
 ///     Added to entities which have started falling into a chasm.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
 public sealed partial class ChasmFallingComponent : Component
 {
     /// <summary>
@@ -23,6 +23,7 @@ public sealed partial class ChasmFallingComponent : Component
     public TimeSpan DeletionTime = TimeSpan.FromSeconds(1.8f);
 
     [DataField("nextDeletionTime", customTypeSerializer:typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan NextDeletionTime = TimeSpan.Zero;
 
     /// <summary>
diff --git a/Content.Shared/Chasm/ChasmSystem.cs b/Content.Shared/Chasm/ChasmSystem.cs
index 4045a27078..51299557db 100644
--- a/Content.Shared/Chasm/ChasmSystem.cs
+++ b/Content.Shared/Chasm/ChasmSystem.cs
@@ -26,7 +26,6 @@ public override void Initialize()
 
         SubscribeLocalEvent<ChasmComponent, StepTriggeredEvent>(OnStepTriggered);
         SubscribeLocalEvent<ChasmComponent, StepTriggerAttemptEvent>(OnStepTriggerAttempt);
-        SubscribeLocalEvent<ChasmFallingComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<ChasmFallingComponent, UpdateCanMoveEvent>(OnUpdateCanMove);
     }
 
@@ -73,11 +72,6 @@ private void OnStepTriggerAttempt(EntityUid uid, ChasmComponent component, ref S
         args.Continue = true;
     }
 
-    private void OnUnpaused(EntityUid uid, ChasmFallingComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextDeletionTime += args.PausedTime;
-    }
-
     private void OnUpdateCanMove(EntityUid uid, ChasmFallingComponent component, UpdateCanMoveEvent args)
     {
         args.Cancel();
diff --git a/Content.Shared/Chat/ChatChannel.cs b/Content.Shared/Chat/ChatChannel.cs
index 890d1282b2..d87fcbc075 100644
--- a/Content.Shared/Chat/ChatChannel.cs
+++ b/Content.Shared/Chat/ChatChannel.cs
@@ -49,45 +49,51 @@ public enum ChatChannel : ushort
         /// </summary>
         Visual = 1 << 7,
 
+        /// <summary>
+        ///     Notifications from things like the PDA.
+        ///     Receiving a PDA message will send a notification to this channel for example
+        /// </summary>
+        Notifications = 1 << 8,
+
         /// <summary>
         ///     Emotes
         /// </summary>
-        Emotes = 1 << 8,
+        Emotes = 1 << 9,
 
         /// <summary>
         ///     Deadchat
         /// </summary>
-        Dead = 1 << 9,
+        Dead = 1 << 10,
 
         /// <summary>
         ///     Misc admin messages
         /// </summary>
-        Admin = 1 << 10,
+        Admin = 1 << 11,
 
         /// <summary>
         ///     Admin alerts, messages likely of elevated importance to admins
         /// </summary>
-        AdminAlert = 1 << 11,
+        AdminAlert = 1 << 12,
 
         /// <summary>
         ///     Admin chat
         /// </summary>
-        AdminChat = 1 << 12,
+        AdminChat = 1 << 13,
 
         /// <summary>
         ///     Unspecified.
         /// </summary>
-        Unspecified = 1 << 13,
+        Unspecified = 1 << 14,
 
         /// <summary>
         ///     Nyano - Summary:: Telepathic channel for all psionic entities.
         /// </summary>
-        Telepathic = 1 << 14,
+        Telepathic = 1 << 15,
 
         /// <summary>
         ///     Channels considered to be IC.
         /// </summary>
-        IC = Local | Whisper | Radio | Dead | Emotes | Damage | Visual | Telepathic, //Nyano - Summary: Adds telepathic as an 'IC' labelled chat.. 
+        IC = Local | Whisper | Radio | Dead | Emotes | Damage | Visual | Telepathic | Notifications, //Nyano - Summary: Adds telepathic as an 'IC' labelled chat..
 
         AdminRelated = Admin | AdminAlert | AdminChat,
     }
diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs
index 71e7e0399e..8d14adcc24 100644
--- a/Content.Shared/Chat/SharedChatSystem.cs
+++ b/Content.Shared/Chat/SharedChatSystem.cs
@@ -215,4 +215,31 @@ public static string SanitizeAnnouncement(string message, int maxLength = 0, int
 
         return trimmed;
     }
+
+    public static string InjectTagInsideTag(ChatMessage message, string outerTag, string innerTag, string? tagParameter)
+    {
+        var rawmsg = message.WrappedMessage;
+        var tagStart = rawmsg.IndexOf($"[{outerTag}]");
+        var tagEnd = rawmsg.IndexOf($"[/{outerTag}]");
+        if (tagStart < 0 || tagEnd < 0) //If the outer tag is not found, the injection is not performed
+            return rawmsg;
+        tagStart += outerTag.Length + 2;
+
+        string innerTagProcessed = tagParameter != null ? $"[{innerTag}={tagParameter}]" : $"[{innerTag}]";
+
+        rawmsg = rawmsg.Insert(tagEnd, $"[/{innerTag}]");
+        rawmsg = rawmsg.Insert(tagStart, innerTagProcessed);
+
+        return rawmsg;
+    }
+    public static string GetStringInsideTag(ChatMessage message, string tag)
+    {
+        var rawmsg = message.WrappedMessage;
+        var tagStart = rawmsg.IndexOf($"[{tag}]");
+        var tagEnd = rawmsg.IndexOf($"[/{tag}]");
+        if (tagStart < 0 || tagEnd < 0)
+            return "";
+        tagStart += tag.Length + 2;
+        return rawmsg.Substring(tagStart, tagEnd - tagStart);
+    }
 }
diff --git a/Content.Shared/Chemistry/Components/InjectorComponent.cs b/Content.Shared/Chemistry/Components/InjectorComponent.cs
new file mode 100644
index 0000000000..e29047b6de
--- /dev/null
+++ b/Content.Shared/Chemistry/Components/InjectorComponent.cs
@@ -0,0 +1,104 @@
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Chemistry.Components;
+
+[Serializable, NetSerializable]
+public sealed partial class InjectorDoAfterEvent : SimpleDoAfterEvent
+{
+}
+
+/// <summary>
+/// Implements draw/inject behavior for droppers and syringes.
+/// </summary>
+/// <remarks>
+/// Can optionally support both
+/// injection and drawing or just injection. Can inject/draw reagents from solution
+/// containers, and can directly inject into a mobs bloodstream.
+/// </remarks>
+/// <seealso cref="SharedInjectorSystem"/>
+/// <seealso cref="InjectorToggleMode"/>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class InjectorComponent : Component
+{
+    public const string SolutionName = "injector";
+
+    /// <summary>
+    /// Whether or not the injector is able to draw from containers or if it's a single use
+    /// device that can only inject.
+    /// </summary>
+    [DataField("injectOnly")]
+    public bool InjectOnly;
+
+    /// <summary>
+    /// Whether or not the injector is able to draw from or inject from mobs
+    /// </summary>
+    /// <remarks>
+    ///     for example: droppers would ignore mobs
+    /// </remarks>
+    [DataField("ignoreMobs")]
+    public bool IgnoreMobs;
+
+    /// <summary>
+    ///     The minimum amount of solution that can be transferred at once from this solution.
+    /// </summary>
+    [DataField("minTransferAmount")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public FixedPoint2 MinimumTransferAmount = FixedPoint2.New(5);
+
+    /// <summary>
+    ///     The maximum amount of solution that can be transferred at once from this solution.
+    /// </summary>
+    [DataField("maxTransferAmount")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public FixedPoint2 MaximumTransferAmount = FixedPoint2.New(50);
+
+    /// <summary>
+    /// Amount to inject or draw on each usage. If the injector is inject only, it will
+    /// attempt to inject it's entire contents upon use.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("transferAmount")]
+    [AutoNetworkedField]
+    public FixedPoint2 TransferAmount = FixedPoint2.New(5);
+
+    /// <summary>
+    /// Injection delay (seconds) when the target is a mob.
+    /// </summary>
+    /// <remarks>
+    /// The base delay has a minimum of 1 second, but this will still be modified if the target is incapacitated or
+    /// in combat mode.
+    /// </remarks>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField("delay")]
+    public TimeSpan Delay = TimeSpan.FromSeconds(5);
+
+    /// <summary>
+    /// The state of the injector. Determines it's attack behavior. Containers must have the
+    /// right SolutionCaps to support injection/drawing. For InjectOnly injectors this should
+    /// only ever be set to Inject
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [AutoNetworkedField]
+    [DataField]
+    public InjectorToggleMode ToggleState = InjectorToggleMode.Draw;
+}
+
+/// <summary>
+/// Possible modes for an <see cref="InjectorComponent"/>.
+/// </summary>
+public enum InjectorToggleMode : byte
+{
+    /// <summary>
+    /// The injector will try to inject reagent into things.
+    /// </summary>
+    Inject,
+
+    /// <summary>
+    /// The injector will try to draw reagent from things.
+    /// </summary>
+    Draw
+}
diff --git a/Content.Shared/Chemistry/Components/RehydratableComponent.cs b/Content.Shared/Chemistry/Components/RehydratableComponent.cs
new file mode 100644
index 0000000000..00599498e4
--- /dev/null
+++ b/Content.Shared/Chemistry/Components/RehydratableComponent.cs
@@ -0,0 +1,39 @@
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.Chemistry.Components;
+
+/// <summary>
+/// Basically, monkey cubes.
+/// But specifically, this component deletes the entity and spawns in a new entity when the entity is exposed to a certain amount of a given reagent.
+/// </summary>
+[RegisterComponent, Access(typeof(RehydratableSystem))]
+public sealed partial class RehydratableComponent : Component
+{
+    /// <summary>
+    /// The reagent that must be present to count as hydrated.
+    /// </summary>
+    [DataField("catalyst")]
+    public ProtoId<ReagentPrototype> CatalystPrototype = "Water";
+
+    /// <summary>
+    /// The minimum amount of catalyst that must be present to be hydrated.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 CatalystMinimum = FixedPoint2.Zero;
+
+    /// <summary>
+    /// The entity to create when hydrated.
+    /// </summary>
+    [DataField(required: true)]
+    public List<EntProtoId> PossibleSpawns = new();
+}
+
+/// <summary>
+/// Raised on the rehydrated entity with target being the new entity it became.
+/// </summary>
+[ByRefEvent]
+public readonly record struct GotRehydratedEvent(EntityUid Target);
diff --git a/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs b/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs
deleted file mode 100644
index a4cea4e7c4..0000000000
--- a/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Content.Shared.DoAfter;
-using Content.Shared.FixedPoint;
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Chemistry.Components
-{
-    [Serializable, NetSerializable]
-    public sealed partial class InjectorDoAfterEvent : SimpleDoAfterEvent
-    {
-    }
-
-    /// <summary>
-    /// Shared class for injectors & syringes
-    /// </summary>
-    [NetworkedComponent, ComponentProtoName("Injector")]
-    public abstract partial class SharedInjectorComponent : Component
-    {
-        /// <summary>
-        /// Component data used for net updates. Used by client for item status ui
-        /// </summary>
-        [Serializable, NetSerializable]
-        public sealed class InjectorComponentState : ComponentState
-        {
-            public FixedPoint2 CurrentVolume { get; }
-            public FixedPoint2 TotalVolume { get; }
-            public InjectorToggleMode CurrentMode { get; }
-
-            public InjectorComponentState(FixedPoint2 currentVolume, FixedPoint2 totalVolume,
-                InjectorToggleMode currentMode)
-            {
-                CurrentVolume = currentVolume;
-                TotalVolume = totalVolume;
-                CurrentMode = currentMode;
-            }
-        }
-
-        public enum InjectorToggleMode : byte
-        {
-            Inject,
-            Draw
-        }
-    }
-}
diff --git a/Content.Shared/Chemistry/Components/SmokeAffectedComponent.cs b/Content.Shared/Chemistry/Components/SmokeAffectedComponent.cs
index def6940ee1..fdc46dfbef 100644
--- a/Content.Shared/Chemistry/Components/SmokeAffectedComponent.cs
+++ b/Content.Shared/Chemistry/Components/SmokeAffectedComponent.cs
@@ -7,13 +7,14 @@ namespace Content.Shared.Chemistry.Components;
 /// This is used for entities which are currently being affected by smoke.
 /// Manages the gradual metabolism every second.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
 public sealed partial class SmokeAffectedComponent : Component
 {
     /// <summary>
     /// The time at which the next smoke metabolism will occur.
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan NextSecond;
 
     /// <summary>
diff --git a/Content.Shared/Chemistry/Components/Solution.cs b/Content.Shared/Chemistry/Components/Solution.cs
index f8e4821319..1c24c860dd 100644
--- a/Content.Shared/Chemistry/Components/Solution.cs
+++ b/Content.Shared/Chemistry/Components/Solution.cs
@@ -92,6 +92,12 @@ public bool CanAddSolution(Solution solution)
         /// </summary>
         [ViewVariables] private bool _heatCapacityDirty = true;
 
+        [ViewVariables(VVAccess.ReadWrite)]
+        private int _heatCapacityUpdateCounter;
+
+        // This value is arbitrary btw.
+        private const int HeatCapacityUpdateInterval = 15;
+
         public void UpdateHeatCapacity(IPrototypeManager? protoMan)
         {
             IoCManager.Resolve(ref protoMan);
@@ -103,6 +109,8 @@ public void UpdateHeatCapacity(IPrototypeManager? protoMan)
                 _heatCapacity += (float) quantity *
                                     protoMan.Index<ReagentPrototype>(reagent.Prototype).SpecificHeat;
             }
+
+            _heatCapacityUpdateCounter = 0;
         }
 
         public float GetHeatCapacity(IPrototypeManager? protoMan)
@@ -112,6 +120,15 @@ public float GetHeatCapacity(IPrototypeManager? protoMan)
             return _heatCapacity;
         }
 
+        public void CheckRecalculateHeatCapacity()
+        {
+            // For performance, we have a few ways for heat capacity to get modified without a full recalculation.
+            // To avoid these drifting too much due to float error, we mark it as dirty after N such operations,
+            // so it will be recalculated.
+            if (++_heatCapacityUpdateCounter >= HeatCapacityUpdateInterval)
+                _heatCapacityDirty = true;
+        }
+
         public float GetThermalEnergy(IPrototypeManager? protoMan)
         {
             return GetHeatCapacity(protoMan) * Temperature;
@@ -165,6 +182,7 @@ public Solution(Solution solution)
             Temperature = solution.Temperature;
             _heatCapacity = solution._heatCapacity;
             _heatCapacityDirty = solution._heatCapacityDirty;
+            _heatCapacityUpdateCounter = solution._heatCapacityUpdateCounter;
             ValidateSolution();
         }
 
@@ -193,7 +211,7 @@ public void ValidateSolution()
                 var cur = _heatCapacity;
                 _heatCapacityDirty = true;
                 UpdateHeatCapacity(null);
-                DebugTools.Assert(MathHelper.CloseTo(_heatCapacity, cur));
+                DebugTools.Assert(MathHelper.CloseTo(_heatCapacity, cur, tolerance: 0.01));
             }
     #endif
         }
@@ -380,7 +398,9 @@ public void AddReagent(ReagentId id, FixedPoint2 quantity, bool dirtyHeatCap = t
         public void AddReagent(ReagentPrototype proto, ReagentId reagentId, FixedPoint2 quantity)
         {
             AddReagent(reagentId, quantity, false);
+
             _heatCapacity += quantity.Float() * proto.SpecificHeat;
+            CheckRecalculateHeatCapacity();
         }
 
         public void AddReagent(ReagentQuantity reagentQuantity)
@@ -419,6 +439,7 @@ public void ScaleSolution(int scale)
 
             _heatCapacity *= scale;
             Volume *= scale;
+            CheckRecalculateHeatCapacity();
 
             for (int i = 0; i < Contents.Count; i++)
             {
@@ -752,6 +773,7 @@ public void AddSolution(Solution otherSolution, IPrototypeManager? protoMan)
             }
 
             _heatCapacity += otherSolution._heatCapacity;
+            CheckRecalculateHeatCapacity();
             if (closeTemps)
                 _heatCapacityDirty |= otherSolution._heatCapacityDirty;
             else
diff --git a/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs b/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs
new file mode 100644
index 0000000000..e260280ae4
--- /dev/null
+++ b/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs
@@ -0,0 +1,49 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.FixedPoint;
+using Content.Shared.Popups;
+using Robust.Shared.Random;
+
+namespace Content.Shared.Chemistry.EntitySystems;
+
+public sealed class RehydratableSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly SharedSolutionContainerSystem _solutions = default!;
+    [Dependency] private readonly SharedTransformSystem _xform = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RehydratableComponent, SolutionContainerChangedEvent>(OnSolutionChange);
+    }
+
+    private void OnSolutionChange(Entity<RehydratableComponent> ent, ref SolutionContainerChangedEvent args)
+    {
+        var quantity = _solutions.GetTotalPrototypeQuantity(ent, ent.Comp.CatalystPrototype);
+        if (quantity != FixedPoint2.Zero && quantity >= ent.Comp.CatalystMinimum)
+        {
+            Expand(ent);
+        }
+    }
+
+    // Try not to make this public if you can help it.
+    private void Expand(Entity<RehydratableComponent> ent)
+    {
+        var (uid, comp) = ent;
+
+        var randomMob = _random.Pick(comp.PossibleSpawns);
+
+        var target = Spawn(randomMob, Transform(uid).Coordinates);
+        _popup.PopupEntity(Loc.GetString("rehydratable-component-expands-message", ("owner", uid)), target);
+
+        _xform.AttachToGridOrMap(target);
+        var ev = new GotRehydratedEvent(target);
+        RaiseLocalEvent(uid, ref ev);
+
+        // prevent double hydration while queued
+        RemComp<RehydratableComponent>(uid);
+        QueueDel(uid);
+    }
+}
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
new file mode 100644
index 0000000000..dad8eb4091
--- /dev/null
+++ b/Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
@@ -0,0 +1,138 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.CombatMode;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Robust.Shared.Player;
+
+namespace Content.Shared.Chemistry.EntitySystems;
+
+public abstract class SharedInjectorSystem : EntitySystem
+{
+    /// <summary>
+    ///     Default transfer amounts for the set-transfer verb.
+    /// </summary>
+    public static readonly FixedPoint2[] TransferAmounts = { 1, 5, 10, 15 };
+
+    [Dependency] protected readonly SharedPopupSystem Popup = default!;
+    [Dependency] protected readonly SharedSolutionContainerSystem SolutionContainers = default!;
+    [Dependency] protected readonly MobStateSystem MobState = default!;
+    [Dependency] protected readonly SharedCombatModeSystem Combat = default!;
+    [Dependency] protected readonly SharedDoAfterSystem DoAfter = default!;
+    [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<InjectorComponent, GetVerbsEvent<AlternativeVerb>>(AddSetTransferVerbs);
+        SubscribeLocalEvent<InjectorComponent, ComponentStartup>(OnInjectorStartup);
+        SubscribeLocalEvent<InjectorComponent, UseInHandEvent>(OnInjectorUse);
+    }
+
+    private void AddSetTransferVerbs(Entity<InjectorComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null)
+            return;
+
+        if (!HasComp<ActorComponent>(args.User))
+            return;
+
+        var (_, component) = entity;
+
+        // Add specific transfer verbs according to the container's size
+        var priority = 0;
+        var user = args.User;
+        foreach (var amount in TransferAmounts)
+        {
+            if (amount < component.MinimumTransferAmount || amount > component.MaximumTransferAmount)
+                continue;
+
+            AlternativeVerb verb = new()
+            {
+                Text = Loc.GetString("comp-solution-transfer-verb-amount", ("amount", amount)),
+                Category = VerbCategory.SetTransferAmount,
+                Act = () =>
+                {
+                    component.TransferAmount = amount;
+                    Popup.PopupClient(Loc.GetString("comp-solution-transfer-set-amount", ("amount", amount)), user, user);
+                    Dirty(entity);
+                },
+
+                // we want to sort by size, not alphabetically by the verb text.
+                Priority = priority
+            };
+
+            priority -= 1;
+
+            args.Verbs.Add(verb);
+        }
+    }
+
+    private void OnInjectorStartup(Entity<InjectorComponent> entity, ref ComponentStartup args)
+    {
+        // ???? why ?????
+        Dirty(entity);
+    }
+
+    private void OnInjectorUse(Entity<InjectorComponent> entity, ref UseInHandEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        Toggle(entity, args.User);
+        args.Handled = true;
+    }
+
+    /// <summary>
+    /// Toggle between draw/inject state if applicable
+    /// </summary>
+    private void Toggle(Entity<InjectorComponent> injector, EntityUid user)
+    {
+        if (injector.Comp.InjectOnly)
+            return;
+
+        if (!SolutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out var solEnt, out var solution))
+            return;
+
+        string msg;
+
+        switch (injector.Comp.ToggleState)
+        {
+            case InjectorToggleMode.Inject:
+                if (solution.AvailableVolume > 0) // If solution has empty space to fill up, allow toggling to draw
+                {
+                    SetMode(injector, InjectorToggleMode.Draw);
+                    msg = "injector-component-drawing-text";
+                }
+                else
+                {
+                    msg = "injector-component-cannot-toggle-draw-message";
+                }
+                break;
+            case InjectorToggleMode.Draw:
+                if (solution.Volume > 0) // If solution has anything in it, allow toggling to inject
+                {
+                    SetMode(injector, InjectorToggleMode.Inject);
+                    msg = "injector-component-injecting-text";
+                }
+                else
+                {
+                    msg = "injector-component-cannot-toggle-inject-message";
+                }
+                break;
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
+
+        Popup.PopupClient(Loc.GetString(msg), injector, user);
+    }
+
+    public void SetMode(Entity<InjectorComponent> injector, InjectorToggleMode mode)
+    {
+        injector.Comp.ToggleState = mode;
+        Dirty(injector);
+    }
+}
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
index 32ecdd4ba6..6e762aa598 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
@@ -212,8 +212,6 @@ protected void UpdateAppearance(Entity<AppearanceComponent?> container, Entity<S
 
         if (solution.GetPrimaryReagentId() is { } reagent)
             AppearanceSystem.SetData(uid, SolutionContainerVisuals.BaseOverride, reagent.ToString(), appearanceComponent);
-        else
-            AppearanceSystem.SetData(uid, SolutionContainerVisuals.BaseOverride, string.Empty, appearanceComponent);
     }
 
 
@@ -281,8 +279,6 @@ public void UpdateAppearance(Entity<SolutionComponent, AppearanceComponent?> sol
 
         if (solution.GetPrimaryReagentId() is { } reagent)
             AppearanceSystem.SetData(uid, SolutionContainerVisuals.BaseOverride, reagent.ToString(), appearanceComponent);
-        else
-            AppearanceSystem.SetData(uid, SolutionContainerVisuals.BaseOverride, string.Empty, appearanceComponent);
     }
 
     /// <summary>
diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
index f71afa7f47..5d6d9d2120 100644
--- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
@@ -89,6 +89,15 @@ public sealed partial class ReagentPrototype : IPrototype, IInheritingPrototype
         [DataField]
         public SpriteSpecifier? MetamorphicSprite { get; private set; } = null;
 
+        [DataField]
+        public int MetamorphicMaxFillLevels { get; private set; } = 0;
+
+        [DataField]
+        public string? MetamorphicFillBaseName { get; private set; } = null;
+
+        [DataField]
+        public bool MetamorphicChangeColor { get; private set; } = true;
+
         /// <summary>
         /// If this reagent is part of a puddle is it slippery.
         /// </summary>
@@ -102,7 +111,7 @@ public sealed partial class ReagentPrototype : IPrototype, IInheritingPrototype
         [DataField]
         public float Viscosity;
 
-         /// <summary>
+        /// <summary>
         /// Should this reagent work on the dead?
         /// </summary>
         [DataField]
@@ -163,7 +172,7 @@ public void ReactionPlant(EntityUid? plantHolder, ReagentQuantity amount, Soluti
                 if (plantMetabolizable.ShouldLog)
                 {
                     var entity = args.SolutionEntity;
-                    EntitySystem.Get<SharedAdminLogSystem>().Add(LogType.ReagentEffect, plantMetabolizable.LogImpact,
+                    entMan.System<SharedAdminLogSystem>().Add(LogType.ReagentEffect, plantMetabolizable.LogImpact,
                         $"Plant metabolism effect {plantMetabolizable.GetType().Name:effect} of reagent {ID:reagent} applied on entity {entMan.ToPrettyString(entity):entity} at {entMan.GetComponent<TransformComponent>(entity).Coordinates:coordinates}");
                 }
 
diff --git a/Content.Shared/Chemistry/SharedReagentDispenser.cs b/Content.Shared/Chemistry/SharedReagentDispenser.cs
index 22cb87dcdb..2b9c318c58 100644
--- a/Content.Shared/Chemistry/SharedReagentDispenser.cs
+++ b/Content.Shared/Chemistry/SharedReagentDispenser.cs
@@ -56,6 +56,8 @@ public enum ReagentDispenserDispenseAmount
     public sealed class ReagentDispenserBoundUserInterfaceState : BoundUserInterfaceState
     {
         public readonly ContainerInfo? OutputContainer;
+
+        public readonly NetEntity? OutputContainerEntity;
         /// <summary>
         /// A list of the reagents which this dispenser can dispense.
         /// </summary>
@@ -63,9 +65,10 @@ public sealed class ReagentDispenserBoundUserInterfaceState : BoundUserInterface
 
         public readonly ReagentDispenserDispenseAmount SelectedDispenseAmount;
 
-        public ReagentDispenserBoundUserInterfaceState(ContainerInfo? outputContainer, List<KeyValuePair<string, KeyValuePair<string, string>>> inventory, ReagentDispenserDispenseAmount selectedDispenseAmount)
+        public ReagentDispenserBoundUserInterfaceState(ContainerInfo? outputContainer, NetEntity? outputContainerEntity, List<KeyValuePair<string, KeyValuePair<string, string>>> inventory, ReagentDispenserDispenseAmount selectedDispenseAmount)
         {
             OutputContainer = outputContainer;
+            OutputContainerEntity = outputContainerEntity;
             Inventory = inventory;
             SelectedDispenseAmount = selectedDispenseAmount;
         }
diff --git a/Content.Shared/Climbing/Components/ClimbingComponent.cs b/Content.Shared/Climbing/Components/ClimbingComponent.cs
index 2af2c89feb..89320eabc8 100644
--- a/Content.Shared/Climbing/Components/ClimbingComponent.cs
+++ b/Content.Shared/Climbing/Components/ClimbingComponent.cs
@@ -4,7 +4,7 @@
 
 namespace Content.Shared.Climbing.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class ClimbingComponent : Component
 {
     /// <summary>
@@ -17,6 +17,7 @@ public sealed partial class ClimbingComponent : Component
     /// Whether the owner is being moved onto the climbed entity.
     /// </summary>
     [AutoNetworkedField, DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan? NextTransition;
 
     /// <summary>
diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs
index 23bc54b8f8..7c760f2c5d 100644
--- a/Content.Shared/Climbing/Systems/ClimbSystem.cs
+++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs
@@ -62,7 +62,6 @@ public override void Initialize()
         SubscribeLocalEvent<ClimbingComponent, ClimbDoAfterEvent>(OnDoAfter);
         SubscribeLocalEvent<ClimbingComponent, EndCollideEvent>(OnClimbEndCollide);
         SubscribeLocalEvent<ClimbingComponent, BuckleChangeEvent>(OnBuckleChange);
-        SubscribeLocalEvent<ClimbingComponent, EntityUnpausedEvent>(OnClimbableUnpaused);
 
         SubscribeLocalEvent<ClimbableComponent, CanDropTargetEvent>(OnCanDragDropOn);
         SubscribeLocalEvent<ClimbableComponent, GetVerbsEvent<AlternativeVerb>>(AddClimbableVerb);
@@ -71,15 +70,6 @@ public override void Initialize()
         SubscribeLocalEvent<GlassTableComponent, ClimbedOnEvent>(OnGlassClimbed);
     }
 
-    private void OnClimbableUnpaused(EntityUid uid, ClimbingComponent component, ref EntityUnpausedEvent args)
-    {
-        if (component.NextTransition == null)
-            return;
-
-        component.NextTransition = component.NextTransition.Value + args.PausedTime;
-        Dirty(uid, component);
-    }
-
     public override void UpdateBeforeSolve(bool prediction, float frameTime)
     {
         base.UpdateBeforeSolve(prediction, frameTime);
diff --git a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
index 61237b2283..1a40d1dca1 100644
--- a/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/FoldableClothingComponent.cs
@@ -17,4 +17,17 @@ public sealed partial class FoldableClothingComponent : Component
     /// </summary>
     [DataField]
     public SlotFlags? UnfoldedSlots;
+
+
+    /// <summary>
+    /// What equipped prefix does this have while in folded form?
+    /// </summary>
+    [DataField]
+    public string? FoldedEquippedPrefix;
+
+    /// <summary>
+    /// What held prefix does this have while in folded form?
+    /// </summary>
+    [DataField]
+    public string? FoldedHeldPrefix;
 }
diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
index 154171fc05..50a1d93a6c 100644
--- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.Item;
 using Content.Shared.Tag;
 using Robust.Shared.GameStates;
+using System.Linq;
 
 namespace Content.Shared.Clothing.EntitySystems;
 
@@ -22,6 +23,9 @@ public abstract class ClothingSystem : EntitySystem
     [ValidatePrototypeId<TagPrototype>]
     private const string HairTag = "HidesHair";
 
+    [ValidatePrototypeId<TagPrototype>]
+    private const string NoseTag = "HidesNose";
+
     public override void Initialize()
     {
         base.Initialize();
@@ -85,18 +89,57 @@ private void QuickEquip(
         }
     }
 
+    private void ToggleVisualLayer(EntityUid equipee, HumanoidVisualLayers layer, string tag)
+    {
+        InventorySystem.InventorySlotEnumerator enumerator = _invSystem.GetSlotEnumerator(equipee);
+        bool shouldLayerShow = true;
+
+        while (enumerator.NextItem(out EntityUid item))
+        {
+            if (_tagSystem.HasTag(item, tag))
+            {
+                if (tag == NoseTag) //Special check needs to be made for NoseTag, due to masks being toggleable
+                {
+                    if (TryComp(item, out MaskComponent? mask) && TryComp(item, out ClothingComponent? clothing))
+                    {
+                        if (clothing.EquippedPrefix != mask.EquippedPrefix)
+                        {
+                            shouldLayerShow = false;
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        shouldLayerShow = false;
+                        break;
+                    }
+                }
+                else
+                {
+                    shouldLayerShow = false;
+                    break;
+                }
+            }
+        }
+        _humanoidSystem.SetLayerVisibility(equipee, layer, shouldLayerShow);
+    }
+
     protected virtual void OnGotEquipped(EntityUid uid, ClothingComponent component, GotEquippedEvent args)
     {
         component.InSlot = args.Slot;
-        if (args.Slot == "head" && _tagSystem.HasTag(args.Equipment, HairTag))
-            _humanoidSystem.SetLayerVisibility(args.Equipee, HumanoidVisualLayers.Hair, false);
+        if ((new string[] { "head" }).Contains(args.Slot) && _tagSystem.HasTag(args.Equipment, HairTag))
+            ToggleVisualLayer(args.Equipee, HumanoidVisualLayers.Hair, HairTag);
+        if ((new string[] { "mask", "head" }).Contains(args.Slot) && _tagSystem.HasTag(args.Equipment, NoseTag))
+            ToggleVisualLayer(args.Equipee, HumanoidVisualLayers.Snout, NoseTag);
     }
 
     protected virtual void OnGotUnequipped(EntityUid uid, ClothingComponent component, GotUnequippedEvent args)
     {
         component.InSlot = null;
-        if (args.Slot == "head" && _tagSystem.HasTag(args.Equipment, HairTag))
-            _humanoidSystem.SetLayerVisibility(args.Equipee, HumanoidVisualLayers.Hair, true);
+        if ((new string[] { "head" }).Contains(args.Slot) && _tagSystem.HasTag(args.Equipment, HairTag))
+            ToggleVisualLayer(args.Equipee, HumanoidVisualLayers.Hair, HairTag);
+        if ((new string[] { "mask", "head" }).Contains(args.Slot) && _tagSystem.HasTag(args.Equipment, NoseTag))
+            ToggleVisualLayer(args.Equipee, HumanoidVisualLayers.Snout, NoseTag);
     }
 
     private void OnGetState(EntityUid uid, ClothingComponent component, ref ComponentGetState args)
@@ -113,8 +156,8 @@ private void OnHandleState(EntityUid uid, ClothingComponent component, ref Compo
     private void OnMaskToggled(Entity<ClothingComponent> ent, ref ItemMaskToggledEvent args)
     {
         //TODO: sprites for 'pulled down' state. defaults to invisible due to no sprite with this prefix
-        if(args.equippedPrefix != null)
-            SetEquippedPrefix(ent, args.IsToggled ? args.equippedPrefix : null, ent);
+        SetEquippedPrefix(ent, args.IsToggled ? args.equippedPrefix : null, ent);
+        ToggleVisualLayer(args.Wearer, HumanoidVisualLayers.Snout, NoseTag);
     }
 
     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 d0611c5851..27ea168018 100644
--- a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Clothing.Components;
 using Content.Shared.Foldable;
 using Content.Shared.Inventory;
+using Content.Shared.Item;
 
 namespace Content.Shared.Clothing.EntitySystems;
 
@@ -8,6 +9,7 @@ public sealed class FoldableClothingSystem : EntitySystem
 {
     [Dependency] private readonly ClothingSystem _clothingSystem = default!;
     [Dependency] private readonly InventorySystem _inventorySystem = default!;
+    [Dependency] private readonly SharedItemSystem _itemSystem = default!;
 
     public override void Initialize()
     {
@@ -31,12 +33,32 @@ private void OnFoldAttempt(Entity<FoldableClothingComponent> ent, ref FoldAttemp
 
     private void OnFolded(Entity<FoldableClothingComponent> ent, ref FoldedEvent args)
     {
-        if (TryComp<ClothingComponent>(ent.Owner, out var clothingComp))
+        if (TryComp<ClothingComponent>(ent.Owner, out var clothingComp) &&
+            TryComp<ItemComponent>(ent.Owner, out var itemComp))
         {
-            if (args.IsFolded && ent.Comp.FoldedSlots.HasValue)
-                _clothingSystem.SetSlots(ent.Owner, ent.Comp.FoldedSlots.Value, clothingComp);
-            else if (!args.IsFolded && ent.Comp.UnfoldedSlots.HasValue)
-                _clothingSystem.SetSlots(ent.Owner, ent.Comp.UnfoldedSlots.Value, clothingComp);
+            if (args.IsFolded)
+            {
+                if (ent.Comp.FoldedSlots.HasValue)
+                    _clothingSystem.SetSlots(ent.Owner, ent.Comp.FoldedSlots.Value, clothingComp);
+
+                if (ent.Comp.FoldedEquippedPrefix != null)
+                    _clothingSystem.SetEquippedPrefix(ent.Owner, ent.Comp.FoldedEquippedPrefix, clothingComp);
+
+                if (ent.Comp.FoldedHeldPrefix != null)
+                    _itemSystem.SetHeldPrefix(ent.Owner, ent.Comp.FoldedHeldPrefix, false, itemComp);
+            }
+            else
+            {
+                if (ent.Comp.UnfoldedSlots.HasValue)
+                    _clothingSystem.SetSlots(ent.Owner, ent.Comp.UnfoldedSlots.Value, clothingComp);
+
+                if (ent.Comp.FoldedEquippedPrefix != null)
+                    _clothingSystem.SetEquippedPrefix(ent.Owner, null, clothingComp);
+
+                if (ent.Comp.FoldedHeldPrefix != null)
+                    _itemSystem.SetHeldPrefix(ent.Owner, null, false, itemComp);
+
+            }
         }
     }
 }
diff --git a/Content.Shared/Clothing/EntitySystems/StealthClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/StealthClothingSystem.cs
index 4bf2f76ca3..e96d9f866a 100644
--- a/Content.Shared/Clothing/EntitySystems/StealthClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/StealthClothingSystem.cs
@@ -114,7 +114,7 @@ private void OnUnequipped(EntityUid uid, StealthClothingComponent comp, GotUnequ
 /// <summary>
 /// Raised on the stealth clothing when attempting to add an action.
 /// </summary>
-public class AddStealthActionEvent : CancellableEntityEventArgs
+public sealed class AddStealthActionEvent : CancellableEntityEventArgs
 {
     /// <summary>
     /// User that equipped the stealth clothing.
@@ -130,7 +130,7 @@ public AddStealthActionEvent(EntityUid user)
 /// <summary>
 /// Raised on the stealth clothing when the user is attemping to enable it.
 /// </summary>
-public class AttemptStealthEvent : CancellableEntityEventArgs
+public sealed class AttemptStealthEvent : CancellableEntityEventArgs
 {
     /// <summary>
     /// User that is attempting to enable the stealth clothing.
diff --git a/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
index f03745006f..0138de7a98 100644
--- a/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs
@@ -170,12 +170,7 @@ private void OnRemoveToggleable(EntityUid uid, ToggleableClothingComponent compo
         // "outside" of the container or not. This means that if a hardsuit takes too much damage, the helmet will also
         // automatically be deleted.
 
-        // remove action.
-        if (_actionsSystem.TryGetActionData(component.ActionEntity, out var action) &&
-            action.AttachedEntity != null)
-        {
-            _actionsSystem.RemoveAction(action.AttachedEntity.Value, component.ActionEntity);
-        }
+        _actionsSystem.RemoveAction(component.ActionEntity);
 
         if (component.ClothingUid != null && !_netMan.IsClient)
             QueueDel(component.ClothingUid.Value);
@@ -199,13 +194,7 @@ private void OnRemoveAttached(EntityUid uid, AttachedClothingComponent component
         if (toggleComp.LifeStage > ComponentLifeStage.Running)
             return;
 
-        // remove action.
-        if (_actionsSystem.TryGetActionData(toggleComp.ActionEntity, out var action) &&
-            action.AttachedEntity != null)
-        {
-            _actionsSystem.RemoveAction(action.AttachedEntity.Value, toggleComp.ActionEntity);
-        }
-
+        _actionsSystem.RemoveAction(toggleComp.ActionEntity);
         RemComp(component.AttachedUid, toggleComp);
     }
 
diff --git a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
index 0c5e12e6f0..6d94c087af 100644
--- a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
+++ b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
@@ -28,16 +28,9 @@ public override void Initialize()
         SubscribeLocalEvent<PacifiedComponent, BeforeThrowEvent>(OnBeforeThrow);
         SubscribeLocalEvent<PacifiedComponent, AttackAttemptEvent>(OnAttackAttempt);
         SubscribeLocalEvent<PacifiedComponent, ShotAttemptedEvent>(OnShootAttempt);
-        SubscribeLocalEvent<PacifiedComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<PacifismDangerousAttackComponent, AttemptPacifiedAttackEvent>(OnPacifiedDangerousAttack);
     }
 
-    private void OnUnpaused(Entity<PacifiedComponent> ent, ref EntityUnpausedEvent args)
-    {
-        if (ent.Comp.NextPopupTime != null)
-            ent.Comp.NextPopupTime = ent.Comp.NextPopupTime.Value + args.PausedTime;
-    }
-
     private bool PacifiedCanAttack(EntityUid user, EntityUid target, [NotNullWhen(false)] out string? reason)
     {
         var ev = new AttemptPacifiedAttackEvent(user);
diff --git a/Content.Shared/CombatMode/Pacification/PacifiedComponent.cs b/Content.Shared/CombatMode/Pacification/PacifiedComponent.cs
index e271628fcb..464ef77885 100644
--- a/Content.Shared/CombatMode/Pacification/PacifiedComponent.cs
+++ b/Content.Shared/CombatMode/Pacification/PacifiedComponent.cs
@@ -11,7 +11,7 @@ namespace Content.Shared.CombatMode.Pacification;
 ///
 /// If you want full-pacifism (no combat mode at all), you can simply set <see cref="DisallowAllCombat"/> before adding.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
 [Access(typeof(PacificationSystem))]
 public sealed partial class PacifiedComponent : Component
 {
@@ -33,6 +33,7 @@ public sealed partial class PacifiedComponent : Component
     public TimeSpan PopupCooldown = TimeSpan.FromSeconds(3.0);
 
     [DataField]
+    [AutoPausedField]
     public TimeSpan? NextPopupTime = null;
 
     /// <summary>
diff --git a/Content.Shared/Construction/Components/AnchorableComponent.cs b/Content.Shared/Construction/Components/AnchorableComponent.cs
index 09bb94f465..064f839efa 100644
--- a/Content.Shared/Construction/Components/AnchorableComponent.cs
+++ b/Content.Shared/Construction/Components/AnchorableComponent.cs
@@ -1,16 +1,21 @@
 using Content.Shared.Construction.EntitySystems;
 using Content.Shared.Tools;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Construction.Components
 {
-    [RegisterComponent, Access(typeof(AnchorableSystem))]
+    [RegisterComponent, Access(typeof(AnchorableSystem)), NetworkedComponent, AutoGenerateComponentState]
     public sealed partial class AnchorableComponent : Component
     {
-        [DataField("tool", customTypeSerializer: typeof(PrototypeIdSerializer<ToolQualityPrototype>))]
-        public string Tool { get; private set; } = "Anchoring";
+        [DataField]
+        public ProtoId<ToolQualityPrototype> Tool { get; private set; } = "Anchoring";
 
-        [DataField("snap")]
+        [DataField, AutoNetworkedField]
+        public AnchorableFlags Flags = AnchorableFlags.Anchorable | AnchorableFlags.Unanchorable;
+
+        [DataField]
         [ViewVariables(VVAccess.ReadWrite)]
         public bool Snap { get; private set; } = true;
 
@@ -18,10 +23,18 @@ public sealed partial class AnchorableComponent : Component
         /// Base delay to use for anchoring.
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite)]
-        [DataField("delay")]
+        [DataField]
         public float Delay = 1f;
     }
 
+    [Flags]
+    public enum AnchorableFlags : byte
+    {
+        None = 0,
+        Anchorable = 1 << 0,
+        Unanchorable = 1 << 1,
+    }
+
     public abstract class BaseAnchoredAttemptEvent : CancellableEntityEventArgs
     {
         public EntityUid User { get; }
diff --git a/Content.Shared/Construction/Components/FlatpackCreatorComponent.cs b/Content.Shared/Construction/Components/FlatpackCreatorComponent.cs
index 1270591548..ed084b39b5 100644
--- a/Content.Shared/Construction/Components/FlatpackCreatorComponent.cs
+++ b/Content.Shared/Construction/Components/FlatpackCreatorComponent.cs
@@ -11,7 +11,7 @@ namespace Content.Shared.Construction.Components;
 /// </summary>
 [RegisterComponent, NetworkedComponent]
 [Access(typeof(SharedFlatpackSystem))]
-[AutoGenerateComponentState]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class FlatpackCreatorComponent : Component
 {
     /// <summary>
@@ -26,6 +26,7 @@ public sealed partial class FlatpackCreatorComponent : Component
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
     [AutoNetworkedField]
+    [AutoPausedField]
     public TimeSpan PackEndTime;
 
     /// <summary>
diff --git a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
index b40c049562..70bcfbab43 100644
--- a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
+++ b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
@@ -69,6 +69,9 @@ private void TryUnAnchor(EntityUid uid, EntityUid userUid, EntityUid usingUid,
         if (!Valid(uid, userUid, usingUid, false))
             return;
 
+        // Log unanchor attempt (server only)
+        _adminLogger.Add(LogType.Anchor, LogImpact.Low, $"{ToPrettyString(userUid):user} is trying to unanchor {ToPrettyString(uid):entity} from {transform.Coordinates:targetlocation}");
+
         _tool.UseTool(usingUid, userUid, uid, anchorable.Delay, usingTool.Qualities, new TryUnanchorCompletedEvent());
     }
 
@@ -181,16 +184,10 @@ public void TryToggleAnchor(EntityUid uid, EntityUid userUid, EntityUid usingUid
         if (transform.Anchored)
         {
             TryUnAnchor(uid, userUid, usingUid, anchorable, transform, usingTool);
-
-            // Log unanchor attempt (server only)
-            _adminLogger.Add(LogType.Anchor, LogImpact.Low, $"{ToPrettyString(userUid):user} is trying to unanchor {ToPrettyString(uid):entity} from {transform.Coordinates:targetlocation}");
         }
         else
         {
             TryAnchor(uid, userUid, usingUid, anchorable, transform, pullable, usingTool);
-
-            // Log anchor attempt (server only)
-            _adminLogger.Add(LogType.Anchor, LogImpact.Low, $"{ToPrettyString(userUid):user} is trying to anchor {ToPrettyString(uid):entity} to {transform.Coordinates:targetlocation}");
         }
     }
 
@@ -216,6 +213,9 @@ private void TryAnchor(EntityUid uid, EntityUid userUid, EntityUid usingUid,
         if (!Valid(uid, userUid, usingUid, true, anchorable, usingTool))
             return;
 
+        // Log anchor attempt (server only)
+        _adminLogger.Add(LogType.Anchor, LogImpact.Low, $"{ToPrettyString(userUid):user} is trying to anchor {ToPrettyString(uid):entity} to {transform.Coordinates:targetlocation}");
+
         if (TryComp<PhysicsComponent>(uid, out var anchorBody) &&
             !TileFree(transform.Coordinates, anchorBody))
         {
@@ -246,6 +246,12 @@ private bool Valid(
         if (!Resolve(usingUid, ref usingTool))
             return false;
 
+        if (anchoring && (anchorable.Flags & AnchorableFlags.Anchorable) == 0x0)
+            return false;
+
+        if (!anchoring && (anchorable.Flags & AnchorableFlags.Unanchorable) == 0x0)
+            return false;
+
         BaseAnchoredAttemptEvent attempt =
             anchoring ? new AnchorAttemptEvent(userUid, usingUid) : new UnanchorAttemptEvent(userUid, usingUid);
 
diff --git a/Content.Shared/Construction/SharedFlatpackSystem.cs b/Content.Shared/Construction/SharedFlatpackSystem.cs
index c6f3e89744..a62488d6f3 100644
--- a/Content.Shared/Construction/SharedFlatpackSystem.cs
+++ b/Content.Shared/Construction/SharedFlatpackSystem.cs
@@ -20,7 +20,6 @@ namespace Content.Shared.Construction;
 public abstract class SharedFlatpackSystem : EntitySystem
 {
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
     [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
@@ -41,7 +40,6 @@ public override void Initialize()
         SubscribeLocalEvent<FlatpackComponent, ExaminedEvent>(OnFlatpackExamined);
 
         SubscribeLocalEvent<FlatpackCreatorComponent, ContainerIsRemovingAttemptEvent>(OnCreatorRemovingAttempt);
-        SubscribeLocalEvent<FlatpackCreatorComponent, EntityUnpausedEvent>(OnCreatorUnpaused);
     }
 
     private void OnFlatpackInteractUsing(Entity<FlatpackComponent> ent, ref InteractUsingEvent args)
@@ -111,11 +109,6 @@ private void OnCreatorRemovingAttempt(Entity<FlatpackCreatorComponent> ent, ref
             args.Cancel();
     }
 
-    private void OnCreatorUnpaused(Entity<FlatpackCreatorComponent> ent, ref EntityUnpausedEvent args)
-    {
-        ent.Comp.PackEndTime += args.PausedTime;
-    }
-
     public void SetupFlatpack(Entity<FlatpackComponent?> ent, EntityUid? board)
     {
         if (!Resolve(ent, ref ent.Comp))
diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs
index f02cdc48db..42e7f721b3 100644
--- a/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs
+++ b/Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs
@@ -21,7 +21,7 @@ public sealed partial class ItemSlotsComponent : Component
         ///     The dictionary that stores all of the item slots whose interactions will be managed by the <see
         ///     cref="ItemSlotsSystem"/>.
         /// </summary>
-        [DataField("slots", readOnly:true)]
+        [DataField(readOnly:true)]
         public Dictionary<string, ItemSlot> Slots = new();
 
         // There are two ways to use item slots:
@@ -67,17 +67,17 @@ public ItemSlot(ItemSlot other)
             CopyFrom(other);
         }
 
-        [DataField("whitelist")]
+        [DataField]
         [Access(typeof(ItemSlotsSystem), Other = AccessPermissions.ReadWriteExecute)]
         public EntityWhitelist? Whitelist;
 
-        [DataField("blacklist")]
+        [DataField]
         public EntityWhitelist? Blacklist;
 
-        [DataField("insertSound")]
+        [DataField]
         public SoundSpecifier InsertSound = new SoundPathSpecifier("/Audio/Weapons/Guns/MagIn/revolver_magin.ogg");
 
-        [DataField("ejectSound")]
+        [DataField]
         public SoundSpecifier EjectSound = new SoundPathSpecifier("/Audio/Weapons/Guns/MagOut/revolver_magout.ogg");
 
         /// <summary>
@@ -87,7 +87,7 @@ public ItemSlot(ItemSlot other)
         ///     This will be passed through Loc.GetString. If the name is an empty string, then verbs will use the name
         ///     of the currently held or currently inserted entity instead.
         /// </remarks>
-        [DataField("name", readOnly: true)]
+        [DataField(readOnly: true)]
         [Access(typeof(ItemSlotsSystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends
         public string Name = string.Empty;
 
@@ -99,7 +99,7 @@ public ItemSlot(ItemSlot other)
         ///     property of that component (e.g., cell slot size category), and this can lead to unnecessary changes
         ///     when mapping.
         /// </remarks>
-        [DataField("startingItem", readOnly: true, customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        [DataField(readOnly: true, customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
         [Access(typeof(ItemSlotsSystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends
         [NonSerialized]
         public string? StartingItem;
@@ -111,7 +111,7 @@ public ItemSlot(ItemSlot other)
         ///     This doesn't have to mean the slot is somehow physically locked. In the case of the item cabinet, the
         ///     cabinet may simply be closed at the moment and needs to be opened first.
         /// </remarks>
-        [DataField("locked", readOnly: true)]
+        [DataField(readOnly: true)]
         [ViewVariables(VVAccess.ReadWrite)]
         public bool Locked = false;
 
@@ -121,14 +121,14 @@ public ItemSlot(ItemSlot other)
         /// <remarks>
         ///     This does not affect EjectOnInteract, since if you do that you probably want ejecting to work.
         /// </remarks>
-        [DataField("disableEject"), ViewVariables(VVAccess.ReadWrite)]
+        [DataField, ViewVariables(VVAccess.ReadWrite)]
         public bool DisableEject = false;
 
         /// <summary>
         ///     Whether the item slots system will attempt to insert item from the user's hands into this slot when interacted with.
         ///     It doesn't block other insertion methods, like verbs.
         /// </summary>
-        [DataField("insertOnInteract")]
+        [DataField]
         public bool InsertOnInteract = true;
 
         /// <summary>
@@ -139,7 +139,7 @@ public ItemSlot(ItemSlot other)
         ///     there are some exceptions. For example item cabinets and charging stations should probably eject their
         ///     contents when clicked on normally.
         /// </remarks>
-        [DataField("ejectOnInteract")]
+        [DataField]
         public bool EjectOnInteract = false;
 
         /// <summary>
@@ -151,21 +151,21 @@ public ItemSlot(ItemSlot other)
         ///     'Z' to open UI). Unlike <see cref="EjectOnInteract"/>, this will not make any changes to the context
         ///     menu, nor will it disable alt-click interactions.
         /// </remarks>
-        [DataField("ejectOnUse")]
+        [DataField]
         public bool EjectOnUse = false;
 
         /// <summary>
         ///     Override the insert verb text. Defaults to using the slot's name (if specified) or the name of the
         ///     targeted item. If specified, the verb will not be added to the default insert verb category.
         /// </summary>
-        [DataField("insertVerbText")]
+        [DataField]
         public string? InsertVerbText;
 
         /// <summary>
         ///     Override the eject verb text. Defaults to using the slot's name (if specified) or the name of the
         ///     targeted item. If specified, the verb will not be added to the default eject verb category
         /// </summary>
-        [DataField("ejectVerbText")]
+        [DataField]
         public string? EjectVerbText;
 
         [ViewVariables, NonSerialized]
@@ -178,7 +178,7 @@ public ItemSlot(ItemSlot other)
         /// <remarks>
         ///     The actual deconstruction logic is handled by the server-side EmptyOnMachineDeconstructSystem.
         /// </remarks>
-        [DataField("ejectOnDeconstruct")]
+        [DataField]
         [Access(typeof(ItemSlotsSystem), Other = AccessPermissions.ReadWriteExecute)]
         [NonSerialized]
         public bool EjectOnDeconstruct = true;
@@ -187,17 +187,30 @@ public ItemSlot(ItemSlot other)
         ///     If this slot belongs to some breakable or destructible entity, should the item inside the slot be
         ///     ejected when it is broken or destroyed?
         /// </summary>
-        [DataField("ejectOnBreak")]
+        [DataField]
         [Access(typeof(ItemSlotsSystem), Other = AccessPermissions.ReadWriteExecute)]
         [NonSerialized]
         public bool EjectOnBreak = false;
 
         /// <summary>
-        ///     If this is not an empty string, this will generate a popup when someone attempts to insert a bad item
-        ///     into this slot. This string will be passed through localization.
+        ///     When specified, a popup will be generated whenever someone attempts to insert a bad item into this slot.
         /// </summary>
-        [DataField("whitelistFailPopup")]
-        public string WhitelistFailPopup = string.Empty;
+        [DataField]
+        public LocId? WhitelistFailPopup;
+
+        /// <summary>
+        ///     When specified, a popup will be generated whenever someone attempts to insert a valid item, or eject an item
+        ///     from the slot while that slot is locked.
+        /// </summary>
+        [DataField]
+        public LocId? LockedFailPopup;
+
+        /// <summary>
+        ///     When specified, a popup will be generated whenever someone successfully inserts a valid item into this slot.
+        ///     This is also used for insertions resulting from swapping.
+        /// </summary>
+        [DataField]
+        public LocId? InsertSuccessPopup;
 
         /// <summary>
         ///     If the user interacts with an entity with an already-filled item slot, should they attempt to swap out the item?
@@ -206,7 +219,7 @@ public ItemSlot(ItemSlot other)
         ///     Useful for things like chem dispensers, but undesirable for things like the ID card console, where you
         ///     want to insert more than one item that matches the same whitelist.
         /// </remarks>
-        [DataField("swap")]
+        [DataField]
         [Access(typeof(ItemSlotsSystem), Other = AccessPermissions.ReadWriteExecute)]
         public bool Swap = true;
 
@@ -219,7 +232,7 @@ public ItemSlot(ItemSlot other)
         /// <summary>
         ///     Priority for use with the eject & insert verbs for this slot.
         /// </summary>
-        [DataField("priority")]
+        [DataField]
         public int Priority = 0;
 
         /// <summary>
@@ -244,6 +257,8 @@ public void CopyFrom(ItemSlot other)
             InsertVerbText = other.InsertVerbText;
             EjectVerbText = other.EjectVerbText;
             WhitelistFailPopup = other.WhitelistFailPopup;
+            LockedFailPopup = other.LockedFailPopup;
+            InsertSuccessPopup = other.InsertSuccessPopup;
             Swap = other.Swap;
             Priority = other.Priority;
         }
diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
index d832cdfef8..fb50803596 100644
--- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
+++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs
@@ -9,12 +9,9 @@
 using Content.Shared.Interaction.Events;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
-using Robust.Shared.Network;
-using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Containers.ItemSlots
@@ -22,10 +19,12 @@ namespace Content.Shared.Containers.ItemSlots
     /// <summary>
     ///     A class that handles interactions related to inserting/ejecting items into/from an item slot.
     /// </summary>
+    /// <remarks>
+    ///     Note when using popups on entities with many slots with InsertOnInteract, EjectOnInteract or EjectOnUse:
+    ///     A single use will try to insert to/eject from every slot and generate a popup for each that fails.
+    /// </remarks>
     public sealed class ItemSlotsSystem : EntitySystem
     {
-        [Dependency] private readonly IGameTiming _timing = default!;
-        [Dependency] private readonly INetManager _netManager = default!;
         [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
         [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
         [Dependency] private readonly SharedContainerSystem _containers = default!;
@@ -153,7 +152,7 @@ private void OnInteractHand(EntityUid uid, ItemSlotsComponent itemSlots, Interac
 
             foreach (var slot in itemSlots.Slots.Values)
             {
-                if (slot.Locked || !slot.EjectOnInteract || slot.Item == null)
+                if (!slot.EjectOnInteract || slot.Item == null || !CanEject(uid, args.User, slot, popup: args.User))
                     continue;
 
                 args.Handled = true;
@@ -172,7 +171,7 @@ private void OnUseInHand(EntityUid uid, ItemSlotsComponent itemSlots, UseInHandE
 
             foreach (var slot in itemSlots.Slots.Values)
             {
-                if (slot.Locked || !slot.EjectOnUse || slot.Item == null)
+                if (!slot.EjectOnUse || slot.Item == null || !CanEject(uid, args.User, slot, popup: args.User))
                     continue;
 
                 args.Handled = true;
@@ -214,6 +213,10 @@ private void OnInteractUsing(EntityUid uid, ItemSlotsComponent itemSlots, Intera
                     _handsSystem.TryPickupAnyHand(args.User, slot.Item.Value, handsComp: hands);
 
                 Insert(uid, slot, args.Used, args.User, excludeUserAudio: true);
+
+                if (slot.InsertSuccessPopup.HasValue)
+                    _popupSystem.PopupClient(Loc.GetString(slot.InsertSuccessPopup), uid, args.User);
+
                 args.Handled = true;
                 return;
             }
@@ -245,27 +248,29 @@ private void Insert(EntityUid uid, ItemSlot slot, EntityUid item, EntityUid? use
         /// </summary>
         /// <remarks>
         ///     If a popup entity is given, and if the item slot is set to generate a popup message when it fails to
-        ///     pass the whitelist, then this will generate a popup.
+        ///     pass the whitelist or due to slot being locked, then this will generate an appropriate popup.
         /// </remarks>
         public bool CanInsert(EntityUid uid, EntityUid usedUid, EntityUid? user, ItemSlot slot, bool swap = false, EntityUid? popup = null)
         {
             if (slot.ContainerSlot == null)
                 return false;
 
-            if (slot.Locked)
-                return false;
-
-            if (!swap && slot.HasItem)
+            if ((!slot.Whitelist?.IsValid(usedUid) ?? false) ||
+                (slot.Blacklist?.IsValid(usedUid) ?? false))
+            {
+                if (popup.HasValue && slot.WhitelistFailPopup.HasValue)
+                    _popupSystem.PopupClient(Loc.GetString(slot.WhitelistFailPopup), uid, popup.Value);
                 return false;
+            }
 
-            if ((slot.Whitelist != null && !slot.Whitelist.IsValid(usedUid)) || (slot.Blacklist != null && slot.Blacklist.IsValid(usedUid)))
+            if (slot.Locked)
             {
-                if (_netManager.IsClient && _timing.IsFirstTimePredicted && popup.HasValue && !string.IsNullOrWhiteSpace(slot.WhitelistFailPopup))
-                    _popupSystem.PopupEntity(Loc.GetString(slot.WhitelistFailPopup), uid, popup.Value);
+                if (popup.HasValue && slot.LockedFailPopup.HasValue)
+                    _popupSystem.PopupClient(Loc.GetString(slot.LockedFailPopup), uid, popup.Value);
                 return false;
             }
 
-            if (swap && slot.HasItem && !CanEject(uid, user, slot))
+            if (slot.HasItem && (!swap || (swap && !CanEject(uid, user, slot))))
                 return false;
 
             var ev = new ItemSlotInsertAttemptEvent(uid, usedUid, user, slot);
@@ -332,9 +337,22 @@ public bool TryInsertFromHand(EntityUid uid, ItemSlot slot, EntityUid user, Hand
 
         #region Eject
 
-        public bool CanEject(EntityUid uid, EntityUid? user, ItemSlot slot)
+        /// <summary>
+        ///     Check whether an ejection from a given slot may happen.
+        /// </summary>
+        /// <remarks>
+        ///     If a popup entity is given, this will generate a popup message if any are configured on the the item slot.
+        /// </remarks>
+        public bool CanEject(EntityUid uid, EntityUid? user, ItemSlot slot, EntityUid? popup = null)
         {
-            if (slot.Locked || slot.ContainerSlot?.ContainedEntity is not {} item)
+            if (slot.Locked)
+            {
+                if (popup.HasValue && slot.LockedFailPopup.HasValue)
+                    _popupSystem.PopupClient(Loc.GetString(slot.LockedFailPopup), uid, popup.Value);
+                return false;
+            }
+
+            if (slot.ContainerSlot?.ContainedEntity is not {} item)
                 return false;
 
             var ev = new ItemSlotEjectAttemptEvent(uid, item, user, slot);
@@ -347,7 +365,7 @@ public bool CanEject(EntityUid uid, EntityUid? user, ItemSlot slot)
         }
 
         /// <summary>
-        ///     Eject an item into a slot. This does not perform checks (e.g., is the slot locked?), so you should
+        ///     Eject an item from a slot. This does not perform checks (e.g., is the slot locked?), so you should
         ///     probably just use <see cref="TryEject"/> instead.
         /// </summary>
         /// <param name="excludeUserAudio">If true, will exclude the user when playing sound. Does nothing client-side.
diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj
index e90e1ea723..9752bfcfe2 100644
--- a/Content.Shared/Content.Shared.csproj
+++ b/Content.Shared/Content.Shared.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>11</LangVersion>
+    <LangVersion>12</LangVersion>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <WarningsAsErrors>nullable</WarningsAsErrors>
diff --git a/Content.Shared/CrewManifest/SharedCrewManifestSystem.cs b/Content.Shared/CrewManifest/SharedCrewManifestSystem.cs
index 7e4c824e20..a9279cc7f1 100644
--- a/Content.Shared/CrewManifest/SharedCrewManifestSystem.cs
+++ b/Content.Shared/CrewManifest/SharedCrewManifestSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Eui;
+using NetSerializer;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.CrewManifest;
@@ -39,7 +40,7 @@ public sealed class CrewManifestEntries
     ///     Entries in the crew manifest. Goes by department ID.
     /// </summary>
     // public Dictionary<string, List<CrewManifestEntry>> Entries = new();
-    public List<CrewManifestEntry> Entries = new();
+    public CrewManifestEntry[] Entries = Array.Empty<CrewManifestEntry>();
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Cuffs/Components/HandcuffComponent.cs b/Content.Shared/Cuffs/Components/HandcuffComponent.cs
index a91692389f..77a77cf2f8 100644
--- a/Content.Shared/Cuffs/Components/HandcuffComponent.cs
+++ b/Content.Shared/Cuffs/Components/HandcuffComponent.cs
@@ -25,7 +25,7 @@ public sealed partial class HandcuffComponent : Component
     ///     The time it takes for a cuffed entity to uncuff itself.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float BreakoutTime = 30f;
+    public float BreakoutTime = 15f;
 
     /// <summary>
     ///     If an entity being cuffed is stunned, this amount of time is subtracted from the time it takes to add/remove their cuffs.
@@ -52,15 +52,6 @@ public sealed partial class HandcuffComponent : Component
     [DataField]
     public bool Removing;
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public DamageSpecifier DamageOnResist = new()
-    {
-        DamageDict = new()
-             {
-                 { "Blunt", 3.0 },
-             }
-    };
-
     /// <summary>
     ///     The path of the RSI file used for the player cuffed overlay.
     /// </summary>
diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs
index 99657c87aa..fc005fd30f 100644
--- a/Content.Shared/Cuffs/SharedCuffableSystem.cs
+++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs
@@ -6,7 +6,6 @@
 using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.Buckle.Components;
 using Content.Shared.Cuffs.Components;
-using Content.Shared.Damage;
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.Effects;
@@ -28,6 +27,7 @@
 using Content.Shared.Pulling.Events;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Stunnable;
+using Content.Shared.Timing;
 using Content.Shared.Verbs;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Audio;
@@ -48,7 +48,6 @@ public abstract partial class SharedCuffableSystem : EntitySystem
         [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
         [Dependency] private readonly AlertsSystem _alerts = default!;
         [Dependency] private readonly SharedColorFlashEffectSystem _color = default!;
-        [Dependency] private readonly DamageableSystem _damageSystem = default!;
         [Dependency] private readonly MobStateSystem _mobState = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly SharedContainerSystem _container = default!;
@@ -58,6 +57,7 @@ public abstract partial class SharedCuffableSystem : EntitySystem
         [Dependency] private readonly SharedInteractionSystem _interaction = default!;
         [Dependency] private readonly SharedPopupSystem _popup = default!;
         [Dependency] private readonly SharedTransformSystem _transform = default!;
+        [Dependency] private readonly UseDelaySystem _delay = default!;
 
         public override void Initialize()
         {
@@ -128,9 +128,9 @@ private void OnUncuffAttempt(ref UncuffAttemptEvent args)
                 }
             }
 
-            if (args.Cancelled && _net.IsServer)
+            if (args.Cancelled)
             {
-                _popup.PopupEntity(Loc.GetString("cuffable-component-cannot-interact-message"), args.Target, args.User);
+                _popup.PopupClient(Loc.GetString("cuffable-component-cannot-interact-message"), args.Target, args.User);
             }
         }
 
@@ -202,8 +202,8 @@ private void OnBuckleAttemptEvent(EntityUid uid, CuffableComponent component, re
             var message = args.Buckling
                 ? Loc.GetString("handcuff-component-cuff-interrupt-buckled-message")
                 : Loc.GetString("handcuff-component-cuff-interrupt-unbuckled-message");
-            if (_net.IsServer)
-                _popup.PopupEntity(message, uid, args.UserEntity);
+
+            _popup.PopupClient(message, uid, args.UserEntity);
         }
 
         private void OnPull(EntityUid uid, CuffableComponent component, PullMessage args)
@@ -265,9 +265,9 @@ private void OnCuffableDoAfter(EntityUid uid, CuffableComponent component, UnCuf
             {
                 Uncuff(target, user, used, component);
             }
-            else if (_net.IsServer)
+            else
             {
-                _popup.PopupEntity(Loc.GetString("cuffable-component-remove-cuffs-fail-message"), user, user);
+                _popup.PopupClient(Loc.GetString("cuffable-component-remove-cuffs-fail-message"), user, user);
             }
         }
 
@@ -278,8 +278,7 @@ private void OnCuffAfterInteract(EntityUid uid, HandcuffComponent component, Aft
 
             if (!args.CanReach)
             {
-                if (_net.IsServer)
-                    _popup.PopupEntity(Loc.GetString("handcuff-component-too-far-away-error"), args.User, args.User);
+                _popup.PopupClient(Loc.GetString("handcuff-component-too-far-away-error"), args.User, args.User);
                 return;
             }
 
@@ -312,8 +311,6 @@ private void OnAddCuffDoAfter(EntityUid uid, HandcuffComponent component, AddCuf
             if (!args.Cancelled && TryAddNewCuffs(target, user, uid, cuffable))
             {
                 _audio.PlayPredicted(component.EndCuffSound, uid, user);
-                if (!_net.IsServer)
-                    return;
 
                 _popup.PopupEntity(Loc.GetString("handcuff-component-cuff-observer-success-message",
                         ("user", Identity.Name(user, EntityManager)), ("target", Identity.Name(target, EntityManager))),
@@ -322,15 +319,15 @@ private void OnAddCuffDoAfter(EntityUid uid, HandcuffComponent component, AddCuf
 
                 if (target == user)
                 {
-                    _popup.PopupEntity(Loc.GetString("handcuff-component-cuff-self-success-message"), user, user);
+                    _popup.PopupClient(Loc.GetString("handcuff-component-cuff-self-success-message"), user, user);
                     _adminLog.Add(LogType.Action, LogImpact.Medium,
                         $"{ToPrettyString(user):player} has cuffed himself");
                 }
                 else
                 {
-                    _popup.PopupEntity(Loc.GetString("handcuff-component-cuff-other-success-message",
+                    _popup.PopupClient(Loc.GetString("handcuff-component-cuff-other-success-message",
                         ("otherName", Identity.Name(target, EntityManager, user))), user, user);
-                    _popup.PopupEntity(Loc.GetString("handcuff-component-cuff-by-other-success-message",
+                    _popup.PopupClient(Loc.GetString("handcuff-component-cuff-by-other-success-message",
                         ("otherName", Identity.Name(user, EntityManager, target))), target, target);
                     _adminLog.Add(LogType.Action, LogImpact.Medium,
                         $"{ToPrettyString(user):player} has cuffed {ToPrettyString(target):player}");
@@ -338,20 +335,18 @@ private void OnAddCuffDoAfter(EntityUid uid, HandcuffComponent component, AddCuf
             }
             else
             {
-                if (!_net.IsServer)
-                    return;
                 if (target == user)
                 {
-                    _popup.PopupEntity(Loc.GetString("handcuff-component-cuff-interrupt-self-message"), user, user);
+                    _popup.PopupClient(Loc.GetString("handcuff-component-cuff-interrupt-self-message"), user, user);
                 }
                 else
                 {
                     // TODO Fix popup message wording
                     // This message assumes that the user being handcuffed is the one that caused the handcuff to fail.
 
-                    _popup.PopupEntity(Loc.GetString("handcuff-component-cuff-interrupt-message",
+                    _popup.PopupClient(Loc.GetString("handcuff-component-cuff-interrupt-message",
                         ("targetName", Identity.Name(target, EntityManager, user))), user, user);
-                    _popup.PopupEntity(Loc.GetString("handcuff-component-cuff-interrupt-other-message",
+                    _popup.PopupClient(Loc.GetString("handcuff-component-cuff-interrupt-other-message",
                         ("otherName", Identity.Name(user, EntityManager, target))), target, target);
                 }
             }
@@ -462,21 +457,15 @@ public bool TryCuffing(EntityUid user, EntityUid target, EntityUid handcuff, Han
 
             if (!TryComp<HandsComponent>(target, out var hands))
             {
-                if (_net.IsServer)
-                {
-                    _popup.PopupEntity(Loc.GetString("handcuff-component-target-has-no-hands-error",
-                        ("targetName", Identity.Name(target, EntityManager, user))), user, user);
-                }
+                _popup.PopupClient(Loc.GetString("handcuff-component-target-has-no-hands-error",
+                    ("targetName", Identity.Name(target, EntityManager, user))), user, user);
                 return true;
             }
 
             if (cuffable.CuffedHandCount >= hands.Count)
             {
-                if (_net.IsServer)
-                {
-                    _popup.PopupEntity(Loc.GetString("handcuff-component-target-has-no-free-hands-error",
-                        ("targetName", Identity.Name(target, EntityManager, user))), user, user);
-                }
+                _popup.PopupClient(Loc.GetString("handcuff-component-target-has-no-free-hands-error",
+                    ("targetName", Identity.Name(target, EntityManager, user))), user, user);
                 return true;
             }
 
@@ -499,24 +488,21 @@ public bool TryCuffing(EntityUid user, EntityUid target, EntityUid handcuff, Han
             if (!_doAfter.TryStartDoAfter(doAfterEventArgs))
                 return true;
 
-            if (_net.IsServer)
-            {
-                _popup.PopupEntity(Loc.GetString("handcuff-component-start-cuffing-observer",
+            _popup.PopupEntity(Loc.GetString("handcuff-component-start-cuffing-observer",
                     ("user", Identity.Name(user, EntityManager)), ("target", Identity.Name(target, EntityManager))),
-                    target, Filter.Pvs(target, entityManager: EntityManager)
+                target, Filter.Pvs(target, entityManager: EntityManager)
                     .RemoveWhere(e => e.AttachedEntity == target || e.AttachedEntity == user), true);
 
-                if (target == user)
-                {
-                    _popup.PopupEntity(Loc.GetString("handcuff-component-target-self"), user, user);
-                }
-                else
-                {
-                    _popup.PopupEntity(Loc.GetString("handcuff-component-start-cuffing-target-message",
-                        ("targetName", Identity.Name(target, EntityManager, user))), user, user);
-                    _popup.PopupEntity(Loc.GetString("handcuff-component-start-cuffing-by-other-message",
-                        ("otherName", Identity.Name(user, EntityManager, target))), target, target);
-                }
+            if (target == user)
+            {
+                _popup.PopupClient(Loc.GetString("handcuff-component-target-self"), user, user);
+            }
+            else
+            {
+                _popup.PopupClient(Loc.GetString("handcuff-component-start-cuffing-target-message",
+                    ("targetName", Identity.Name(target, EntityManager, user))), user, user);
+                _popup.PopupClient(Loc.GetString("handcuff-component-start-cuffing-by-other-message",
+                    ("otherName", Identity.Name(user, EntityManager, target))), target, target);
             }
 
             _audio.PlayPredicted(handcuffComponent.StartCuffSound, handcuff, user);
@@ -569,12 +555,23 @@ public void TryUncuff(EntityUid target, EntityUid user, EntityUid? cuffsToRemove
 
             if (!isOwner && !_interaction.InRangeUnobstructed(user, target))
             {
-                if (_net.IsServer)
-                    _popup.PopupEntity(Loc.GetString("cuffable-component-cannot-remove-cuffs-too-far-message"), user, user);
+                _popup.PopupClient(Loc.GetString("cuffable-component-cannot-remove-cuffs-too-far-message"), user, user);
                 return;
             }
 
             var uncuffTime = isOwner ? cuff.BreakoutTime : cuff.UncuffTime;
+
+            if (isOwner)
+            {
+                if (!TryComp(cuffsToRemove.Value, out UseDelayComponent? useDelay))
+                    return;
+
+                if (!_delay.TryResetDelay((cuffsToRemove.Value, useDelay), true))
+                {
+                    return;
+                }
+            }
+
             var doAfterEventArgs = new DoAfterArgs(EntityManager, user, uncuffTime, new UnCuffDoAfterEvent(), target, target, cuffsToRemove)
             {
                 BreakOnUserMove = true,
@@ -589,31 +586,23 @@ public void TryUncuff(EntityUid target, EntityUid user, EntityUid? cuffsToRemove
 
             _adminLog.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(user)} is trying to uncuff {ToPrettyString(target)}");
 
-            if (isOwner)
+            _popup.PopupEntity(Loc.GetString("cuffable-component-start-uncuffing-observer",
+                    ("user", Identity.Name(user, EntityManager)), ("target", Identity.Name(target, EntityManager))),
+                target, Filter.Pvs(target, entityManager: EntityManager)
+                    .RemoveWhere(e => e.AttachedEntity == target || e.AttachedEntity == user), true);
+
+            if (target == user)
             {
-                _damageSystem.TryChangeDamage(target, cuff.DamageOnResist, true, false);
+                _popup.PopupClient(Loc.GetString("cuffable-component-start-uncuffing-self"), user, user);
             }
-
-            if (_net.IsServer)
+            else
             {
-                _popup.PopupEntity(Loc.GetString("cuffable-component-start-uncuffing-observer",
-                 ("user", Identity.Name(user, EntityManager)), ("target", Identity.Name(target, EntityManager))),
-                 target, Filter.Pvs(target, entityManager: EntityManager)
-                .RemoveWhere(e => e.AttachedEntity == target || e.AttachedEntity == user), true);
-
-                if (target == user)
-                {
-                    _color.RaiseEffect(Color.Red, new List<EntityUid>() { user }, Filter.Pvs(user, entityManager: EntityManager));
-                    _popup.PopupEntity(Loc.GetString("cuffable-component-start-uncuffing-self"), user, user);
-                }
-                else
-                {
-                    _popup.PopupEntity(Loc.GetString("cuffable-component-start-uncuffing-target-message",
-                        ("targetName", Identity.Name(target, EntityManager, user))), user, user);
-                    _popup.PopupEntity(Loc.GetString("cuffable-component-start-uncuffing-by-other-message",
-                        ("otherName", Identity.Name(user, EntityManager, target))), target, target);
-                }
+                _popup.PopupClient(Loc.GetString("cuffable-component-start-uncuffing-target-message",
+                    ("targetName", Identity.Name(target, EntityManager, user))), user, user);
+                _popup.PopupClient(Loc.GetString("cuffable-component-start-uncuffing-by-other-message",
+                    ("otherName", Identity.Name(user, EntityManager, target))), target, target);
             }
+
             _audio.PlayPredicted(isOwner ? cuff.StartBreakoutSound : cuff.StartUncuffSound, target, user);
         }
 
@@ -636,6 +625,8 @@ public void Uncuff(EntityUid target, EntityUid? user, EntityUid cuffsToRemove, C
             cuff.Removing = true;
             _audio.PlayPredicted(cuff.EndUncuffSound, target, user);
 
+            var isOwner = user == target;
+
             _container.Remove(cuffsToRemove, cuffable.Container);
 
             if (_net.IsServer)
diff --git a/Content.Shared/Damage/Components/DamageOnHoldingComponent.cs b/Content.Shared/Damage/Components/DamageOnHoldingComponent.cs
index fe28b7e7f0..8af477c30b 100644
--- a/Content.Shared/Damage/Components/DamageOnHoldingComponent.cs
+++ b/Content.Shared/Damage/Components/DamageOnHoldingComponent.cs
@@ -5,7 +5,7 @@
 namespace Content.Shared.Damage.Components;
 
 [RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentState]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
 [Access(typeof(DamageOnHoldingSystem))]
 public sealed partial class DamageOnHoldingComponent : Component
 {
@@ -29,5 +29,6 @@ public sealed partial class DamageOnHoldingComponent : Component
 
     [DataField("nextDamage", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
     [AutoNetworkedField]
+    [AutoPausedField]
     public TimeSpan NextDamage = TimeSpan.Zero;
 }
diff --git a/Content.Shared/Damage/Components/StaminaComponent.cs b/Content.Shared/Damage/Components/StaminaComponent.cs
index 74e0f6c852..5a2fba4970 100644
--- a/Content.Shared/Damage/Components/StaminaComponent.cs
+++ b/Content.Shared/Damage/Components/StaminaComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Shared.Damage.Components;
 /// <summary>
 /// Add to an entity to paralyze it whenever it reaches critical amounts of Stamina DamageType.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), AutoGenerateComponentPause]
 public sealed partial class StaminaComponent : Component
 {
     /// <summary>
@@ -49,5 +49,6 @@ public sealed partial class StaminaComponent : Component
     /// To avoid continuously updating our data we track the last time we updated so we can extrapolate our current stamina.
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]
+    [AutoPausedField]
     public TimeSpan NextUpdate = TimeSpan.Zero;
 }
diff --git a/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs b/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs
index e22be2fbbf..c13ec0a1b9 100644
--- a/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs
@@ -13,7 +13,6 @@ public sealed class DamageOnHoldingSystem : EntitySystem
     public override void Initialize()
     {
         base.Initialize();
-        SubscribeLocalEvent<DamageOnHoldingComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<DamageOnHoldingComponent, MapInitEvent>(OnMapInit);
     }
 
@@ -26,11 +25,6 @@ public void SetEnabled(EntityUid uid, bool enabled, DamageOnHoldingComponent? co
         }
     }
 
-    private void OnUnpaused(EntityUid uid, DamageOnHoldingComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextDamage += args.PausedTime;
-    }
-
     private void OnMapInit(EntityUid uid, DamageOnHoldingComponent component, MapInitEvent args)
     {
         component.NextDamage = _timing.CurTime;
@@ -50,4 +44,4 @@ public override void Update(float frameTime)
             component.NextDamage = _timing.CurTime + TimeSpan.FromSeconds(component.Interval);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Damage/Systems/DamageableSystem.cs b/Content.Shared/Damage/Systems/DamageableSystem.cs
index 9337e79439..4aaf380c47 100644
--- a/Content.Shared/Damage/Systems/DamageableSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageableSystem.cs
@@ -18,7 +18,6 @@ namespace Content.Shared.Damage
     public sealed class DamageableSystem : EntitySystem
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly INetManager _netMan = default!;
         [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
diff --git a/Content.Shared/Damage/Systems/PassiveDamageSystem.cs b/Content.Shared/Damage/Systems/PassiveDamageSystem.cs
index 5a37d6a6e6..e750863e24 100644
--- a/Content.Shared/Damage/Systems/PassiveDamageSystem.cs
+++ b/Content.Shared/Damage/Systems/PassiveDamageSystem.cs
@@ -10,7 +10,6 @@ public sealed class PassiveDamageSystem : EntitySystem
 {
     [Dependency] private readonly DamageableSystem _damageable = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
 
     public override void Initialize()
     {
@@ -33,14 +32,14 @@ public override void Update(float frameTime)
         // Go through every entity with the component
         var query = EntityQueryEnumerator<PassiveDamageComponent, DamageableComponent, MobStateComponent>();
         while (query.MoveNext(out var uid, out var comp, out var damage, out var mobState))
-        {   
+        {
             // Make sure they're up for a damage tick
             if (comp.NextDamage > curTime)
                 continue;
 
             if (comp.DamageCap != 0 && damage.TotalDamage >= comp.DamageCap)
                 continue;
-            
+
             // Set the next time they can take damage
             comp.NextDamage = curTime + TimeSpan.FromSeconds(1f);
 
diff --git a/Content.Shared/Damage/Systems/StaminaSystem.cs b/Content.Shared/Damage/Systems/StaminaSystem.cs
index 2587d4e05f..de5338615e 100644
--- a/Content.Shared/Damage/Systems/StaminaSystem.cs
+++ b/Content.Shared/Damage/Systems/StaminaSystem.cs
@@ -48,7 +48,6 @@ public override void Initialize()
 
         InitializeModifier();
 
-        SubscribeLocalEvent<StaminaComponent, EntityUnpausedEvent>(OnStamUnpaused);
         SubscribeLocalEvent<StaminaComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<StaminaComponent, ComponentShutdown>(OnShutdown);
         SubscribeLocalEvent<StaminaComponent, AfterAutoHandleStateEvent>(OnStamHandleState);
@@ -63,11 +62,6 @@ public override void Initialize()
         SubscribeLocalEvent<StaminaDamageOnHitComponent, MeleeHitEvent>(OnMeleeHit);
     }
 
-    private void OnStamUnpaused(EntityUid uid, StaminaComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextUpdate += args.PausedTime;
-    }
-
     private void OnStamHandleState(EntityUid uid, StaminaComponent component, ref AfterAutoHandleStateEvent args)
     {
         if (component.Critical)
diff --git a/Content.Shared/Decals/Decal.cs b/Content.Shared/Decals/Decal.cs
index 56ecc829e7..cb6f944c65 100644
--- a/Content.Shared/Decals/Decal.cs
+++ b/Content.Shared/Decals/Decal.cs
@@ -8,7 +8,7 @@ namespace Content.Shared.Decals
     public sealed partial class Decal
     {
         // if these are made not-readonly, then decal grid state handling needs to be updated to clone decals.
-        [DataField("coordinates")] public  Vector2 Coordinates = Vector2.Zero;
+        [DataField("coordinates")] public Vector2 Coordinates = Vector2.Zero;
         [DataField("id")] public  string Id = string.Empty;
         [DataField("color")] public  Color? Color;
         [DataField("angle")] public  Angle Angle = Angle.Zero;
diff --git a/Content.Shared/Decals/DecalGridComponent.cs b/Content.Shared/Decals/DecalGridComponent.cs
index 140eb5bafc..8ac05cb280 100644
--- a/Content.Shared/Decals/DecalGridComponent.cs
+++ b/Content.Shared/Decals/DecalGridComponent.cs
@@ -12,7 +12,8 @@ namespace Content.Shared.Decals
     [NetworkedComponent]
     public sealed partial class DecalGridComponent : Component
     {
-        [DataField("chunkCollection", serverOnly: true)]
+        [Access(Other = AccessPermissions.ReadExecute)]
+        [DataField(serverOnly: true)]
         public DecalGridChunkCollection ChunkCollection = new(new ());
 
         /// <summary>
@@ -25,10 +26,6 @@ public sealed partial class DecalGridComponent : Component
         /// </summary>
         public GameTick ForceTick { get; set; }
 
-        // client-side data. I CBF creating a separate client-side comp for this. The server can survive with some empty dictionaries.
-        public readonly Dictionary<uint, int> DecalZIndexIndex = new();
-        public readonly SortedDictionary<int, SortedDictionary<uint, Decal>> DecalRenderIndex = new();
-
         [DataDefinition]
         [Serializable, NetSerializable]
         public sealed partial class DecalChunk
diff --git a/Content.Shared/Decals/SharedDecalSystem.cs b/Content.Shared/Decals/SharedDecalSystem.cs
index 02f73bdacb..76fa9d64db 100644
--- a/Content.Shared/Decals/SharedDecalSystem.cs
+++ b/Content.Shared/Decals/SharedDecalSystem.cs
@@ -122,39 +122,6 @@ public virtual bool RemoveDecal(EntityUid gridId, uint decalId, DecalGridCompone
         }
     }
 
-    // TODO: Pretty sure paul was moving this somewhere but just so people know
-    public struct ChunkIndicesEnumerator
-    {
-        private Vector2i _chunkLB;
-        private Vector2i _chunkRT;
-
-        private int _xIndex;
-        private int _yIndex;
-
-        public ChunkIndicesEnumerator(Box2 localAABB, int chunkSize)
-        {
-            _chunkLB = new Vector2i((int)Math.Floor(localAABB.Left / chunkSize), (int)Math.Floor(localAABB.Bottom / chunkSize));
-            _chunkRT = new Vector2i((int)Math.Floor(localAABB.Right / chunkSize), (int)Math.Floor(localAABB.Top / chunkSize));
-
-            _xIndex = _chunkLB.X;
-            _yIndex = _chunkLB.Y;
-        }
-
-        public bool MoveNext([NotNullWhen(true)] out Vector2i? indices)
-        {
-            if (_yIndex > _chunkRT.Y)
-            {
-                _yIndex = _chunkLB.Y;
-                _xIndex += 1;
-            }
-
-            indices = new Vector2i(_xIndex, _yIndex);
-            _yIndex += 1;
-
-            return _xIndex <= _chunkRT.X;
-        }
-    }
-
     /// <summary>
     ///     Sent by clients to request that a decal is placed on the server.
     /// </summary>
diff --git a/Content.Shared/DeltaV/Abilities/DefaultVisionComponent.cs b/Content.Shared/DeltaV/Abilities/DefaultVisionComponent.cs
deleted file mode 100644
index 0126450e5d..0000000000
--- a/Content.Shared/DeltaV/Abilities/DefaultVisionComponent.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Robust.Shared.GameStates;
-namespace Content.Shared.DeltaV.Abilities;
-
-[RegisterComponent]
-[NetworkedComponent]
-
-public sealed partial class DefaultVisionComponent : Component
-{}
diff --git a/Content.Shared/DeltaV/Abilities/DefaultVisionSystem.cs b/Content.Shared/DeltaV/Abilities/DefaultVisionSystem.cs
deleted file mode 100644
index 7c8fc36354..0000000000
--- a/Content.Shared/DeltaV/Abilities/DefaultVisionSystem.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Content.Shared.Abilities;
-using Content.Shared.DeltaV.Abilities;
-
-namespace Content.Client.DeltaV.Overlays;
-
-public sealed partial class DefaultVisionSystem : EntitySystem
-{
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<DefaultVisionComponent, ComponentInit>(OnDefaultVisionInit);
-    }
-
-    private void OnDefaultVisionInit(EntityUid uid, DefaultVisionComponent component, ComponentInit args)
-    {
-        RemComp<UltraVisionComponent>(uid);
-        RemComp<DogVisionComponent>(uid);
-    }
-}
diff --git a/Content.Shared/DeltaV/CCVars/DCCVars.cs b/Content.Shared/DeltaV/CCVars/DCCVars.cs
index 89a14275be..2028397ffe 100644
--- a/Content.Shared/DeltaV/CCVars/DCCVars.cs
+++ b/Content.Shared/DeltaV/CCVars/DCCVars.cs
@@ -15,4 +15,10 @@ public sealed class DCCVars
     /// </summary>
     public static readonly CVarDef<bool> RoundEndPacifist =
         CVarDef.Create("game.round_end_pacifist", false, CVar.SERVERONLY);
+
+    /// <summary>
+    /// Disables all vision filters for species like Vulpkanin or Harpies. There are good reasons someone might want to disable these.
+    /// </summary>
+    public static readonly CVarDef<bool> NoVisionFilters =
+        CVarDef.Create("accessibility.no_vision_filters", false, CVar.CLIENTONLY | CVar.ARCHIVE);
 }
diff --git a/Content.Shared/DeviceLinking/Components/TwoWayLeverComponent.cs b/Content.Shared/DeviceLinking/Components/TwoWayLeverComponent.cs
new file mode 100644
index 0000000000..6dfc25582a
--- /dev/null
+++ b/Content.Shared/DeviceLinking/Components/TwoWayLeverComponent.cs
@@ -0,0 +1,26 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.DeviceLinking.Components;
+
+/// <summary>
+/// Simple ternary state for device linking.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TwoWayLeverComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public TwoWayLeverState State;
+
+    [DataField, AutoNetworkedField]
+    public bool NextSignalLeft;
+
+    [DataField]
+    public ProtoId<SourcePortPrototype> LeftPort = "Left";
+
+    [DataField]
+    public ProtoId<SourcePortPrototype> RightPort = "Right";
+
+    [DataField]
+    public ProtoId<SourcePortPrototype> MiddlePort = "Middle";
+}
diff --git a/Content.Shared/DeviceLinking/DeviceLinkSourceComponent.cs b/Content.Shared/DeviceLinking/DeviceLinkSourceComponent.cs
index 3a5d4d9f6d..332eff23cb 100644
--- a/Content.Shared/DeviceLinking/DeviceLinkSourceComponent.cs
+++ b/Content.Shared/DeviceLinking/DeviceLinkSourceComponent.cs
@@ -1,5 +1,5 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.DeviceLinking;
 
@@ -11,25 +11,32 @@ public sealed partial class DeviceLinkSourceComponent : Component
     /// <summary>
     /// The ports the device link source sends signals from
     /// </summary>
-    [DataField("ports", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<SourcePortPrototype>))]
-    public HashSet<string>? Ports;
+    [DataField]
+    public HashSet<ProtoId<SourcePortPrototype>>? Ports;
 
     /// <summary>
     /// A list of sink uids that got linked for each port
     /// </summary>
     [ViewVariables]
-    public Dictionary<string, HashSet<EntityUid>> Outputs = new();
+    public Dictionary<ProtoId<SourcePortPrototype>, HashSet<EntityUid>> Outputs = new();
+
+    /// <summary>
+    /// If set to High or Low, the last signal state for a given port.
+    /// Used when linking ports of devices that are currently outputting a signal.
+    /// Only set by <c>DeviceLinkSystem.SendSignal</c>.
+    /// </summary>
+    [DataField]
+    public Dictionary<ProtoId<SourcePortPrototype>, bool> LastSignals = new();
 
     /// <summary>
     /// The list of source to sink ports for each linked sink entity for easier managing of links
     /// </summary>
-    [DataField("linkedPorts")]
-    public Dictionary<EntityUid, HashSet<(string source, string sink)>> LinkedPorts = new();
+    [DataField]
+    public Dictionary<EntityUid, HashSet<(ProtoId<SourcePortPrototype> source, ProtoId<SinkPortPrototype> sink)>> LinkedPorts = new();
 
     /// <summary>
     ///     Limits the range devices can be linked across.
     /// </summary>
-    [DataField("range")]
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField]
     public float Range = 30f;
 }
diff --git a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
index 02c0f60853..2ac525d154 100644
--- a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
+++ b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.DeviceLinking.Events;
+using Content.Shared.DeviceNetwork;
 using Content.Shared.Popups;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
@@ -148,8 +149,11 @@ private void OnSinkRemoved(EntityUid sinkUid, DeviceLinkSinkComponent sinkCompon
     /// </summary>
     public void EnsureSourcePorts(EntityUid uid, params string[] ports)
     {
+        if (ports.Length == 0)
+            return;
+
         var comp = EnsureComp<DeviceLinkSourceComponent>(uid);
-        comp.Ports ??= new HashSet<string>();
+        comp.Ports ??= new HashSet<ProtoId<SourcePortPrototype>>();
 
         foreach (var port in ports)
         {
@@ -163,6 +167,9 @@ public void EnsureSourcePorts(EntityUid uid, params string[] ports)
     /// </summary>
     public void EnsureSinkPorts(EntityUid uid, params string[] ports)
     {
+        if (ports.Length == 0)
+            return;
+
         var comp = EnsureComp<DeviceLinkSinkComponent>(uid);
         comp.Ports ??= new HashSet<string>();
 
@@ -226,10 +233,10 @@ public string PortName<TPort>(string port) where TPort : DevicePortPrototype, IP
     /// Returns the links of a source
     /// </summary>
     /// <returns>A list of sink and source port ids that are linked together</returns>
-    public HashSet<(string source, string sink)> GetLinks(EntityUid sourceUid, EntityUid sinkUid, DeviceLinkSourceComponent? sourceComponent = null)
+    public HashSet<(ProtoId<SourcePortPrototype> source, ProtoId<SinkPortPrototype> sink)> GetLinks(EntityUid sourceUid, EntityUid sinkUid, DeviceLinkSourceComponent? sourceComponent = null)
     {
         if (!Resolve(sourceUid, ref sourceComponent) || !sourceComponent.LinkedPorts.TryGetValue(sinkUid, out var links))
-            return new HashSet<(string source, string sink)>();
+            return new HashSet<(ProtoId<SourcePortPrototype>, ProtoId<SinkPortPrototype>)>();
 
         return links;
     }
@@ -550,4 +557,20 @@ private void CreateLinkPopup(EntityUid? userId, EntityUid sourceUid, string sour
                 ("machine2", sinkUid), ("port2", PortName<SinkPortPrototype>(sink))), userId.Value, PopupType.Medium);
     }
     #endregion
+
+    #region Sending & Receiving
+    /// <summary>
+    /// Sends a network payload directed at the sink entity.
+    /// Just raises a <see cref="SignalReceivedEvent"/> without data if the source or the sink doesn't have a <see cref="DeviceNetworkComponent"/>
+    /// </summary>
+    /// <param name="uid">The source uid that invokes the port</param>
+    /// <param name="port">The port to invoke</param>
+    /// <param name="data">Optional data to send along</param>
+    /// <param name="sourceComponent"></param>
+    public virtual void InvokePort(EntityUid uid, string port, NetworkPayload? data = null,
+        DeviceLinkSourceComponent? sourceComponent = null)
+    {
+        // NOOP on client for the moment.
+    }
+    #endregion
 }
diff --git a/Content.Server/DeviceLinking/Systems/TwoWayLeverSystem.cs b/Content.Shared/DeviceLinking/Systems/TwoWayLeverSystem.cs
similarity index 95%
rename from Content.Server/DeviceLinking/Systems/TwoWayLeverSystem.cs
rename to Content.Shared/DeviceLinking/Systems/TwoWayLeverSystem.cs
index 7d351dcac5..c8783b05fc 100644
--- a/Content.Server/DeviceLinking/Systems/TwoWayLeverSystem.cs
+++ b/Content.Shared/DeviceLinking/Systems/TwoWayLeverSystem.cs
@@ -1,14 +1,13 @@
-using Content.Server.DeviceLinking.Components;
-using Content.Shared.DeviceLinking;
+using Content.Shared.DeviceLinking.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Verbs;
 using Robust.Shared.Utility;
 
-namespace Content.Server.DeviceLinking.Systems
+namespace Content.Shared.DeviceLinking.Systems
 {
     public sealed class TwoWayLeverSystem : EntitySystem
     {
-        [Dependency] private readonly DeviceLinkSystem _signalSystem = default!;
+        [Dependency] private readonly SharedDeviceLinkSystem _signalSystem = default!;
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
 
         const string _leftToggleImage = "rotate_ccw.svg.192dpi.png";
@@ -111,6 +110,7 @@ private void StateChanged(EntityUid uid, TwoWayLeverComponent component)
                 _ => throw new ArgumentOutOfRangeException()
             };
 
+            Dirty(uid, component);
             _signalSystem.InvokePort(uid, port);
         }
     }
diff --git a/Content.Shared/DeviceNetwork/NetworkConfiguratorUserInterfaceState.cs b/Content.Shared/DeviceNetwork/NetworkConfiguratorUserInterfaceState.cs
index d12456dc52..13000d00c9 100644
--- a/Content.Shared/DeviceNetwork/NetworkConfiguratorUserInterfaceState.cs
+++ b/Content.Shared/DeviceNetwork/NetworkConfiguratorUserInterfaceState.cs
@@ -1,4 +1,5 @@
-using Content.Shared.DeviceLinking;
+using Content.Shared.DeviceLinking;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.DeviceNetwork;
@@ -30,12 +31,18 @@ public sealed class DeviceLinkUserInterfaceState : BoundUserInterfaceState
 {
     public readonly List<SourcePortPrototype> Sources;
     public readonly List<SinkPortPrototype> Sinks;
-    public readonly HashSet<(string source, string sink)> Links;
+    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, HashSet<(string source, string sink)> links, string sourceAddress, string sinkAddress, List<(string source, string sink)>? defaults = default)
+    public DeviceLinkUserInterfaceState(
+        List<SourcePortPrototype> sources,
+        List<SinkPortPrototype> sinks,
+        HashSet<(ProtoId<SourcePortPrototype> source, ProtoId<SinkPortPrototype> sink)> links,
+        string sourceAddress,
+        string sinkAddress,
+        List<(string source, string sink)>? defaults = default)
     {
         Links = links;
         SourceAddress = sourceAddress;
diff --git a/Content.Shared/DeviceNetwork/NetworkPayload.cs b/Content.Shared/DeviceNetwork/NetworkPayload.cs
new file mode 100644
index 0000000000..3239374021
--- /dev/null
+++ b/Content.Shared/DeviceNetwork/NetworkPayload.cs
@@ -0,0 +1,24 @@
+using System.Diagnostics.CodeAnalysis;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.DeviceNetwork;
+
+public sealed class NetworkPayload : Dictionary<string, object?>
+{
+    /// <summary>
+    /// Tries to get a value from the payload and checks if that value is of type  T.
+    /// </summary>
+    /// <typeparam name="T">The type that should be casted to</typeparam>
+    /// <returns>Whether the value was present in the payload and of the required type</returns>
+    public bool TryGetValue<T>(string key, [NotNullWhen(true)] out T? value)
+    {
+        if (this.TryCastValue(key, out T? result))
+        {
+            value = result;
+            return true;
+        }
+
+        value = default;
+        return false;
+    }
+}
diff --git a/Content.Shared/Doors/Components/AirlockComponent.cs b/Content.Shared/Doors/Components/AirlockComponent.cs
index 332df2ac77..dd8241c64e 100644
--- a/Content.Shared/Doors/Components/AirlockComponent.cs
+++ b/Content.Shared/Doors/Components/AirlockComponent.cs
@@ -12,6 +12,9 @@ namespace Content.Shared.Doors.Components;
 [Access(typeof(SharedAirlockSystem), Friend = AccessPermissions.ReadWriteExecute, Other = AccessPermissions.Read)]
 public sealed partial class AirlockComponent : Component
 {
+    [DataField, AutoNetworkedField]
+    public bool Powered;
+
     // Need to network airlock safety state to avoid mis-predicts when a door auto-closes as the client walks through the door.
     [ViewVariables(VVAccess.ReadWrite)]
     [DataField, AutoNetworkedField]
diff --git a/Content.Shared/Doors/Components/DoorBoltComponent.cs b/Content.Shared/Doors/Components/DoorBoltComponent.cs
index 52f7d56db5..a5b0621ff4 100644
--- a/Content.Shared/Doors/Components/DoorBoltComponent.cs
+++ b/Content.Shared/Doors/Components/DoorBoltComponent.cs
@@ -8,36 +8,43 @@ namespace Content.Shared.Doors.Components;
 /// Companion component to DoorComponent that handles bolt-specific behavior.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
-[Access(typeof(SharedDoorBoltSystem))]
+[Access(typeof(SharedDoorSystem))]
+[AutoGenerateComponentState]
 public sealed partial class DoorBoltComponent : Component
 {
     /// <summary>
     /// Sound to play when the bolts on the airlock go up.
     /// </summary>
-    [DataField("boltUpSound"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public SoundSpecifier BoltUpSound = new SoundPathSpecifier("/Audio/Machines/boltsup.ogg");
 
     /// <summary>
     /// Sound to play when the bolts on the airlock go down.
     /// </summary>
-    [DataField("boltDownSound"), ViewVariables(VVAccess.ReadWrite)]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public SoundSpecifier BoltDownSound = new SoundPathSpecifier("/Audio/Machines/boltsdown.ogg");
 
     /// <summary>
     /// Whether the door bolts are currently deployed.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public bool BoltsDown;
 
     /// <summary>
     /// Whether the bolt lights are currently enabled.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public bool BoltLightsEnabled = true;
 
     /// <summary>
     /// True if the bolt wire is cut, which will force the airlock to always be bolted as long as it has power.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField, AutoNetworkedField]
     public bool BoltWireCut;
+
+    /// <summary>
+    /// Used for prediction. true if the door has power.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Powered;
 }
diff --git a/Content.Shared/Doors/Components/DoorComponent.cs b/Content.Shared/Doors/Components/DoorComponent.cs
index 135f8b0856..21fad142b3 100644
--- a/Content.Shared/Doors/Components/DoorComponent.cs
+++ b/Content.Shared/Doors/Components/DoorComponent.cs
@@ -96,12 +96,6 @@ public sealed partial class DoorComponent : Component
     [DataField("denySound")]
     public SoundSpecifier? DenySound;
 
-    /// <summary>
-    /// Sound to play when a disarmed (hands comp with 0 hands) entity opens the door. What?
-    /// </summary>
-    [DataField("tryOpenDoorSound")]
-    public SoundSpecifier TryOpenDoorSound = new SoundCollectionSpecifier("MetalSlam");
-
     /// <summary>
     /// Sound to play when door has been emagged or possibly electrically tampered
     /// </summary>
@@ -124,14 +118,14 @@ public sealed partial class DoorComponent : Component
     /// If false, this door is incapable of crushing entities. This just determines whether it will apply damage and
     /// stun, not whether it can close despite entities being in the way.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool CanCrush = true;
 
     /// <summary>
     /// Whether to check for colliding entities before closing. This may be overridden by other system by subscribing to
     /// <see cref="BeforeDoorClosedEvent"/>. For example, hacked airlocks will set this to false.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public bool PerformCollisionCheck = true;
 
     /// <summary>
@@ -190,7 +184,7 @@ public sealed partial class DoorComponent : Component
     /// The sprite state used for the door when it's being emagged.
     /// </summary>
     [DataField]
-    public string EmaggingSpriteState = "emagging";
+    public string EmaggingSpriteState = "sparks";
 
     /// <summary>
     /// The sprite state used for the door when it's open.
diff --git a/Content.Shared/Doors/Systems/SharedAirlockSystem.cs b/Content.Shared/Doors/Systems/SharedAirlockSystem.cs
index 9e1273b784..a3172bb8c3 100644
--- a/Content.Shared/Doors/Systems/SharedAirlockSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedAirlockSystem.cs
@@ -1,5 +1,7 @@
 using Content.Shared.Doors.Components;
 using Content.Shared.Popups;
+using Content.Shared.Prying.Components;
+using Content.Shared.Wires;
 
 namespace Content.Shared.Doors.Systems;
 
@@ -8,18 +10,112 @@ public abstract class SharedAirlockSystem : EntitySystem
     [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
     [Dependency] protected readonly SharedDoorSystem DoorSystem = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
+    [Dependency] private readonly SharedWiresSystem _wiresSystem = default!;
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<AirlockComponent, BeforeDoorClosedEvent>(OnBeforeDoorClosed);
+        SubscribeLocalEvent<AirlockComponent, DoorStateChangedEvent>(OnStateChanged);
+        SubscribeLocalEvent<AirlockComponent, BeforeDoorOpenedEvent>(OnBeforeDoorOpened);
+        SubscribeLocalEvent<AirlockComponent, BeforeDoorDeniedEvent>(OnBeforeDoorDenied);
+        SubscribeLocalEvent<AirlockComponent, GetPryTimeModifierEvent>(OnGetPryMod);
+        SubscribeLocalEvent<AirlockComponent, BeforePryEvent>(OnBeforePry);
     }
 
-    protected virtual void OnBeforeDoorClosed(EntityUid uid, AirlockComponent airlock, BeforeDoorClosedEvent args)
+    private void OnBeforeDoorClosed(EntityUid uid, AirlockComponent airlock, BeforeDoorClosedEvent args)
     {
+        if (args.Cancelled)
+            return;
+
         if (!airlock.Safety)
             args.PerformCollisionCheck = false;
+
+        // only block based on bolts / power status when initially closing the door, not when its already
+        // mid-transition. Particularly relevant for when the door was pried-closed with a crowbar, which bypasses
+        // the initial power-check.
+
+        if (TryComp(uid, out DoorComponent? door)
+            && !door.Partial
+            && !CanChangeState(uid, airlock))
+        {
+            args.Cancel();
+        }
+    }
+
+    private void OnStateChanged(EntityUid uid, AirlockComponent component, DoorStateChangedEvent args)
+    {
+        // Only show the maintenance panel if the airlock is closed
+        if (TryComp<WiresPanelComponent>(uid, out var wiresPanel))
+        {
+            _wiresSystem.ChangePanelVisibility(uid, wiresPanel, component.OpenPanelVisible || args.State != DoorState.Open);
+        }
+        // If the door is closed, we should look if the bolt was locked while closing
+        UpdateAutoClose(uid, component);
+
+        // Make sure the airlock auto closes again next time it is opened
+        if (args.State == DoorState.Closed)
+            component.AutoClose = true;
+    }
+
+    private void OnBeforeDoorOpened(EntityUid uid, AirlockComponent component, BeforeDoorOpenedEvent args)
+    {
+        if (!CanChangeState(uid, component))
+            args.Cancel();
+    }
+
+    private void OnBeforeDoorDenied(EntityUid uid, AirlockComponent component, BeforeDoorDeniedEvent args)
+    {
+        if (!CanChangeState(uid, component))
+            args.Cancel();
+    }
+
+    private void OnGetPryMod(EntityUid uid, AirlockComponent component, ref GetPryTimeModifierEvent args)
+    {
+        if (component.Powered)
+            args.PryTimeModifier *= component.PoweredPryModifier;
+
+        if (DoorSystem.IsBolted(uid))
+            args.PryTimeModifier *= component.BoltedPryModifier;
+    }
+
+    /// <summary>
+    /// Updates the auto close timer.
+    /// </summary>
+    public void UpdateAutoClose(EntityUid uid, AirlockComponent? airlock = null, DoorComponent? door = null)
+    {
+        if (!Resolve(uid, ref airlock, ref door))
+            return;
+
+        if (door.State != DoorState.Open)
+            return;
+
+        if (!airlock.AutoClose)
+            return;
+
+        if (!CanChangeState(uid, airlock))
+            return;
+
+        var autoev = new BeforeDoorAutoCloseEvent();
+        RaiseLocalEvent(uid, autoev);
+        if (autoev.Cancelled)
+            return;
+
+        DoorSystem.SetNextStateChange(uid, airlock.AutoCloseDelay * airlock.AutoCloseDelayModifier);
+    }
+
+    private void OnBeforePry(EntityUid uid, AirlockComponent component, ref BeforePryEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (!component.Powered || args.PryPowered)
+            return;
+
+        args.Message = "airlock-component-cannot-pry-is-powered-message";
+
+        args.Cancelled = true;
     }
 
     public void UpdateEmergencyLightStatus(EntityUid uid, AirlockComponent component)
@@ -45,4 +141,9 @@ public void SetSafety(AirlockComponent component, bool value)
     {
         component.Safety = value;
     }
+
+    public bool CanChangeState(EntityUid uid, AirlockComponent component)
+    {
+        return component.Powered && !DoorSystem.IsBolted(uid);
+    }
 }
diff --git a/Content.Shared/Doors/Systems/SharedDoorBoltSystem.cs b/Content.Shared/Doors/Systems/SharedDoorBoltSystem.cs
deleted file mode 100644
index 7c5ef45275..0000000000
--- a/Content.Shared/Doors/Systems/SharedDoorBoltSystem.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Content.Shared.Doors.Components;
-using Content.Shared.Popups;
-using Content.Shared.Prying.Components;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-
-namespace Content.Shared.Doors.Systems;
-
-public abstract class SharedDoorBoltSystem : EntitySystem
-{
-
-    [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
-    [Dependency] protected readonly SharedAudioSystem Audio = default!;
-    [Dependency] protected readonly SharedPopupSystem Popup = default!;
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<DoorBoltComponent, BeforeDoorOpenedEvent>(OnBeforeDoorOpened);
-        SubscribeLocalEvent<DoorBoltComponent, BeforeDoorClosedEvent>(OnBeforeDoorClosed);
-        SubscribeLocalEvent<DoorBoltComponent, BeforeDoorDeniedEvent>(OnBeforeDoorDenied);
-        SubscribeLocalEvent<DoorBoltComponent, BeforePryEvent>(OnDoorPry);
-
-    }
-
-    private void OnDoorPry(EntityUid uid, DoorBoltComponent component, ref BeforePryEvent args)
-    {
-        if (args.Cancelled)
-            return;
-
-        if (!component.BoltsDown || args.Force)
-            return;
-
-        args.Message = "airlock-component-cannot-pry-is-bolted-message";
-
-        args.Cancelled = true;
-    }
-
-    private void OnBeforeDoorOpened(EntityUid uid, DoorBoltComponent component, BeforeDoorOpenedEvent args)
-    {
-        if (component.BoltsDown)
-            args.Cancel();
-    }
-
-    private void OnBeforeDoorClosed(EntityUid uid, DoorBoltComponent component, BeforeDoorClosedEvent args)
-    {
-        if (component.BoltsDown)
-            args.Cancel();
-    }
-
-    private void OnBeforeDoorDenied(EntityUid uid, DoorBoltComponent component, BeforeDoorDeniedEvent args)
-    {
-        if (component.BoltsDown)
-            args.Cancel();
-    }
-
-    public void SetBoltWireCut(DoorBoltComponent component, bool value)
-    {
-        component.BoltWireCut = value;
-    }
-}
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.Bolts.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.Bolts.cs
new file mode 100644
index 0000000000..35681bfd82
--- /dev/null
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.Bolts.cs
@@ -0,0 +1,109 @@
+using Content.Shared.Doors.Components;
+using Content.Shared.Prying.Components;
+
+namespace Content.Shared.Doors.Systems;
+
+public abstract partial class SharedDoorSystem
+{
+    public void InitializeBolts()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DoorBoltComponent, BeforeDoorOpenedEvent>(OnBeforeDoorOpened);
+        SubscribeLocalEvent<DoorBoltComponent, BeforeDoorClosedEvent>(OnBeforeDoorClosed);
+        SubscribeLocalEvent<DoorBoltComponent, BeforeDoorDeniedEvent>(OnBeforeDoorDenied);
+        SubscribeLocalEvent<DoorBoltComponent, BeforePryEvent>(OnDoorPry);
+        SubscribeLocalEvent<DoorBoltComponent, DoorStateChangedEvent>(OnStateChanged);
+    }
+
+    private void OnDoorPry(EntityUid uid, DoorBoltComponent component, ref BeforePryEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        if (!component.BoltsDown || args.Force)
+            return;
+
+        args.Message = "airlock-component-cannot-pry-is-bolted-message";
+
+        args.Cancelled = true;
+    }
+
+    private void OnBeforeDoorOpened(EntityUid uid, DoorBoltComponent component, BeforeDoorOpenedEvent args)
+    {
+        if (component.BoltsDown)
+            args.Cancel();
+    }
+
+    private void OnBeforeDoorClosed(EntityUid uid, DoorBoltComponent component, BeforeDoorClosedEvent args)
+    {
+        if (component.BoltsDown)
+            args.Cancel();
+    }
+
+    private void OnBeforeDoorDenied(EntityUid uid, DoorBoltComponent component, BeforeDoorDeniedEvent args)
+    {
+        if (component.BoltsDown)
+            args.Cancel();
+    }
+
+    public void SetBoltWireCut(Entity<DoorBoltComponent> ent, bool value)
+    {
+        ent.Comp.BoltWireCut = value;
+        Dirty(ent, ent.Comp);
+    }
+
+    public void UpdateBoltLightStatus(Entity<DoorBoltComponent> ent)
+    {
+        AppearanceSystem.SetData(ent, DoorVisuals.BoltLights, GetBoltLightsVisible(ent));
+    }
+
+    public bool GetBoltLightsVisible(Entity<DoorBoltComponent> ent)
+    {
+        return ent.Comp.BoltLightsEnabled &&
+               ent.Comp.BoltsDown &&
+               ent.Comp.Powered;
+    }
+
+    public void SetBoltLightsEnabled(Entity<DoorBoltComponent> ent, bool value)
+    {
+        if (ent.Comp.BoltLightsEnabled == value)
+            return;
+
+        ent.Comp.BoltLightsEnabled = value;
+        Dirty(ent, ent.Comp);
+        UpdateBoltLightStatus(ent);
+    }
+
+    public void SetBoltsDown(Entity<DoorBoltComponent> ent, bool value, EntityUid? user = null, bool predicted = false)
+    {
+        if (ent.Comp.BoltsDown == value)
+            return;
+
+        ent.Comp.BoltsDown = value;
+        Dirty(ent, ent.Comp);
+        UpdateBoltLightStatus(ent);
+
+        var sound = value ? ent.Comp.BoltDownSound : ent.Comp.BoltUpSound;
+        if (predicted)
+            Audio.PlayPredicted(sound, ent, user: user);
+        else
+            Audio.PlayPvs(sound, ent);
+    }
+
+    private void OnStateChanged(Entity<DoorBoltComponent> entity, ref DoorStateChangedEvent args)
+    {
+        // If the door is closed, we should look if the bolt was locked while closing
+        UpdateBoltLightStatus(entity);
+    }
+
+    public bool IsBolted(EntityUid uid, DoorBoltComponent? component = null)
+    {
+        if (!Resolve(uid, ref component))
+        {
+            return false;
+        }
+
+        return component.BoltsDown;
+    }
+}
diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
index 53d79cada7..b58b7b265e 100644
--- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs
@@ -1,27 +1,35 @@
 using System.Linq;
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Damage;
+using Content.Shared.Database;
 using Content.Shared.Doors.Components;
+using Content.Shared.Emag.Systems;
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Physics;
+using Content.Shared.Popups;
 using Content.Shared.Prying.Components;
+using Content.Shared.Prying.Systems;
 using Content.Shared.Stunnable;
 using Content.Shared.Tag;
+using Content.Shared.Tools.Systems;
 using Robust.Shared.Audio;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Timing;
-using Content.Shared.Prying.Components;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Network;
 
 namespace Content.Shared.Doors.Systems;
 
-public abstract class SharedDoorSystem : EntitySystem
+public abstract partial class SharedDoorSystem : EntitySystem
 {
+    [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 SharedStunSystem _stunSystem = default!;
@@ -31,6 +39,11 @@ public abstract class SharedDoorSystem : EntitySystem
     [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!;
+
+    [ValidatePrototypeId<TagPrototype>]
+    public const string DoorBumpTag = "DoorBumpOpener";
 
     /// <summary>
     ///     A body must have an intersection percentage larger than this in order to be considered as colliding with a
@@ -51,6 +64,8 @@ public override void Initialize()
     {
         base.Initialize();
 
+        InitializeBolts();
+
         SubscribeLocalEvent<DoorComponent, ComponentInit>(OnComponentInit);
         SubscribeLocalEvent<DoorComponent, ComponentRemove>(OnRemove);
 
@@ -61,8 +76,13 @@ public override void Initialize()
         SubscribeLocalEvent<DoorComponent, StartCollideEvent>(HandleCollide);
         SubscribeLocalEvent<DoorComponent, PreventCollideEvent>(PreventCollision);
         SubscribeLocalEvent<DoorComponent, BeforePryEvent>(OnBeforePry);
+        SubscribeLocalEvent<DoorComponent, PriedEvent>(OnAfterPry);
+        SubscribeLocalEvent<DoorComponent, WeldableAttemptEvent>(OnWeldAttempt);
+        SubscribeLocalEvent<DoorComponent, WeldableChangedEvent>(OnWeldChanged);
         SubscribeLocalEvent<DoorComponent, GetPryTimeModifierEvent>(OnPryTimeModifier);
 
+        SubscribeLocalEvent<DoorComponent, OnAttemptEmagEvent>(OnAttemptEmag);
+        SubscribeLocalEvent<DoorComponent, GotEmaggedEvent>(OnEmagged);
     }
 
     protected virtual void OnComponentInit(Entity<DoorComponent> ent, ref ComponentInit args)
@@ -101,6 +121,34 @@ private void OnRemove(Entity<DoorComponent> door, ref ComponentRemove args)
         _activeDoors.Remove(door);
     }
 
+    private void OnAttemptEmag(EntityUid uid, DoorComponent door, ref OnAttemptEmagEvent args)
+    {
+        if (!TryComp<AirlockComponent>(uid, out var airlock))
+        {
+            args.Handled = true;
+            return;
+        }
+
+        if (IsBolted(uid) || !airlock.Powered)
+        {
+            args.Handled = true;
+            return;
+        }
+
+        if (door.State != DoorState.Closed)
+        {
+            args.Handled = true;
+        }
+    }
+
+    private void OnEmagged(EntityUid uid, DoorComponent door, ref GotEmaggedEvent args)
+    {
+        if (!SetState(uid, DoorState.Emagging, door))
+            return;
+        Audio.PlayPredicted(door.SparkSound, uid, args.UserUid, AudioParams.Default.WithVolume(8));
+        args.Handled = true;
+    }
+
     #region StateManagement
     private void OnHandleState(Entity<DoorComponent> ent, ref AfterAutoHandleStateEvent args)
     {
@@ -114,14 +162,14 @@ private void OnHandleState(Entity<DoorComponent> ent, ref AfterAutoHandleStateEv
         AppearanceSystem.SetData(ent, DoorVisuals.State, door.State);
     }
 
-    protected void SetState(EntityUid uid, DoorState state, DoorComponent? door = null)
+    protected bool SetState(EntityUid uid, DoorState state, DoorComponent? door = null)
     {
         if (!Resolve(uid, ref door))
-            return;
+            return false;
 
         // If no change, return to avoid firing a new DoorStateChangedEvent.
         if (state == door.State)
-            return;
+            return false;
 
         switch (state)
         {
@@ -160,14 +208,20 @@ protected void SetState(EntityUid uid, DoorState state, DoorComponent? door = nu
         Dirty(uid, door);
         RaiseLocalEvent(uid, new DoorStateChangedEvent(state));
         AppearanceSystem.SetData(uid, DoorVisuals.State, door.State);
+        return true;
     }
 
     #endregion
 
     #region Interactions
-    protected virtual void OnActivate(EntityUid uid, DoorComponent door, ActivateInWorldEvent args)
+    protected void OnActivate(EntityUid uid, DoorComponent door, ActivateInWorldEvent args)
     {
-        // avoid client-mispredicts, as the server will definitely handle this event
+        if (args.Handled || !door.ClickOpen)
+            return;
+
+        if (!TryToggleDoor(uid, door, args.User, predicted: true))
+            _pryingSystem.TryPry(uid, args.User, out _);
+
         args.Handled = true;
     }
 
@@ -182,6 +236,44 @@ private void OnBeforePry(EntityUid uid, DoorComponent door, ref BeforePryEvent a
             args.Cancelled = true;
     }
 
+    /// <summary>
+    ///     Open or close a door after it has been successfully pried.
+    /// </summary>
+    private void OnAfterPry(EntityUid uid, DoorComponent door, ref PriedEvent args)
+    {
+        if (door.State == DoorState.Closed)
+        {
+            _adminLog.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(args.User)} pried {ToPrettyString(uid)} open");
+            StartOpening(uid, door, args.User, true);
+        }
+        else if (door.State == DoorState.Open)
+        {
+            _adminLog.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(args.User)} pried {ToPrettyString(uid)} closed");
+            StartClosing(uid, door, args.User, true);
+        }
+    }
+
+    private void OnWeldAttempt(EntityUid uid, DoorComponent component, WeldableAttemptEvent args)
+    {
+        if (component.CurrentlyCrushing.Count > 0)
+        {
+            args.Cancel();
+            return;
+        }
+        if (component.State != DoorState.Closed && component.State != DoorState.Welded)
+        {
+            args.Cancel();
+        }
+    }
+
+    private void OnWeldChanged(EntityUid uid, DoorComponent component, ref WeldableChangedEvent args)
+    {
+        if (component.State == DoorState.Closed)
+            SetState(uid, DoorState.Welded, component);
+        else if (component.State == DoorState.Welded)
+            SetState(uid, DoorState.Closed, component);
+    }
+
     /// <summary>
     ///     Update the door state/visuals and play an access denied sound when a user without access interacts with the
     ///     door.
@@ -200,13 +292,15 @@ public void Deny(EntityUid uid, DoorComponent? door = null, EntityUid? user = nu
         if (ev.Cancelled)
             return;
 
-        SetState(uid, DoorState.Denying, door);
+        if (!SetState(uid, DoorState.Denying, door))
+            return;
 
-        if (door.DenySound != null)
-            PlaySound(uid, door.DenySound, AudioParams.Default.WithVolume(-3), user, predicted);
+        if (predicted)
+            Audio.PlayPredicted(door.DenySound, uid, user, AudioParams.Default.WithVolume(-3));
+        else if (_net.IsServer)
+            Audio.PlayPvs(door.DenySound, uid, AudioParams.Default.WithVolume(-3));
     }
 
-
     public bool TryToggleDoor(EntityUid uid, DoorComponent? door = null, EntityUid? user = null, bool predicted = false)
     {
         if (!Resolve(uid, ref door))
@@ -216,7 +310,8 @@ public bool TryToggleDoor(EntityUid uid, DoorComponent? door = null, EntityUid?
         {
             return TryOpen(uid, door, user, predicted, quiet: door.State == DoorState.Denying);
         }
-        else if (door.State == DoorState.Open)
+
+        if (door.State == DoorState.Open)
         {
             return TryClose(uid, door, user, predicted);
         }
@@ -255,7 +350,7 @@ public bool CanOpen(EntityUid uid, DoorComponent? door = null, EntityUid? user =
         if (!HasAccess(uid, user, door))
         {
             if (!quiet)
-                Deny(uid, door);
+                Deny(uid, door, user, predicted: true);
             return false;
         }
 
@@ -270,22 +365,23 @@ public bool CanOpen(EntityUid uid, DoorComponent? door = null, EntityUid? user =
     /// <param name="user"> The user (if any) opening the door</param>
     /// <param name="predicted">Whether the interaction would have been
     /// predicted. See comments in the PlaySound method on the Server system for details</param>
-    public virtual void StartOpening(EntityUid uid, DoorComponent? door = null, EntityUid? user = null, bool predicted = false)
+    public void StartOpening(EntityUid uid, DoorComponent? door = null, EntityUid? user = null, bool predicted = false)
     {
         if (!Resolve(uid, ref door))
             return;
 
-        SetState(uid, DoorState.Opening, door);
+        var lastState = door.State;
 
-        if (door.OpenSound != null)
-            PlaySound(uid, door.OpenSound, AudioParams.Default.WithVolume(-5), user, predicted);
+        if (!SetState(uid, DoorState.Opening, door))
+            return;
 
-        // I'm not sure what the intent here is/was? It plays a sound if the user is opening a door with a hands
-        // component, but no actual hands!? What!? Is this the sound of them head-butting the door to get it to open??
-        // I'm 99% sure something is wrong here, but I kind of want to keep it this way.
+        if (predicted)
+            Audio.PlayPredicted(door.OpenSound, uid, user, AudioParams.Default.WithVolume(-5));
+        else if (_net.IsServer)
+            Audio.PlayPvs(door.OpenSound, uid, AudioParams.Default.WithVolume(-5));
 
-        if (user != null && TryComp(user.Value, out HandsComponent? hands) && hands.Hands.Count == 0)
-            PlaySound(uid, door.TryOpenDoorSound, AudioParams.Default.WithVolume(-2), user, predicted);
+        if (lastState == DoorState.Emagging && TryComp<DoorBoltComponent>(uid, out var doorBoltComponent))
+            SetBoltsDown((uid, doorBoltComponent), !doorBoltComponent.BoltsDown, user, true);
     }
 
     /// <summary>
@@ -311,7 +407,7 @@ public bool TryClose(EntityUid uid, DoorComponent? door = null, EntityUid? user
         if (!Resolve(uid, ref door))
             return false;
 
-        if (!CanClose(uid, door, user, false))
+        if (!CanClose(uid, door, user))
             return false;
 
         StartClosing(uid, door, user, predicted);
@@ -324,9 +420,7 @@ public bool TryClose(EntityUid uid, DoorComponent? door = null, EntityUid? user
     /// <param name="uid"> The uid of the door</param>
     /// <param name="door"> The doorcomponent of the door</param>
     /// <param name="user"> The user (if any) opening the door</param>
-    /// <param name="predicted">Whether the interaction would have been
-    /// predicted. See comments in the PlaySound method on the Server system for details</param>
-    public bool CanClose(EntityUid uid, DoorComponent? door = null, EntityUid? user = null, bool quiet = true)
+    public bool CanClose(EntityUid uid, DoorComponent? door = null, EntityUid? user = null)
     {
         if (!Resolve(uid, ref door))
             return false;
@@ -337,7 +431,7 @@ public bool CanClose(EntityUid uid, DoorComponent? door = null, EntityUid? user
             return false;
 
         var ev = new BeforeDoorClosedEvent(door.PerformCollisionCheck);
-        RaiseLocalEvent(uid, ev, false);
+        RaiseLocalEvent(uid, ev);
         if (ev.Cancelled)
             return false;
 
@@ -347,15 +441,18 @@ public bool CanClose(EntityUid uid, DoorComponent? door = null, EntityUid? user
         return !ev.PerformCollisionCheck || !GetColliding(uid).Any();
     }
 
-    public virtual void StartClosing(EntityUid uid, DoorComponent? door = null, EntityUid? user = null, bool predicted = false)
+    public void StartClosing(EntityUid uid, DoorComponent? door = null, EntityUid? user = null, bool predicted = false)
     {
         if (!Resolve(uid, ref door))
             return;
 
-        SetState(uid, DoorState.Closing, door);
+        if (!SetState(uid, DoorState.Closing, door))
+            return;
 
-        if (door.CloseSound != null)
-            PlaySound(uid, door.CloseSound, AudioParams.Default.WithVolume(-5), user, predicted);
+        if (predicted)
+            Audio.PlayPredicted(door.CloseSound, uid, user, AudioParams.Default.WithVolume(-5));
+        else if (_net.IsServer)
+            Audio.PlayPvs(door.CloseSound, uid, AudioParams.Default.WithVolume(-5));
     }
 
     /// <summary>
@@ -368,7 +465,6 @@ public bool OnPartialClose(EntityUid uid, DoorComponent? door = null, PhysicsCom
             return false;
 
         door.Partial = true;
-        Dirty(uid, door);
 
         // Make sure no entity waled into the airlock when it started closing.
         if (!CanClose(uid, door))
@@ -381,6 +477,7 @@ public bool OnPartialClose(EntityUid uid, DoorComponent? door = null, PhysicsCom
 
         SetCollidable(uid, true, door, physics);
         door.NextStateChange = GameTiming.CurTime + door.CloseTimeTwo;
+        Dirty(uid, door);
         _activeDoors.Add((uid, door));
 
         // Crush any entities. Note that we don't check airlock safety here. This should have been checked before
@@ -490,10 +587,22 @@ private void PreventCollision(EntityUid uid, DoorComponent component, ref Preven
         }
     }
 
-    protected virtual void HandleCollide(EntityUid uid, DoorComponent door, ref StartCollideEvent args)
+    /// <summary>
+    ///     Open a door if a player or door-bumper (PDA, ID-card) collide with the door. Sadly, bullets no longer
+    ///     generate "access denied" sounds as you fire at a door.
+    /// </summary>
+    private void HandleCollide(EntityUid uid, DoorComponent door, ref StartCollideEvent args)
     {
-        // TODO ACCESS READER move access reader to shared and predict door opening/closing
-        // Then this can be moved to the shared system without mispredicting.
+        if (!door.BumpOpen)
+            return;
+
+        if (door.State is not (DoorState.Closed or DoorState.Denying))
+            return;
+
+        var otherUid = args.OtherEntity;
+
+        if (Tags.HasTag(otherUid, DoorBumpTag))
+            TryOpen(uid, door, otherUid, quiet: door.State == DoorState.Denying);
     }
     #endregion
 
@@ -588,6 +697,19 @@ public void SetNextStateChange(EntityUid uid, TimeSpan? delay, DoorComponent? do
         _activeDoors.Add((uid, door));
     }
 
+    protected void CheckDoorBump(Entity<DoorComponent, PhysicsComponent> ent)
+    {
+        var (uid, door, physics) = ent;
+        if (door.BumpOpen)
+        {
+            foreach (var other in PhysicsSystem.GetContactingEntities(uid, physics, approximate: true))
+            {
+                if (Tags.HasTag(other, DoorBumpTag) && TryOpen(uid, door, other, quiet: true))
+                    break;
+            }
+        }
+    }
+
     /// <summary>
     ///     Iterate over active doors and progress them to the next state if they need to be updated.
     /// </summary>
@@ -620,8 +742,6 @@ public override void Update(float frameTime)
         }
     }
 
-    protected virtual void CheckDoorBump(Entity<DoorComponent, PhysicsComponent> ent) { }
-
     /// <summary>
     ///     Makes a door proceed to the next state (if applicable).
     /// </summary>
@@ -633,7 +753,7 @@ private void NextState(Entity<DoorComponent> ent, TimeSpan time)
         if (door.CurrentlyCrushing.Count > 0)
             // This is a closed door that is crushing people and needs to auto-open. Note that we don't check "can open"
             // here. The door never actually finished closing and we don't want people to get stuck inside of doors.
-            StartOpening(ent, door, predicted: true);
+            StartOpening(ent, door);
 
         switch (door.State)
         {
@@ -666,7 +786,7 @@ private void NextState(Entity<DoorComponent> ent, TimeSpan time)
 
             case DoorState.Open:
                 // This door is open, and queued for an auto-close.
-                if (!TryClose(ent, door, predicted: true))
+                if (!TryClose(ent, door))
                 {
                     // The door failed to close (blocked?). Try again in one second.
                     door.NextStateChange = time + TimeSpan.FromSeconds(1);
@@ -680,6 +800,4 @@ private void NextState(Entity<DoorComponent> ent, TimeSpan time)
         }
     }
     #endregion
-
-    protected abstract void PlaySound(EntityUid uid, SoundSpecifier soundSpecifier, AudioParams audioParams, EntityUid? predictingPlayer, bool predicted);
 }
diff --git a/Content.Shared/Drone/SharedDroneSystem.cs b/Content.Shared/Drone/SharedDroneSystem.cs
deleted file mode 100644
index d6fc7efcc6..0000000000
--- a/Content.Shared/Drone/SharedDroneSystem.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Drone
-{
-    public abstract class SharedDroneSystem : EntitySystem
-    {
-        [Serializable, NetSerializable]
-        public enum DroneVisuals : byte
-        {
-            Status
-        }
-
-        [Serializable, NetSerializable]
-        public enum DroneStatus : byte
-        {
-            Off,
-            On
-        }
-    }
-}
diff --git a/Content.Shared/Emp/EmpDisabledComponent.cs b/Content.Shared/Emp/EmpDisabledComponent.cs
index 33ba619a0d..9e5a56de83 100644
--- a/Content.Shared/Emp/EmpDisabledComponent.cs
+++ b/Content.Shared/Emp/EmpDisabledComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Shared.Emp;
 /// While entity has this component it is "disabled" by EMP.
 /// Add desired behaviour in other systems
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
 [Access(typeof(SharedEmpSystem))]
 public sealed partial class EmpDisabledComponent : Component
 {
@@ -15,6 +15,7 @@ public sealed partial class EmpDisabledComponent : Component
     /// Moment of time when component is removed and entity stops being "disabled"
     /// </summary>
     [DataField("timeLeft", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    [AutoPausedField]
     public TimeSpan DisabledUntil;
 
     [DataField("effectCoolDown"), ViewVariables(VVAccess.ReadWrite)]
@@ -23,5 +24,6 @@ public sealed partial class EmpDisabledComponent : Component
     /// <summary>
     /// When next effect will be spawned
     /// </summary>
+    [AutoPausedField]
     public TimeSpan TargetTime = TimeSpan.Zero;
 }
diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs
index a06a4b7049..5a3fb87229 100644
--- a/Content.Shared/Examine/ExamineSystemShared.cs
+++ b/Content.Shared/Examine/ExamineSystemShared.cs
@@ -17,6 +17,7 @@ namespace Content.Shared.Examine
 {
     public abstract partial class ExamineSystemShared : EntitySystem
     {
+        [Dependency] private readonly SharedTransformSystem _transform = default!;
         [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
         [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
         [Dependency] protected readonly MobStateSystem MobStateSystem = default!;
@@ -57,7 +58,7 @@ public bool IsInDetailsRange(EntityUid examiner, EntityUid entity)
             if (MobStateSystem.IsIncapacitated(examiner))
                 return false;
 
-            if (!_interactionSystem.InRangeUnobstructed(examiner, entity, ExamineDetailsRange))
+            if (!InRangeUnOccluded(examiner, entity, ExamineDetailsRange))
                 return false;
 
             // Is the target hidden in a opaque locker or something? Currently this check allows players to examine
@@ -77,7 +78,7 @@ public bool CanExamine(EntityUid examiner, EntityUid examined)
             if (IsClientSide(examined))
                 return true;
 
-            return !Deleted(examined) && CanExamine(examiner, EntityManager.GetComponent<TransformComponent>(examined).MapPosition,
+            return !Deleted(examined) && CanExamine(examiner, _transform.GetMapCoordinates(examined),
                 entity => entity == examiner || entity == examined, examined);
         }
 
@@ -109,7 +110,7 @@ public virtual bool CanExamine(EntityUid examiner, MapCoordinates target, Ignore
                 return false;
 
             return InRangeUnOccluded(
-                EntityManager.GetComponent<TransformComponent>(examiner).MapPosition,
+                _transform.GetMapCoordinates(examiner),
                 target,
                 GetExaminerRange(examiner),
                 predicate: predicate,
diff --git a/Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs b/Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs
index cfbe1fcb3d..80d65f4c2c 100644
--- a/Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs
+++ b/Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs
@@ -1,9 +1,7 @@
 using Content.Shared.Explosion.EntitySystems;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Explosion.EntitySystems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-using Robust.Shared.GameStates;
 
 namespace Content.Shared.Explosion.Components;
 
diff --git a/Content.Shared/Eye/Blinding/Systems/BlurryVisionSystem.cs b/Content.Shared/Eye/Blinding/Systems/BlurryVisionSystem.cs
index 4577bcda99..099753d51e 100644
--- a/Content.Shared/Eye/Blinding/Systems/BlurryVisionSystem.cs
+++ b/Content.Shared/Eye/Blinding/Systems/BlurryVisionSystem.cs
@@ -6,8 +6,6 @@ namespace Content.Shared.Eye.Blinding.Systems;
 
 public sealed class BlurryVisionSystem : EntitySystem
 {
-    [Dependency] private readonly IEntityManager _entityManager = default!;
-
     public override void Initialize()
     {
         base.Initialize();
diff --git a/Content.Shared/Fax/SharedFax.cs b/Content.Shared/Fax/SharedFax.cs
index ccb998925f..15674aef7e 100644
--- a/Content.Shared/Fax/SharedFax.cs
+++ b/Content.Shared/Fax/SharedFax.cs
@@ -34,6 +34,24 @@ public FaxUiState(string deviceName,
     }
 }
 
+[Serializable, NetSerializable]
+public sealed class FaxFileMessage : BoundUserInterfaceMessage
+{
+    public string Content;
+    public bool OfficePaper;
+
+    public FaxFileMessage(string content, bool officePaper)
+    {
+        Content = content;
+        OfficePaper = officePaper;
+    }
+}
+
+public static class FaxFileMessageValidation
+{
+    public const int MaxContentSize = 10000;
+}
+
 [Serializable, NetSerializable]
 public sealed class FaxCopyMessage : BoundUserInterfaceMessage
 {
diff --git a/Content.Shared/FixedPoint/FixedPoint2.cs b/Content.Shared/FixedPoint/FixedPoint2.cs
index eb0e75e7ab..33a9d25bc2 100644
--- a/Content.Shared/FixedPoint/FixedPoint2.cs
+++ b/Content.Shared/FixedPoint/FixedPoint2.cs
@@ -20,6 +20,9 @@ public struct FixedPoint2 : ISelfSerialize, IComparable<FixedPoint2>, IEquatable
         public static FixedPoint2 Epsilon { get; } = new(1);
         public static FixedPoint2 Zero { get; } = new(0);
 
+        // This value isn't picked by any proper testing, don't @ me.
+        private const float FloatEpsilon = 0.00001f;
+
 #if DEBUG
         static FixedPoint2()
         {
@@ -47,7 +50,17 @@ public static FixedPoint2 New(int value)
 
         public static FixedPoint2 New(float value)
         {
-            return new((int) MathF.Round(value * ShiftConstant, MidpointRounding.AwayFromZero));
+            return new((int) ApplyFloatEpsilon(value * ShiftConstant));
+        }
+
+        private static float ApplyFloatEpsilon(float value)
+        {
+            return value + FloatEpsilon * Math.Sign(value);
+        }
+
+        private static double ApplyFloatEpsilon(double value)
+        {
+            return value + FloatEpsilon * Math.Sign(value);
         }
 
         /// <summary>
@@ -60,17 +73,12 @@ public static FixedPoint2 NewCeiling(float value)
 
         public static FixedPoint2 New(double value)
         {
-            return new((int) Math.Round(value * ShiftConstant, MidpointRounding.AwayFromZero));
+            return new((int) ApplyFloatEpsilon(value * ShiftConstant));
         }
 
         public static FixedPoint2 New(string value)
         {
-            return New(FloatFromString(value));
-        }
-
-        private static float FloatFromString(string value)
-        {
-            return float.Parse(value, CultureInfo.InvariantCulture);
+            return New(Parse.Float(value));
         }
 
         public static FixedPoint2 operator +(FixedPoint2 a) => a;
@@ -85,17 +93,17 @@ private static float FloatFromString(string value)
 
         public static FixedPoint2 operator *(FixedPoint2 a, FixedPoint2 b)
         {
-            return new((int) MathF.Round(b.Value * a.Value / (float) ShiftConstant, MidpointRounding.AwayFromZero));
+            return new(b.Value * a.Value / ShiftConstant);
         }
 
         public static FixedPoint2 operator *(FixedPoint2 a, float b)
         {
-            return new((int) MathF.Round(a.Value * b, MidpointRounding.AwayFromZero));
+            return new((int) ApplyFloatEpsilon(a.Value * b));
         }
 
         public static FixedPoint2 operator *(FixedPoint2 a, double b)
         {
-            return new((int) Math.Round(a.Value * b, MidpointRounding.AwayFromZero));
+            return new((int) ApplyFloatEpsilon(a.Value * b));
         }
 
         public static FixedPoint2 operator *(FixedPoint2 a, int b)
@@ -105,12 +113,12 @@ private static float FloatFromString(string value)
 
         public static FixedPoint2 operator /(FixedPoint2 a, FixedPoint2 b)
         {
-            return new((int) MathF.Round((ShiftConstant * a.Value) / (float) b.Value, MidpointRounding.AwayFromZero));
+            return new((int) (ShiftConstant * (long) a.Value / b.Value));
         }
 
         public static FixedPoint2 operator /(FixedPoint2 a, float b)
         {
-            return new((int) MathF.Round(a.Value / b, MidpointRounding.AwayFromZero));
+            return new((int) ApplyFloatEpsilon(a.Value / b));
         }
 
         public static bool operator <=(FixedPoint2 a, int b)
@@ -185,7 +193,7 @@ public readonly double Double()
 
         public readonly int Int()
         {
-            return (int) ShiftDown();
+            return Value / ShiftConstant;
         }
 
         // Implicit operators ftw
@@ -266,7 +274,7 @@ public void Deserialize(string value)
             if (value == "MaxValue")
                 Value = int.MaxValue;
             else
-                this = New(FloatFromString(value));
+                this = New(Parse.Float(value));
         }
 
         public override readonly string ToString() => $"{ShiftDown().ToString(CultureInfo.InvariantCulture)}";
diff --git a/Content.Shared/Flash/FlashableComponent.cs b/Content.Shared/Flash/FlashableComponent.cs
index e20e2e7941..c4f8074cea 100644
--- a/Content.Shared/Flash/FlashableComponent.cs
+++ b/Content.Shared/Flash/FlashableComponent.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Physics;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
@@ -9,6 +10,9 @@ public sealed partial class FlashableComponent : Component
         public float Duration;
         public TimeSpan LastFlash;
 
+        [DataField]
+        public CollisionGroup CollisionGroup = CollisionGroup.Opaque;
+
         public override bool SendOnlyToOwner => true;
     }
 
diff --git a/Content.Shared/Fluids/Components/EvaporationComponent.cs b/Content.Shared/Fluids/Components/EvaporationComponent.cs
new file mode 100644
index 0000000000..f2ed3a6186
--- /dev/null
+++ b/Content.Shared/Fluids/Components/EvaporationComponent.cs
@@ -0,0 +1,25 @@
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Fluids.Components;
+
+/// <summary>
+/// Added to puddles that contain water so it may evaporate over time.
+/// </summary>
+[NetworkedComponent]
+[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;
+
+    /// <summary>
+    /// How much evaporation occurs every tick.
+    /// </summary>
+    [DataField("evaporationAmount")]
+    public FixedPoint2 EvaporationAmount = FixedPoint2.New(0.3);
+}
diff --git a/Content.Shared/Fluids/Components/PuddleComponent.cs b/Content.Shared/Fluids/Components/PuddleComponent.cs
index bc40e9960c..b8a6fe0cb8 100644
--- a/Content.Shared/Fluids/Components/PuddleComponent.cs
+++ b/Content.Shared/Fluids/Components/PuddleComponent.cs
@@ -11,10 +11,10 @@ namespace Content.Shared.Fluids.Components
     [RegisterComponent, NetworkedComponent, Access(typeof(SharedPuddleSystem))]
     public sealed partial class PuddleComponent : Component
     {
-        [DataField("spillSound")]
+        [DataField]
         public SoundSpecifier SpillSound = new SoundPathSpecifier("/Audio/Effects/Fluids/splat.ogg");
 
-        [DataField("overflowVolume")]
+        [DataField]
         public FixedPoint2 OverflowVolume = FixedPoint2.New(20);
 
         [DataField("solution")] public string SolutionName = "puddle";
diff --git a/Content.Server/Fluids/Components/SpillableComponent.cs b/Content.Shared/Fluids/Components/SpillableComponent.cs
similarity index 80%
rename from Content.Server/Fluids/Components/SpillableComponent.cs
rename to Content.Shared/Fluids/Components/SpillableComponent.cs
index 645b0af612..a1b5fa17eb 100644
--- a/Content.Server/Fluids/Components/SpillableComponent.cs
+++ b/Content.Shared/Fluids/Components/SpillableComponent.cs
@@ -1,6 +1,6 @@
 using Content.Shared.FixedPoint;
 
-namespace Content.Server.Fluids.Components;
+namespace Content.Shared.Fluids.Components;
 
 [RegisterComponent]
 public sealed partial class SpillableComponent : Component
@@ -12,15 +12,15 @@ public sealed partial class SpillableComponent : Component
     ///     Should this item be spilled when worn as clothing?
     ///     Doesn't count for pockets or hands.
     /// </summary>
-    [DataField("spillWorn")]
+    [DataField]
     public bool SpillWorn = true;
 
-    [DataField("spillDelay")]
+    [DataField]
     public float? SpillDelay;
 
     /// <summary>
     ///     At most how much reagent can be splashed on someone at once?
     /// </summary>
-    [DataField("maxMeleeSpillAmount")]
+    [DataField]
     public FixedPoint2 MaxMeleeSpillAmount = FixedPoint2.New(20);
 }
diff --git a/Content.Shared/Fluids/SharedDrainSystem.cs b/Content.Shared/Fluids/SharedDrainSystem.cs
index f9bcee44ee..d65dddb0df 100644
--- a/Content.Shared/Fluids/SharedDrainSystem.cs
+++ b/Content.Shared/Fluids/SharedDrainSystem.cs
@@ -3,7 +3,7 @@
 
 namespace Content.Shared.Fluids;
 
-public partial class SharedDrainSystem : EntitySystem
+public abstract partial class SharedDrainSystem : EntitySystem
 {
     [Serializable, NetSerializable]
     public sealed partial class DrainDoAfterEvent : SimpleDoAfterEvent
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs b/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs
new file mode 100644
index 0000000000..023d024a05
--- /dev/null
+++ b/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
+
+namespace Content.Shared.Fluids;
+
+public abstract partial class SharedPuddleSystem
+{
+    [ValidatePrototypeId<ReagentPrototype>]
+    private const string Water = "Water";
+
+    public static readonly string[] EvaporationReagents = [Water];
+
+    public bool CanFullyEvaporate(Solution solution)
+    {
+        return solution.GetTotalPrototypeQuantity(EvaporationReagents) == solution.Volume;
+    }
+}
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
new file mode 100644
index 0000000000..77730e5afc
--- /dev/null
+++ b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
@@ -0,0 +1,24 @@
+using Content.Shared.Examine;
+using Content.Shared.Fluids.Components;
+using Content.Shared.Weapons.Melee;
+
+namespace Content.Shared.Fluids;
+
+public abstract partial class SharedPuddleSystem
+{
+    protected virtual void InitializeSpillable()
+    {
+        SubscribeLocalEvent<SpillableComponent, ExaminedEvent>(OnExamined);
+    }
+
+    private void OnExamined(Entity<SpillableComponent> entity, ref ExaminedEvent args)
+    {
+        using (args.PushGroup(nameof(SpillableComponent)))
+        {
+            args.PushMarkup(Loc.GetString("spill-examine-is-spillable"));
+
+            if (HasComp<MeleeWeaponComponent>(entity))
+                args.PushMarkup(Loc.GetString("spill-examine-spillable-weapon"));
+        }
+    }
+}
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.cs b/Content.Shared/Fluids/SharedPuddleSystem.cs
index 59a9c6ef26..e4bd61baa8 100644
--- a/Content.Shared/Fluids/SharedPuddleSystem.cs
+++ b/Content.Shared/Fluids/SharedPuddleSystem.cs
@@ -2,13 +2,16 @@
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.DragDrop;
+using Content.Shared.Examine;
+using Content.Shared.FixedPoint;
 using Content.Shared.Fluids.Components;
 using Content.Shared.Movement.Events;
+using Content.Shared.StepTrigger.Components;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Fluids;
 
-public abstract class SharedPuddleSystem : EntitySystem
+public abstract partial class SharedPuddleSystem : EntitySystem
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
@@ -28,6 +31,9 @@ public override void Initialize()
         SubscribeLocalEvent<DrainableSolutionComponent, CanDropTargetEvent>(OnDrainCanDropTarget);
         SubscribeLocalEvent<RefillableSolutionComponent, CanDropDraggedEvent>(OnRefillableCanDropDragged);
         SubscribeLocalEvent<PuddleComponent, GetFootstepSoundEvent>(OnGetFootstepSound);
+        SubscribeLocalEvent<PuddleComponent, ExaminedEvent>(HandlePuddleExamined);
+
+        InitializeSpillable();
     }
 
     private void OnRefillableCanDrag(Entity<RefillableSolutionComponent> entity, ref CanDragEvent args)
@@ -75,4 +81,29 @@ private void OnGetFootstepSound(Entity<PuddleComponent> entity, ref GetFootstepS
             args.Sound = proto.FootstepSound;
         }
     }
+
+    private void HandlePuddleExamined(Entity<PuddleComponent> entity, ref ExaminedEvent args)
+    {
+        using (args.PushGroup(nameof(PuddleComponent)))
+        {
+            if (TryComp<StepTriggerComponent>(entity, out var slippery) && slippery.Active)
+            {
+                args.PushMarkup(Loc.GetString("puddle-component-examine-is-slippery-text"));
+            }
+
+            if (HasComp<EvaporationComponent>(entity) &&
+                _solutionContainerSystem.ResolveSolution(entity.Owner, entity.Comp.SolutionName,
+                    ref entity.Comp.Solution, out var solution))
+            {
+                if (CanFullyEvaporate(solution))
+                    args.PushMarkup(Loc.GetString("puddle-component-examine-evaporating"));
+                else if (solution.GetTotalPrototypeQuantity(EvaporationReagents) > FixedPoint2.Zero)
+                    args.PushMarkup(Loc.GetString("puddle-component-examine-evaporating-partial"));
+                else
+                    args.PushMarkup(Loc.GetString("puddle-component-examine-evaporating-no"));
+            }
+            else
+                args.PushMarkup(Loc.GetString("puddle-component-examine-evaporating-no"));
+        }
+    }
 }
diff --git a/Content.Shared/Foldable/FoldableComponent.cs b/Content.Shared/Foldable/FoldableComponent.cs
index c22095f3f2..74f6a20913 100644
--- a/Content.Shared/Foldable/FoldableComponent.cs
+++ b/Content.Shared/Foldable/FoldableComponent.cs
@@ -17,4 +17,10 @@ public sealed partial class FoldableComponent : Component
 
     [DataField]
     public bool CanFoldInsideContainer = false;
+
+    [DataField]
+    public LocId UnfoldVerbText = "unfold-verb";
+
+    [DataField]
+    public LocId FoldVerbText = "fold-verb";
 }
diff --git a/Content.Shared/Foldable/FoldableSystem.cs b/Content.Shared/Foldable/FoldableSystem.cs
index 374aba44c5..10baf8165b 100644
--- a/Content.Shared/Foldable/FoldableSystem.cs
+++ b/Content.Shared/Foldable/FoldableSystem.cs
@@ -134,7 +134,7 @@ private void AddFoldVerb(EntityUid uid, FoldableComponent component, GetVerbsEve
         AlternativeVerb verb = new()
         {
             Act = () => TryToggleFold(uid, component),
-            Text = component.IsFolded ? Loc.GetString("unfold-verb") : Loc.GetString("fold-verb"),
+            Text = component.IsFolded ? Loc.GetString(component.UnfoldVerbText) : Loc.GetString(component.FoldVerbText),
             Icon = new SpriteSpecifier.Texture(new ("/Textures/Interface/VerbIcons/fold.svg.192dpi.png")),
 
             // If the object is unfolded and they click it, they want to fold it, if it's folded, they want to pick it up
diff --git a/Content.Shared/Friction/TileFrictionController.cs b/Content.Shared/Friction/TileFrictionController.cs
index 472f5b574b..ba4d9fc24f 100644
--- a/Content.Shared/Friction/TileFrictionController.cs
+++ b/Content.Shared/Friction/TileFrictionController.cs
@@ -31,20 +31,8 @@ public override void Initialize()
         {
             base.Initialize();
 
-            _configManager.OnValueChanged(CCVars.TileFrictionModifier, SetFrictionModifier, true);
-            _configManager.OnValueChanged(CCVars.StopSpeed, SetStopSpeed, true);
-        }
-
-        private void SetStopSpeed(float value) => _stopSpeed = value;
-
-        private void SetFrictionModifier(float value) => _frictionModifier = value;
-
-        public override void Shutdown()
-        {
-            base.Shutdown();
-
-            _configManager.UnsubValueChanged(CCVars.TileFrictionModifier, SetFrictionModifier);
-            _configManager.UnsubValueChanged(CCVars.StopSpeed, SetStopSpeed);
+            Subs.CVar(_configManager, CCVars.TileFrictionModifier, value => _frictionModifier = value, true);
+            Subs.CVar(_configManager, CCVars.StopSpeed, value => _stopSpeed = value, true);
         }
 
         public override void UpdateBeforeMapSolve(bool prediction, PhysicsMapComponent mapComponent, float frameTime)
diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs
index 7778588f97..95da4f4c38 100644
--- a/Content.Shared/GameTicking/SharedGameTicker.cs
+++ b/Content.Shared/GameTicking/SharedGameTicker.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Roles;
+using Robust.Shared.Network;
 using Robust.Shared.Replays;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Markdown.Mapping;
@@ -77,7 +78,6 @@ public TickerConnectionStatusEvent(TimeSpan roundStartTimeSpan)
     public sealed class TickerLobbyStatusEvent : EntityEventArgs
     {
         public bool IsRoundStarted { get; }
-        public string? LobbySong { get; }
         public string? LobbyBackground { get; }
         public bool YouAreReady { get; }
         // UTC.
@@ -85,10 +85,9 @@ public sealed class TickerLobbyStatusEvent : EntityEventArgs
         public TimeSpan RoundStartTimeSpan { get; }
         public bool Paused { get; }
 
-        public TickerLobbyStatusEvent(bool isRoundStarted, string? lobbySong, string? lobbyBackground, bool youAreReady, TimeSpan startTime, TimeSpan preloadTime, TimeSpan roundStartTimeSpan, bool paused)
+        public TickerLobbyStatusEvent(bool isRoundStarted, string? lobbyBackground, bool youAreReady, TimeSpan startTime, TimeSpan preloadTime, TimeSpan roundStartTimeSpan, bool paused)
         {
             IsRoundStarted = isRoundStarted;
-            LobbySong = lobbySong;
             LobbyBackground = lobbyBackground;
             YouAreReady = youAreReady;
             StartTime = startTime;
@@ -144,18 +143,37 @@ public TickerJobsAvailableEvent(Dictionary<NetEntity, string> stationNames, Dict
         }
     }
 
-    [Serializable, NetSerializable]
-    public sealed class RoundEndMessageEvent : EntityEventArgs
+    [Serializable, NetSerializable, DataDefinition]
+    public sealed partial class RoundEndMessageEvent : EntityEventArgs
     {
-        [Serializable, NetSerializable]
-        public struct RoundEndPlayerInfo
+        [Serializable, NetSerializable, DataDefinition]
+        public partial struct RoundEndPlayerInfo
         {
+            [DataField]
             public string PlayerOOCName;
+
+            [DataField]
             public string? PlayerICName;
+
+            [DataField, NonSerialized]
+            public NetUserId? PlayerGuid;
+
             public string Role;
+
+            [DataField, NonSerialized]
+            public string[] JobPrototypes;
+
+            [DataField, NonSerialized]
+            public string[] AntagPrototypes;
+
             public NetEntity? PlayerNetEntity;
+
+            [DataField]
             public bool Antag;
+
+            [DataField]
             public bool Observer;
+
             public bool Connected;
         }
 
@@ -165,7 +183,6 @@ public struct RoundEndPlayerInfo
         public int RoundId { get; }
         public int PlayerCount { get; }
         public RoundEndPlayerInfo[] AllPlayersEndInfo { get; }
-        public string? LobbySong;
 
         /// <summary>
         /// Sound gets networked due to how entity lifecycle works between client / server and to avoid clipping.
@@ -179,7 +196,6 @@ public RoundEndMessageEvent(
             int roundId,
             int playerCount,
             RoundEndPlayerInfo[] allPlayersEndInfo,
-            string? lobbySong,
             string? restartSound)
         {
             GamemodeTitle = gamemodeTitle;
@@ -188,7 +204,6 @@ public RoundEndMessageEvent(
             RoundId = roundId;
             PlayerCount = playerCount;
             AllPlayersEndInfo = allPlayersEndInfo;
-            LobbySong = lobbySong;
             RestartSound = restartSound;
         }
     }
diff --git a/Content.Shared/Gibbing/Components/GibbableComponent.cs b/Content.Shared/Gibbing/Components/GibbableComponent.cs
new file mode 100644
index 0000000000..9c7501f028
--- /dev/null
+++ b/Content.Shared/Gibbing/Components/GibbableComponent.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Gibbing.Systems;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Gibbing.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(GibbingSystem))]
+public sealed partial class GibbableComponent : Component
+{
+    /// <summary>
+    /// Giblet entity prototypes to randomly select from when spawning additional giblets
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public List<EntProtoId> GibPrototypes = new();
+
+    /// <summary>
+    /// Number of giblet entities to spawn in addition to entity contents
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int GibCount;
+
+    /// <summary>
+    /// Sound to be played when this entity is gibbed, only played when playsound is true on the gibbing function
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? GibSound = new SoundCollectionSpecifier("gib", AudioParams.Default.WithVariation(0.025f));
+
+    /// <summary>
+    /// Max distance giblets can be dropped from an entity when NOT using physics-based scattering
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float GibScatterRange = 0.3f;
+}
diff --git a/Content.Shared/Gibbing/Events/GibbingEvents.cs b/Content.Shared/Gibbing/Events/GibbingEvents.cs
new file mode 100644
index 0000000000..949b10eab9
--- /dev/null
+++ b/Content.Shared/Gibbing/Events/GibbingEvents.cs
@@ -0,0 +1,50 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Gibbing.Events;
+
+
+
+/// <summary>
+/// Called just before we actually gib the target entity
+/// </summary>
+/// <param name="Target">The entity being gibed</param>
+/// <param name="GibType">What type of gibbing is occuring</param>
+/// <param name="AllowedContainers">Containers we are allow to gib</param>
+/// <param name="ExcludedContainers">Containers we are allow not allowed to gib</param>
+[ByRefEvent] public record struct AttemptEntityContentsGibEvent(
+    EntityUid Target,
+    GibContentsOption GibType,
+    List<string>? AllowedContainers,
+    List<string>? ExcludedContainers
+    );
+
+
+/// <summary>
+/// Called just before we actually gib the target entity
+/// </summary>
+/// <param name="Target">The entity being gibed</param>
+/// <param name="GibletCount">how many giblets to spawn</param>
+/// <param name="GibType">What type of gibbing is occuring</param>
+[ByRefEvent] public record struct AttemptEntityGibEvent(EntityUid Target, int GibletCount, GibType GibType);
+
+/// <summary>
+/// Called immediately after we gib the target entity
+/// </summary>
+/// <param name="Target">The entity being gibbed</param>
+/// <param name="DroppedEntities">Any entities that are spilled out (if any)</param>
+[ByRefEvent] public record struct EntityGibbedEvent(EntityUid Target, List<EntityUid> DroppedEntities);
+
+[Serializable, NetSerializable]
+public enum GibType : byte
+{
+    Skip,
+    Drop,
+    Gib,
+}
+
+public enum GibContentsOption : byte
+{
+    Skip,
+    Drop,
+    Gib
+}
diff --git a/Content.Shared/Gibbing/Systems/GibbingSystem.cs b/Content.Shared/Gibbing/Systems/GibbingSystem.cs
new file mode 100644
index 0000000000..f3d982977a
--- /dev/null
+++ b/Content.Shared/Gibbing/Systems/GibbingSystem.cs
@@ -0,0 +1,340 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Numerics;
+using Content.Shared.Gibbing.Components;
+using Content.Shared.Gibbing.Events;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
+using Robust.Shared.Map;
+using Robust.Shared.Physics.Systems;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+
+namespace Content.Shared.Gibbing.Systems;
+
+public sealed class GibbingSystem : EntitySystem
+{
+    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
+    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physicsSystem = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    //TODO: (future optimization) implement a system that "caps" giblet entities by deleting the oldest ones once we reach a certain limit, customizable via CVAR
+
+    /// <summary>
+    /// Attempt to gib a specified entity. That entity must have a gibable components. This method is NOT recursive will only
+    /// work on the target and any entities it contains (depending on gibContentsOption)
+    /// </summary>
+    /// <param name="outerEntity">The outermost entity we care about, used to place the dropped items</param>
+    /// <param name="gibbable">Target entity/comp we wish to gib</param>
+    /// <param name="gibType">What type of gibing are we performing</param>
+    /// <param name="gibContentsOption">What type of gibing do we perform on any container contents?</param>
+    /// <param name="droppedEntities">a hashset containing all the entities that have been dropped/created</param>
+    /// <param name="randomSpreadMod">How much to multiply the random spread on dropped giblets(if we are dropping them!)</param>
+    /// <param name="playAudio">Should we play audio</param>
+    /// <param name="allowedContainers">A list of containerIds on the target that permit gibing</param>
+    /// <param name="excludedContainers">A list of containerIds on the target that DO NOT permit gibing</param>
+    /// <param name="launchCone">The cone we are launching giblets in (if we are launching them!)</param>
+    /// <param name="launchGibs">Should we launch giblets or just drop them</param>
+    /// <param name="launchDirection">The direction to launch giblets (if we are launching them!)</param>
+    /// <param name="launchImpulse">The impluse to launch giblets at(if we are launching them!)</param>
+    /// /// <param name="logMissingGibable">Should we log if we are missing a gibbableComp when we call this function</param>
+    /// <param name="launchImpulseVariance">The variation in giblet launch impulse (if we are launching them!)</param>
+    /// <returns>True if successful, false if not</returns>
+    public bool TryGibEntity(EntityUid outerEntity, Entity<GibbableComponent?> gibbable, GibType gibType,
+        GibContentsOption gibContentsOption,
+        out HashSet<EntityUid> droppedEntities, bool launchGibs = true,
+        Vector2 launchDirection = default, float launchImpulse = 0f, float launchImpulseVariance = 0f,
+        Angle launchCone = default,
+        float randomSpreadMod = 1.0f, bool playAudio = true, List<string>? allowedContainers = null,
+        List<string>? excludedContainers = null, bool logMissingGibable = false)
+    {
+        droppedEntities = new();
+        return TryGibEntityWithRef(outerEntity, gibbable, gibType, gibContentsOption, ref droppedEntities,
+            launchGibs, launchDirection, launchImpulse, launchImpulseVariance, launchCone, randomSpreadMod, playAudio,
+            allowedContainers, excludedContainers, logMissingGibable);
+    }
+
+
+    /// <summary>
+    /// Attempt to gib a specified entity. That entity must have a gibable components. This method is NOT recursive will only
+    /// work on the target and any entities it contains (depending on gibContentsOption)
+    /// </summary>
+    /// <param name="outerEntity">The outermost entity we care about, used to place the dropped items</param>
+    /// <param name="gibbable">Target entity/comp we wish to gib</param>
+    /// <param name="gibType">What type of gibing are we performing</param>
+    /// <param name="gibContentsOption">What type of gibing do we perform on any container contents?</param>
+    /// <param name="droppedEntities">a hashset containing all the entities that have been dropped/created</param>
+    /// <param name="randomSpreadMod">How much to multiply the random spread on dropped giblets(if we are dropping them!)</param>
+    /// <param name="playAudio">Should we play audio</param>
+    /// <param name="allowedContainers">A list of containerIds on the target that permit gibing</param>
+    /// <param name="excludedContainers">A list of containerIds on the target that DO NOT permit gibing</param>
+    /// <param name="launchCone">The cone we are launching giblets in (if we are launching them!)</param>
+    /// <param name="launchGibs">Should we launch giblets or just drop them</param>
+    /// <param name="launchDirection">The direction to launch giblets (if we are launching them!)</param>
+    /// <param name="launchImpulse">The impluse to launch giblets at(if we are launching them!)</param>
+    /// <param name="launchImpulseVariance">The variation in giblet launch impulse (if we are launching them!)</param>
+    /// <param name="logMissingGibable">Should we log if we are missing a gibbableComp when we call this function</param>
+    /// <returns>True if successful, false if not</returns>
+    public bool TryGibEntityWithRef(
+        EntityUid outerEntity,
+        Entity<GibbableComponent?> gibbable,
+        GibType gibType,
+        GibContentsOption gibContentsOption,
+        ref HashSet<EntityUid> droppedEntities,
+        bool launchGibs = true,
+        Vector2? launchDirection = null,
+        float launchImpulse = 0f,
+        float launchImpulseVariance = 0f,
+        Angle launchCone = default,
+        float randomSpreadMod = 1.0f,
+        bool playAudio = true,
+        List<string>? allowedContainers = null,
+        List<string>? excludedContainers = null,
+        bool logMissingGibable = false)
+    {
+        if (!Resolve(gibbable, ref gibbable.Comp, logMissing: false))
+        {
+            DropEntity(gibbable, Transform(outerEntity), randomSpreadMod, ref droppedEntities,
+                launchGibs, launchDirection, launchImpulse, launchImpulseVariance, launchCone);
+            if (logMissingGibable)
+            {
+                Log.Warning($"{ToPrettyString(gibbable)} does not have a GibbableComponent! " +
+                            $"This is not required but may cause issues contained items to not be dropped.");
+            }
+
+            return false;
+        }
+
+        if (gibType == GibType.Skip && gibContentsOption == GibContentsOption.Skip)
+            return true;
+        if (launchGibs)
+        {
+            randomSpreadMod = 0;
+        }
+
+        var parentXform = Transform(outerEntity);
+        HashSet<BaseContainer> validContainers = new();
+        var gibContentsAttempt =
+            new AttemptEntityContentsGibEvent(gibbable, gibContentsOption, allowedContainers, excludedContainers);
+        RaiseLocalEvent(gibbable, ref gibContentsAttempt);
+
+        foreach (var container in _containerSystem.GetAllContainers(gibbable))
+        {
+            var valid = true;
+            if (allowedContainers != null)
+                valid = allowedContainers.Contains(container.ID);
+            if (excludedContainers != null)
+                valid = valid && !excludedContainers.Contains(container.ID);
+            if (valid)
+                validContainers.Add(container);
+        }
+
+        switch (gibContentsOption)
+        {
+            case GibContentsOption.Skip:
+                break;
+            case GibContentsOption.Drop:
+            {
+                foreach (var container in validContainers)
+                {
+                    foreach (var ent in container.ContainedEntities)
+                    {
+                        DropEntity(new Entity<GibbableComponent?>(ent, null), parentXform, randomSpreadMod,
+                            ref droppedEntities, launchGibs,
+                            launchDirection, launchImpulse, launchImpulseVariance, launchCone);
+                    }
+                }
+
+                break;
+            }
+            case GibContentsOption.Gib:
+            {
+                foreach (var container in validContainers)
+                {
+                    foreach (var ent in container.ContainedEntities)
+                    {
+                        GibEntity(new Entity<GibbableComponent?>(ent, null), parentXform, randomSpreadMod,
+                            ref droppedEntities, launchGibs,
+                            launchDirection, launchImpulse, launchImpulseVariance, launchCone);
+                    }
+                }
+
+                break;
+            }
+        }
+
+        switch (gibType)
+        {
+            case GibType.Skip:
+                break;
+            case GibType.Drop:
+            {
+                DropEntity(gibbable, parentXform, randomSpreadMod, ref droppedEntities, launchGibs,
+                    launchDirection, launchImpulse, launchImpulseVariance, launchCone);
+                break;
+            }
+            case GibType.Gib:
+            {
+                GibEntity(gibbable, parentXform, randomSpreadMod, ref droppedEntities, launchGibs,
+                    launchDirection, launchImpulse, launchImpulseVariance, launchCone);
+                break;
+            }
+        }
+
+        if (playAudio)
+        {
+            _audioSystem.PlayPredicted(gibbable.Comp.GibSound, parentXform.Coordinates, null);
+        }
+
+        if (gibType == GibType.Gib)
+            QueueDel(gibbable);
+        return true;
+    }
+
+    private void DropEntity(Entity<GibbableComponent?> gibbable, TransformComponent parentXform, float randomSpreadMod,
+        ref HashSet<EntityUid> droppedEntities, bool flingEntity, Vector2? scatterDirection, float scatterImpulse,
+        float scatterImpulseVariance, Angle scatterCone)
+    {
+        var gibCount = 0;
+        if (Resolve(gibbable, ref gibbable.Comp, logMissing: false))
+        {
+            gibCount = gibbable.Comp.GibCount;
+        }
+
+        var gibAttemptEvent = new AttemptEntityGibEvent(gibbable, gibCount, GibType.Drop);
+        RaiseLocalEvent(gibbable, ref gibAttemptEvent);
+        switch (gibAttemptEvent.GibType)
+        {
+            case GibType.Skip:
+                return;
+            case GibType.Gib:
+                GibEntity(gibbable, parentXform, randomSpreadMod, ref droppedEntities, flingEntity, scatterDirection,
+                    scatterImpulse, scatterImpulseVariance, scatterCone, deleteTarget: false);
+                return;
+        }
+
+        _transformSystem.AttachToGridOrMap(gibbable);
+        _transformSystem.SetCoordinates(gibbable, parentXform.Coordinates);
+        _transformSystem.SetWorldRotation(gibbable, _random.NextAngle());
+        droppedEntities.Add(gibbable);
+        if (flingEntity)
+        {
+            FlingDroppedEntity(gibbable, scatterDirection, scatterImpulse, scatterImpulseVariance, scatterCone);
+        }
+
+        var gibbedEvent = new EntityGibbedEvent(gibbable, new List<EntityUid> {gibbable});
+        RaiseLocalEvent(gibbable, ref gibbedEvent);
+    }
+
+    private List<EntityUid> GibEntity(Entity<GibbableComponent?> gibbable, TransformComponent parentXform,
+        float randomSpreadMod,
+        ref HashSet<EntityUid> droppedEntities, bool flingEntity, Vector2? scatterDirection, float scatterImpulse,
+        float scatterImpulseVariance, Angle scatterCone, bool deleteTarget = true)
+    {
+        var localGibs = new List<EntityUid>();
+        var gibCount = 0;
+        var gibProtoCount = 0;
+        if (Resolve(gibbable, ref gibbable.Comp, logMissing: false))
+        {
+            gibCount = gibbable.Comp.GibCount;
+            gibProtoCount = gibbable.Comp.GibPrototypes.Count;
+        }
+
+        var gibAttemptEvent = new AttemptEntityGibEvent(gibbable, gibCount, GibType.Drop);
+        RaiseLocalEvent(gibbable, ref gibAttemptEvent);
+        switch (gibAttemptEvent.GibType)
+        {
+            case GibType.Skip:
+                return localGibs;
+            case GibType.Drop:
+                DropEntity(gibbable, parentXform, randomSpreadMod, ref droppedEntities, flingEntity,
+                    scatterDirection, scatterImpulse, scatterImpulseVariance, scatterCone);
+                localGibs.Add(gibbable);
+                return localGibs;
+        }
+
+        if (gibbable.Comp != null && gibProtoCount > 0)
+        {
+            if (flingEntity)
+            {
+                for (var i = 0; i < gibAttemptEvent.GibletCount; i++)
+                {
+                    if (!TryCreateRandomGiblet(gibbable.Comp, parentXform.Coordinates, false, out var giblet,
+                            randomSpreadMod))
+                        continue;
+                    FlingDroppedEntity(giblet.Value, scatterDirection, scatterImpulse, scatterImpulseVariance,
+                        scatterCone);
+                    droppedEntities.Add(giblet.Value);
+                }
+            }
+            else
+            {
+                for (var i = 0; i < gibAttemptEvent.GibletCount; i++)
+                {
+                    if (TryCreateRandomGiblet(gibbable.Comp, parentXform.Coordinates, false, out var giblet,
+                            randomSpreadMod))
+                        droppedEntities.Add(giblet.Value);
+                }
+            }
+        }
+
+        _transformSystem.AttachToGridOrMap(gibbable, Transform(gibbable));
+        if (flingEntity)
+        {
+            FlingDroppedEntity(gibbable, scatterDirection, scatterImpulse, scatterImpulseVariance, scatterCone);
+        }
+
+        var gibbedEvent = new EntityGibbedEvent(gibbable, localGibs);
+        RaiseLocalEvent(gibbable, ref gibbedEvent);
+        if (deleteTarget)
+            QueueDel(gibbable);
+        return localGibs;
+    }
+
+
+    public bool TryCreateRandomGiblet(Entity<GibbableComponent?> gibbable, [NotNullWhen(true)] out EntityUid? gibletEntity,
+        float randomSpreadModifier = 1.0f, bool playSound = true)
+    {
+        gibletEntity = null;
+        return Resolve(gibbable, ref gibbable.Comp) && TryCreateRandomGiblet(gibbable.Comp, Transform(gibbable).Coordinates,
+            playSound, out gibletEntity, randomSpreadModifier);
+    }
+
+    public bool TryCreateAndFlingRandomGiblet(Entity<GibbableComponent?> gibbable, [NotNullWhen(true)] out EntityUid? gibletEntity,
+        Vector2 scatterDirection, float force, float scatterImpulseVariance, Angle scatterCone = default,
+        bool playSound = true)
+    {
+        gibletEntity = null;
+        if (!Resolve(gibbable, ref gibbable.Comp) ||
+            !TryCreateRandomGiblet(gibbable.Comp, Transform(gibbable).Coordinates, playSound, out gibletEntity))
+            return false;
+        FlingDroppedEntity(gibletEntity.Value, scatterDirection, force, scatterImpulseVariance, scatterCone);
+        return true;
+    }
+
+    private void FlingDroppedEntity(EntityUid target, Vector2? direction, float impulse, float impulseVariance,
+        Angle scatterConeAngle)
+    {
+        var scatterAngle = direction?.ToAngle() ?? _random.NextAngle();
+        var scatterVector = _random.NextAngle(scatterAngle - scatterConeAngle / 2, scatterAngle + scatterConeAngle / 2)
+            .ToVec() * (impulse + _random.NextFloat(impulseVariance));
+        _physicsSystem.ApplyLinearImpulse(target, scatterVector);
+    }
+
+    private bool TryCreateRandomGiblet(GibbableComponent gibbable, EntityCoordinates coords,
+        bool playSound, [NotNullWhen(true)] out EntityUid? gibletEntity, float? randomSpreadModifier = null)
+    {
+        gibletEntity = null;
+        if (gibbable.GibPrototypes.Count == 0)
+            return false;
+        gibletEntity = Spawn(gibbable.GibPrototypes[_random.Next(0, gibbable.GibPrototypes.Count)],
+            randomSpreadModifier == null
+                ? coords
+                : coords.Offset(_random.NextVector2(gibbable.GibScatterRange * randomSpreadModifier.Value)));
+        if (playSound)
+            _audioSystem.PlayPredicted(gibbable.GibSound, coords, null);
+        _transformSystem.SetWorldRotation(gibletEntity.Value, _random.NextAngle());
+        return true;
+    }
+}
diff --git a/Content.Shared/Gravity/GravityShakeComponent.cs b/Content.Shared/Gravity/GravityShakeComponent.cs
index e8608a9681..c910320a2f 100644
--- a/Content.Shared/Gravity/GravityShakeComponent.cs
+++ b/Content.Shared/Gravity/GravityShakeComponent.cs
@@ -6,12 +6,13 @@ namespace Content.Shared.Gravity;
 /// <summary>
 /// Indicates this entity is shaking due to gravity changes.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class GravityShakeComponent : Component
 {
     [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
     public int ShakeTimes;
 
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]
+    [AutoPausedField]
     public TimeSpan NextShake;
 }
diff --git a/Content.Shared/Gravity/SharedGravitySystem.Shake.cs b/Content.Shared/Gravity/SharedGravitySystem.Shake.cs
index e590baae44..ad2e0e3ad5 100644
--- a/Content.Shared/Gravity/SharedGravitySystem.Shake.cs
+++ b/Content.Shared/Gravity/SharedGravitySystem.Shake.cs
@@ -5,16 +5,6 @@ public abstract partial class SharedGravitySystem
     protected const float GravityKick = 100.0f;
     protected const float ShakeCooldown = 0.2f;
 
-    private void InitializeShake()
-    {
-        SubscribeLocalEvent<GravityShakeComponent, EntityUnpausedEvent>(OnShakeUnpaused);
-    }
-
-    private void OnShakeUnpaused(EntityUid uid, GravityShakeComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextShake += args.PausedTime;
-    }
-
     private void UpdateShake()
     {
         var curTime = Timing.CurTime;
diff --git a/Content.Shared/Gravity/SharedGravitySystem.cs b/Content.Shared/Gravity/SharedGravitySystem.cs
index a65c386ae5..100d2ee74f 100644
--- a/Content.Shared/Gravity/SharedGravitySystem.cs
+++ b/Content.Shared/Gravity/SharedGravitySystem.cs
@@ -61,8 +61,6 @@ public override void Initialize()
             SubscribeLocalEvent<GravityChangedEvent>(OnGravityChange);
             SubscribeLocalEvent<GravityComponent, ComponentGetState>(OnGetState);
             SubscribeLocalEvent<GravityComponent, ComponentHandleState>(OnHandleState);
-
-            InitializeShake();
         }
 
         public override void Update(float frameTime)
diff --git a/Content.Shared/Hands/Components/HandsComponent.cs b/Content.Shared/Hands/Components/HandsComponent.cs
index ef3b2a6a0e..904b10b3bd 100644
--- a/Content.Shared/Hands/Components/HandsComponent.cs
+++ b/Content.Shared/Hands/Components/HandsComponent.cs
@@ -5,7 +5,7 @@
 
 namespace Content.Shared.Hands.Components;
 
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
 [Access(typeof(SharedHandsSystem))]
 public sealed partial class HandsComponent : Component
 {
@@ -62,6 +62,7 @@ public sealed partial class HandsComponent : Component
     ///     The time at which throws will be allowed again.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
+    [AutoPausedField]
     public TimeSpan NextThrowTime;
 
     /// <summary>
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
index 699fb64ee8..b72a7c4eb3 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
@@ -18,7 +18,6 @@ public abstract partial class SharedHandsSystem
     [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
     [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
-    [Dependency] private readonly SharedItemSystem _items = default!;
     [Dependency] private readonly SharedStorageSystem _storage = default!;
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
     [Dependency] private readonly SharedVirtualItemSystem _virtualSystem = default!;
diff --git a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
index b0bc0eb9a0..4785482ada 100644
--- a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
+++ b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
@@ -6,6 +6,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
+using Content.Shared.Preferences; //DeltaV, used for Metempsychosis, Fugitive, and Paradox Anomaly
 
 namespace Content.Shared.Humanoid;
 
diff --git a/Content.Shared/Humanoid/NamingSystem.cs b/Content.Shared/Humanoid/NamingSystem.cs
index 7ca4fac5b5..d4cca026ef 100644
--- a/Content.Shared/Humanoid/NamingSystem.cs
+++ b/Content.Shared/Humanoid/NamingSystem.cs
@@ -26,6 +26,9 @@ public string GetName(string species, Gender? gender = null)
 
             switch (speciesProto.Naming)
             {
+                case SpeciesNaming.First:
+                    return Loc.GetString("namepreset-first",
+                        ("first", GetFirstName(speciesProto, gender)));
                 // Start of Nyano - Summary: for Oni naming
                 case SpeciesNaming.LastNoFirst:
                     return Loc.GetString("namepreset-lastnofirst",
diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
index e4adb4d55b..8564ebe8e1 100644
--- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
+++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
@@ -15,7 +15,7 @@ public sealed partial class SpeciesPrototype : IPrototype
     /// <summary>
     /// User visible name of the species.
     /// </summary>
-    [DataField("name", required: true)]
+    [DataField(required: true)]
     public string Name { get; private set; } = default!;
 
     /// <summary>
@@ -23,13 +23,13 @@ public sealed partial class SpeciesPrototype : IPrototype
     ///     for an eventual integration into IdentitySystem
     ///     (i.e., young human person, young lizard person, etc.)
     /// </summary>
-    [DataField("descriptor")]
+    [DataField]
     public string Descriptor { get; private set; } = "humanoid";
 
     /// <summary>
     /// Whether the species is available "at round start" (In the character editor)
     /// </summary>
-    [DataField("roundStart", required: true)]
+    [DataField(required: true)]
     public bool RoundStart { get; private set; } = false;
 
     // The below two are to avoid fetching information about the species from the entity
@@ -47,14 +47,14 @@ public sealed partial class SpeciesPrototype : IPrototype
     /// <summary>
     ///     Default skin tone for this species. This applies for non-human skin tones.
     /// </summary>
-    [DataField("defaultSkinTone")]
+    [DataField]
     public Color DefaultSkinTone { get; private set; } = Color.White;
 
     /// <summary>
     ///     Default human skin tone for this species. This applies for human skin tones.
     ///     See <see cref="SkinColor.HumanSkinTone"/> for the valid range of skin tones.
     /// </summary>
-    [DataField("defaultHumanSkinTone")]
+    [DataField]
     public int DefaultHumanSkinTone { get; private set; } = 20;
 
     /// <summary>
@@ -66,64 +66,71 @@ public sealed partial class SpeciesPrototype : IPrototype
     /// <summary>
     ///     Humanoid species variant used by this entity.
     /// </summary>
-    [DataField("prototype", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
+    [DataField(required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
     public string Prototype { get; private set; } = default!;
 
     /// <summary>
     /// Prototype used by the species for the dress-up doll in various menus.
     /// </summary>
-    [DataField("dollPrototype", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
+    [DataField(required: true, customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
     public string DollPrototype { get; private set; } = default!;
 
     /// <summary>
     /// Method of skin coloration used by the species.
     /// </summary>
-    [DataField("skinColoration", required: true)]
+    [DataField(required: true)]
     public HumanoidSkinColor SkinColoration { get; private set; }
 
-    [DataField("maleFirstNames")]
+    [DataField]
     public string MaleFirstNames { get; private set; } = "names_first_male";
 
-    [DataField("femaleFirstNames")]
+    [DataField]
     public string FemaleFirstNames { get; private set; } = "names_first_female";
 
-    [DataField("lastNames")]
+    [DataField]
     public string LastNames { get; private set; } = "names_last";
 
-    [DataField("naming")]
+    [DataField]
     public SpeciesNaming Naming { get; private set; } = SpeciesNaming.FirstLast;
 
-    [DataField("sexes")]
+    [DataField]
     public List<Sex> Sexes { get; private set; } = new() { Sex.Male, Sex.Female };
 
     /// <summary>
     ///     Characters younger than this are too young to be hired by Nanotrasen.
     /// </summary>
-    [DataField("minAge")]
+    [DataField]
     public int MinAge = 18;
 
     /// <summary>
     ///     Characters younger than this appear young.
     /// </summary>
-    [DataField("youngAge")]
+    [DataField]
     public int YoungAge = 30;
 
     /// <summary>
     ///     Characters older than this appear old. Characters in between young and old age appear middle aged.
     /// </summary>
-    [DataField("oldAge")]
+    [DataField]
     public int OldAge = 60;
 
     /// <summary>
     ///     Characters cannot be older than this. Only used for restrictions...
     ///     although imagine if ghosts could age people WYCI...
     /// </summary>
-    [DataField("maxAge")]
+    [DataField]
     public int MaxAge = 120;
+
+    /// <summary>
+    ///     The Style used for the guidebook info link in the character profile editor
+    /// </summary>
+    [DataField]
+    public string GuideBookIcon = "SpeciesInfoDefault";
 }
 
 public enum SpeciesNaming : byte
 {
+    First,
     FirstLast,
     FirstDashFirst,
     //Start of Nyano - Summary: for Oni naming
diff --git a/Content.Shared/Inventory/InventorySystem.Helpers.cs b/Content.Shared/Inventory/InventorySystem.Helpers.cs
index b1212abe67..811387d375 100644
--- a/Content.Shared/Inventory/InventorySystem.Helpers.cs
+++ b/Content.Shared/Inventory/InventorySystem.Helpers.cs
@@ -1,12 +1,16 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Shared.Hands.Components;
+using Content.Shared.Storage.EntitySystems;
+using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Inventory;
 
 public partial class InventorySystem
 {
+    [Dependency] private readonly SharedStorageSystem _storageSystem = default!;
+
     /// <summary>
     /// Yields all entities in hands or inventory slots with the specific flags.
     /// </summary>
@@ -86,4 +90,55 @@ bool DeleteItem()
         // We finally try to equip the item, otherwise we delete it.
         return TryEquip(uid, item, slot, silent, force) || DeleteItem();
     }
+
+    /// <summary>
+    /// Will attempt to spawn a list of items inside of an entities bag, pockets, hands or nearby
+    /// </summary>
+    /// <param name="entity">The entity that you want to spawn an item on</param>
+    /// <param name="items">A list of prototype IDs that you want to spawn in the bag.</param>
+    public void SpawnItemsOnEntity(EntityUid entity, List<EntProtoId> items)
+    {
+        foreach (var item in items)
+        {
+            SpawnItemOnEntity(entity, item);
+        }
+    }
+
+    /// <summary>
+    /// Will attempt to spawn an item inside of an entities bag, pockets, hands or nearby
+    /// </summary>
+    /// <param name="entity">The entity that you want to spawn an item on</param>
+    /// <param name="item">The prototype ID that you want to spawn in the bag.</param>
+    public void SpawnItemOnEntity(EntityUid entity, EntProtoId item)
+    {
+        //Transform() throws error if TransformComponent doesnt exist
+        if (!HasComp<TransformComponent>(entity))
+            return;
+
+        var xform = Transform(entity);
+        var mapCoords = _transform.GetMapCoordinates(xform);
+
+        var itemToSpawn = Spawn(item, mapCoords);
+
+        //Try insert into the backpack
+        if (TryGetSlotContainer(entity, "back", out var backSlot, out _)
+            && backSlot.ContainedEntity.HasValue
+            && _storageSystem.Insert(backSlot.ContainedEntity.Value, itemToSpawn, out _)
+            )
+            return;
+
+        //Try insert into pockets
+        if (TryGetSlotContainer(entity, "pocket1", out var pocket1, out _)
+            && _containerSystem.Insert(itemToSpawn, pocket1)
+            )
+            return;
+
+        if (TryGetSlotContainer(entity, "pocket2", out var pocket2, out _)
+            && _containerSystem.Insert(itemToSpawn, pocket2)
+            )
+            return;
+
+        //Try insert into hands, or drop on the floor
+        _handsSystem.PickupOrDrop(entity, itemToSpawn, false);
+    }
 }
diff --git a/Content.Shared/Inventory/InventorySystem.Slots.cs b/Content.Shared/Inventory/InventorySystem.Slots.cs
index 210e21c2c9..cbbee3a85b 100644
--- a/Content.Shared/Inventory/InventorySystem.Slots.cs
+++ b/Content.Shared/Inventory/InventorySystem.Slots.cs
@@ -51,7 +51,7 @@ public bool TryGetSlotContainer(EntityUid uid, string slot, [NotNullWhen(true)]
         if (!TryGetSlot(uid, slot, out slotDefinition, inventory: inventory))
             return false;
 
-        if (!containerComp.TryGetContainer(slotDefinition.Name, out var container))
+        if (!_containerSystem.TryGetContainer(uid, slotDefinition.Name, out var container, containerComp))
         {
             if (inventory.LifeStage >= ComponentLifeStage.Initialized)
                 Log.Error($"Missing inventory container {slot} on entity {ToPrettyString(uid)}");
diff --git a/Content.Shared/Item/ItemToggle/Components/ItemToggleSizeComponent.cs b/Content.Shared/Item/ItemToggle/Components/ItemToggleSizeComponent.cs
index 353f3d6fd5..b7b47a0732 100644
--- a/Content.Shared/Item/ItemToggle/Components/ItemToggleSizeComponent.cs
+++ b/Content.Shared/Item/ItemToggle/Components/ItemToggleSizeComponent.cs
@@ -18,9 +18,21 @@ public sealed partial class ItemToggleSizeComponent : Component
     [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
     public ProtoId<ItemSizePrototype>? ActivatedSize = null;
 
+    /// <summary>
+    ///     Item's shape when activated
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField]
+    public List<Box2i>? ActivatedShape = null;
+
     /// <summary>
     ///     Item's size when deactivated. If none is mentioned, it uses the item's default size instead.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
     public ProtoId<ItemSizePrototype>? DeactivatedSize = null;
+
+    /// <summary>
+    ///     Item's shape when deactivated. If none is mentioned, it uses the item's default shape instead.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField]
+    public List<Box2i>? DeactivatedShape = null;
 }
diff --git a/Content.Shared/Item/SharedItemSystem.cs b/Content.Shared/Item/SharedItemSystem.cs
index c6a86c5011..29e82f8ade 100644
--- a/Content.Shared/Item/SharedItemSystem.cs
+++ b/Content.Shared/Item/SharedItemSystem.cs
@@ -46,6 +46,15 @@ public void SetSize(EntityUid uid, ProtoId<ItemSizePrototype> size, ItemComponen
         Dirty(uid, component);
     }
 
+    public void SetShape(EntityUid uid, List<Box2i>? shape, ItemComponent? component = null)
+    {
+        if (!Resolve(uid, ref component, false))
+            return;
+
+        component.Shape = shape;
+        Dirty(uid, component);
+    }
+
     public void SetHeldPrefix(EntityUid uid, string? heldPrefix, bool force = false, ItemComponent? component = null)
     {
         if (!Resolve(uid, ref component, false))
@@ -209,6 +218,13 @@ private void OnItemToggle(EntityUid uid, ItemToggleSizeComponent itemToggleSize,
 
         if (args.Activated)
         {
+            if (itemToggleSize.ActivatedShape != null)
+            {
+                // Set the deactivated shape to the default item's shape before it gets changed.
+                itemToggleSize.DeactivatedShape ??= new List<Box2i>(GetItemShape(item));
+                SetShape(uid, itemToggleSize.ActivatedShape, item);
+            }
+
             if (itemToggleSize.ActivatedSize != null)
             {
                 // Set the deactivated size to the default item's size before it gets changed.
@@ -218,6 +234,11 @@ private void OnItemToggle(EntityUid uid, ItemToggleSizeComponent itemToggleSize,
         }
         else
         {
+            if (itemToggleSize.DeactivatedShape != null)
+            {
+                SetShape(uid, itemToggleSize.DeactivatedShape, item);
+            }
+
             if (itemToggleSize.DeactivatedSize != null)
             {
                 SetSize(uid, (ProtoId<ItemSizePrototype>) itemToggleSize.DeactivatedSize, item);
diff --git a/Content.Shared/Kitchen/Components/SharedMicrowave.cs b/Content.Shared/Kitchen/Components/SharedMicrowave.cs
index ed07fd1287..fa12368984 100644
--- a/Content.Shared/Kitchen/Components/SharedMicrowave.cs
+++ b/Content.Shared/Kitchen/Components/SharedMicrowave.cs
@@ -54,13 +54,16 @@ public sealed class MicrowaveUpdateUserInterfaceState : BoundUserInterfaceState
         public int ActiveButtonIndex;
         public uint CurrentCookTime;
 
+        public TimeSpan CurrentCookTimeEnd;
+
         public MicrowaveUpdateUserInterfaceState(NetEntity[] containedSolids,
-            bool isMicrowaveBusy, int activeButtonIndex, uint currentCookTime)
+            bool isMicrowaveBusy, int activeButtonIndex, uint currentCookTime, TimeSpan currentCookTimeEnd)
         {
             ContainedSolids = containedSolids;
             IsMicrowaveBusy = isMicrowaveBusy;
             ActiveButtonIndex = activeButtonIndex;
             CurrentCookTime = currentCookTime;
+            CurrentCookTimeEnd = currentCookTimeEnd;
         }
 
     }
diff --git a/Content.Shared/Labels/Components/LabelComponent.cs b/Content.Shared/Labels/Components/LabelComponent.cs
new file mode 100644
index 0000000000..c0dccd3481
--- /dev/null
+++ b/Content.Shared/Labels/Components/LabelComponent.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Labels.Components;
+
+/// <summary>
+/// Makes entities have a label in their name. Labels are normally given by <see cref="HandLabelerComponent"/>
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class LabelComponent : Component
+{
+    /// <summary>
+    /// Current text on the label. If set before map init, during map init this string will be localized.
+    /// This permits localized preset labels with fallback to the text written on the label.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string? CurrentLabel { get; set; }
+
+    /// <summary>
+    ///  The original name of the entity
+    ///  Used for reverting the modified entity name when the label is removed
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public string? OriginalName { get; set; }
+}
diff --git a/Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs b/Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
new file mode 100644
index 0000000000..a8239e7867
--- /dev/null
+++ b/Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
@@ -0,0 +1,28 @@
+using Content.Shared.Examine;
+using Content.Shared.Labels.Components;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Labels.EntitySystems;
+
+public abstract partial class SharedLabelSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<LabelComponent, ExaminedEvent>(OnExamine);
+    }
+
+    private void OnExamine(EntityUid uid, LabelComponent? label, ExaminedEvent args)
+    {
+        if (!Resolve(uid, ref label))
+            return;
+
+        if (label.CurrentLabel == null)
+            return;
+
+        var message = new FormattedMessage();
+        message.AddText(Loc.GetString("hand-labeler-has-label", ("label", label.CurrentLabel)));
+        args.PushMessage(message);
+    }
+}
diff --git a/Content.Shared/Lock/LockComponent.cs b/Content.Shared/Lock/LockComponent.cs
index b3c4659749..5587fc2698 100644
--- a/Content.Shared/Lock/LockComponent.cs
+++ b/Content.Shared/Lock/LockComponent.cs
@@ -113,3 +113,10 @@ public override DoAfterEvent Clone()
         return this;
     }
 }
+
+[NetSerializable]
+[Serializable]
+public enum LockVisuals : byte
+{
+    Locked
+}
diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs
index e5f53b4080..53c199e410 100644
--- a/Content.Shared/Lock/LockSystem.cs
+++ b/Content.Shared/Lock/LockSystem.cs
@@ -7,11 +7,9 @@
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
-using Content.Shared.Storage;
 using Content.Shared.Storage.Components;
 using Content.Shared.Verbs;
 using JetBrains.Annotations;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Utility;
 
@@ -46,8 +44,7 @@ public override void Initialize()
 
     private void OnStartup(EntityUid uid, LockComponent lockComp, ComponentStartup args)
     {
-        _appearanceSystem.SetData(uid, StorageVisuals.CanLock, true);
-        _appearanceSystem.SetData(uid, StorageVisuals.Locked, lockComp.Locked);
+        _appearanceSystem.SetData(uid, LockVisuals.Locked, lockComp.Locked);
     }
 
     private void OnActivated(EntityUid uid, LockComponent lockComp, ActivateInWorldEvent args)
@@ -124,7 +121,7 @@ public bool TryLock(EntityUid uid, EntityUid user, LockComponent? lockComp = nul
         _audio.PlayPredicted(lockComp.LockSound, uid, user);
 
         lockComp.Locked = true;
-        _appearanceSystem.SetData(uid, StorageVisuals.Locked, true);
+        _appearanceSystem.SetData(uid, LockVisuals.Locked, true);
         Dirty(uid, lockComp);
 
         var ev = new LockToggledEvent(true);
@@ -155,7 +152,7 @@ public void Unlock(EntityUid uid, EntityUid? user, LockComponent? lockComp = nul
         _audio.PlayPredicted(lockComp.UnlockSound, uid, user);
 
         lockComp.Locked = false;
-        _appearanceSystem.SetData(uid, StorageVisuals.Locked, false);
+        _appearanceSystem.SetData(uid, LockVisuals.Locked, false);
         Dirty(uid, lockComp);
 
         var ev = new LockToggledEvent(false);
@@ -249,8 +246,16 @@ private void OnEmagged(EntityUid uid, LockComponent component, ref GotEmaggedEve
     {
         if (!component.Locked || !component.BreakOnEmag)
             return;
-        _audio.PlayPredicted(component.UnlockSound, uid, null);
-        _appearanceSystem.SetData(uid, StorageVisuals.Locked, false);
+
+        _audio.PlayPredicted(component.UnlockSound, uid, args.UserUid);
+
+        component.Locked = false;
+        _appearanceSystem.SetData(uid, LockVisuals.Locked, false);
+        Dirty(uid, component);
+
+        var ev = new LockToggledEvent(false);
+        RaiseLocalEvent(uid, ref ev, true);
+
         RemComp<LockComponent>(uid); //Literally destroys the lock as a tell it was emagged
         args.Handled = true;
     }
diff --git a/Content.Shared/MassMedia/Components/NewsWriterBuiMessages.cs b/Content.Shared/MassMedia/Components/NewsWriterBuiMessages.cs
new file mode 100644
index 0000000000..f3dda48730
--- /dev/null
+++ b/Content.Shared/MassMedia/Components/NewsWriterBuiMessages.cs
@@ -0,0 +1,55 @@
+using Content.Shared.MassMedia.Systems;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.MassMedia.Components;
+
+[Serializable, NetSerializable]
+public enum NewsWriterUiKey : byte
+{
+    Key
+}
+
+[Serializable, NetSerializable]
+public sealed class NewsWriterBoundUserInterfaceState : BoundUserInterfaceState
+{
+    public readonly NewsArticle[] Articles;
+    public readonly bool PublishEnabled;
+    public readonly TimeSpan NextPublish;
+
+    public NewsWriterBoundUserInterfaceState(NewsArticle[] articles, bool publishEnabled, TimeSpan nextPublish)
+    {
+        Articles = articles;
+        PublishEnabled = publishEnabled;
+        NextPublish = nextPublish;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class NewsWriterPublishMessage : BoundUserInterfaceMessage
+{
+    public readonly string Title;
+    public readonly string Content;
+
+
+    public NewsWriterPublishMessage(string title, string content)
+    {
+        Title = title;
+        Content = content;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class NewsWriterDeleteMessage : BoundUserInterfaceMessage
+{
+    public readonly int ArticleNum;
+
+    public NewsWriterDeleteMessage(int num)
+    {
+        ArticleNum = num;
+    }
+}
+
+[Serializable, NetSerializable]
+public sealed class NewsWriterArticlesRequestMessage : BoundUserInterfaceMessage
+{
+}
diff --git a/Content.Shared/MassMedia/Components/SharedNewsWriteComponent.cs b/Content.Shared/MassMedia/Components/SharedNewsWriteComponent.cs
deleted file mode 100644
index 503b8ee13b..0000000000
--- a/Content.Shared/MassMedia/Components/SharedNewsWriteComponent.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using Content.Shared.MassMedia.Systems;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.MassMedia.Components;
-
-[Serializable, NetSerializable]
-public enum NewsWriteUiKey : byte
-{
-    Key
-}
-
-[Serializable, NetSerializable]
-public sealed class NewsWriteBoundUserInterfaceState : BoundUserInterfaceState
-{
-    public NewsArticle[] Articles;
-    public bool ShareAvalible;
-
-    public NewsWriteBoundUserInterfaceState(NewsArticle[] articles, bool shareAvalible)
-    {
-        Articles = articles;
-        ShareAvalible = shareAvalible;
-    }
-}
-
-[Serializable, NetSerializable]
-public sealed class NewsWriteShareMessage : BoundUserInterfaceMessage
-{
-    public readonly string Name;
-    public readonly string Content;
-    public NewsWriteShareMessage(string name, string content)
-    {
-        Name = name;
-        Content = content;
-    }
-}
-
-[Serializable, NetSerializable]
-public sealed class NewsWriteDeleteMessage : BoundUserInterfaceMessage
-{
-    public int ArticleNum;
-
-    public NewsWriteDeleteMessage(int num)
-    {
-        ArticleNum = num;
-    }
-}
-
-[Serializable, NetSerializable]
-public sealed class NewsWriteArticlesRequestMessage : BoundUserInterfaceMessage
-{
-    public NewsWriteArticlesRequestMessage()
-    {
-    }
-}
diff --git a/Content.Shared/MassMedia/Components/StationNewsComponent.cs b/Content.Shared/MassMedia/Components/StationNewsComponent.cs
new file mode 100644
index 0000000000..055b332255
--- /dev/null
+++ b/Content.Shared/MassMedia/Components/StationNewsComponent.cs
@@ -0,0 +1,10 @@
+using Content.Shared.MassMedia.Systems;
+
+namespace Content.Shared.MassMedia.Components;
+
+[RegisterComponent]
+public sealed partial class StationNewsComponent : Component
+{
+    [DataField]
+    public List<NewsArticle> Articles = new();
+}
diff --git a/Content.Shared/MassMedia/Systems/SharedNewsSystem.cs b/Content.Shared/MassMedia/Systems/SharedNewsSystem.cs
index 057ce9a2ed..f59b6af3de 100644
--- a/Content.Shared/MassMedia/Systems/SharedNewsSystem.cs
+++ b/Content.Shared/MassMedia/Systems/SharedNewsSystem.cs
@@ -4,16 +4,31 @@ namespace Content.Shared.MassMedia.Systems;
 
 public abstract class SharedNewsSystem : EntitySystem
 {
-    public const int MaxNameLength = 25;
-    public const int MaxArticleLength = 2048;
+    public const int MaxTitleLength = 25;
+    public const int MaxContentLength = 2048;
 }
 
 [Serializable, NetSerializable]
 public struct NewsArticle
 {
-    public string Name;
+    [ViewVariables(VVAccess.ReadWrite)]
+    public string Title;
+
+    [ViewVariables(VVAccess.ReadWrite)]
     public string Content;
+
+    [ViewVariables(VVAccess.ReadWrite)]
     public string? Author;
+
+    [ViewVariables]
     public ICollection<(NetEntity, uint)>? AuthorStationRecordKeyIds;
+
+    [ViewVariables]
     public TimeSpan ShareTime;
 }
+
+[ByRefEvent]
+public record struct NewsArticlePublishedEvent(NewsArticle Article);
+
+[ByRefEvent]
+public record struct NewsArticleDeletedEvent;
diff --git a/Content.Shared/Materials/ActiveMaterialReclaimerComponent.cs b/Content.Shared/Materials/ActiveMaterialReclaimerComponent.cs
index 9c2ee9632e..2beeed5d1e 100644
--- a/Content.Shared/Materials/ActiveMaterialReclaimerComponent.cs
+++ b/Content.Shared/Materials/ActiveMaterialReclaimerComponent.cs
@@ -8,7 +8,7 @@ namespace Content.Shared.Materials;
 /// Tracker component for the process of reclaiming entities
 /// <seealso cref="MaterialReclaimerComponent"/>
 /// </summary>
-[RegisterComponent, NetworkedComponent, Access(typeof(SharedMaterialReclaimerSystem))]
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedMaterialReclaimerSystem)), AutoGenerateComponentPause]
 public sealed partial class ActiveMaterialReclaimerComponent : Component
 {
     /// <summary>
@@ -21,6 +21,7 @@ public sealed partial class ActiveMaterialReclaimerComponent : Component
     /// When the reclaiming process ends.
     /// </summary>
     [DataField("endTime", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    [AutoPausedField]
     public TimeSpan EndTime;
 
     /// <summary>
diff --git a/Content.Shared/Materials/InsertingMaterialStorageComponent.cs b/Content.Shared/Materials/InsertingMaterialStorageComponent.cs
index 007dc73345..8ff96c17a7 100644
--- a/Content.Shared/Materials/InsertingMaterialStorageComponent.cs
+++ b/Content.Shared/Materials/InsertingMaterialStorageComponent.cs
@@ -3,7 +3,7 @@
 
 namespace Content.Shared.Materials;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class InsertingMaterialStorageComponent : Component
 {
     /// <summary>
@@ -11,6 +11,7 @@ public sealed partial class InsertingMaterialStorageComponent : Component
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]
     [ViewVariables(VVAccess.ReadWrite)]
+    [AutoPausedField]
     public TimeSpan EndTime;
 
     [ViewVariables, AutoNetworkedField]
diff --git a/Content.Shared/Materials/MaterialReclaimerComponent.cs b/Content.Shared/Materials/MaterialReclaimerComponent.cs
index 6c625e2fa2..3e72baf604 100644
--- a/Content.Shared/Materials/MaterialReclaimerComponent.cs
+++ b/Content.Shared/Materials/MaterialReclaimerComponent.cs
@@ -10,7 +10,7 @@ namespace Content.Shared.Materials;
 /// This is a machine that handles converting entities
 /// into the raw materials and chemicals that make them up.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 [Access(typeof(SharedMaterialReclaimerSystem))]
 public sealed partial class MaterialReclaimerComponent : Component
 {
@@ -90,6 +90,7 @@ public sealed partial class MaterialReclaimerComponent : Component
     /// When the next sound will be allowed to be played. Used to prevent spam.
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan NextSound;
 
     /// <summary>
diff --git a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
index c470e11a0d..5a9ada7f58 100644
--- a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
+++ b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
@@ -34,13 +34,11 @@ public abstract class SharedMaterialReclaimerSystem : EntitySystem
     public override void Initialize()
     {
         SubscribeLocalEvent<MaterialReclaimerComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<MaterialReclaimerComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<MaterialReclaimerComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<MaterialReclaimerComponent, GotEmaggedEvent>(OnEmagged);
         SubscribeLocalEvent<MaterialReclaimerComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<CollideMaterialReclaimerComponent, StartCollideEvent>(OnCollide);
         SubscribeLocalEvent<ActiveMaterialReclaimerComponent, ComponentStartup>(OnActiveStartup);
-        SubscribeLocalEvent<ActiveMaterialReclaimerComponent, EntityUnpausedEvent>(OnActiveUnpaused);
     }
 
     private void OnMapInit(EntityUid uid, MaterialReclaimerComponent component, MapInitEvent args)
@@ -53,11 +51,6 @@ private void OnShutdown(EntityUid uid, MaterialReclaimerComponent component, Com
         _audio.Stop(component.Stream);
     }
 
-    private void OnUnpaused(EntityUid uid, MaterialReclaimerComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextSound += args.PausedTime;
-    }
-
     private void OnExamined(EntityUid uid, MaterialReclaimerComponent component, ExaminedEvent args)
     {
         args.PushMarkup(Loc.GetString("recycler-count-items", ("items", component.ItemsProcessed)));
@@ -82,11 +75,6 @@ private void OnActiveStartup(EntityUid uid, ActiveMaterialReclaimerComponent com
         component.ReclaimingContainer = Container.EnsureContainer<Container>(uid, ActiveReclaimerContainerId);
     }
 
-    private void OnActiveUnpaused(EntityUid uid, ActiveMaterialReclaimerComponent component, ref EntityUnpausedEvent args)
-    {
-        component.EndTime += args.PausedTime;
-    }
-
     /// <summary>
     /// Tries to start processing an item via a <see cref="MaterialReclaimerComponent"/>.
     /// </summary>
diff --git a/Content.Shared/Materials/SharedMaterialStorageSystem.cs b/Content.Shared/Materials/SharedMaterialStorageSystem.cs
index 9f7c87df3c..b1de77d971 100644
--- a/Content.Shared/Materials/SharedMaterialStorageSystem.cs
+++ b/Content.Shared/Materials/SharedMaterialStorageSystem.cs
@@ -30,7 +30,6 @@ public override void Initialize()
 
         SubscribeLocalEvent<MaterialStorageComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<MaterialStorageComponent, InteractUsingEvent>(OnInteractUsing);
-        SubscribeLocalEvent<InsertingMaterialStorageComponent, EntityUnpausedEvent>(OnUnpaused);
     }
 
     public override void Update(float frameTime)
@@ -52,11 +51,6 @@ private void OnMapInit(EntityUid uid, MaterialStorageComponent component, MapIni
         _appearance.SetData(uid, MaterialStorageVisuals.Inserting, false);
     }
 
-    private void OnUnpaused(EntityUid uid, InsertingMaterialStorageComponent component, ref EntityUnpausedEvent args)
-    {
-        component.EndTime += args.PausedTime;
-    }
-
     /// <summary>
     /// Gets the volume of a specified material contained in this storage.
     /// </summary>
diff --git a/Content.Shared/Medical/DefibrillatorComponent.cs b/Content.Shared/Medical/DefibrillatorComponent.cs
index afd1e0cc96..2da5285285 100644
--- a/Content.Shared/Medical/DefibrillatorComponent.cs
+++ b/Content.Shared/Medical/DefibrillatorComponent.cs
@@ -11,7 +11,7 @@ namespace Content.Shared.Medical;
 /// This is used for defibrillators; a machine that shocks a dead
 /// person back into the world of the living.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
 public sealed partial class DefibrillatorComponent : Component
 {
     /// <summary>
@@ -24,6 +24,7 @@ public sealed partial class DefibrillatorComponent : Component
     /// The time at which the zap cooldown will be completed
     /// </summary>
     [DataField("nextZapTime", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    [AutoPausedField]
     public TimeSpan? NextZapTime;
 
     /// <summary>
diff --git a/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs b/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
index 1e2c2575d9..78f26ed5c0 100644
--- a/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
+++ b/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs
@@ -12,13 +12,15 @@ public sealed class HealthAnalyzerScannedUserMessage : BoundUserInterfaceMessage
     public float Temperature;
     public float BloodLevel;
     public bool? ScanMode;
+    public bool? Bleeding;
 
-    public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float temperature, float bloodLevel, bool? scanMode)
+    public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float temperature, float bloodLevel, bool? scanMode, bool? bleeding)
     {
         TargetEntity = targetEntity;
         Temperature = temperature;
         BloodLevel = bloodLevel;
         ScanMode = scanMode;
+        Bleeding = bleeding;
     }
 }
 
diff --git a/Content.Shared/Mind/Components/IsDeadICComponent.cs b/Content.Shared/Mind/Components/IsDeadICComponent.cs
new file mode 100644
index 0000000000..d62743d912
--- /dev/null
+++ b/Content.Shared/Mind/Components/IsDeadICComponent.cs
@@ -0,0 +1,8 @@
+namespace Content.Shared.Mind.Components;
+
+[RegisterComponent]
+public sealed partial class IsDeadICComponent : Component
+{
+}
+
+
diff --git a/Content.Shared/Mind/IsDeadICSystem.cs b/Content.Shared/Mind/IsDeadICSystem.cs
new file mode 100644
index 0000000000..6716f38115
--- /dev/null
+++ b/Content.Shared/Mind/IsDeadICSystem.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Mind.Components;
+
+namespace Content.Shared.Mind;
+
+/// <summary>
+/// This marks any entity with the component as dead
+/// for stuff like objectives & round-end
+/// used for nymphs & reformed diona.
+/// </summary>
+public sealed class IsDeadICSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<IsDeadICComponent, GetCharactedDeadIcEvent>(OnGetDeadIC);
+    }
+
+    private void OnGetDeadIC(EntityUid uid, IsDeadICComponent component, ref GetCharactedDeadIcEvent args)
+    {
+        args.Dead = true;
+    }
+}
diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs
index 25e644c901..1d6d052f9a 100644
--- a/Content.Shared/Mind/SharedMindSystem.cs
+++ b/Content.Shared/Mind/SharedMindSystem.cs
@@ -399,7 +399,8 @@ public bool TryGetMind(
         EntityUid uid,
         out EntityUid mindId,
         [NotNullWhen(true)] out MindComponent? mind,
-        MindContainerComponent? container = null)
+        MindContainerComponent? container = null,
+        VisitingMindComponent? visitingmind = null)
     {
         mindId = default;
         mind = null;
@@ -408,7 +409,14 @@ public bool TryGetMind(
             return false;
 
         if (!container.HasMind)
-            return false;
+        {
+            // The container has no mind. Check for a visiting mind...
+            if (!Resolve(uid, ref visitingmind, false))
+                return false;
+
+            mindId = visitingmind.MindId ?? default;
+            return TryComp(mindId, out mind);
+        }
 
         mindId = container.Mind ?? default;
         return TryComp(mindId, out mind);
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
index 6fb8c64b8e..bce3aeff52 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
@@ -57,13 +57,8 @@ private void InitializeInput()
 
             SubscribeLocalEvent<FollowedComponent, EntParentChangedMessage>(OnFollowedParentChange);
 
-            _configManager.OnValueChanged(CCVars.CameraRotationLocked, SetCameraRotationLocked, true);
-            _configManager.OnValueChanged(CCVars.GameDiagonalMovement, SetDiagonalMovement, true);
-        }
-
-        private void SetCameraRotationLocked(bool obj)
-        {
-            CameraRotationLocked = obj;
+            Subs.CVar(_configManager, CCVars.CameraRotationLocked, obj => CameraRotationLocked = obj, true);
+            Subs.CVar(_configManager, CCVars.GameDiagonalMovement, value => DiagonalMovementEnabled = value, true);
         }
 
         /// <summary>
@@ -141,14 +136,10 @@ private void OnMoverGetState(EntityUid uid, InputMoverComponent component, ref C
         private void ShutdownInput()
         {
             CommandBinds.Unregister<SharedMoverController>();
-            _configManager.UnsubValueChanged(CCVars.CameraRotationLocked, SetCameraRotationLocked);
-            _configManager.UnsubValueChanged(CCVars.GameDiagonalMovement, SetDiagonalMovement);
         }
 
         public bool DiagonalMovementEnabled { get; private set; }
 
-        private void SetDiagonalMovement(bool value) => DiagonalMovementEnabled = value;
-
         protected virtual void HandleShuttleInput(EntityUid uid, ShuttleButtons button, ushort subTick, bool state) {}
 
         private void OnAutoParentChange(EntityUid uid, AutoOrientComponent component, ref EntParentChangedMessage args)
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs b/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
index 846fbfaf7e..8568290bff 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs
@@ -57,8 +57,8 @@ public void SetRelay(EntityUid uid, EntityUid relayEntity)
         Physics.UpdateIsPredicted(relayEntity);
         component.RelayEntity = relayEntity;
         targetComp.Source = uid;
-        Dirty(component);
-        Dirty(targetComp);
+        Dirty(uid, component);
+        Dirty(relayEntity, targetComp);
     }
 
     private void OnRelayShutdown(EntityUid uid, RelayInputMoverComponent component, ComponentShutdown args)
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index 49ad40ae59..4d9eedbf7c 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -94,20 +94,15 @@ public override void Initialize()
 
             InitializeInput();
             InitializeRelay();
-            _configManager.OnValueChanged(CCVars.RelativeMovement, SetRelativeMovement, true);
-            _configManager.OnValueChanged(CCVars.StopSpeed, SetStopSpeed, true);
+            Subs.CVar(_configManager, CCVars.RelativeMovement, value => _relativeMovement = value, true);
+            Subs.CVar(_configManager, CCVars.StopSpeed, value => _stopSpeed = value, true);
             UpdatesBefore.Add(typeof(TileFrictionController));
         }
 
-        private void SetRelativeMovement(bool value) => _relativeMovement = value;
-        private void SetStopSpeed(float value) => _stopSpeed = value;
-
         public override void Shutdown()
         {
             base.Shutdown();
             ShutdownInput();
-            _configManager.UnsubValueChanged(CCVars.RelativeMovement, SetRelativeMovement);
-            _configManager.UnsubValueChanged(CCVars.StopSpeed, SetStopSpeed);
         }
 
         public override void UpdateAfterSolve(bool prediction, float frameTime)
diff --git a/Content.Shared/Ninja/Components/NinjaSuitComponent.cs b/Content.Shared/Ninja/Components/NinjaSuitComponent.cs
index b6fac57b0b..7e7b1ffcd3 100644
--- a/Content.Shared/Ninja/Components/NinjaSuitComponent.cs
+++ b/Content.Shared/Ninja/Components/NinjaSuitComponent.cs
@@ -15,6 +15,7 @@ namespace Content.Shared.Ninja.Components;
 /// As an implementation detail, dashing with katana is a suit action which isn't ideal.
 /// </summary>
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedNinjaSuitSystem)), AutoGenerateComponentState]
+[AutoGenerateComponentPause]
 public sealed partial class NinjaSuitComponent : Component
 {
     /// <summary>
@@ -46,6 +47,7 @@ public sealed partial class NinjaSuitComponent : Component
     /// Time at which we will be able to use our abilities again
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan DisableCooldown;
 
     /// <summary>
diff --git a/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs b/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs
index 1449157538..fed41eaed8 100644
--- a/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs
+++ b/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs
@@ -27,7 +27,6 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<NinjaSuitComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<NinjaSuitComponent, EntityUnpausedEvent>(OnEntityUnpaused);
 
         SubscribeLocalEvent<NinjaSuitComponent, GotEquippedEvent>(OnEquipped);
         SubscribeLocalEvent<NinjaSuitComponent, GetItemActionsEvent>(OnGetItemActions);
@@ -43,11 +42,6 @@ private void OnMapInit(EntityUid uid, NinjaSuitComponent component, MapInitEvent
         Dirty(uid, component);
     }
 
-    private void OnEntityUnpaused(Entity<NinjaSuitComponent> ent, ref EntityUnpausedEvent args)
-    {
-        ent.Comp.DisableCooldown += args.PausedTime;
-    }
-
     /// <summary>
     /// Call the shared and serverside code for when a ninja equips the suit.
     /// </summary>
diff --git a/Content.Shared/Nuke/SharedNuke.cs b/Content.Shared/Nuke/SharedNuke.cs
index 1c471e11c6..c845ed6c2a 100644
--- a/Content.Shared/Nuke/SharedNuke.cs
+++ b/Content.Shared/Nuke/SharedNuke.cs
@@ -3,6 +3,27 @@
 
 namespace Content.Shared.Nuke
 {
+    public enum NukeVisualLayers
+    {
+        Base,
+        Unlit
+    }
+
+    [NetSerializable, Serializable]
+    public enum NukeVisuals
+    {
+        Deployed,
+        State,
+    }
+
+    [NetSerializable, Serializable]
+    public enum NukeVisualState
+    {
+        Idle,
+        Armed,
+        YoureFucked
+    }
+
     [Serializable, NetSerializable]
     public enum NukeUiKey : byte
     {
diff --git a/Content.Shared/NukeOps/WarDeclaratorEvents.cs b/Content.Shared/NukeOps/WarDeclaratorEvents.cs
index 3e0c12b7ec..0f521c14b1 100644
--- a/Content.Shared/NukeOps/WarDeclaratorEvents.cs
+++ b/Content.Shared/NukeOps/WarDeclaratorEvents.cs
@@ -10,30 +10,28 @@ public enum WarDeclaratorUiKey
 
 public enum WarConditionStatus : byte
 {
-    WAR_READY,
-    WAR_DELAY,
-    YES_WAR,
-    NO_WAR_UNKNOWN,
-    NO_WAR_TIMEOUT,
-    NO_WAR_SMALL_CREW,
-    NO_WAR_SHUTTLE_DEPARTED
+    WarReady,
+    YesWar,
+    NoWarUnknown,
+    NoWarTimeout,
+    NoWarSmallCrew,
+    NoWarShuttleDeparted
 }
 
 [Serializable, NetSerializable]
 public sealed class WarDeclaratorBoundUserInterfaceState : BoundUserInterfaceState
 {
-    public WarConditionStatus Status;
-    public int MinCrew;
-    public TimeSpan Delay;
+    public WarConditionStatus? Status;
+    public TimeSpan ShuttleDisabledTime;
     public TimeSpan EndTime;
 
-    public WarDeclaratorBoundUserInterfaceState(WarConditionStatus status, int minCrew, TimeSpan delay, TimeSpan endTime)
+    public WarDeclaratorBoundUserInterfaceState(WarConditionStatus? status, TimeSpan endTime, TimeSpan shuttleDisabledTime)
     {
         Status = status;
-        MinCrew = minCrew;
-        Delay = delay;
         EndTime = endTime;
+        ShuttleDisabledTime = shuttleDisabledTime;
     }
+
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Nutrition/AnimalHusbandry/InfantComponent.cs b/Content.Shared/Nutrition/AnimalHusbandry/InfantComponent.cs
index c6406a0866..2708c823d2 100644
--- a/Content.Shared/Nutrition/AnimalHusbandry/InfantComponent.cs
+++ b/Content.Shared/Nutrition/AnimalHusbandry/InfantComponent.cs
@@ -8,7 +8,7 @@ namespace Content.Shared.Nutrition.AnimalHusbandry;
 /// This is used for marking entities as infants.
 /// Infants have half the size, visually, and cannot breed.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
 public sealed partial class InfantComponent : Component
 {
     /// <summary>
@@ -33,6 +33,7 @@ public sealed partial class InfantComponent : Component
     /// When the entity will stop being an infant.
     /// </summary>
     [DataField("infantEndTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan InfantEndTime;
 
     /// <summary>
diff --git a/Content.Shared/Nutrition/AnimalHusbandry/ReproductiveComponent.cs b/Content.Shared/Nutrition/AnimalHusbandry/ReproductiveComponent.cs
index ea9edcb507..8d128f547e 100644
--- a/Content.Shared/Nutrition/AnimalHusbandry/ReproductiveComponent.cs
+++ b/Content.Shared/Nutrition/AnimalHusbandry/ReproductiveComponent.cs
@@ -9,13 +9,14 @@ namespace Content.Shared.Nutrition.AnimalHusbandry;
 /// given they are next to a particular entity that fulfills a whitelist,
 /// can create several "child" entities.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, AutoGenerateComponentPause]
 public sealed partial class ReproductiveComponent : Component
 {
     /// <summary>
     /// The next time when breeding will be attempted.
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
+    [AutoPausedField]
     public TimeSpan NextBreedAttempt;
 
     /// <summary>
diff --git a/Content.Shared/Nutrition/Components/HungerComponent.cs b/Content.Shared/Nutrition/Components/HungerComponent.cs
index 11197d8b42..9ac82ba283 100644
--- a/Content.Shared/Nutrition/Components/HungerComponent.cs
+++ b/Content.Shared/Nutrition/Components/HungerComponent.cs
@@ -9,7 +9,7 @@
 namespace Content.Shared.Nutrition.Components;
 
 [RegisterComponent, NetworkedComponent, Access(typeof(HungerSystem))]
-[AutoGenerateComponentState]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class HungerComponent : Component
 {
     /// <summary>
@@ -106,6 +106,7 @@ public sealed partial class HungerComponent : Component
     /// </summary>
     [DataField("nextUpdateTime", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
     [AutoNetworkedField]
+    [AutoPausedField]
     public TimeSpan NextUpdateTime;
 
     /// <summary>
diff --git a/Content.Shared/Nutrition/Components/OpenableComponent.cs b/Content.Shared/Nutrition/Components/OpenableComponent.cs
new file mode 100644
index 0000000000..3a230fc765
--- /dev/null
+++ b/Content.Shared/Nutrition/Components/OpenableComponent.cs
@@ -0,0 +1,74 @@
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Nutrition.Components;
+
+/// <summary>
+/// A drink or food that can be opened.
+/// Starts closed, open it with Z or E.
+/// </summary>
+[NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, Access(typeof(SharedOpenableSystem))]
+public sealed partial class OpenableComponent : Component
+{
+    /// <summary>
+    /// Whether this drink or food is opened or not.
+    /// Drinks can only be drunk or poured from/into when open, and food can only be eaten when open.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Opened;
+
+    /// <summary>
+    /// If this is false you cant press Z to open it.
+    /// Requires an OpenBehavior damage threshold or other logic to open.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool OpenableByHand = true;
+
+    /// <summary>
+    /// Text shown when examining and its open.
+    /// </summary>
+    [DataField]
+    public LocId ExamineText = "drink-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.
+    /// Defaults to the popup drink uses since its "correct".
+    /// 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";
+
+    /// <summary>
+    /// Text to show in the verb menu for the "Open" action.
+    /// You may want to change this for non-drinks, i.e. "Peel", "Unwrap"
+    /// </summary>
+    [DataField]
+    public LocId OpenVerbText = "openable-component-verb-open";
+
+    /// <summary>
+    /// Text to show in the verb menu for the "Close" action.
+    /// You may want to change this for non-drinks, i.e. "Wrap"
+    /// </summary>
+    [DataField]
+    public LocId CloseVerbText = "openable-component-verb-close";
+
+    /// <summary>
+    /// Sound played when opening.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier Sound = new SoundCollectionSpecifier("canOpenSounds");
+
+    /// <summary>
+    /// Can this item be closed again after opening?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Closeable;
+
+    /// <summary>
+    /// Sound played when closing.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier? CloseSound;
+}
diff --git a/Content.Shared/Nutrition/Components/SealableComponent.cs b/Content.Shared/Nutrition/Components/SealableComponent.cs
new file mode 100644
index 0000000000..1c2f732e7a
--- /dev/null
+++ b/Content.Shared/Nutrition/Components/SealableComponent.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Nutrition.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Nutrition.Components;
+
+/// <summary>
+/// Represents a tamper-evident seal on an Openable.
+/// Only affects the Examine text.
+/// Once the seal has been broken, it cannot be resealed.
+/// </summary>
+[NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, Access(typeof(SealableSystem))]
+public sealed partial class SealableComponent : Component
+{
+    /// <summary>
+    /// Whether the item's seal is intact (i.e. it has never been opened)
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Sealed = true;
+
+    /// <summary>
+    /// Text shown when examining and the item's seal has not been broken.
+    /// </summary>
+    [DataField]
+    public LocId ExamineTextSealed = "drink-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";
+}
diff --git a/Content.Shared/Nutrition/Components/SharedFoodComponent.cs b/Content.Shared/Nutrition/Components/SharedFoodComponent.cs
index 99ddabd3ce..07c02fb22b 100644
--- a/Content.Shared/Nutrition/Components/SharedFoodComponent.cs
+++ b/Content.Shared/Nutrition/Components/SharedFoodComponent.cs
@@ -16,4 +16,11 @@ public enum OpenableVisuals : byte
         Opened,
         Layer
     }
+
+    [Serializable, NetSerializable]
+    public enum SealableVisuals : byte
+    {
+        Sealed,
+        Layer,
+    }
 }
diff --git a/Content.Shared/Nutrition/Components/ThirstComponent.cs b/Content.Shared/Nutrition/Components/ThirstComponent.cs
index 35eb4d2614..731346401f 100644
--- a/Content.Shared/Nutrition/Components/ThirstComponent.cs
+++ b/Content.Shared/Nutrition/Components/ThirstComponent.cs
@@ -6,7 +6,7 @@
 namespace Content.Shared.Nutrition.Components;
 
 [RegisterComponent, NetworkedComponent, Access(typeof(ThirstSystem))]
-[AutoGenerateComponentState]
+[AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class ThirstComponent : Component
 {
     // Base stuff
@@ -35,6 +35,7 @@ public sealed partial class ThirstComponent : Component
     /// </summary>
     [DataField("nextUpdateTime", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
     [AutoNetworkedField]
+    [AutoPausedField]
     public TimeSpan NextUpdateTime;
 
     /// <summary>
diff --git a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
index 9c09603510..d8808b6e4a 100644
--- a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
@@ -23,18 +23,12 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<HungerComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<HungerComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<HungerComponent, ComponentShutdown>(OnShutdown);
         SubscribeLocalEvent<HungerComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
         SubscribeLocalEvent<HungerComponent, RejuvenateEvent>(OnRejuvenate);
     }
 
-    private void OnUnpaused(EntityUid uid, HungerComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextUpdateTime += args.PausedTime;
-    }
-
     private void OnMapInit(EntityUid uid, HungerComponent component, MapInitEvent args)
     {
         var amount = _random.Next(
diff --git a/Content.Shared/Nutrition/EntitySystems/SealableSystem.cs b/Content.Shared/Nutrition/EntitySystems/SealableSystem.cs
new file mode 100644
index 0000000000..b0873f23a1
--- /dev/null
+++ b/Content.Shared/Nutrition/EntitySystems/SealableSystem.cs
@@ -0,0 +1,59 @@
+using Content.Shared.Examine;
+using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Nutrition.Components;
+
+namespace Content.Shared.Nutrition.EntitySystems;
+
+public sealed partial class SealableSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SealableComponent, ExaminedEvent>(OnExamined, after: new[] { typeof(SharedOpenableSystem) });
+        SubscribeLocalEvent<SealableComponent, OpenableOpenedEvent>(OnOpened);
+    }
+
+    private void OnExamined(EntityUid uid, SealableComponent comp, ExaminedEvent args)
+    {
+        if (!args.IsInDetailsRange)
+            return;
+
+        var sealedText = comp.Sealed ? Loc.GetString(comp.ExamineTextSealed) : Loc.GetString(comp.ExamineTextUnsealed);
+
+        args.PushMarkup(sealedText);
+    }
+
+    private void OnOpened(EntityUid uid, SealableComponent comp, OpenableOpenedEvent args)
+    {
+        comp.Sealed = false;
+
+        Dirty(uid, comp);
+
+        UpdateAppearance(uid, comp);
+    }
+
+    /// <summary>
+    /// Update seal visuals to the current value.
+    /// </summary>
+    public void UpdateAppearance(EntityUid uid, SealableComponent? comp = null, AppearanceComponent? appearance = null)
+    {
+        if (!Resolve(uid, ref comp))
+            return;
+
+        _appearance.SetData(uid, SealableVisuals.Sealed, comp.Sealed, appearance);
+    }
+
+    /// <summary>
+    /// Returns true if the entity's seal is intact.
+    /// Items without SealableComponent are considered unsealed.
+    /// </summary>
+    public bool IsSealed(EntityUid uid, SealableComponent? comp = null)
+    {
+        if (!Resolve(uid, ref comp, false))
+            return false;
+
+        return comp.Sealed;
+    }
+}
diff --git a/Content.Shared/Nutrition/EntitySystems/SharedOpenableSystem.cs b/Content.Shared/Nutrition/EntitySystems/SharedOpenableSystem.cs
new file mode 100644
index 0000000000..f3b1127578
--- /dev/null
+++ b/Content.Shared/Nutrition/EntitySystems/SharedOpenableSystem.cs
@@ -0,0 +1,199 @@
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Content.Shared.Weapons.Melee.Events;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Nutrition.EntitySystems;
+
+/// <summary>
+/// Provides API for openable food and drinks, handles opening on use and preventing transfer when closed.
+/// </summary>
+public abstract partial class SharedOpenableSystem : EntitySystem
+{
+    [Dependency] protected readonly SharedAppearanceSystem Appearance = default!;
+    [Dependency] protected readonly SharedAudioSystem Audio = default!;
+    [Dependency] protected readonly SharedPopupSystem Popup = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<OpenableComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<OpenableComponent, UseInHandEvent>(OnUse);
+        SubscribeLocalEvent<OpenableComponent, ExaminedEvent>(OnExamined);
+        SubscribeLocalEvent<OpenableComponent, MeleeHitEvent>(HandleIfClosed);
+        SubscribeLocalEvent<OpenableComponent, AfterInteractEvent>(HandleIfClosed);
+        SubscribeLocalEvent<OpenableComponent, GetVerbsEvent<Verb>>(AddOpenCloseVerbs);
+    }
+
+    private void OnInit(EntityUid uid, OpenableComponent comp, ComponentInit args)
+    {
+        UpdateAppearance(uid, comp);
+    }
+
+    private void OnUse(EntityUid uid, OpenableComponent comp, UseInHandEvent args)
+    {
+        if (args.Handled || !comp.OpenableByHand)
+            return;
+
+        args.Handled = TryOpen(uid, comp, args.User);
+    }
+
+    private void OnExamined(EntityUid uid, OpenableComponent comp, ExaminedEvent args)
+    {
+        if (!comp.Opened || !args.IsInDetailsRange)
+            return;
+
+        var text = Loc.GetString(comp.ExamineText);
+        args.PushMarkup(text);
+    }
+
+    private void HandleIfClosed(EntityUid uid, OpenableComponent comp, HandledEntityEventArgs args)
+    {
+        // prevent spilling/pouring/whatever drinks when closed
+        args.Handled = !comp.Opened;
+    }
+
+    private void AddOpenCloseVerbs(EntityUid uid, OpenableComponent comp, GetVerbsEvent<Verb> args)
+    {
+        if (args.Hands == null || !args.CanAccess || !args.CanInteract)
+            return;
+
+        Verb verb;
+        if (comp.Opened)
+        {
+            if (!comp.Closeable)
+                return;
+
+            verb = new()
+            {
+                Text = Loc.GetString(comp.CloseVerbText),
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/close.svg.192dpi.png")),
+                Act = () => TryClose(args.Target, comp, args.User)
+            };
+        }
+        else
+        {
+            verb = new()
+            {
+                Text = Loc.GetString(comp.OpenVerbText),
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/open.svg.192dpi.png")),
+                Act = () => TryOpen(args.Target, comp, args.User)
+            };
+        }
+        args.Verbs.Add(verb);
+    }
+
+    /// <summary>
+    /// Returns true if the entity either does not have OpenableComponent or it is opened.
+    /// Drinks that don't have OpenableComponent are automatically open, so it returns true.
+    /// </summary>
+    public bool IsOpen(EntityUid uid, OpenableComponent? comp = null)
+    {
+        if (!Resolve(uid, ref comp, false))
+            return true;
+
+        return comp.Opened;
+    }
+
+    /// <summary>
+    /// Returns true if the entity both has OpenableComponent and is not opened.
+    /// Drinks that don't have OpenableComponent are automatically open, so it returns false.
+    /// If user is not null a popup will be shown to them.
+    /// </summary>
+    public bool IsClosed(EntityUid uid, EntityUid? user = null, OpenableComponent? comp = null)
+    {
+        if (!Resolve(uid, ref comp, false))
+            return false;
+
+        if (comp.Opened)
+            return false;
+
+        if (user != null)
+            Popup.PopupEntity(Loc.GetString(comp.ClosedPopup, ("owner", uid)), user.Value, user.Value);
+
+        return true;
+    }
+
+    /// <summary>
+    /// Update open visuals to the current value.
+    /// </summary>
+    public void UpdateAppearance(EntityUid uid, OpenableComponent? comp = null, AppearanceComponent? appearance = null)
+    {
+        if (!Resolve(uid, ref comp))
+            return;
+
+        Appearance.SetData(uid, OpenableVisuals.Opened, comp.Opened, appearance);
+    }
+
+    /// <summary>
+    /// Sets the opened field and updates open visuals.
+    /// </summary>
+    public void SetOpen(EntityUid uid, bool opened = true, OpenableComponent? comp = null)
+    {
+        if (!Resolve(uid, ref comp, false) || opened == comp.Opened)
+            return;
+
+        comp.Opened = opened;
+        Dirty(uid, comp);
+
+        if (opened)
+        {
+            var ev = new OpenableOpenedEvent();
+            RaiseLocalEvent(uid, ref ev);
+        }
+        else
+        {
+            var ev = new OpenableClosedEvent();
+            RaiseLocalEvent(uid, ref ev);
+        }
+
+        UpdateAppearance(uid, comp);
+    }
+
+    /// <summary>
+    /// If closed, opens it and plays the sound.
+    /// </summary>
+    /// <returns>Whether it got opened</returns>
+    public bool TryOpen(EntityUid uid, OpenableComponent? comp = null, EntityUid? user = null)
+    {
+        if (!Resolve(uid, ref comp, false) || comp.Opened)
+            return false;
+
+        SetOpen(uid, true, comp);
+        Audio.PlayPredicted(comp.Sound, uid, user);
+        return true;
+    }
+
+    /// <summary>
+    /// If opened, closes it and plays the close sound, if one is defined.
+    /// </summary>
+    /// <returns>Whether it got closed</returns>
+    public bool TryClose(EntityUid uid, OpenableComponent? comp = null, EntityUid? user = null)
+    {
+        if (!Resolve(uid, ref comp, false) || !comp.Opened || !comp.Closeable)
+            return false;
+
+        SetOpen(uid, false, comp);
+        if (comp.CloseSound != null)
+            Audio.PlayPredicted(comp.CloseSound, uid, user);
+        return true;
+    }
+}
+
+/// <summary>
+/// Raised after an Openable is opened.
+/// </summary>
+[ByRefEvent]
+public record struct OpenableOpenedEvent;
+
+/// <summary>
+/// Raised after an Openable is closed.
+/// </summary>
+[ByRefEvent]
+public record struct OpenableClosedEvent;
diff --git a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
index 05a2338768..b070cee283 100644
--- a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
@@ -29,7 +29,6 @@ public override void Initialize()
         SubscribeLocalEvent<ThirstComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
         SubscribeLocalEvent<ThirstComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<ThirstComponent, RejuvenateEvent>(OnRejuvenate);
-        SubscribeLocalEvent<ThirstComponent, EntityUnpausedEvent>(OnUnpaused);
     }
 
     private void OnMapInit(EntityUid uid, ThirstComponent component, MapInitEvent args)
@@ -184,9 +183,4 @@ public override void Update(float frameTime)
             UpdateEffects(uid, thirst);
         }
     }
-
-    private void OnUnpaused(EntityUid uid, ThirstComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextUpdateTime += args.PausedTime;
-    }
 }
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
index a45a6d2be6..4a62e84d19 100644
--- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
+++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
@@ -18,7 +18,7 @@ public sealed partial class PsionicRegenerationPowerComponent : Component
         public float UseDelay = 8f;
         [DataField("soundUse")]
 
-        public SoundSpecifier SoundUse = new SoundPathSpecifier("/Audio/Nyanotrasen/heartbeat_fast.ogg");
+        public SoundSpecifier SoundUse = new SoundPathSpecifier("/Audio/Nyanotrasen/Psionics/heartbeat_fast.ogg");
 
         [DataField("psionicRegenerationActionId",
         customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
diff --git a/Content.Shared/Paper/SharedPaperComponent.cs b/Content.Shared/Paper/SharedPaperComponent.cs
index 1e654cc68a..dd87f9f907 100644
--- a/Content.Shared/Paper/SharedPaperComponent.cs
+++ b/Content.Shared/Paper/SharedPaperComponent.cs
@@ -1,9 +1,16 @@
+using Robust.Shared.Audio;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Paper;
 
 public abstract partial class SharedPaperComponent : Component
 {
+    /// <summary>
+    /// Sound played after writing to the paper.
+    /// </summary>
+    [DataField("sound")]
+    public SoundSpecifier? Sound { get; private set; } = new SoundCollectionSpecifier("PaperScribbles", AudioParams.Default.WithVariation(0.1f));
+
     [Serializable, NetSerializable]
     public sealed class PaperBoundUserInterfaceState : BoundUserInterfaceState
     {
diff --git a/Content.Shared/Parallax/ParallaxComponent.cs b/Content.Shared/Parallax/ParallaxComponent.cs
index 79ae855a21..5df38eec4d 100644
--- a/Content.Shared/Parallax/ParallaxComponent.cs
+++ b/Content.Shared/Parallax/ParallaxComponent.cs
@@ -10,7 +10,7 @@ namespace Content.Shared.Parallax;
 public sealed partial class ParallaxComponent : Component
 {
     // I wish I could use a typeserializer here but parallax is extremely client-dependent.
-    [DataField("parallax"), AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public string Parallax = "Default";
 
     [UsedImplicitly, ViewVariables(VVAccess.ReadWrite)]
diff --git a/Content.Shared/Pinpointer/SharedPinpointerSystem.cs b/Content.Shared/Pinpointer/SharedPinpointerSystem.cs
index 43550f2919..7f6b889125 100644
--- a/Content.Shared/Pinpointer/SharedPinpointerSystem.cs
+++ b/Content.Shared/Pinpointer/SharedPinpointerSystem.cs
@@ -41,7 +41,7 @@ private void OnAfterInteract(EntityUid uid, PinpointerComponent component, After
     /// <summary>
     ///     Set pinpointers target to track
     /// </summary>
-    public void SetTarget(EntityUid uid, EntityUid? target, PinpointerComponent? pinpointer = null)
+    public virtual void SetTarget(EntityUid uid, EntityUid? target, PinpointerComponent? pinpointer = null)
     {
         if (!Resolve(uid, ref pinpointer))
             return;
@@ -84,7 +84,7 @@ public void SetDistance(EntityUid uid, Distance distance, PinpointerComponent? p
             return;
 
         pinpointer.DistanceToTarget = distance;
-        Dirty(pinpointer);
+        Dirty(uid, pinpointer);
     }
 
     /// <summary>
@@ -101,7 +101,7 @@ public bool TrySetArrowAngle(EntityUid uid, Angle arrowAngle, PinpointerComponen
             return false;
 
         pinpointer.ArrowAngle = arrowAngle;
-        Dirty(pinpointer);
+        Dirty(uid, pinpointer);
 
         return true;
     }
@@ -117,7 +117,7 @@ public void SetActive(EntityUid uid, bool isActive, PinpointerComponent? pinpoin
             return;
 
         pinpointer.IsActive = isActive;
-        Dirty(pinpointer);
+        Dirty(uid, pinpointer);
     }
 
 
@@ -125,7 +125,7 @@ public void SetActive(EntityUid uid, bool isActive, PinpointerComponent? pinpoin
     ///     Toggle Pinpointer screen. If it has target it will start tracking it.
     /// </summary>
     /// <returns>True if pinpointer was activated, false otherwise</returns>
-    public bool TogglePinpointer(EntityUid uid, PinpointerComponent? pinpointer = null)
+    public virtual bool TogglePinpointer(EntityUid uid, PinpointerComponent? pinpointer = null)
     {
         if (!Resolve(uid, ref pinpointer))
             return false;
diff --git a/Content.Shared/Placeable/ItemPlacerSystem.cs b/Content.Shared/Placeable/ItemPlacerSystem.cs
index f2fe58adcb..9be6a4acd5 100644
--- a/Content.Shared/Placeable/ItemPlacerSystem.cs
+++ b/Content.Shared/Placeable/ItemPlacerSystem.cs
@@ -11,7 +11,6 @@ public sealed class ItemPlacerSystem : EntitySystem
 {
     [Dependency] private readonly CollisionWakeSystem _wake = default!;
     [Dependency] private readonly PlaceableSurfaceSystem _placeableSurface = default!;
-    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Popups/SharedPopupSystem.cs b/Content.Shared/Popups/SharedPopupSystem.cs
index f8e07e5df5..aeb85de2f5 100644
--- a/Content.Shared/Popups/SharedPopupSystem.cs
+++ b/Content.Shared/Popups/SharedPopupSystem.cs
@@ -83,10 +83,17 @@ public abstract class SharedPopupSystem : EntitySystem
         public abstract void PopupEntity(string? message, EntityUid uid, Filter filter, bool recordReplay, PopupType type = PopupType.Small);
 
         /// <summary>
-        /// Variant of <see cref="PopupEnity(string, EntityUid, EntityUid, PopupType)"/> that only runs on the client, outside of prediction.
+        /// Variant of <see cref="PopupEntity(string, EntityUid, EntityUid, PopupType)"/> that only runs on the client, outside of prediction.
         /// Useful for shared code that is always ran by both sides to avoid duplicate popups.
         /// </summary>
         public abstract void PopupClient(string? message, EntityUid uid, EntityUid recipient, PopupType type = PopupType.Small);
+
+        /// <summary>
+        /// Variant of <see cref="PopupEntity(string, EntityUid, EntityUid, PopupType)"/> for use with prediction. The local client will show
+        /// the popup to the recipient, and the server will show it to every other player in PVS range. If recipient is null, the local client
+        /// will do nothing and the server will show the message to every player in PVS range.
+        /// </summary>
+        public abstract void PopupPredicted(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small);
     }
 
     /// <summary>
diff --git a/Content.Shared/Power/Generator/ActiveGeneratorRevvingSystem.cs b/Content.Shared/Power/Generator/ActiveGeneratorRevvingSystem.cs
index 1c39997f30..9cd11ae604 100644
--- a/Content.Shared/Power/Generator/ActiveGeneratorRevvingSystem.cs
+++ b/Content.Shared/Power/Generator/ActiveGeneratorRevvingSystem.cs
@@ -1,12 +1,7 @@
-using Content.Shared.DoAfter;
-
 namespace Content.Shared.Power.Generator;
 
 public sealed class ActiveGeneratorRevvingSystem: EntitySystem
 {
-    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
-    [Dependency] private readonly EntityManager _entity = default!;
-
     public override void Initialize()
     {
         base.Initialize();
diff --git a/Content.Shared/PowerCell/PowerCellDrawComponent.cs b/Content.Shared/PowerCell/PowerCellDrawComponent.cs
index 6963326b70..708a86a8ea 100644
--- a/Content.Shared/PowerCell/PowerCellDrawComponent.cs
+++ b/Content.Shared/PowerCell/PowerCellDrawComponent.cs
@@ -6,7 +6,7 @@ namespace Content.Shared.PowerCell;
 /// <summary>
 /// Indicates that the entity's ActivatableUI requires power or else it closes.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class PowerCellDrawComponent : Component
 {
     #region Prediction
@@ -49,5 +49,6 @@ public sealed partial class PowerCellDrawComponent : Component
     /// When the next automatic power draw will occur
     /// </summary>
     [DataField("nextUpdate", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan NextUpdateTime;
 }
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index af4516df7d..59906538ec 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -181,7 +181,17 @@ public static HumanoidCharacterProfile RandomWithSpecies(string species = Shared
                 age = random.Next(speciesPrototype.MinAge, speciesPrototype.OldAge); // people don't look and keep making 119 year old characters with zero rp, cap it at middle aged
             }
 
-            var gender = sex == Sex.Male ? Gender.Male : Gender.Female;
+            var gender = Gender.Epicene;
+
+            switch (sex)
+            {
+                case Sex.Male:
+                    gender = Gender.Male;
+                    break;
+                case Sex.Female:
+                    gender = Gender.Female;
+                    break;
+            }
 
             var name = GetName(species, gender);
 
@@ -297,16 +307,16 @@ public HumanoidCharacterProfile WithAntagPreferences(IEnumerable<string> antagPr
         public HumanoidCharacterProfile WithAntagPreference(string antagId, bool pref)
         {
             var list = new List<string>(_antagPreferences);
-            if(pref)
+            if (pref)
             {
-                if(!list.Contains(antagId))
+                if (!list.Contains(antagId))
                 {
                     list.Add(antagId);
                 }
             }
             else
             {
-                if(list.Contains(antagId))
+                if (list.Contains(antagId))
                 {
                     list.Remove(antagId);
                 }
@@ -319,16 +329,16 @@ public HumanoidCharacterProfile WithTraitPreference(string traitId, bool pref)
             var list = new List<string>(_traitPreferences);
 
             // TODO: Maybe just refactor this to HashSet? Same with _antagPreferences
-            if(pref)
+            if (pref)
             {
-                if(!list.Contains(traitId))
+                if (!list.Contains(traitId))
                 {
                     list.Add(traitId);
                 }
             }
             else
             {
-                if(list.Contains(traitId))
+                if (list.Contains(traitId))
                 {
                     list.Remove(traitId);
                 }
@@ -361,11 +371,9 @@ public bool MemberwiseEquals(ICharacterProfile maybeOther)
             return Appearance.MemberwiseEquals(other.Appearance);
         }
 
-        public void EnsureValid()
+        public void EnsureValid(IConfigurationManager configManager, IPrototypeManager prototypeManager)
         {
-            var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
-
-            if (!prototypeManager.TryIndex<SpeciesPrototype>(Species, out var speciesPrototype))
+            if (!prototypeManager.TryIndex<SpeciesPrototype>(Species, out var speciesPrototype) || speciesPrototype.RoundStart == false)
             {
                 Species = SharedHumanoidAppearanceSystem.DefaultSpecies;
                 speciesPrototype = prototypeManager.Index<SpeciesPrototype>(Species);
@@ -380,15 +388,10 @@ public void EnsureValid()
             };
 
             // ensure the species can be that sex and their age fits the founds
-            var age = Age;
-            if (speciesPrototype != null)
-            {
-                if (!speciesPrototype.Sexes.Contains(sex))
-                {
-                    sex = speciesPrototype.Sexes[0];
-                }
-                age = Math.Clamp(Age, speciesPrototype.MinAge, speciesPrototype.MaxAge);
-            }
+            if (!speciesPrototype.Sexes.Contains(sex))
+                sex = speciesPrototype.Sexes[0];
+
+            var age = Math.Clamp(Age, speciesPrototype.MinAge, speciesPrototype.MaxAge);
 
             var gender = Gender switch
             {
@@ -415,7 +418,6 @@ public void EnsureValid()
 
             name = name.Trim();
 
-            var configManager = IoCManager.Resolve<IConfigurationManager>();
             if (configManager.GetCVar(CCVars.RestrictedNames))
             {
                 name = Regex.Replace(name, @"[^\u0030-\u0039,\u0041-\u005A,\u0061-\u007A,\u00C0-\u00D6,\u00D8-\u00F6,\u00F8-\u00FF,\u0100-\u017F, '.,-]", string.Empty);
@@ -486,7 +488,7 @@ public void EnsureValid()
             };
 
             var priorities = new Dictionary<string, JobPriority>(JobPriorities
-                .Where(p => prototypeManager.HasIndex<JobPrototype>(p.Key) && p.Value switch
+                .Where(p => prototypeManager.TryIndex<JobPrototype>(p.Key, out var job) && job.SetPreference && p.Value switch
                 {
                     JobPriority.Never => false, // Drop never since that's assumed default.
                     JobPriority.Low => true,
@@ -496,7 +498,7 @@ public void EnsureValid()
                 }));
 
             var antags = AntagPreferences
-                .Where(prototypeManager.HasIndex<AntagPrototype>)
+                .Where(id => prototypeManager.TryIndex<AntagPrototype>(id, out var antag) && antag.SetPreference)
                 .ToList();
 
             var traits = TraitPreferences
@@ -529,6 +531,13 @@ public void EnsureValid()
             _traitPreferences.AddRange(traits);
         }
 
+        public ICharacterProfile Validated(IConfigurationManager configManager, IPrototypeManager prototypeManager)
+        {
+            var profile = new HumanoidCharacterProfile(this);
+            profile.EnsureValid(configManager, prototypeManager);
+            return profile;
+        }
+
         // sorry this is kind of weird and duplicated,
         /// working inside these non entity systems is a bit wack
         public static string GetName(string species, Gender gender)
diff --git a/Content.Shared/Preferences/ICharacterProfile.cs b/Content.Shared/Preferences/ICharacterProfile.cs
index a17a74498d..a9d30639bb 100644
--- a/Content.Shared/Preferences/ICharacterProfile.cs
+++ b/Content.Shared/Preferences/ICharacterProfile.cs
@@ -1,4 +1,6 @@
 using Content.Shared.Humanoid;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Preferences
 {
@@ -13,6 +15,11 @@ public interface ICharacterProfile
         /// <summary>
         ///     Makes this profile valid so there's no bad data like negative ages.
         /// </summary>
-        void EnsureValid();
+        void EnsureValid(IConfigurationManager configManager, IPrototypeManager prototypeManager);
+
+        /// <summary>
+        /// Gets a copy of this profile that has <see cref="EnsureValid"/> applied, i.e. no invalid data.
+        /// </summary>
+        ICharacterProfile Validated(IConfigurationManager configManager, IPrototypeManager prototypeManager);
     }
 }
diff --git a/Content.Shared/Procedural/PostGeneration/AutoCablingPostGen.cs b/Content.Shared/Procedural/PostGeneration/AutoCablingPostGen.cs
index 384d641a35..8278352b03 100644
--- a/Content.Shared/Procedural/PostGeneration/AutoCablingPostGen.cs
+++ b/Content.Shared/Procedural/PostGeneration/AutoCablingPostGen.cs
@@ -1,3 +1,5 @@
+using Robust.Shared.Prototypes;
+
 namespace Content.Shared.Procedural.PostGeneration;
 
 /// <summary>
@@ -5,5 +7,6 @@ namespace Content.Shared.Procedural.PostGeneration;
 /// </summary>
 public sealed partial class AutoCablingPostGen : IPostDunGen
 {
-
+    [DataField]
+    public EntProtoId Entity = "CableApcExtension";
 }
diff --git a/Content.Shared/Procedural/PostGeneration/CorridorPostGen.cs b/Content.Shared/Procedural/PostGeneration/CorridorPostGen.cs
index 12e06c7131..32c49d1951 100644
--- a/Content.Shared/Procedural/PostGeneration/CorridorPostGen.cs
+++ b/Content.Shared/Procedural/PostGeneration/CorridorPostGen.cs
@@ -1,3 +1,6 @@
+using Content.Shared.Maps;
+using Robust.Shared.Prototypes;
+
 namespace Content.Shared.Procedural.PostGeneration;
 
 /// <summary>
@@ -17,6 +20,9 @@ public sealed partial class CorridorPostGen : IPostDunGen
     [DataField("method")]
     public CorridorPostGenMethod Method = CorridorPostGenMethod.MinimumSpanningTree;
 
+    [DataField]
+    public ProtoId<ContentTileDefinition> Tile = "FloorSteel";
+
     /// <summary>
     /// How wide to make the corridor.
     /// </summary>
diff --git a/Content.Shared/Projectiles/CanPenetrateComponent.cs b/Content.Shared/Projectiles/CanPenetrateComponent.cs
deleted file mode 100644
index 6134978b1b..0000000000
--- a/Content.Shared/Projectiles/CanPenetrateComponent.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Content.Shared.FixedPoint;
-using Content.Shared.Physics;
-using Robust.Shared.GameStates;
-
-namespace Content.Shared.Projectiles;
-
-[RegisterComponent, NetworkedComponent]
-public sealed partial class CanPenetrateComponent : Component
-{
-    /// <summary>
-    ///     Should the projectile keep the ability to deal damage after colliding.
-    /// </summary>
-    [DataField]
-    public bool DamageAfterCollide = true;
-
-    /// <summary>
-    ///     The CollisionLayer, up to and including the one set, the projectile is allowed to penetrate.
-    /// </summary>
-    ///<remarks>
-    ///     Can penetrate everything if this value is not set.
-    /// </remarks>
-    [DataField]
-    public CollisionGroup? PenetrationLayer;
-
-    /// <summary>
-    ///     How many times the projectile is allowed to deal damage.
-    /// </summary>
-    /// <remarks>
-    ///     Can deal damage on every collision if this value is not set.
-    /// </remarks>
-    [DataField]
-    public float? PenetrationPower;
-
-    /// <summary>
-    ///     Modifies the damage of a projectile after it has penetrated an entity.
-    /// </summary>
-    /// <remarks>
-    ///     Won't modify the projectile's damage if this value is not set.
-    /// </remarks>
-    [DataField]
-    public FixedPoint2? DamageModifier;
-}
diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs
index 2fa5ee1c8c..f40a7a0363 100644
--- a/Content.Shared/Projectiles/SharedProjectileSystem.cs
+++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs
@@ -34,7 +34,6 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<ProjectileComponent, PreventCollideEvent>(PreventCollision);
-        SubscribeLocalEvent<ProjectileComponent, AfterProjectileHitEvent>(AfterProjectileHit);
         SubscribeLocalEvent<EmbeddableProjectileComponent, ProjectileHitEvent>(OnEmbedProjectileHit);
         SubscribeLocalEvent<EmbeddableProjectileComponent, ThrowDoHitEvent>(OnEmbedThrowDoHit);
         SubscribeLocalEvent<EmbeddableProjectileComponent, ActivateInWorldEvent>(OnEmbedActivate);
@@ -163,45 +162,6 @@ private void OnAttemptPacifiedThrow(Entity<EmbeddableProjectileComponent> ent, r
     {
         args.Cancel("pacified-cannot-throw-embed");
     }
-
-    /// <summary>
-    /// Checks if the projectile is allowed to penetrate the target it hit.
-    /// </summary>
-    private void AfterProjectileHit(EntityUid uid, ProjectileComponent component, ref AfterProjectileHitEvent args)
-    {
-        if (!TryComp<CanPenetrateComponent>(uid, out var damageAfterCollide))
-            return;
-
-        //Delete the projectile if it hits an entity with a CollisionLayer that has a higher value than it's PenetrationLayer.
-        //This allows a projectile to only penetrate a specific set of entities.
-        if (damageAfterCollide.PenetrationLayer != null)
-        {
-            if (args.Fixture.CollisionLayer > (int) damageAfterCollide.PenetrationLayer ||
-                damageAfterCollide.PenetrationPower == 0)
-            {
-                QueueDel(uid);
-                return;
-            }
-        }
-
-        //Allow the projectile to deal damage again.
-        if(damageAfterCollide.DamageAfterCollide)
-            component.DamagedEntity = false;
-
-        //If the projectile has a limit on the amount of penetrations, reduce it.
-        if (damageAfterCollide.PenetrationPower != null)
-            damageAfterCollide.PenetrationPower -= 1;
-
-        //Apply the penetration damage modifier if the projectile has one.
-        if (damageAfterCollide.DamageModifier != null)
-            component.Damage *= damageAfterCollide.DamageModifier.Value;
-
-        //Overrides the original DeleteOnCollide if the projectile passes all penetration checks.
-        //This is to prevent having to set DeleteOnCollide to false on every prototype
-        //you want to give the ability to penetrate entities.
-        if(component.DeleteOnCollide)
-            component.DeleteOnCollide = false;
-    }
 }
 
 [Serializable, NetSerializable]
@@ -228,9 +188,3 @@ public record struct ProjectileReflectAttemptEvent(EntityUid ProjUid, Projectile
 /// </summary>
 [ByRefEvent]
 public record struct ProjectileHitEvent(DamageSpecifier Damage, EntityUid Target, EntityUid? Shooter = null);
-
-/// <summary>
-/// Raised after a projectile has dealt it's damage.
-/// </summary>
-[ByRefEvent]
-public record struct AfterProjectileHitEvent(DamageSpecifier Damage, EntityUid Target, Fixture Fixture);
diff --git a/Content.Shared/Prying/Systems/PryingSystem.cs b/Content.Shared/Prying/Systems/PryingSystem.cs
index 7271258f5c..fa7a135e6c 100644
--- a/Content.Shared/Prying/Systems/PryingSystem.cs
+++ b/Content.Shared/Prying/Systems/PryingSystem.cs
@@ -74,8 +74,8 @@ public bool TryPry(EntityUid target, EntityUid user, out DoAfterId? id, EntityUi
 
         if (!CanPry(target, user, out var message, comp))
         {
-            if (message != null)
-                Popup.PopupEntity(Loc.GetString(message), target, user);
+            if (!string.IsNullOrWhiteSpace(message))
+                Popup.PopupClient(Loc.GetString(message), target, user);
             // If we have reached this point we want the event that caused this
             // to be marked as handled.
             return true;
@@ -162,23 +162,14 @@ private void OnDoAfter(EntityUid uid, DoorComponent door, DoorPryDoAfterEvent ar
 
         if (!CanPry(uid, args.User, out var message, comp))
         {
-            if (message != null)
-                Popup.PopupEntity(Loc.GetString(message), uid, args.User);
+            if (!string.IsNullOrWhiteSpace(message))
+                Popup.PopupClient(Loc.GetString(message), uid, args.User);
             return;
         }
 
-        // TODO: When we get airlock prediction make this fully predicted.
-        // When that happens also fix the checking function in the Client AirlockSystem.
         if (args.Used != null && comp != null)
         {
-            if (HasComp<AirlockComponent>(uid))
-            {
-                _audioSystem.PlayPvs(comp.UseSound, args.Used.Value);
-            }
-            else
-            {
-                _audioSystem.PlayPredicted(comp.UseSound, args.Used.Value, args.User);
-            }
+            _audioSystem.PlayPredicted(comp.UseSound, args.Used.Value, args.User);
         }
 
         var ev = new PriedEvent(args.User);
diff --git a/Content.Shared/RCD/Systems/RCDSystem.cs b/Content.Shared/RCD/Systems/RCDSystem.cs
index 402b424fb6..187c8d8a9d 100644
--- a/Content.Shared/RCD/Systems/RCDSystem.cs
+++ b/Content.Shared/RCD/Systems/RCDSystem.cs
@@ -34,7 +34,6 @@ public sealed class RCDSystem : EntitySystem
     [Dependency] private readonly SharedChargesSystem _charges = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly TagSystem _tag = default!;
     [Dependency] private readonly TurfSystem _turf = default!;
diff --git a/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs b/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs
index 587c148dd7..73f533cf69 100644
--- a/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs
+++ b/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs
@@ -2,6 +2,7 @@
 using Robust.Shared.GameStates;
 using Content.Shared.StatusIcon;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Audio;
 
 namespace Content.Shared.Revolutionary.Components;
 
@@ -17,8 +18,14 @@ public sealed partial class RevolutionaryComponent : Component, IAntagStatusIcon
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public ProtoId<StatusIconPrototype> StatusIcon { get; set; } = "RevolutionaryFaction";
 
+    /// <summary>
+    /// Sound that plays when you are chosen as Rev. (Placeholder until I find something cool I guess)
+    /// </summary>
+    [DataField]
+    public SoundSpecifier RevStartSound = new SoundPathSpecifier("/Audio/Ambience/Antag/headrev_start.ogg");
+
     public override bool SessionSpecific => true;
 
     [DataField]
-    public bool IconVisibleToGhost { get; set; } = true;
+    public bool IconVisibleToGhost { get; set; }  = true;
 }
diff --git a/Content.Shared/Roles/AntagonistRoleComponent.cs b/Content.Shared/Roles/AntagonistRoleComponent.cs
index 1ced44c910..748b18255a 100644
--- a/Content.Shared/Roles/AntagonistRoleComponent.cs
+++ b/Content.Shared/Roles/AntagonistRoleComponent.cs
@@ -1,4 +1,5 @@
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using JetBrains.Annotations;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Roles;
 
@@ -7,3 +8,13 @@ public abstract partial class AntagonistRoleComponent : Component
     [DataField("prototype", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<AntagPrototype>))]
     public string? PrototypeId;
 }
+
+/// <summary>
+/// Mark the antagonist role component as being exclusive
+/// IE by default other antagonists should refuse to select the same entity for a different antag role
+/// </summary>
+[AttributeUsage(AttributeTargets.Class, Inherited = false)]
+[BaseTypeRequired(typeof(AntagonistRoleComponent))]
+public sealed partial class ExclusiveAntagonistAttribute : Attribute
+{
+}
diff --git a/Content.Shared/Roles/DepartmentPrototype.cs b/Content.Shared/Roles/DepartmentPrototype.cs
index f79b03f4a6..024eca37fa 100644
--- a/Content.Shared/Roles/DepartmentPrototype.cs
+++ b/Content.Shared/Roles/DepartmentPrototype.cs
@@ -37,3 +37,27 @@ public sealed partial class DepartmentPrototype : IPrototype
     [DataField("weight")]
     public int Weight { get; private set; } = 0;
 }
+
+/// <summary>
+/// Sorts <see cref="DepartmentPrototype"/> appropriately for display in the UI,
+/// respecting their <see cref="DepartmentPrototype.Weight"/>.
+/// </summary>
+public sealed class DepartmentUIComparer : IComparer<DepartmentPrototype>
+{
+    public static readonly DepartmentUIComparer Instance = new();
+
+    public int Compare(DepartmentPrototype? x, DepartmentPrototype? y)
+    {
+        if (ReferenceEquals(x, y))
+            return 0;
+        if (ReferenceEquals(null, y))
+            return 1;
+        if (ReferenceEquals(null, x))
+            return -1;
+
+        var cmp = -x.Weight.CompareTo(y.Weight);
+        if (cmp != 0)
+            return cmp;
+        return string.Compare(x.ID, y.ID, StringComparison.Ordinal);
+    }
+}
diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs
index 19c11189cf..307559242b 100644
--- a/Content.Shared/Roles/JobPrototype.cs
+++ b/Content.Shared/Roles/JobPrototype.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Access;
 using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Roles;
 using Content.Shared.StatusIcon;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
@@ -76,6 +77,16 @@ public sealed partial class JobPrototype : IPrototype
         [DataField("weight")]
         public int Weight { get; private set; }
 
+        /// <summary>
+        /// How to sort this job relative to other jobs in the UI.
+        /// Jobs with a higher value with sort before jobs with a lower value.
+        /// If not set, <see cref="Weight"/> is used as a fallback.
+        /// </summary>
+        [DataField]
+        public int? DisplayWeight { get; private set; }
+
+        public int RealDisplayWeight => DisplayWeight ?? Weight;
+
         /// <summary>
         ///     A numerical score for how much easier this job is for antagonists.
         ///     For traitors, reduces starting TC by this amount. Other gamemodes can use it for whatever they find fitting.
@@ -112,4 +123,28 @@ public sealed partial class JobPrototype : IPrototype
         [DataField("extendedAccessGroups", customTypeSerializer: typeof(PrototypeIdListSerializer<AccessGroupPrototype>))]
         public IReadOnlyCollection<string> ExtendedAccessGroups { get; private set; } = Array.Empty<string>();
     }
+
+    /// <summary>
+    /// Sorts <see cref="JobPrototype"/>s appropriately for display in the UI,
+    /// respecting their <see cref="JobPrototype.Weight"/>.
+    /// </summary>
+    public sealed class JobUIComparer : IComparer<JobPrototype>
+    {
+        public static readonly JobUIComparer Instance = new();
+
+        public int Compare(JobPrototype? x, JobPrototype? y)
+        {
+            if (ReferenceEquals(x, y))
+                return 0;
+            if (ReferenceEquals(null, y))
+                return 1;
+            if (ReferenceEquals(null, x))
+                return -1;
+
+            var cmp = -x.RealDisplayWeight.CompareTo(y.RealDisplayWeight);
+            if (cmp != 0)
+                return cmp;
+            return string.Compare(x.ID, y.ID, StringComparison.Ordinal);
+        }
+    }
 }
diff --git a/Content.Shared/Roles/MindGetAllRolesEvent.cs b/Content.Shared/Roles/MindGetAllRolesEvent.cs
index 9313d94edf..6987873908 100644
--- a/Content.Shared/Roles/MindGetAllRolesEvent.cs
+++ b/Content.Shared/Roles/MindGetAllRolesEvent.cs
@@ -16,4 +16,5 @@ namespace Content.Shared.Roles;
 /// <param name="Name">Name of the role.</param>
 /// <param name="Antagonist">Whether or not this role makes this player an antagonist.</param>
 /// <param name="PlayTimeTrackerId">The <see cref="PlayTimeTrackerPrototype"/> id associated with the role.</param>
-public readonly record struct RoleInfo(Component Component, string Name, bool Antagonist, string? PlayTimeTrackerId);
+/// <param name="Prototype">The prototype ID of the role</param>
+public readonly record struct RoleInfo(Component Component, string Name, bool Antagonist, string? PlayTimeTrackerId, string Prototype);
diff --git a/Content.Shared/Roles/MindIsAntagonistEvent.cs b/Content.Shared/Roles/MindIsAntagonistEvent.cs
index e37715d803..aad3578359 100644
--- a/Content.Shared/Roles/MindIsAntagonistEvent.cs
+++ b/Content.Shared/Roles/MindIsAntagonistEvent.cs
@@ -1,9 +1,10 @@
-namespace Content.Shared.Roles;
+namespace Content.Shared.Roles;
 
 /// <summary>
 ///     Event raised on a mind entity id to get whether or not the player is considered an antagonist,
 ///     depending on their roles.
 /// </summary>
 /// <param name="IsAntagonist">Whether or not the player is an antagonist.</param>
+/// <param name="IsExclusiveAntagonist">Whether or not AntagSelectionSystem should exclude this player from other antag roles</param
 [ByRefEvent]
-public record struct MindIsAntagonistEvent(bool IsAntagonist);
+public record struct MindIsAntagonistEvent(bool IsAntagonist, bool IsExclusiveAntagonist);
diff --git a/Content.Shared/Roles/SharedRoleSystem.cs b/Content.Shared/Roles/SharedRoleSystem.cs
index 05d6ab9f37..e8053e4c67 100644
--- a/Content.Shared/Roles/SharedRoleSystem.cs
+++ b/Content.Shared/Roles/SharedRoleSystem.cs
@@ -1,10 +1,11 @@
-using Content.Shared.Administration.Logs;
+using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.Mind;
 using Content.Shared.Roles.Jobs;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
 
 namespace Content.Shared.Roles;
 
@@ -27,16 +28,18 @@ public override void Initialize()
     private void OnJobGetAllRoles(EntityUid uid, JobComponent component, ref MindGetAllRolesEvent args)
     {
         var name = "game-ticker-unknown-role";
+        var prototype = "";
         string? playTimeTracker = null;
         if (component.Prototype != null && _prototypes.TryIndex(component.Prototype, out JobPrototype? job))
         {
             name = job.Name;
+            prototype = job.ID;
             playTimeTracker = job.PlayTimeTracker;
         }
 
         name = Loc.GetString(name);
 
-        args.Roles.Add(new RoleInfo(component, name, false, playTimeTracker));
+        args.Roles.Add(new RoleInfo(component, name, false, playTimeTracker, prototype));
     }
 
     protected void SubscribeAntagEvents<T>() where T : AntagonistRoleComponent
@@ -44,16 +47,18 @@ protected void SubscribeAntagEvents<T>() where T : AntagonistRoleComponent
         SubscribeLocalEvent((EntityUid _, T component, ref MindGetAllRolesEvent args) =>
         {
             var name = "game-ticker-unknown-role";
+            var prototype = "";
             if (component.PrototypeId != null && _prototypes.TryIndex(component.PrototypeId, out AntagPrototype? antag))
             {
                 name = antag.Name;
+                prototype = antag.ID;
             }
             name = Loc.GetString(name);
 
-            args.Roles.Add(new RoleInfo(component, name, true, null));
+            args.Roles.Add(new RoleInfo(component, name, true, null, prototype));
         });
 
-        SubscribeLocalEvent((EntityUid _, T _, ref MindIsAntagonistEvent args) => args.IsAntagonist = true);
+        SubscribeLocalEvent((EntityUid _, T _, ref MindIsAntagonistEvent args) => { args.IsAntagonist = true; args.IsExclusiveAntagonist |= typeof(T).TryGetCustomAttribute<ExclusiveAntagonistAttribute>(out _); });
         _antagTypes.Add(typeof(T));
     }
 
@@ -81,7 +86,7 @@ protected void SubscribeAntagEvents<T>() where T : AntagonistRoleComponent
         AddComp(mindId, component);
         var antagonist = IsAntagonistRole<T>();
 
-        var mindEv = new MindRoleAddedEvent();
+        var mindEv = new MindRoleAddedEvent(silent);
         RaiseLocalEvent(mindId, ref mindEv);
 
         var message = new RoleAddedEvent(mindId, mind, antagonist, silent);
@@ -152,6 +157,21 @@ public bool MindIsAntagonist(EntityUid? mindId)
         return ev.IsAntagonist;
     }
 
+    /// <summary>
+    /// Does this mind possess an exclusive antagonist role
+    /// </summary>
+    /// <param name="mindId">The mind entity</param>
+    /// <returns>True if the mind possesses an exclusive antag role</returns>
+    public bool MindIsExclusiveAntagonist(EntityUid? mindId)
+    {
+        if (mindId == null)
+            return false;
+
+        var ev = new MindIsAntagonistEvent();
+        RaiseLocalEvent(mindId.Value, ref ev);
+        return ev.IsExclusiveAntagonist;
+    }
+
     public bool IsAntagonistRole<T>()
     {
         return _antagTypes.Contains(typeof(T));
diff --git a/Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs b/Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs
index 41f44f672b..fe4d59b81a 100644
--- a/Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs
+++ b/Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs
@@ -42,7 +42,7 @@ public sealed class ClaimSalvageMessage : BoundUserInterfaceMessage
 /// <summary>
 /// Added per station to store data on their available salvage missions.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, AutoGenerateComponentPause]
 public sealed partial class SalvageExpeditionDataComponent : Component
 {
     /// <summary>
@@ -61,6 +61,7 @@ public sealed partial class SalvageExpeditionDataComponent : Component
     /// Nexy time salvage missions are offered.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("nextOffer", customTypeSerializer:typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan NextOffer;
 
     [ViewVariables]
diff --git a/Content.Shared/Salvage/Fulton/FultonedComponent.cs b/Content.Shared/Salvage/Fulton/FultonedComponent.cs
index 3070249eee..c73237a366 100644
--- a/Content.Shared/Salvage/Fulton/FultonedComponent.cs
+++ b/Content.Shared/Salvage/Fulton/FultonedComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Shared.Salvage.Fulton;
 /// <summary>
 /// Marks an entity as pending being fultoned.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), AutoGenerateComponentPause]
 public sealed partial class FultonedComponent : Component
 {
     /// <summary>
@@ -26,6 +26,7 @@ public sealed partial class FultonedComponent : Component
     /// When the fulton is travelling to the beacon.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("nextFulton", customTypeSerializer:typeof(TimeOffsetSerializer)), AutoNetworkedField]
+    [AutoPausedField]
     public TimeSpan NextFulton;
 
     [ViewVariables(VVAccess.ReadWrite), DataField("sound"), AutoNetworkedField]
diff --git a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
index adaef16608..0599482bbe 100644
--- a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
+++ b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
@@ -40,7 +40,6 @@ public override void Initialize()
 
         SubscribeLocalEvent<FultonedDoAfterEvent>(OnFultonDoAfter);
 
-        SubscribeLocalEvent<FultonedComponent, EntityUnpausedEvent>(OnFultonUnpaused);
         SubscribeLocalEvent<FultonedComponent, GetVerbsEvent<InteractionVerb>>(OnFultonedGetVerbs);
         SubscribeLocalEvent<FultonedComponent, ExaminedEvent>(OnFultonedExamine);
         SubscribeLocalEvent<FultonedComponent, EntGotInsertedIntoContainerMessage>(OnFultonContainerInserted);
@@ -106,11 +105,6 @@ private void OnFultonDoAfter(FultonedDoAfterEvent args)
         Audio.PlayPredicted(fulton.FultonSound, args.Target.Value, args.User);
     }
 
-    private void OnFultonUnpaused(EntityUid uid, FultonedComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextFulton += args.PausedTime;
-    }
-
     private void OnFultonInteract(EntityUid uid, FultonComponent component, AfterInteractEvent args)
     {
         if (args.Target == null || args.Handled || !args.CanReach)
diff --git a/Content.Shared/Security/DeployableBarrierVisuals.cs b/Content.Shared/Security/DeployableBarrierVisuals.cs
deleted file mode 100644
index 147ae23bac..0000000000
--- a/Content.Shared/Security/DeployableBarrierVisuals.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Security
-{
-    [Serializable, NetSerializable]
-    public enum DeployableBarrierVisuals : byte
-    {
-        State
-    }
-
-
-    [Serializable, NetSerializable]
-    public enum DeployableBarrierState : byte
-    {
-        Idle,
-        Deployed
-    }
-}
diff --git a/Content.Shared/Security/Systems/DeployableBarrierSystem.cs b/Content.Shared/Security/Systems/DeployableBarrierSystem.cs
index 9d021c5219..7b9ce841a9 100644
--- a/Content.Shared/Security/Systems/DeployableBarrierSystem.cs
+++ b/Content.Shared/Security/Systems/DeployableBarrierSystem.cs
@@ -8,7 +8,6 @@ namespace Content.Shared.Security.Systems;
 
 public sealed class DeployableBarrierSystem : EntitySystem
 {
-    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly FixtureSystem _fixtures = default!;
     [Dependency] private readonly SharedPointLightSystem _pointLight = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
@@ -55,9 +54,6 @@ private void ToggleBarrierDeploy(EntityUid uid, bool isDeployed, DeployableBarri
                 _physics.SetHard(uid, fixture, false);
         }
 
-        var state = isDeployed ? DeployableBarrierState.Deployed : DeployableBarrierState.Idle;
-        _appearance.SetData(uid, DeployableBarrierVisuals.State, state);
-
         if (TryComp(uid, out SharedPullableComponent? pullable))
             _pulling.TryStopPull(pullable);
 
diff --git a/Content.Shared/Shuttles/BUIStates/DockingInterfaceState.cs b/Content.Shared/Shuttles/BUIStates/DockingInterfaceState.cs
new file mode 100644
index 0000000000..9070605433
--- /dev/null
+++ b/Content.Shared/Shuttles/BUIStates/DockingInterfaceState.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Shuttles.BUIStates;
+
+[Serializable, NetSerializable]
+public sealed class DockingInterfaceState
+{
+    public Dictionary<NetEntity, List<DockingPortState>> Docks;
+
+    public DockingInterfaceState(Dictionary<NetEntity, List<DockingPortState>> docks)
+    {
+        Docks = docks;
+    }
+}
diff --git a/Content.Shared/Shuttles/BUIStates/DockingPortState.cs b/Content.Shared/Shuttles/BUIStates/DockingPortState.cs
new file mode 100644
index 0000000000..a605c2ea77
--- /dev/null
+++ b/Content.Shared/Shuttles/BUIStates/DockingPortState.cs
@@ -0,0 +1,20 @@
+using Robust.Shared.Map;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Shuttles.BUIStates;
+
+/// <summary>
+/// State of each individual docking port for interface purposes
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class DockingPortState
+{
+    public string Name = string.Empty;
+
+    public NetCoordinates Coordinates;
+    public Angle Angle;
+    public NetEntity Entity;
+    public bool Connected => GridDockedWith != null;
+
+    public NetEntity? GridDockedWith;
+}
diff --git a/Content.Shared/Shuttles/BUIStates/NavBoundUserInterfaceState.cs b/Content.Shared/Shuttles/BUIStates/NavBoundUserInterfaceState.cs
new file mode 100644
index 0000000000..c18047a18b
--- /dev/null
+++ b/Content.Shared/Shuttles/BUIStates/NavBoundUserInterfaceState.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Shuttles.BUIStates;
+
+/// <summary>
+/// Wrapper around <see cref="NavInterfaceState"/>
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class NavBoundUserInterfaceState : BoundUserInterfaceState
+{
+    public NavInterfaceState State;
+
+    public NavBoundUserInterfaceState(NavInterfaceState state)
+    {
+        State = state;
+    }
+}
diff --git a/Content.Shared/Shuttles/BUIStates/NavInterfaceState.cs b/Content.Shared/Shuttles/BUIStates/NavInterfaceState.cs
new file mode 100644
index 0000000000..a6f4c01657
--- /dev/null
+++ b/Content.Shared/Shuttles/BUIStates/NavInterfaceState.cs
@@ -0,0 +1,40 @@
+using Robust.Shared.Map;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Shuttles.BUIStates;
+
+[Serializable, NetSerializable]
+public sealed class NavInterfaceState
+{
+    public float MaxRange;
+
+    /// <summary>
+    /// The relevant coordinates to base the radar around.
+    /// </summary>
+    public NetCoordinates? Coordinates;
+
+    /// <summary>
+    /// The relevant rotation to rotate the angle around.
+    /// </summary>
+    public Angle? Angle;
+
+    public Dictionary<NetEntity, List<DockingPortState>> Docks;
+
+    public NavInterfaceState(
+        float maxRange,
+        NetCoordinates? coordinates,
+        Angle? angle,
+        Dictionary<NetEntity, List<DockingPortState>> docks)
+    {
+        MaxRange = maxRange;
+        Coordinates = coordinates;
+        Angle = angle;
+        Docks = docks;
+    }
+}
+
+[Serializable, NetSerializable]
+public enum RadarConsoleUiKey : byte
+{
+    Key
+}
diff --git a/Content.Shared/Shuttles/BUIStates/RadarConsoleBoundInterfaceState.cs b/Content.Shared/Shuttles/BUIStates/RadarConsoleBoundInterfaceState.cs
deleted file mode 100644
index d60f5274b5..0000000000
--- a/Content.Shared/Shuttles/BUIStates/RadarConsoleBoundInterfaceState.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using Robust.Shared.Map;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Shuttles.BUIStates;
-
-[Serializable, NetSerializable]
-[Virtual]
-public class RadarConsoleBoundInterfaceState : BoundUserInterfaceState
-{
-    public readonly float MaxRange;
-
-    /// <summary>
-    /// The relevant coordinates to base the radar around.
-    /// </summary>
-    public NetCoordinates? Coordinates;
-
-    /// <summary>
-    /// The relevant rotation to rotate the angle around.
-    /// </summary>
-    public Angle? Angle;
-
-    public readonly List<DockingInterfaceState> Docks;
-
-    public RadarConsoleBoundInterfaceState(
-        float maxRange,
-        NetCoordinates? coordinates,
-        Angle? angle,
-        List<DockingInterfaceState> docks)
-    {
-        MaxRange = maxRange;
-        Coordinates = coordinates;
-        Angle = angle;
-        Docks = docks;
-    }
-}
-
-/// <summary>
-/// State of each individual docking port for interface purposes
-/// </summary>
-[Serializable, NetSerializable]
-public sealed class DockingInterfaceState
-{
-    public NetCoordinates Coordinates;
-    public Angle Angle;
-    public NetEntity Entity;
-    public bool Connected;
-    public Color Color;
-    public Color HighlightedColor;
-}
-
-[Serializable, NetSerializable]
-public enum RadarConsoleUiKey : byte
-{
-    Key
-}
diff --git a/Content.Shared/Shuttles/BUIStates/ShuttleBoundUserInterfaceState.cs b/Content.Shared/Shuttles/BUIStates/ShuttleBoundUserInterfaceState.cs
new file mode 100644
index 0000000000..8d418f7631
--- /dev/null
+++ b/Content.Shared/Shuttles/BUIStates/ShuttleBoundUserInterfaceState.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Shuttles.UI.MapObjects;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Shuttles.BUIStates;
+
+[Serializable, NetSerializable]
+public sealed class ShuttleBoundUserInterfaceState : BoundUserInterfaceState
+{
+    public NavInterfaceState NavState;
+    public ShuttleMapInterfaceState MapState;
+    public DockingInterfaceState DockState;
+
+    public ShuttleBoundUserInterfaceState(NavInterfaceState navState, ShuttleMapInterfaceState mapState, DockingInterfaceState dockState)
+    {
+        NavState = navState;
+        MapState = mapState;
+        DockState = dockState;
+    }
+}
diff --git a/Content.Shared/Shuttles/BUIStates/ShuttleConsoleBoundInterfaceState.cs b/Content.Shared/Shuttles/BUIStates/ShuttleConsoleBoundInterfaceState.cs
deleted file mode 100644
index db38416ce2..0000000000
--- a/Content.Shared/Shuttles/BUIStates/ShuttleConsoleBoundInterfaceState.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Content.Shared.Shuttles.Components;
-using Content.Shared.Shuttles.Systems;
-using Robust.Shared.Map;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Shuttles.BUIStates;
-
-[Serializable, NetSerializable]
-public sealed class ShuttleConsoleBoundInterfaceState : RadarConsoleBoundInterfaceState
-{
-    /// <summary>
-    /// The current FTL state.
-    /// </summary>
-    public readonly FTLState FTLState;
-
-    /// <summary>
-    ///  When the next FTL state change happens.
-    /// </summary>
-    public readonly TimeSpan FTLTime;
-
-    public List<(NetEntity Entity, string Destination, bool Enabled)> Destinations;
-
-    public ShuttleConsoleBoundInterfaceState(
-        FTLState ftlState,
-        TimeSpan ftlTime,
-        List<(NetEntity Entity, string Destination, bool Enabled)> destinations,
-        float maxRange,
-        NetCoordinates? coordinates,
-        Angle? angle,
-        List<DockingInterfaceState> docks) : base(maxRange, coordinates, angle, docks)
-    {
-        FTLState = ftlState;
-        FTLTime = ftlTime;
-        Destinations = destinations;
-    }
-}
diff --git a/Content.Shared/Shuttles/BUIStates/ShuttleMapInterfaceState.cs b/Content.Shared/Shuttles/BUIStates/ShuttleMapInterfaceState.cs
new file mode 100644
index 0000000000..cee0daab4b
--- /dev/null
+++ b/Content.Shared/Shuttles/BUIStates/ShuttleMapInterfaceState.cs
@@ -0,0 +1,38 @@
+using Content.Shared.Shuttles.Systems;
+using Content.Shared.Shuttles.UI.MapObjects;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Shuttles.BUIStates;
+
+/// <summary>
+/// Handles BUI data for Map screen.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class ShuttleMapInterfaceState
+{
+    /// <summary>
+    /// The current FTL state.
+    /// </summary>
+    public readonly FTLState FTLState;
+
+    /// <summary>
+    /// How long the FTL state takes.
+    /// </summary>
+    public float FTLDuration;
+
+    public List<ShuttleBeaconObject> Destinations;
+
+    public List<ShuttleExclusionObject> Exclusions;
+
+    public ShuttleMapInterfaceState(
+        FTLState ftlState,
+        float ftlDuration,
+        List<ShuttleBeaconObject> destinations,
+        List<ShuttleExclusionObject> exclusions)
+    {
+        FTLState = ftlState;
+        FTLDuration = ftlDuration;
+        Destinations = destinations;
+        Exclusions = exclusions;
+    }
+}
diff --git a/Content.Shared/Shuttles/Components/FTLDestinationComponent.cs b/Content.Shared/Shuttles/Components/FTLDestinationComponent.cs
new file mode 100644
index 0000000000..58cff96c2b
--- /dev/null
+++ b/Content.Shared/Shuttles/Components/FTLDestinationComponent.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Shuttles.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class FTLDestinationComponent : Component
+{
+    /// <summary>
+    /// Should this destination be restricted in some form from console visibility.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    /// Is this destination visible but available to be warped to?
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
+    public bool Enabled = true;
+
+    /// <summary>
+    /// Can we only FTL to beacons on this map.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool BeaconsOnly;
+}
diff --git a/Content.Shared/Shuttles/Components/FTLMapComponent.cs b/Content.Shared/Shuttles/Components/FTLMapComponent.cs
new file mode 100644
index 0000000000..4d57b0901f
--- /dev/null
+++ b/Content.Shared/Shuttles/Components/FTLMapComponent.cs
@@ -0,0 +1,28 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Shuttles.Components;
+
+/// <summary>
+/// Marker that specifies a map as being for FTLing entities.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class FTLMapComponent : Component
+{
+    /// <summary>
+    /// Offset for FTLing shuttles so they don't overlap each other.
+    /// </summary>
+    [DataField]
+    public int Index;
+
+    /// <summary>
+    /// What parallax to use for the background, immediately gets deffered to ParallaxComponent.
+    /// </summary>
+    [DataField]
+    public string Parallax = "FastSpace";
+
+    /// <summary>
+    /// Can FTL on this map only be done to beacons.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Beacons;
+}
diff --git a/Content.Shared/Shuttles/Components/IFFComponent.cs b/Content.Shared/Shuttles/Components/IFFComponent.cs
index 24f06e93d4..a7e6ac1152 100644
--- a/Content.Shared/Shuttles/Components/IFFComponent.cs
+++ b/Content.Shared/Shuttles/Components/IFFComponent.cs
@@ -15,10 +15,12 @@ public sealed partial class IFFComponent : Component
     /// </summary>
     public const bool ShowIFFDefault = true;
 
+    public static readonly Color SelfColor = Color.MediumSpringGreen;
+
     /// <summary>
     /// Default color to use for IFF if no component is found.
     /// </summary>
-    public static readonly Color IFFColor = Color.Aquamarine;
+    public static readonly Color IFFColor = Color.Gold;
 
     [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
     public IFFFlags Flags = IFFFlags.None;
diff --git a/Content.Shared/Shuttles/Components/PilotComponent.cs b/Content.Shared/Shuttles/Components/PilotComponent.cs
index e561aebca7..1a6927cf81 100644
--- a/Content.Shared/Shuttles/Components/PilotComponent.cs
+++ b/Content.Shared/Shuttles/Components/PilotComponent.cs
@@ -22,8 +22,6 @@ public sealed partial class PilotComponent : Component
         [ViewVariables]
         public EntityCoordinates? Position { get; set; }
 
-        public const float BreakDistance = 0.25f;
-
         public Vector2 CurTickStrafeMovement = Vector2.Zero;
         public float CurTickRotationMovement;
         public float CurTickBraking;
diff --git a/Content.Shared/Shuttles/Components/RadarConsoleComponent.cs b/Content.Shared/Shuttles/Components/RadarConsoleComponent.cs
index 96018480f1..f4ce29e691 100644
--- a/Content.Shared/Shuttles/Components/RadarConsoleComponent.cs
+++ b/Content.Shared/Shuttles/Components/RadarConsoleComponent.cs
@@ -19,4 +19,10 @@ public float RangeVV
 
     [DataField, AutoNetworkedField]
     public float MaxRange = 256f;
+
+    /// <summary>
+    /// If true, the radar will be centered on the entity. If not - on the grid on which it is located.
+    /// </summary>
+    [DataField]
+    public bool FollowEntity = false;
 }
diff --git a/Content.Shared/Shuttles/Components/SharedDockingComponent.cs b/Content.Shared/Shuttles/Components/SharedDockingComponent.cs
index 501132f804..15af045cc4 100644
--- a/Content.Shared/Shuttles/Components/SharedDockingComponent.cs
+++ b/Content.Shared/Shuttles/Components/SharedDockingComponent.cs
@@ -5,9 +5,6 @@ public abstract partial class SharedDockingComponent : Component
         // Yes I left this in for now because there's no overhead and we'll need a client one later anyway
         // and I was too lazy to delete it.
 
-        [ViewVariables]
-        public bool Enabled = false;
-
         public abstract bool Docked { get; }
     }
 }
diff --git a/Content.Shared/Shuttles/Components/ShuttleMapParallaxComponent.cs b/Content.Shared/Shuttles/Components/ShuttleMapParallaxComponent.cs
new file mode 100644
index 0000000000..1d186b3f2e
--- /dev/null
+++ b/Content.Shared/Shuttles/Components/ShuttleMapParallaxComponent.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Shuttles.Components;
+
+/// <summary>
+/// Shows a parallax background on the shuttle map console.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ShuttleMapParallaxComponent : Component
+{
+    public static readonly ResPath FallbackTexture = new ResPath("/Textures/Parallaxes/space_map2.png");
+
+    // TODO: This should ideally be shared with parallax stuff to avoid duplication, for now it's just a texture
+    [DataField, AutoNetworkedField]
+    public ResPath TexturePath;
+}
diff --git a/Content.Shared/Shuttles/Events/AutodockRequestMessage.cs b/Content.Shared/Shuttles/Events/AutodockRequestMessage.cs
deleted file mode 100644
index 39b91e6278..0000000000
--- a/Content.Shared/Shuttles/Events/AutodockRequestMessage.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Shuttles.Events;
-
-/// <summary>
-/// Raised on the client when it's viewing a particular docking port to try and dock it automatically.
-/// </summary>
-[Serializable, NetSerializable]
-public sealed class AutodockRequestMessage : BoundUserInterfaceMessage
-{
-    public NetEntity DockEntity;
-}
diff --git a/Content.Shared/Shuttles/Events/DockRequestMessage.cs b/Content.Shared/Shuttles/Events/DockRequestMessage.cs
new file mode 100644
index 0000000000..a8e0c3f7d2
--- /dev/null
+++ b/Content.Shared/Shuttles/Events/DockRequestMessage.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Shuttles.Events;
+
+/// <summary>
+/// Raised on the client when it's viewing a particular docking port to try and dock it.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class DockRequestMessage : BoundUserInterfaceMessage
+{
+    public NetEntity DockEntity;
+
+    public NetEntity TargetDockEntity;
+}
diff --git a/Content.Shared/Shuttles/Events/ShuttleConsoleFTLBeaconMessage.cs b/Content.Shared/Shuttles/Events/ShuttleConsoleFTLBeaconMessage.cs
new file mode 100644
index 0000000000..2b04514ca8
--- /dev/null
+++ b/Content.Shared/Shuttles/Events/ShuttleConsoleFTLBeaconMessage.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Shuttles.Events;
+
+/// <summary>
+/// Raised on a client when it wishes to FTL to a beacon.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class ShuttleConsoleFTLBeaconMessage : BoundUserInterfaceMessage
+{
+    public NetEntity Beacon;
+    public Angle Angle;
+}
diff --git a/Content.Shared/Shuttles/Events/ShuttleConsoleFTLPositionMessage.cs b/Content.Shared/Shuttles/Events/ShuttleConsoleFTLPositionMessage.cs
new file mode 100644
index 0000000000..4375d03721
--- /dev/null
+++ b/Content.Shared/Shuttles/Events/ShuttleConsoleFTLPositionMessage.cs
@@ -0,0 +1,14 @@
+using Robust.Shared.Map;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Shuttles.Events;
+
+/// <summary>
+/// Raised on the client when it wishes to travel somewhere.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class ShuttleConsoleFTLPositionMessage : BoundUserInterfaceMessage
+{
+    public MapCoordinates Coordinates;
+    public Angle Angle;
+}
diff --git a/Content.Shared/Shuttles/Events/ShuttleConsoleFTLRequestMessage.cs b/Content.Shared/Shuttles/Events/ShuttleConsoleFTLRequestMessage.cs
deleted file mode 100644
index 73fd9d2c64..0000000000
--- a/Content.Shared/Shuttles/Events/ShuttleConsoleFTLRequestMessage.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Shuttles.Events;
-
-/// <summary>
-/// Raised on the client when it wishes to travel somewhere.
-/// </summary>
-[Serializable, NetSerializable]
-public sealed class ShuttleConsoleFTLRequestMessage : BoundUserInterfaceMessage
-{
-    public NetEntity Destination;
-}
diff --git a/Content.Shared/Shuttles/Events/StopAutodockRequestMessage.cs b/Content.Shared/Shuttles/Events/StopAutodockRequestMessage.cs
deleted file mode 100644
index e00e1553e2..0000000000
--- a/Content.Shared/Shuttles/Events/StopAutodockRequestMessage.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Shuttles.Events;
-
-/// <summary>
-/// Raised on a client when it is no longer viewing a dock.
-/// </summary>
-[Serializable, NetSerializable]
-public sealed class StopAutodockRequestMessage : BoundUserInterfaceMessage
-{
-    public NetEntity DockEntity;
-}
diff --git a/Content.Shared/Shuttles/Systems/SharedDockingSystem.cs b/Content.Shared/Shuttles/Systems/SharedDockingSystem.cs
new file mode 100644
index 0000000000..4b3f6975d1
--- /dev/null
+++ b/Content.Shared/Shuttles/Systems/SharedDockingSystem.cs
@@ -0,0 +1,78 @@
+using Content.Shared.Shuttles.Components;
+using Robust.Shared.Map;
+
+namespace Content.Shared.Shuttles.Systems;
+
+public abstract class SharedDockingSystem : EntitySystem
+{
+    [Dependency] protected readonly SharedTransformSystem XformSystem = default!;
+
+    public const float DockingHiglightRange = 4f;
+    public const float DockRange = 1f + 0.2f;
+    public static readonly double AlignmentTolerance = Angle.FromDegrees(15).Theta;
+
+    public bool CanShuttleDock(EntityUid? shuttle)
+    {
+        if (shuttle == null)
+            return false;
+
+        return !HasComp<PreventPilotComponent>(shuttle.Value);
+    }
+
+    public bool CanShuttleUndock(EntityUid? shuttle)
+    {
+        if (shuttle == null)
+            return false;
+
+        return !HasComp<PreventPilotComponent>(shuttle.Value);
+    }
+
+    public bool CanDock(MapCoordinates mapPosA, Angle worldRotA,
+                        MapCoordinates mapPosB, Angle worldRotB)
+    {
+        // Uh oh
+        if (mapPosA.MapId != mapPosB.MapId)
+            return false;
+
+        return InRange(mapPosA, mapPosB) && InAlignment(mapPosA, worldRotA, mapPosB, worldRotB);
+    }
+
+    public bool InRange(MapCoordinates mapPosA, MapCoordinates mapPosB)
+    {
+        return (mapPosA.Position - mapPosB.Position).Length() <= DockRange;
+    }
+
+    public bool InAlignment(MapCoordinates mapPosA, Angle worldRotA, MapCoordinates mapPosB, Angle worldRotB)
+    {
+        // Check if the nubs are in line with the two docks.
+        var worldRotToB = (mapPosB.Position - mapPosA.Position).ToWorldAngle();
+        var worldRotToA = (mapPosA.Position - mapPosB.Position).ToWorldAngle();
+
+        var aDiff = Angle.ShortestDistance((worldRotA - worldRotToB).Reduced(), Angle.Zero);
+        var bDiff = Angle.ShortestDistance((worldRotB - worldRotToA).Reduced(), Angle.Zero);
+
+        if (Math.Abs(aDiff.Theta) > AlignmentTolerance)
+            return false;
+
+        if (Math.Abs(bDiff.Theta) > AlignmentTolerance)
+            return false;
+
+        return true;
+    }
+
+    public bool CanDock(NetCoordinates coordinatesOne, Angle angleOne,
+                        NetCoordinates coordinatesTwo, Angle angleTwo)
+    {
+        // TODO: Dump the dock fixtures
+        var coordsA = GetCoordinates(coordinatesOne);
+        var coordsB = GetCoordinates(coordinatesTwo);
+
+        var mapPosA = XformSystem.ToMapCoordinates(coordsA);
+        var mapPosB = XformSystem.ToMapCoordinates(coordsB);
+
+        var worldRotA = XformSystem.GetWorldRotation(coordsA.EntityId) + angleOne;
+        var worldRotB = XformSystem.GetWorldRotation(coordsB.EntityId) + angleTwo;
+
+        return CanDock(mapPosA, worldRotA, mapPosB, worldRotB);
+    }
+}
diff --git a/Content.Shared/Shuttles/Systems/SharedRadarConsoleSystem.cs b/Content.Shared/Shuttles/Systems/SharedRadarConsoleSystem.cs
index a069a2d2e2..c7e7482374 100644
--- a/Content.Shared/Shuttles/Systems/SharedRadarConsoleSystem.cs
+++ b/Content.Shared/Shuttles/Systems/SharedRadarConsoleSystem.cs
@@ -4,7 +4,6 @@ namespace Content.Shared.Shuttles.Systems;
 
 public abstract class SharedRadarConsoleSystem : EntitySystem
 {
-    public const float DefaultMinRange = 64f;
     public const float DefaultMaxRange = 256f;
 
     protected virtual void UpdateState(EntityUid uid, RadarConsoleComponent component)
diff --git a/Content.Shared/Shuttles/Systems/SharedShuttleConsoleSystem.cs b/Content.Shared/Shuttles/Systems/SharedShuttleConsoleSystem.cs
index f6224a8af6..38a76ae6d1 100644
--- a/Content.Shared/Shuttles/Systems/SharedShuttleConsoleSystem.cs
+++ b/Content.Shared/Shuttles/Systems/SharedShuttleConsoleSystem.cs
@@ -1,5 +1,6 @@
 using Content.Shared.ActionBlocker;
 using Content.Shared.Movement.Events;
+using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Components;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.IFF.cs b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.IFF.cs
index 587b5fafe0..72068c71f8 100644
--- a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.IFF.cs
+++ b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.IFF.cs
@@ -11,6 +11,43 @@ public abstract partial class SharedShuttleSystem
 
     protected virtual void UpdateIFFInterfaces(EntityUid gridUid, IFFComponent component) {}
 
+    public Color GetIFFColor(EntityUid gridUid, bool self = false, IFFComponent? component = null)
+    {
+        if (self)
+        {
+            return IFFComponent.SelfColor;
+        }
+
+        if (!Resolve(gridUid, ref component, false))
+        {
+            return IFFComponent.IFFColor;
+        }
+
+        return component.Color;
+    }
+
+    public string? GetIFFLabel(EntityUid gridUid, bool self = false, IFFComponent? component = null)
+    {
+        if (!IFFComponent.ShowIFFDefault)
+        {
+            return null;
+        }
+
+        var entName = MetaData(gridUid).EntityName;
+
+        if (self)
+        {
+            return entName;
+        }
+
+        if (Resolve(gridUid, ref component, false) && (component.Flags & (IFFFlags.HideLabel | IFFFlags.Hide)) != 0x0)
+        {
+            return null;
+        }
+
+        return string.IsNullOrEmpty(entName) ? Loc.GetString("shuttle-console-unknown") : entName;
+    }
+
     /// <summary>
     /// Sets the color for this grid to appear as on radar.
     /// </summary>
diff --git a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
index 8471e83df5..324fd65c86 100644
--- a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
+++ b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
@@ -1,7 +1,198 @@
+using Content.Shared.Shuttles.BUIStates;
+using Content.Shared.Shuttles.Components;
+using Content.Shared.Shuttles.UI.MapObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Physics.Collision.Shapes;
+using Robust.Shared.Physics.Components;
+
 namespace Content.Shared.Shuttles.Systems;
 
 public abstract partial class SharedShuttleSystem : EntitySystem
 {
+    [Dependency] private   readonly IMapManager _mapManager = default!;
+    [Dependency] protected readonly SharedMapSystem Maps = default!;
+    [Dependency] protected readonly SharedTransformSystem XformSystem = default!;
+
+    public const float FTLRange = 512f;
+    public const float FTLBufferRange = 8f;
+
+    private EntityQuery<MapGridComponent> _gridQuery;
+    private EntityQuery<PhysicsComponent> _physicsQuery;
+    private EntityQuery<TransformComponent> _xformQuery;
+
+    private List<Entity<MapGridComponent>> _grids = new();
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        _gridQuery = GetEntityQuery<MapGridComponent>();
+        _physicsQuery = GetEntityQuery<PhysicsComponent>();
+        _xformQuery = GetEntityQuery<TransformComponent>();
+    }
+
+    /// <summary>
+    /// Returns whether an entity can FTL to the specified map.
+    /// </summary>
+    public bool CanFTLTo(EntityUid shuttleUid, MapId targetMap)
+    {
+        var mapUid = _mapManager.GetMapEntityId(targetMap);
+        var shuttleMap = _xformQuery.GetComponent(shuttleUid).MapID;
+
+        if (shuttleMap == targetMap)
+            return true;
+
+        if (!TryComp<FTLDestinationComponent>(mapUid, out var destination) ||
+            !destination.Enabled)
+        {
+            return false;
+        }
+
+        if (HasComp<FTLMapComponent>(mapUid))
+            return false;
+
+        return destination.Whitelist?.IsValid(shuttleUid, EntityManager) != false;
+    }
+
+    /// <summary>
+    /// Gets the list of map objects relevant for the specified map.
+    /// </summary>
+    public IEnumerable<(ShuttleExclusionObject Exclusion, MapCoordinates Coordinates)> GetExclusions(MapId mapId, List<ShuttleExclusionObject> exclusions)
+    {
+        foreach (var exc in exclusions)
+        {
+            var beaconCoords = XformSystem.ToMapCoordinates(GetCoordinates(exc.Coordinates));
+
+            if (beaconCoords.MapId != mapId)
+                continue;
+
+            yield return (exc, beaconCoords);
+        }
+    }
+
+    /// <summary>
+    /// Gets the list of map objects relevant for the specified map.
+    /// </summary>
+    public IEnumerable<(ShuttleBeaconObject Beacon, MapCoordinates Coordinates)> GetBeacons(MapId mapId, List<ShuttleBeaconObject> beacons)
+    {
+        foreach (var beacon in beacons)
+        {
+            var beaconCoords = XformSystem.ToMapCoordinates(GetCoordinates(beacon.Coordinates));
+
+            if (beaconCoords.MapId != mapId)
+                continue;
+
+            yield return (beacon, beaconCoords);
+        }
+    }
+
+    public bool CanDraw(EntityUid gridUid, PhysicsComponent? physics = null, IFFComponent? iffComp = null)
+    {
+        if (!Resolve(gridUid, ref physics))
+            return true;
+
+        if (physics.Mass < 10f)
+        {
+            return false;
+        }
+
+        if (!Resolve(gridUid, ref iffComp, false))
+        {
+            return true;
+        }
+
+        // Hide it entirely.
+        return (iffComp.Flags & IFFFlags.Hide) == 0x0;
+    }
+
+    public bool IsBeaconMap(EntityUid mapUid)
+    {
+        return TryComp(mapUid, out FTLDestinationComponent? ftlDest) && ftlDest.BeaconsOnly;
+    }
+
+    /// <summary>
+    /// Returns true if a beacon can be FTLd to.
+    /// </summary>
+    public bool CanFTLBeacon(NetCoordinates nCoordinates)
+    {
+        // Only beacons parented to map supported.
+        var coordinates = GetCoordinates(nCoordinates);
+        return HasComp<MapComponent>(coordinates.EntityId);
+    }
+
+    public float GetFTLRange(EntityUid shuttleUid) => FTLRange;
+
+    public float GetFTLBufferRange(EntityUid shuttleUid, MapGridComponent? grid = null)
+    {
+        if (!_gridQuery.Resolve(shuttleUid, ref grid))
+            return 0f;
+
+        var localAABB = grid.LocalAABB;
+        var maxExtent = localAABB.MaxDimension / 2f;
+        var range = maxExtent + FTLBufferRange;
+        return range;
+    }
+
+    /// <summary>
+    /// Returns true if the spot is free to be FTLd to (not close to any objects and in range).
+    /// </summary>
+    public bool FTLFree(EntityUid shuttleUid, EntityCoordinates coordinates, Angle angle, List<ShuttleExclusionObject>? exclusionZones)
+    {
+        if (!_physicsQuery.TryGetComponent(shuttleUid, out var shuttlePhysics) ||
+            !_xformQuery.TryGetComponent(shuttleUid, out var shuttleXform))
+        {
+            return false;
+        }
+
+        // Just checks if any grids inside of a buffer range at the target position.
+        _grids.Clear();
+        var ftlRange = FTLRange;
+        var mapCoordinates = coordinates.ToMap(EntityManager, XformSystem);
+
+        var ourPos = Maps.GetGridPosition((shuttleUid, shuttlePhysics, shuttleXform));
+
+        // This is the already adjusted position
+        var targetPosition = mapCoordinates.Position;
+
+        // Check range even if it's cross-map.
+        if ((targetPosition - ourPos).Length() > FTLRange)
+        {
+            return false;
+        }
+
+        // Check exclusion zones.
+        // This needs to be passed in manually due to PVS.
+        if (exclusionZones != null)
+        {
+            foreach (var exclusion in exclusionZones)
+            {
+                var exclusionCoords = XformSystem.ToMapCoordinates(GetCoordinates(exclusion.Coordinates));
+
+                if (exclusionCoords.MapId != mapCoordinates.MapId)
+                    continue;
+
+                if ((mapCoordinates.Position - exclusionCoords.Position).Length() <= exclusion.Range)
+                    return false;
+            }
+        }
+
+        var ourFTLBuffer = GetFTLBufferRange(shuttleUid);
+        var circle = new PhysShapeCircle(ourFTLBuffer + FTLBufferRange, targetPosition);
+
+        _mapManager.FindGridsIntersecting(mapCoordinates.MapId, circle, Robust.Shared.Physics.Transform.Empty,
+            ref _grids, includeMap: false);
+
+        // If any grids in range that aren't us then can't FTL.
+        foreach (var grid in _grids)
+        {
+            if (grid.Owner == shuttleUid)
+                continue;
+
+            return false;
+        }
+
+        return true;
+    }
 }
 
 [Flags]
diff --git a/Content.Shared/Shuttles/UI/MapObjects/GridMapObject.cs b/Content.Shared/Shuttles/UI/MapObjects/GridMapObject.cs
new file mode 100644
index 0000000000..cb4194b732
--- /dev/null
+++ b/Content.Shared/Shuttles/UI/MapObjects/GridMapObject.cs
@@ -0,0 +1,7 @@
+namespace Content.Shared.Shuttles.UI.MapObjects;
+
+public record struct GridMapObject : IMapObject
+{
+    public string Name { get; set; }
+    public EntityUid Entity;
+}
diff --git a/Content.Shared/Shuttles/UI/MapObjects/IMapObject.cs b/Content.Shared/Shuttles/UI/MapObjects/IMapObject.cs
new file mode 100644
index 0000000000..80e165d0b0
--- /dev/null
+++ b/Content.Shared/Shuttles/UI/MapObjects/IMapObject.cs
@@ -0,0 +1,9 @@
+namespace Content.Shared.Shuttles.UI.MapObjects;
+
+/// <summary>
+/// Abstract map object representing a grid, beacon etc for use on the map screen.
+/// </summary>
+public interface IMapObject
+{
+    string Name { get; }
+}
diff --git a/Content.Shared/Shuttles/UI/MapObjects/ShuttleBeaconObject.cs b/Content.Shared/Shuttles/UI/MapObjects/ShuttleBeaconObject.cs
new file mode 100644
index 0000000000..2be80f46a8
--- /dev/null
+++ b/Content.Shared/Shuttles/UI/MapObjects/ShuttleBeaconObject.cs
@@ -0,0 +1,7 @@
+using Robust.Shared.Map;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Shuttles.UI.MapObjects;
+
+[Serializable, NetSerializable]
+public readonly record struct ShuttleBeaconObject(NetEntity Entity, NetCoordinates Coordinates, string Name) : IMapObject;
diff --git a/Content.Shared/Shuttles/UI/MapObjects/ShuttleExclusionObject.cs b/Content.Shared/Shuttles/UI/MapObjects/ShuttleExclusionObject.cs
new file mode 100644
index 0000000000..a5ac93c658
--- /dev/null
+++ b/Content.Shared/Shuttles/UI/MapObjects/ShuttleExclusionObject.cs
@@ -0,0 +1,7 @@
+using Robust.Shared.Map;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Shuttles.UI.MapObjects;
+
+[Serializable, NetSerializable]
+public record struct ShuttleExclusionObject(NetCoordinates Coordinates, float Range, string Name = "") : IMapObject;
diff --git a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs
index 9aa0aa9a38..c0619e6e43 100644
--- a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs
+++ b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs
@@ -21,6 +21,14 @@ public override void Initialize()
 
     protected virtual void OnAttemptEmag(EntityUid uid, EmagSiliconLawComponent component, ref OnAttemptEmagEvent args)
     {
+        //prevent self emagging
+        if (uid == args.UserUid)
+        {
+            _popup.PopupClient(Loc.GetString("law-emag-cannot-emag-self"), uid, args.UserUid);
+            args.Handled = true;
+            return;
+        }
+
         if (component.RequireOpenPanel &&
             TryComp<WiresPanelComponent>(uid, out var panel) &&
             !panel.Open)
diff --git a/Content.Shared/Singularity/Components/EventHorizonComponent.cs b/Content.Shared/Singularity/Components/EventHorizonComponent.cs
index 2aa081915b..106d790ccb 100644
--- a/Content.Shared/Singularity/Components/EventHorizonComponent.cs
+++ b/Content.Shared/Singularity/Components/EventHorizonComponent.cs
@@ -10,7 +10,7 @@ namespace Content.Shared.Singularity.Components;
 /// Primarily managed by <see cref="SharedEventHorizonSystem"/> and its server/client versions.
 /// </summary>
 [Access(friends: typeof(SharedEventHorizonSystem))]
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
 public sealed partial class EventHorizonComponent : Component
 {
     /// <summary>
@@ -78,6 +78,7 @@ public sealed partial class EventHorizonComponent : Component
     /// The next time at which this consumed everything it overlapped with.
     /// </summary>
     [ViewVariables(VVAccess.ReadOnly), DataField("nextConsumeWaveTime", customTypeSerializer:typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan NextConsumeWaveTime;
 
     #endregion Update Timing
diff --git a/Content.Shared/Sound/Components/EmitSoundOnCollideComponent.cs b/Content.Shared/Sound/Components/EmitSoundOnCollideComponent.cs
index f2c71ad120..a2cdd63ab7 100644
--- a/Content.Shared/Sound/Components/EmitSoundOnCollideComponent.cs
+++ b/Content.Shared/Sound/Components/EmitSoundOnCollideComponent.cs
@@ -3,7 +3,7 @@
 
 namespace Content.Shared.Sound.Components;
 
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause]
 public sealed partial class EmitSoundOnCollideComponent : BaseEmitSoundComponent
 {
     public static readonly TimeSpan CollideCooldown = TimeSpan.FromSeconds(0.2);
@@ -18,5 +18,6 @@ public sealed partial class EmitSoundOnCollideComponent : BaseEmitSoundComponent
     /// To avoid sound spam add a cooldown to it.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("nextSound", customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
     public TimeSpan NextSound;
 }
diff --git a/Content.Shared/Sound/SharedEmitSoundSystem.cs b/Content.Shared/Sound/SharedEmitSoundSystem.cs
index 5e131a1355..22ba8e0e3e 100644
--- a/Content.Shared/Sound/SharedEmitSoundSystem.cs
+++ b/Content.Shared/Sound/SharedEmitSoundSystem.cs
@@ -42,7 +42,6 @@ public override void Initialize()
         SubscribeLocalEvent<EmitSoundOnPickupComponent, GotEquippedHandEvent>(OnEmitSoundOnPickup);
         SubscribeLocalEvent<EmitSoundOnDropComponent, DroppedEvent>(OnEmitSoundOnDrop);
 
-        SubscribeLocalEvent<EmitSoundOnCollideComponent, EntityUnpausedEvent>(OnEmitSoundUnpaused);
         SubscribeLocalEvent<EmitSoundOnCollideComponent, StartCollideEvent>(OnEmitSoundOnCollide);
     }
 
@@ -119,11 +118,6 @@ protected void TryEmitSound(EntityUid uid, BaseEmitSoundComponent component, Ent
         }
     }
 
-    private void OnEmitSoundUnpaused(EntityUid uid, EmitSoundOnCollideComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextSound += args.PausedTime;
-    }
-
     private void OnEmitSoundOnCollide(EntityUid uid, EmitSoundOnCollideComponent component, ref StartCollideEvent args)
     {
         if (!args.OurFixture.Hard ||
diff --git a/Content.Shared/Species/Components/GibActionComponent.cs b/Content.Shared/Species/Components/GibActionComponent.cs
new file mode 100644
index 0000000000..bed94f047e
--- /dev/null
+++ b/Content.Shared/Species/Components/GibActionComponent.cs
@@ -0,0 +1,30 @@
+using Content.Shared.Mobs;
+using Robust.Shared.Prototypes;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Species.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class GibActionComponent : Component
+{
+    /// <summary>
+    /// The action to use.
+    /// </summary>
+    [DataField("actionPrototype", required: true)]
+    public EntProtoId ActionPrototype;
+
+    [DataField, AutoNetworkedField] 
+    public EntityUid? ActionEntity;
+
+    /// <summary>
+    /// What mob states the action will appear in
+    /// </summary>
+    [DataField("allowedStates"), ViewVariables(VVAccess.ReadWrite)]
+    public List<MobState> AllowedStates = new();
+
+    /// <summary>
+    /// The text that appears when attempting to split.
+    /// </summary>
+    [DataField("popupText")]
+    public string PopupText = "diona-gib-action-use";
+}
diff --git a/Content.Shared/Species/Components/NymphComponent.cs b/Content.Shared/Species/Components/NymphComponent.cs
new file mode 100644
index 0000000000..e8fe2f367e
--- /dev/null
+++ b/Content.Shared/Species/Components/NymphComponent.cs
@@ -0,0 +1,24 @@
+using Robust.Shared.Prototypes;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Species.Components;
+/// <summary>
+/// This will replace one entity with another entity when it is removed from a body part.
+/// Obviously hyper-specific. If you somehow find another use for this, good on you. 
+/// </summary>
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class NymphComponent : Component
+{
+    /// <summary>
+    /// The entity to replace the organ with.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId EntityPrototype = default!;
+
+    /// <summary>
+    /// Whether to transfer the mind to this new entity.
+    /// </summary>
+    [DataField]
+    public bool TransferMind = false;
+}
diff --git a/Content.Shared/Species/Components/ReformComponent.cs b/Content.Shared/Species/Components/ReformComponent.cs
new file mode 100644
index 0000000000..724c9dc330
--- /dev/null
+++ b/Content.Shared/Species/Components/ReformComponent.cs
@@ -0,0 +1,48 @@
+    using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Species.Components;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ReformComponent : Component
+{
+    /// <summary>
+    /// The action to use.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId ActionPrototype = default!;
+
+    [DataField, AutoNetworkedField] 
+    public EntityUid? ActionEntity;
+
+    /// <summary>
+    /// How long it will take to reform
+    /// </summary>
+    [DataField(required: true)]
+    public float ReformTime = 0;
+
+    /// <summary>
+    /// Whether or not the entity should start with a cooldown
+    /// </summary>
+    [DataField]
+    public bool StartDelayed = true;
+
+    /// <summary>
+    /// Whether or not the entity should be stunned when reforming at all
+    /// </summary>
+    [DataField]
+    public bool ShouldStun = true;
+
+    /// <summary>
+    /// The text that appears when attempting to reform
+    /// </summary>
+    [DataField(required: true)]
+    public string PopupText;
+
+    /// <summary>
+    /// The mob that our entity will reform into
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId ReformPrototype { get; private set; }
+}
diff --git a/Content.Shared/Species/Systems/GibActionSystem.cs b/Content.Shared/Species/Systems/GibActionSystem.cs
new file mode 100644
index 0000000000..bd7cb6baff
--- /dev/null
+++ b/Content.Shared/Species/Systems/GibActionSystem.cs
@@ -0,0 +1,61 @@
+using Content.Shared.Species.Components;
+using Content.Shared.Actions;
+using Content.Shared.Body.Systems;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Popups;
+using Robust.Shared.Prototypes;
+
+
+namespace Content.Shared.Species;
+
+public sealed partial class GibActionSystem : EntitySystem
+{
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
+    [Dependency] private readonly IPrototypeManager _protoManager = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GibActionComponent, MobStateChangedEvent>(OnMobStateChanged);
+        SubscribeLocalEvent<GibActionComponent, GibActionEvent>(OnGibAction);
+    }
+
+    private void OnMobStateChanged(EntityUid uid, GibActionComponent comp, MobStateChangedEvent args)
+    {
+        // When the mob changes state, check if they're dead and give them the action if so. 
+        if (!TryComp<MobStateComponent>(uid, out var mobState))
+            return;
+
+        if (!_protoManager.TryIndex<EntityPrototype>(comp.ActionPrototype, out var actionProto))
+            return;
+
+
+        foreach (var allowedState in comp.AllowedStates)
+        {
+            if(allowedState == mobState.CurrentState)
+            {
+                // The mob should never have more than 1 state so I don't see this being an issue
+                _actionsSystem.AddAction(uid, ref comp.ActionEntity, comp.ActionPrototype);
+                return;
+            }
+        }
+
+        // If they aren't given the action, remove it.
+        _actionsSystem.RemoveAction(uid, comp.ActionEntity);
+    }
+    
+    private void OnGibAction(EntityUid uid, GibActionComponent comp, GibActionEvent args)
+    {
+        // When they use the action, gib them.
+        _popupSystem.PopupClient(Loc.GetString(comp.PopupText, ("name", uid)), uid, uid);
+        _bodySystem.GibBody(uid, true);
+    }
+       
+
+
+    public sealed partial class GibActionEvent : InstantActionEvent { } 
+}
diff --git a/Content.Shared/Species/Systems/ReformSystem.cs b/Content.Shared/Species/Systems/ReformSystem.cs
new file mode 100644
index 0000000000..dc2ce3fb90
--- /dev/null
+++ b/Content.Shared/Species/Systems/ReformSystem.cs
@@ -0,0 +1,112 @@
+using Content.Shared.Species.Components;
+using Content.Shared.Actions;
+using Content.Shared.DoAfter;
+using Content.Shared.Popups;
+using Content.Shared.Stunnable;
+using Content.Shared.Mind;
+using Content.Shared.Zombies;
+using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Species;
+
+public sealed partial class ReformSystem : EntitySystem
+{
+    [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
+    [Dependency] private readonly INetManager _netMan = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly IPrototypeManager _protoManager = default!;
+    [Dependency] private readonly SharedStunSystem _stunSystem = default!;
+    [Dependency] private readonly IGameTiming _gameTiming = default!;
+    [Dependency] private readonly SharedMindSystem _mindSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ReformComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ReformComponent, ComponentShutdown>(OnCompRemove);
+
+        SubscribeLocalEvent<ReformComponent, ReformEvent>(OnReform);
+        SubscribeLocalEvent<ReformComponent, ReformDoAfterEvent>(OnDoAfter);
+
+        SubscribeLocalEvent<ReformComponent, EntityZombifiedEvent>(OnZombified);
+    }
+
+    private void OnMapInit(EntityUid uid, ReformComponent comp, MapInitEvent args)
+    {
+        // When the map is initialized, give them the action
+        if (comp.ActionPrototype != default && !_protoManager.TryIndex<EntityPrototype>(comp.ActionPrototype, out var actionProto))
+            return;
+
+        _actionsSystem.AddAction(uid, ref comp.ActionEntity, out var reformAction, comp.ActionPrototype);
+
+        // See if the action should start with a delay, and give it that starting delay if so.
+        if (comp.StartDelayed && reformAction != null && reformAction.UseDelay != null)
+        {
+            var start = _gameTiming.CurTime;
+            var end = _gameTiming.CurTime + reformAction.UseDelay.Value;
+
+            _actionsSystem.SetCooldown(comp.ActionEntity!.Value, start, end);
+        }
+    }
+
+    private void OnCompRemove(EntityUid uid, ReformComponent comp, ComponentShutdown args)
+    {
+        _actionsSystem.RemoveAction(uid, comp.ActionEntity);
+    }
+
+    private void OnReform(EntityUid uid, ReformComponent comp, ReformEvent args)
+    {
+        // Stun them when they use the action for the amount of reform time.
+        if (comp.ShouldStun)
+            _stunSystem.TryStun(uid, TimeSpan.FromSeconds(comp.ReformTime), true);
+        _popupSystem.PopupClient(Loc.GetString(comp.PopupText, ("name", uid)), uid, uid);
+
+        // Create a doafter & start it
+        var doAfter = new DoAfterArgs(EntityManager, uid, comp.ReformTime, new ReformDoAfterEvent(), uid)
+        {
+            BreakOnUserMove = true,
+            BlockDuplicate = true,
+            BreakOnDamage = true,
+            CancelDuplicate = true,
+            RequireCanInteract = false,
+        };
+
+        _doAfterSystem.TryStartDoAfter(doAfter);
+        args.Handled = true;
+    }
+
+    private void OnDoAfter(EntityUid uid, ReformComponent comp, ReformDoAfterEvent args)
+    {
+        if (args.Cancelled || args.Handled || comp.Deleted)
+            return;
+
+        if (_netMan.IsClient)
+            return;
+
+        // Spawn a new entity
+        // This is, to an extent, taken from polymorph. I don't use polymorph for various reasons- most notably that this is permanent. 
+        var child = Spawn(comp.ReformPrototype, Transform(uid).Coordinates);
+
+        // This transfers the mind to the new entity
+        if (_mindSystem.TryGetMind(uid, out var mindId, out var mind))
+            _mindSystem.TransferTo(mindId, child, mind: mind);
+
+        // Delete the old entity
+        QueueDel(uid);
+    }
+
+    private void OnZombified(EntityUid uid, ReformComponent comp, ref EntityZombifiedEvent args)
+    {
+        _actionsSystem.RemoveAction(uid, comp.ActionEntity); // Zombies can't reform
+    }
+
+    public sealed partial class ReformEvent : InstantActionEvent { } 
+    
+    [Serializable, NetSerializable]
+    public sealed partial class ReformDoAfterEvent : SimpleDoAfterEvent { }
+}
diff --git a/Content.Shared/Speech/Muting/MutedComponent.cs b/Content.Shared/Speech/Muting/MutedComponent.cs
new file mode 100644
index 0000000000..46e5f2cbd8
--- /dev/null
+++ b/Content.Shared/Speech/Muting/MutedComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Speech.Muting
+{
+    [RegisterComponent, NetworkedComponent]
+    public sealed partial class MutedComponent : Component
+    {
+
+    }
+}
diff --git a/Content.Shared/Spider/SharedSpiderSystem.cs b/Content.Shared/Spider/SharedSpiderSystem.cs
index 2795d64b93..33473303aa 100644
--- a/Content.Shared/Spider/SharedSpiderSystem.cs
+++ b/Content.Shared/Spider/SharedSpiderSystem.cs
@@ -7,7 +7,6 @@ namespace Content.Shared.Spider;
 public abstract class SharedSpiderSystem : EntitySystem
 {
     [Dependency] private readonly SharedActionsSystem _action = default!;
-    [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
 
diff --git a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
index 1e784797e3..529e321f8d 100644
--- a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
+++ b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs
@@ -24,7 +24,6 @@ public abstract class SharedSprayPainterSystem : EntitySystem
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
     [Dependency] protected readonly SharedDoAfterSystem DoAfter = default!;
     [Dependency] private   readonly SharedPopupSystem _popup = default!;
-    [Dependency] private   readonly SharedUserInterfaceSystem _ui = default!;
 
     public List<AirlockStyle> Styles { get; private set; } = new();
     public List<AirlockGroupPrototype> Groups { get; private set; } = new();
diff --git a/Content.Shared/StatusIcon/StatusIconPrototype.cs b/Content.Shared/StatusIcon/StatusIconPrototype.cs
index 1523ff4e0a..a313f55c05 100644
--- a/Content.Shared/StatusIcon/StatusIconPrototype.cs
+++ b/Content.Shared/StatusIcon/StatusIconPrototype.cs
@@ -34,6 +34,12 @@ public int CompareTo(StatusIconData? other)
     {
         return Priority.CompareTo(other?.Priority ?? int.MaxValue);
     }
+
+    /// <summary>
+    /// The layer the icon is displayed on. Mod is drawn above Base. Base | Mod
+    /// </summary>
+    [DataField]
+    public StatusIconLayer Layer = StatusIconLayer.Base;
 }
 
 /// <summary>
@@ -63,3 +69,9 @@ public enum StatusIconLocationPreference : byte
     Left,
     Right,
 }
+
+public enum StatusIconLayer : byte
+{
+    Base,
+    Mod,
+}
diff --git a/Content.Shared/Stealth/SharedStealthSystem.cs b/Content.Shared/Stealth/SharedStealthSystem.cs
index aeb42453ca..d0ea804534 100644
--- a/Content.Shared/Stealth/SharedStealthSystem.cs
+++ b/Content.Shared/Stealth/SharedStealthSystem.cs
@@ -10,7 +10,6 @@ namespace Content.Shared.Stealth;
 public abstract class SharedStealthSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly MobStateSystem _mobState = default!;
 
     public override void Initialize()
     {
diff --git a/Content.Shared/Storage/Components/DumpableComponent.cs b/Content.Shared/Storage/Components/DumpableComponent.cs
index f10a935fb9..ecf5f17ea9 100644
--- a/Content.Shared/Storage/Components/DumpableComponent.cs
+++ b/Content.Shared/Storage/Components/DumpableComponent.cs
@@ -1,4 +1,5 @@
 using Content.Shared.DoAfter;
+using Content.Shared.Storage.EntitySystems;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
@@ -24,7 +25,7 @@ public sealed partial class DumpableComponent : Component
     /// How long each item adds to the doafter.
     /// </summary>
     [DataField("delayPerItem"), AutoNetworkedField]
-    public TimeSpan DelayPerItem = TimeSpan.FromSeconds(0.2);
+    public TimeSpan DelayPerItem = TimeSpan.FromSeconds(SharedStorageSystem.AreaInsertDelayPerItem);
 
     /// <summary>
     /// The multiplier modifier
diff --git a/Content.Shared/Storage/Components/MagnetPickupComponent.cs b/Content.Shared/Storage/Components/MagnetPickupComponent.cs
index c57b7c4e85..3467439a6d 100644
--- a/Content.Shared/Storage/Components/MagnetPickupComponent.cs
+++ b/Content.Shared/Storage/Components/MagnetPickupComponent.cs
@@ -5,10 +5,11 @@ namespace Content.Server.Storage.Components;
 /// <summary>
 /// Applies an ongoing pickup area around the attached entity.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, AutoGenerateComponentPause]
 public sealed partial class MagnetPickupComponent : Component
 {
     [ViewVariables(VVAccess.ReadWrite), DataField("nextScan")]
+    [AutoPausedField]
     public TimeSpan NextScan = TimeSpan.Zero;
 
     /// <summary>
diff --git a/Content.Shared/Storage/EntitySystems/BinSystem.cs b/Content.Shared/Storage/EntitySystems/BinSystem.cs
index afb1e52881..17c3eb4288 100644
--- a/Content.Shared/Storage/EntitySystems/BinSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/BinSystem.cs
@@ -4,12 +4,11 @@
 using Content.Shared.Examine;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
+using Content.Shared.Item;
 using Content.Shared.Storage.Components;
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
-using Robust.Shared.Map;
 using Robust.Shared.Network;
-using Robust.Shared.Timing;
 
 namespace Content.Shared.Storage.EntitySystems;
 
@@ -18,7 +17,6 @@ namespace Content.Shared.Storage.EntitySystems;
 /// </summary>
 public sealed class BinSystem : EntitySystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly ISharedAdminLogManager _admin = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
@@ -32,7 +30,7 @@ public override void Initialize()
         SubscribeLocalEvent<BinComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<BinComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<BinComponent, EntRemovedFromContainerMessage>(OnEntRemoved);
-        SubscribeLocalEvent<BinComponent, InteractHandEvent>(OnInteractHand);
+        SubscribeLocalEvent<BinComponent, InteractHandEvent>(OnInteractHand, before: new[] { typeof(SharedItemSystem) });
         SubscribeLocalEvent<BinComponent, AfterInteractUsingEvent>(OnAfterInteractUsing);
         SubscribeLocalEvent<BinComponent, GetVerbsEvent<AlternativeVerb>>(OnAltInteractHand);
         SubscribeLocalEvent<BinComponent, ExaminedEvent>(OnExamined);
@@ -73,7 +71,7 @@ private void OnEntRemoved(EntityUid uid, BinComponent component, EntRemovedFromC
 
     private void OnInteractHand(EntityUid uid, BinComponent component, InteractHandEvent args)
     {
-        if (args.Handled || !_timing.IsFirstTimePredicted)
+        if (args.Handled)
             return;
 
         EntityUid? toGrab = component.Items.LastOrDefault();
@@ -111,9 +109,6 @@ private void InsertIntoBin(EntityUid user, EntityUid target, EntityUid itemInHan
         if (handled || !canReach)
             return;
 
-        if (!_timing.IsFirstTimePredicted)
-            return;
-
         if (!TryInsertIntoBin(target, itemInHand, component))
             return;
 
diff --git a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
index cf548693f9..04f7231416 100644
--- a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs
@@ -2,11 +2,13 @@
 using Content.Shared.Disposal;
 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;
 using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
@@ -14,6 +16,7 @@ namespace Content.Shared.Storage.EntitySystems;
 
 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 SharedContainerSystem _container = default!;
@@ -113,7 +116,20 @@ private void StartDoAfter(EntityUid storageUid, EntityUid? targetUid, EntityUid
         if (!TryComp<StorageComponent>(storageUid, out var storage))
             return;
 
-        var delay = storage.Container.ContainedEntities.Count * (float) dumpable.DelayPerItem.TotalSeconds * dumpable.Multiplier;
+        var delay = 0f;
+
+        foreach (var entity in storage.Container.ContainedEntities)
+        {
+            if (!TryComp<ItemComponent>(entity, out var itemComp) ||
+                !_prototypeManager.TryIndex(itemComp.Size, out var itemSize))
+            {
+                continue;
+            }
+
+            delay += itemSize.Weight;
+        }
+
+        delay *= (float) dumpable.DelayPerItem.TotalSeconds * dumpable.Multiplier;
 
         _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, userUid, delay, new DumpableDoAfterEvent(), storageUid, target: targetUid, used: storageUid)
         {
@@ -141,7 +157,7 @@ private void OnDoAfter(EntityUid uid, DumpableComponent component, DoAfterEvent
         {
             var transform = Transform(entity);
             _container.AttachParentToContainerOrGrid((entity, transform));
-            _transformSystem.SetLocalPositionRotation(transform, transform.LocalPosition + _random.NextVector2Box() / 2, _random.NextAngle());
+            _transformSystem.SetLocalPositionRotation(entity, transform.LocalPosition + _random.NextVector2Box() / 2, _random.NextAngle(), transform);
         }
 
         if (args.Args.Target == null)
diff --git a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
index 1703db25f3..21861f57da 100644
--- a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
@@ -26,12 +26,6 @@ public override void Initialize()
         base.Initialize();
         _physicsQuery = GetEntityQuery<PhysicsComponent>();
         SubscribeLocalEvent<MagnetPickupComponent, MapInitEvent>(OnMagnetMapInit);
-        SubscribeLocalEvent<MagnetPickupComponent, EntityUnpausedEvent>(OnMagnetUnpaused);
-    }
-
-    private void OnMagnetUnpaused(EntityUid uid, MagnetPickupComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextScan += args.PausedTime;
     }
 
     private void OnMagnetMapInit(EntityUid uid, MagnetPickupComponent component, MapInitEvent args)
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index c00df04265..11075b4a4c 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -55,6 +55,8 @@ public abstract class SharedStorageSystem : EntitySystem
     [ValidatePrototypeId<ItemSizePrototype>]
     public const string DefaultStorageMaxItemSize = "Normal";
 
+    public const float AreaInsertDelayPerItem = 0.075f;
+
     private ItemSizePrototype _defaultStorageMaxItemSize = default!;
 
     public bool CheckingCanInsert;
@@ -259,11 +261,14 @@ private void AfterInteract(EntityUid uid, StorageComponent storageComp, AfterInt
         if (storageComp.AreaInsert && (args.Target == null || !HasComp<ItemComponent>(args.Target.Value)))
         {
             var validStorables = new List<EntityUid>();
+            var delay = 0f;
 
             foreach (var entity in _entityLookupSystem.GetEntitiesInRange(args.ClickLocation, storageComp.AreaInsertRadius, LookupFlags.Dynamic | LookupFlags.Sundries))
             {
                 if (entity == args.User
-                    || !_itemQuery.HasComponent(entity)
+                    // || !_itemQuery.HasComponent(entity)
+                    || !TryComp<ItemComponent>(entity, out var itemComp) // Need comp to get item size to get weight
+                    || !_prototype.TryIndex(itemComp.Size, out var itemSize)
                     || !CanInsert(uid, entity, out _, storageComp)
                     || !_interactionSystem.InRangeUnobstructed(args.User, entity))
                 {
@@ -271,12 +276,13 @@ private void AfterInteract(EntityUid uid, StorageComponent storageComp, AfterInt
                 }
 
                 validStorables.Add(entity);
+                delay += itemSize.Weight * AreaInsertDelayPerItem;
             }
 
             //If there's only one then let's be generous
             if (validStorables.Count > 1)
             {
-                var doAfterArgs = new DoAfterArgs(EntityManager, args.User, 0.2f * validStorables.Count, new AreaPickupDoAfterEvent(GetNetEntityList(validStorables)), uid, target: uid)
+                var doAfterArgs = new DoAfterArgs(EntityManager, args.User, delay, new AreaPickupDoAfterEvent(GetNetEntityList(validStorables)), uid, target: uid)
                 {
                     BreakOnDamage = true,
                     BreakOnUserMove = true,
diff --git a/Content.Shared/Storage/StorageComponent.cs b/Content.Shared/Storage/StorageComponent.cs
index fa06e333e8..98e80de025 100644
--- a/Content.Shared/Storage/StorageComponent.cs
+++ b/Content.Shared/Storage/StorageComponent.cs
@@ -47,13 +47,13 @@ public sealed partial class StorageComponent : Component
 
         // TODO: Make area insert its own component.
         [DataField]
-        public bool QuickInsert; // Can insert storables by "attacking" them with the storage entity
+        public bool QuickInsert; // Can insert storables by clicking them with the storage entity
 
         [DataField]
         public bool ClickInsert = true; // Can insert stuff by clicking the storage entity with it
 
         [DataField]
-        public bool AreaInsert;  // "Attacking" with the storage entity causes it to insert all nearby storables after a delay
+        public bool AreaInsert; // Clicking with the storage entity causes it to insert all nearby storables after a delay
 
         [DataField]
         public int AreaInsertRadius = 1;
@@ -207,8 +207,6 @@ public enum StorageVisuals : byte
     {
         Open,
         HasContents,
-        CanLock,
-        Locked,
         StorageUsed,
         Capacity
     }
diff --git a/Content.Shared/SubFloor/SubFloorHideComponent.cs b/Content.Shared/SubFloor/SubFloorHideComponent.cs
index 284a4b871f..3b29388fa8 100644
--- a/Content.Shared/SubFloor/SubFloorHideComponent.cs
+++ b/Content.Shared/SubFloor/SubFloorHideComponent.cs
@@ -45,5 +45,12 @@ public sealed partial class SubFloorHideComponent : Component
         /// </summary>
         [DataField("visibleLayers")]
         public HashSet<Enum> VisibleLayers = new() { SubfloorLayers.FirstLayer };
+
+        /// <summary>
+        /// This is used for storing the original draw depth of a t-ray revealed entity.
+        /// e.g. when a t-ray revealed cable is drawn above a carpet.
+        /// </summary>
+        [DataField]
+        public int? OriginalDrawDepth;
     }
 }
diff --git a/Content.Shared/Teleportation/Components/SwapTeleporterComponent.cs b/Content.Shared/Teleportation/Components/SwapTeleporterComponent.cs
index 7a7bac83f4..a080a83aaa 100644
--- a/Content.Shared/Teleportation/Components/SwapTeleporterComponent.cs
+++ b/Content.Shared/Teleportation/Components/SwapTeleporterComponent.cs
@@ -11,7 +11,7 @@ namespace Content.Shared.Teleportation.Components;
 /// This is used for an entity that, when linked to another valid entity, allows the two to swap positions,
 /// additionally swapping the positions of the parents.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 [Access(typeof(SwapTeleporterSystem))]
 public sealed partial class SwapTeleporterComponent : Component
 {
@@ -37,6 +37,7 @@ public sealed partial class SwapTeleporterComponent : Component
     /// The time at which <see cref="Cooldown"/> ends and teleportation can occur again.
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    [AutoPausedField]
     public TimeSpan NextTeleportUse;
 
     /// <summary>
diff --git a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs
index e900700e11..e69a31a1d4 100644
--- a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs
+++ b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs
@@ -5,6 +5,7 @@
 using Content.Shared.Teleportation.Components;
 using Content.Shared.Verbs;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
@@ -20,6 +21,7 @@ public sealed class SwapTeleporterSystem : EntitySystem
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedContainerSystem _container = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
 
@@ -33,7 +35,6 @@ public override void Initialize()
         SubscribeLocalEvent<SwapTeleporterComponent, ActivateInWorldEvent>(OnActivateInWorld);
         SubscribeLocalEvent<SwapTeleporterComponent, ExaminedEvent>(OnExamined);
 
-        SubscribeLocalEvent<SwapTeleporterComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<SwapTeleporterComponent, ComponentShutdown>(OnShutdown);
 
         _xformQuery = GetEntityQuery<TransformComponent>();
@@ -156,6 +157,13 @@ public void DoTeleport(Entity<SwapTeleporterComponent, TransformComponent> ent)
         var pos = teleEntXform.Coordinates;
         var otherPos = otherTeleEntXform.Coordinates;
 
+        if (_transform.ContainsEntity(teleEnt, (otherTeleEnt, otherTeleEntXform)) ||
+            _transform.ContainsEntity(otherTeleEnt, (teleEnt, teleEntXform)))
+        {
+            Log.Error($"Invalid teleport swap attempt between {ToPrettyString(teleEnt)} and {ToPrettyString(otherTeleEnt)}");
+            return;
+        }
+
         _transform.SetCoordinates(teleEnt, otherPos);
         _transform.SetCoordinates(otherTeleEnt, pos);
     }
@@ -186,6 +194,8 @@ public void DestroyLink(Entity<SwapTeleporterComponent?> ent, EntityUid? user)
     private EntityUid GetTeleportingEntity(Entity<TransformComponent> ent)
     {
         var parent = ent.Comp.ParentUid;
+        if (_container.TryGetOuterContainer(ent, ent, out var container))
+            parent = container.Owner;
 
         if (HasComp<MapGridComponent>(parent) || HasComp<MapComponent>(parent))
             return ent;
@@ -217,11 +227,6 @@ private void OnExamined(Entity<SwapTeleporterComponent> ent, ref ExaminedEvent a
         }
     }
 
-    private void OnUnpaused(Entity<SwapTeleporterComponent> ent, ref EntityUnpausedEvent args)
-    {
-        ent.Comp.NextTeleportUse += args.PausedTime;
-    }
-
     private void OnShutdown(Entity<SwapTeleporterComponent> ent, ref ComponentShutdown args)
     {
         DestroyLink((ent, ent), null);
diff --git a/Content.Shared/Throwing/ThrownItemComponent.cs b/Content.Shared/Throwing/ThrownItemComponent.cs
index ab80e07938..16c9b13254 100644
--- a/Content.Shared/Throwing/ThrownItemComponent.cs
+++ b/Content.Shared/Throwing/ThrownItemComponent.cs
@@ -5,7 +5,7 @@
 
 namespace Content.Shared.Throwing
 {
-    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), AutoGenerateComponentPause]
     public sealed partial class ThrownItemComponent : Component
     {
         /// <summary>
@@ -24,6 +24,7 @@ public sealed partial class ThrownItemComponent : Component
         ///     Compared to <see cref="IGameTiming.CurTime"/> to land this entity, if any.
         /// </summary>
         [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+        [AutoPausedField]
         public TimeSpan? LandTime;
 
         /// <summary>
diff --git a/Content.Shared/Throwing/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs
index 0e5817ff92..b3b5bcf787 100644
--- a/Content.Shared/Throwing/ThrownItemSystem.cs
+++ b/Content.Shared/Throwing/ThrownItemSystem.cs
@@ -35,7 +35,6 @@ public override void Initialize()
             SubscribeLocalEvent<ThrownItemComponent, StartCollideEvent>(HandleCollision);
             SubscribeLocalEvent<ThrownItemComponent, PreventCollideEvent>(PreventCollision);
             SubscribeLocalEvent<ThrownItemComponent, ThrownEvent>(ThrowItem);
-            SubscribeLocalEvent<ThrownItemComponent, EntityUnpausedEvent>(OnThrownUnpaused);
 
             SubscribeLocalEvent<PullStartedMessage>(HandlePullStarted);
         }
@@ -59,14 +58,6 @@ private void ThrowItem(EntityUid uid, ThrownItemComponent component, ref ThrownE
             _fixtures.TryCreateFixture(uid, shape, ThrowingFixture, hard: false, collisionMask: (int) CollisionGroup.ThrownItem, manager: fixturesComponent, body: body);
         }
 
-        private void OnThrownUnpaused(EntityUid uid, ThrownItemComponent component, ref EntityUnpausedEvent args)
-        {
-            if (component.LandTime != null)
-            {
-                component.LandTime = component.LandTime.Value + args.PausedTime;
-            }
-        }
-
         private void HandleCollision(EntityUid uid, ThrownItemComponent component, ref StartCollideEvent args)
         {
             if (!args.OtherFixture.Hard)
diff --git a/Content.Shared/Tiles/FloorTileSystem.cs b/Content.Shared/Tiles/FloorTileSystem.cs
index 04aa100cd1..1f8408319d 100644
--- a/Content.Shared/Tiles/FloorTileSystem.cs
+++ b/Content.Shared/Tiles/FloorTileSystem.cs
@@ -27,7 +27,6 @@ public sealed class FloorTileSystem : EntitySystem
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly INetManager _netManager = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
diff --git a/Content.Shared/Timing/UseDelayComponent.cs b/Content.Shared/Timing/UseDelayComponent.cs
index 784fd6632f..1560d4dd0b 100644
--- a/Content.Shared/Timing/UseDelayComponent.cs
+++ b/Content.Shared/Timing/UseDelayComponent.cs
@@ -10,7 +10,7 @@ namespace Content.Shared.Timing;
 /// Currently it only supports a single delay per entity, this means that for things that have two delay interactions they will share one timer, so this can cause issues. For example, the bible has a delay when opening the storage UI and when applying it's interaction effect, and they share the same delay.
 /// </remarks>
 [RegisterComponent]
-[NetworkedComponent, AutoGenerateComponentState]
+[NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 [Access(typeof(UseDelaySystem))]
 public sealed partial class UseDelayComponent : Component
 {
@@ -18,12 +18,14 @@ public sealed partial class UseDelayComponent : Component
     /// When the delay starts.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]
+    [AutoPausedField]
     public TimeSpan DelayStartTime;
 
     /// <summary>
     /// When the delay ends.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]
+    [AutoPausedField]
     public TimeSpan DelayEndTime;
 
     /// <summary>
diff --git a/Content.Shared/Timing/UseDelaySystem.cs b/Content.Shared/Timing/UseDelaySystem.cs
index 34f12fa55e..388f31079c 100644
--- a/Content.Shared/Timing/UseDelaySystem.cs
+++ b/Content.Shared/Timing/UseDelaySystem.cs
@@ -7,19 +7,6 @@ public sealed class UseDelaySystem : EntitySystem
     [Dependency] private readonly IGameTiming _gameTiming = default!;
     [Dependency] private readonly MetaDataSystem _metadata = default!;
 
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<UseDelayComponent, EntityUnpausedEvent>(OnUnpaused);
-    }
-
-    private void OnUnpaused(Entity<UseDelayComponent> ent, ref EntityUnpausedEvent args)
-    {
-        // We got unpaused, resume the delay
-        ent.Comp.DelayStartTime += args.PausedTime;
-        ent.Comp.DelayEndTime += args.PausedTime;
-        Dirty(ent);
-    }
-
     public void SetDelay(Entity<UseDelayComponent> ent, TimeSpan delay)
     {
         if (ent.Comp.Delay == delay)
diff --git a/Content.Shared/UserInterface/OpenUiActionEvent.cs b/Content.Shared/UserInterface/OpenUiActionEvent.cs
index 3053861ea1..1c5ca3d62c 100644
--- a/Content.Shared/UserInterface/OpenUiActionEvent.cs
+++ b/Content.Shared/UserInterface/OpenUiActionEvent.cs
@@ -1,23 +1,10 @@
 using Content.Shared.Actions;
-using Robust.Shared.Reflection;
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations;
 
 namespace Content.Shared.UserInterface;
 
-public sealed partial class OpenUiActionEvent : InstantActionEvent, ISerializationHooks
+public sealed partial class OpenUiActionEvent : InstantActionEvent
 {
-    [ViewVariables]
+    [DataField(required: true, customTypeSerializer: typeof(EnumSerializer))]
     public Enum? Key { get; private set; }
-
-    [DataField("key", required: true)]
-    private string _keyRaw = default!;
-
-    void ISerializationHooks.AfterDeserialization()
-    {
-        var reflectionManager = IoCManager.Resolve<IReflectionManager>();
-        if (reflectionManager.TryParseEnumReference(_keyRaw, out var key))
-            Key = key;
-        else
-            Logger.Error($"Invalid UI key ({_keyRaw}) in open-UI action");
-    }
 }
diff --git a/Content.Shared/Weapons/Marker/DamageMarkerComponent.cs b/Content.Shared/Weapons/Marker/DamageMarkerComponent.cs
index ef3b712f60..87ad6519d0 100644
--- a/Content.Shared/Weapons/Marker/DamageMarkerComponent.cs
+++ b/Content.Shared/Weapons/Marker/DamageMarkerComponent.cs
@@ -10,6 +10,7 @@ namespace Content.Shared.Weapons.Marker;
 /// Marks an entity to take additional damage
 /// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedDamageMarkerSystem))]
+[AutoGenerateComponentPause]
 public sealed partial class DamageMarkerComponent : Component
 {
     /// <summary>
@@ -34,5 +35,6 @@ public sealed partial class DamageMarkerComponent : Component
     public EntityUid Marker;
 
     [ViewVariables(VVAccess.ReadWrite), DataField("endTime", customTypeSerializer:typeof(TimeOffsetSerializer)), AutoNetworkedField]
+    [AutoPausedField]
     public TimeSpan EndTime;
 }
diff --git a/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs b/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs
index 3a6afce363..63b2d5f211 100644
--- a/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs
+++ b/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs
@@ -20,7 +20,6 @@ public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<DamageMarkerOnCollideComponent, StartCollideEvent>(OnMarkerCollide);
-        SubscribeLocalEvent<DamageMarkerComponent, EntityUnpausedEvent>(OnMarkerUnpaused);
         SubscribeLocalEvent<DamageMarkerComponent, AttackedEvent>(OnMarkerAttacked);
     }
 
@@ -54,11 +53,6 @@ public override void Update(float frameTime)
         }
     }
 
-    private void OnMarkerUnpaused(EntityUid uid, DamageMarkerComponent component, ref EntityUnpausedEvent args)
-    {
-        component.EndTime += args.PausedTime;
-    }
-
     private void OnMarkerCollide(EntityUid uid, DamageMarkerOnCollideComponent component, ref StartCollideEvent args)
     {
         if (!args.OtherFixture.Hard ||
diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
index 27c3a5f0df..e5b35f6c0b 100644
--- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
@@ -10,7 +10,7 @@ namespace Content.Shared.Weapons.Melee;
 /// <summary>
 /// When given to a mob lets them do unarmed attacks, or when given to an item lets someone wield it to do attacks.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class MeleeWeaponComponent : Component
 {
     // TODO: This is becoming bloated as shit.
@@ -33,6 +33,7 @@ public sealed partial class MeleeWeaponComponent : Component
     /// </summary>
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoNetworkedField]
     [ViewVariables(VVAccess.ReadWrite)]
+    [AutoPausedField]
     public TimeSpan NextAttack;
 
     /// <summary>
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index 12455a1f49..6a5127f2c9 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -68,7 +68,6 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<MeleeWeaponComponent, EntityUnpausedEvent>(OnMeleeUnpaused);
         SubscribeLocalEvent<MeleeWeaponComponent, HandSelectedEvent>(OnMeleeSelected);
         SubscribeLocalEvent<MeleeWeaponComponent, ShotAttemptedEvent>(OnMeleeShotAttempted);
         SubscribeLocalEvent<MeleeWeaponComponent, GunShotEvent>(OnMeleeShot);
@@ -112,11 +111,6 @@ private void OnMeleeShot(EntityUid uid, MeleeWeaponComponent component, ref GunS
         }
     }
 
-    private void OnMeleeUnpaused(EntityUid uid, MeleeWeaponComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextAttack += args.PausedTime;
-    }
-
     private void OnMeleeSelected(EntityUid uid, MeleeWeaponComponent component, HandSelectedEvent args)
     {
         var attackRate = GetAttackRate(uid, args.User, component);
diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
index 31ad204234..0183a30a73 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs
@@ -10,7 +10,7 @@
 
 namespace Content.Shared.Weapons.Ranged.Components;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 [Access(typeof(SharedGunSystem), typeof(SharedOniSystem))] // DeltaV - I didn't feel like rewriting big chunks of code
 public sealed partial class GunComponent : Component
 {
@@ -199,6 +199,7 @@ public sealed partial class GunComponent : Component
     /// </summary>
     [DataField(customTypeSerializer:typeof(TimeOffsetSerializer))]
     [AutoNetworkedField]
+    [AutoPausedField]
     public TimeSpan NextFire = TimeSpan.Zero;
 
     /// <summary>
diff --git a/Content.Shared/Weapons/Ranged/Components/RechargeBasicEntityAmmoComponent.cs b/Content.Shared/Weapons/Ranged/Components/RechargeBasicEntityAmmoComponent.cs
index 923f95e207..f478405bec 100644
--- a/Content.Shared/Weapons/Ranged/Components/RechargeBasicEntityAmmoComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/RechargeBasicEntityAmmoComponent.cs
@@ -7,7 +7,7 @@ namespace Content.Shared.Weapons.Ranged.Components;
 /// <summary>
 ///     Responsible for handling recharging a basic entity ammo provider over time.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class RechargeBasicEntityAmmoComponent : Component
 {
     [ViewVariables(VVAccess.ReadWrite)]
@@ -25,5 +25,6 @@ public sealed partial class RechargeBasicEntityAmmoComponent : Component
     [ViewVariables(VVAccess.ReadWrite),
      DataField("nextCharge", customTypeSerializer:typeof(TimeOffsetSerializer)),
     AutoNetworkedField]
+    [AutoPausedField]
     public TimeSpan? NextCharge;
 }
diff --git a/Content.Shared/Weapons/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs b/Content.Shared/Weapons/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs
index 536f3da811..b774c8ab45 100644
--- a/Content.Shared/Weapons/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs
@@ -21,19 +21,10 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<RechargeBasicEntityAmmoComponent, EntityUnpausedEvent>(OnUnpaused);
         SubscribeLocalEvent<RechargeBasicEntityAmmoComponent, MapInitEvent>(OnInit);
         SubscribeLocalEvent<RechargeBasicEntityAmmoComponent, ExaminedEvent>(OnExamined);
     }
 
-    private void OnUnpaused(EntityUid uid, RechargeBasicEntityAmmoComponent component, ref EntityUnpausedEvent args)
-    {
-        if (component.NextCharge == null)
-            return;
-
-        component.NextCharge = component.NextCharge.Value + args.PausedTime;
-    }
-
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
index dc5dc5b90c..c421c92a9f 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
@@ -112,7 +112,10 @@ private void UseChambered(EntityUid uid, ChamberMagazineAmmoProviderComponent co
             }
         }
 
-        CycleCartridge(uid, component, user);
+        if (!CycleCartridge(uid, component, user))
+        {
+            UpdateAmmoCount(uid);
+        }
 
         if (component.BoltClosed != false)
         {
@@ -202,11 +205,12 @@ public void SetBoltClosed(EntityUid uid, ChamberMagazineAmmoProviderComponent co
     /// <summary>
     /// Tries to take ammo from the magazine and insert into the chamber.
     /// </summary>
-    private void CycleCartridge(EntityUid uid, ChamberMagazineAmmoProviderComponent component, EntityUid? user = null, AppearanceComponent? appearance = null)
+    private bool CycleCartridge(EntityUid uid, ChamberMagazineAmmoProviderComponent component, EntityUid? user = null, AppearanceComponent? appearance = null)
     {
         // Try to put a new round in if possible.
         var magEnt = GetMagazineEntity(uid);
         var chambered = GetChamberEntity(uid);
+        var result = false;
 
         // Similar to what takeammo does though that uses an optimised version where
         // multiple bullets may be fired in a single tick.
@@ -243,7 +247,11 @@ private void CycleCartridge(EntityUid uid, ChamberMagazineAmmoProviderComponent
             {
                 UpdateAmmoCount(uid);
             }
+
+            result = true;
         }
+
+        return result;
     }
 
     /// <summary>
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index 16db325df4..36b5bbd192 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -95,7 +95,6 @@ public override void Initialize()
         SubscribeLocalEvent<GunComponent, ExaminedEvent>(OnExamine);
         SubscribeLocalEvent<GunComponent, CycleModeEvent>(OnCycleMode);
         SubscribeLocalEvent<GunComponent, HandSelectedEvent>(OnGunSelected);
-        SubscribeLocalEvent<GunComponent, EntityUnpausedEvent>(OnGunUnpaused);
         SubscribeLocalEvent<GunComponent, MapInitEvent>(OnMapInit);
     }
 
@@ -123,11 +122,6 @@ private void OnGunMelee(EntityUid uid, GunComponent component, MeleeHitEvent arg
         }
     }
 
-    private void OnGunUnpaused(EntityUid uid, GunComponent component, ref EntityUnpausedEvent args)
-    {
-        component.NextFire += args.PausedTime;
-    }
-
     private void OnShootRequest(RequestShootEvent msg, EntitySessionEventArgs args)
     {
         var user = args.SenderSession.AttachedEntity;
diff --git a/Content.Shared/Wires/SharedWiresSystem.cs b/Content.Shared/Wires/SharedWiresSystem.cs
index a40f428329..f069687ffb 100644
--- a/Content.Shared/Wires/SharedWiresSystem.cs
+++ b/Content.Shared/Wires/SharedWiresSystem.cs
@@ -76,6 +76,13 @@ private void OnExamine(EntityUid uid, WiresPanelComponent component, ExaminedEve
         }
     }
 
+    public void ChangePanelVisibility(EntityUid uid, WiresPanelComponent component, bool visible)
+    {
+        component.Visible = visible;
+        UpdateAppearance(uid, component);
+        Dirty(uid, component);
+    }
+
     protected void UpdateAppearance(EntityUid uid, WiresPanelComponent panel)
     {
         if (TryComp<AppearanceComponent>(uid, out var appearance))
diff --git a/Content.Tests/Content.Tests.csproj b/Content.Tests/Content.Tests.csproj
index a883892d87..ff295728fc 100644
--- a/Content.Tests/Content.Tests.csproj
+++ b/Content.Tests/Content.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>11</LangVersion>
+    <LangVersion>12</LangVersion>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Tests\</OutputPath>
diff --git a/Content.Tests/Shared/Chemistry/FixedPoint2_Tests.cs b/Content.Tests/Shared/Chemistry/FixedPoint2_Tests.cs
index 5ad157c747..8f9de2c2f8 100644
--- a/Content.Tests/Shared/Chemistry/FixedPoint2_Tests.cs
+++ b/Content.Tests/Shared/Chemistry/FixedPoint2_Tests.cs
@@ -4,7 +4,7 @@
 
 namespace Content.Tests.Shared.Chemistry
 {
-    [TestFixture, TestOf(typeof(FixedPoint2))]
+    [TestFixture, TestOf(typeof(FixedPoint2)), Parallelizable]
     public sealed class FixedPoint2_Tests
     {
         [Test]
@@ -18,8 +18,11 @@ public void FixedPoint2IntegerTests(int value, string expected)
         }
 
         [Test]
-        [TestCase(1.001f, "1")]
-        [TestCase(0.999f, "1")]
+        [TestCase(0.999f, "0.99")]
+        [TestCase(1.005f, "1")]
+        [TestCase(1.015f, "1.01")]
+        [TestCase(1.05f, "1.05")]
+        [TestCase(-1.05f, "-1.05")]
         public void FixedPoint2FloatTests(float value, string expected)
         {
             var result = FixedPoint2.New(value);
@@ -27,8 +30,10 @@ public void FixedPoint2FloatTests(float value, string expected)
         }
 
         [Test]
-        [TestCase(1.001d, "1")]
-        [TestCase(0.999d, "1")]
+        [TestCase(0.999, "0.99")]
+        [TestCase(1.005, "1")]
+        [TestCase(1.015, "1.01")]
+        [TestCase(1.05, "1.05")]
         public void FixedPoint2DoubleTests(double value, string expected)
         {
             var result = FixedPoint2.New(value);
@@ -36,8 +41,10 @@ public void FixedPoint2DoubleTests(double value, string expected)
         }
 
         [Test]
-        [TestCase("1.005", "1.01")]
-        [TestCase("0.999", "1")]
+        [TestCase("0.999", "0.99")]
+        [TestCase("1.005", "1")]
+        [TestCase("1.015", "1.01")]
+        [TestCase("1.05", "1.05")]
         public void FixedPoint2StringTests(string value, string expected)
         {
             var result = FixedPoint2.New(value);
@@ -45,11 +52,9 @@ public void FixedPoint2StringTests(string value, string expected)
         }
 
         [Test]
-        [TestCase(1.001f, 1.001f, "2")]
-        [TestCase(1.001f, 1.004f, "2")]
-        [TestCase(1f, 1.005f, "2.01")]
-        [TestCase(1f, 2.005f, "3.01")]
-        public void CalculusPlus(float aFloat, float bFloat, string expected)
+        [TestCase(1, 1, "2")]
+        [TestCase(1.05f, 1, "2.05")]
+        public void ArithmeticAddition(float aFloat, float bFloat, string expected)
         {
             var a = FixedPoint2.New(aFloat);
             var b = FixedPoint2.New(bFloat);
@@ -60,10 +65,9 @@ public void CalculusPlus(float aFloat, float bFloat, string expected)
         }
 
         [Test]
-        [TestCase(1.001f, 1.001f, "0")]
-        [TestCase(1.001f, 1.004f, "0")]
-        [TestCase(1f, 2.005f, "-1.01")]
-        public void CalculusMinus(float aFloat, float bFloat, string expected)
+        [TestCase(1, 1, "0")]
+        [TestCase(1f, 2.5f, "-1.5")]
+        public void ArithmeticSubtraction(float aFloat, float bFloat, string expected)
         {
             var a = FixedPoint2.New(aFloat);
             var b = FixedPoint2.New(bFloat);
@@ -77,7 +81,8 @@ public void CalculusMinus(float aFloat, float bFloat, string expected)
         [TestCase(1.001f, 3f, "0.33")]
         [TestCase(0.999f, 3f, "0.33")]
         [TestCase(2.1f, 3f, "0.7")]
-        public void CalculusDivision(float aFloat, float bFloat, string expected)
+        [TestCase(0.03f, 2f, "0.01")]
+        public void ArithmeticDivision(float aFloat, float bFloat, string expected)
         {
             var a = FixedPoint2.New(aFloat);
             var b = FixedPoint2.New(bFloat);
@@ -88,9 +93,24 @@ public void CalculusDivision(float aFloat, float bFloat, string expected)
         }
 
         [Test]
-        [TestCase(1.001f, 0.999f, "1")]
-        [TestCase(0.999f, 3f, "3")]
-        public void CalculusMultiplication(float aFloat, float bFloat, string expected)
+        [TestCase(1.001f, 3f, "0.33")]
+        [TestCase(0.999f, 3f, "0.33")]
+        [TestCase(2.1f, 3f, "0.7")]
+        [TestCase(0.03f, 2f, "0.01")]
+        [TestCase(1f, 1 / 1.05f, "1.05")]
+        public void ArithmeticDivisionFloat(float aFloat, float b, string expected)
+        {
+            var a = FixedPoint2.New(aFloat);
+
+            var result = a / b;
+
+            Assert.That($"{result}", Is.EqualTo(expected));
+        }
+
+        [Test]
+        [TestCase(1, 1, "1")]
+        [TestCase(1, 3f, "3")]
+        public void ArithmeticMultiplication(float aFloat, float bFloat, string expected)
         {
             var a = FixedPoint2.New(aFloat);
             var b = FixedPoint2.New(bFloat);
@@ -100,6 +120,17 @@ public void CalculusMultiplication(float aFloat, float bFloat, string expected)
             Assert.That($"{result}", Is.EqualTo(expected));
         }
 
+        [Test]
+        [TestCase(1, 1, "1")]
+        [TestCase(1, 1.05f, "1.05")]
+        public void ArithmeticMultiplicationFloat(float aFloat, float b, string expected)
+        {
+            var a = FixedPoint2.New(aFloat);
+            var result = a * b;
+
+            Assert.That($"{result}", Is.EqualTo(expected));
+        }
+
         [Test]
         [TestCase(0.995f, 100)]
         [TestCase(1.005f, 101)]
diff --git a/Content.Tests/Shared/DamageTest.cs b/Content.Tests/Shared/DamageTest.cs
index b06b8368a9..11b810bf36 100644
--- a/Content.Tests/Shared/DamageTest.cs
+++ b/Content.Tests/Shared/DamageTest.cs
@@ -121,9 +121,9 @@ public void DamageSpecifierTest()
             damageSpec = new(_prototypeManager.Index<DamageGroupPrototype>("Brute"), 4);
             Assert.That(damageSpec.DamageDict.TryGetValue("Blunt", out damage));
             Assert.That(damage, Is.EqualTo(FixedPoint2.New(1.33)));
-            Assert.That(damageSpec.DamageDict.TryGetValue("Piercing", out damage));
-            Assert.That(damage, Is.EqualTo(FixedPoint2.New(1.33)));
             Assert.That(damageSpec.DamageDict.TryGetValue("Slash", out damage));
+            Assert.That(damage, Is.EqualTo(FixedPoint2.New(1.33)));
+            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);
@@ -161,7 +161,7 @@ public void ModifierSetTest()
             Assert.That(damageSpec.DamageDict["Blunt"], Is.EqualTo(FixedPoint2.New(30)));
             Assert.That(damageSpec.DamageDict["Piercing"], Is.EqualTo(FixedPoint2.New(-40))); // resistances don't apply to healing
             Assert.That(!damageSpec.DamageDict.ContainsKey("Slash"));  // Reduction reduced to 0, and removed from specifier
-            Assert.That(damageSpec.DamageDict["Radiation"], Is.EqualTo(FixedPoint2.New(65.63)));
+            Assert.That(damageSpec.DamageDict["Radiation"], Is.EqualTo(FixedPoint2.New(65.62)));
         }
 
         // Default damage Yaml
diff --git a/LEGAL.md b/LEGAL.md
new file mode 100644
index 0000000000..d3026a6617
--- /dev/null
+++ b/LEGAL.md
@@ -0,0 +1,18 @@
+# Legal Information
+
+## Copyright
+
+The Authors retain all copyright to their respective work submitted here.
+
+## License
+
+Content contributed to this repository after commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 (`17 February 2024 23:00:00 UTC`) is licensed under the GNU Affero General Public License version 3.0 unless otherwise stated.
+See [LICENSE-AGPLv3](https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/blob/master/LICENSE-AGPLv3.txt).
+
+Content contributed to this repository before commit 87c70a89a67d0521a56388e6b1c3f2cb947943e4 (`17 February 2024 23:00:00 UTC`) is licensed under the MIT license unless otherwise stated.
+See [LICENSE-MIT](https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/blob/master/LICENSE-MIT.txt).
+
+Most assets are licensed under [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) unless stated otherwise. Assets have their license and the copyright in the metadata file.
+[Example](https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/blob/master/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json).
+
+Note that some assets are licensed under the non-commercial [CC-BY-NC-SA 3.0](https://creativecommons.org/licenses/by-nc-sa/3.0/) or similar non-commercial licenses and will need to be removed if you wish to use this project commercially.
diff --git a/LICENSE-AGPLv3.txt b/LICENSE-AGPLv3.txt
new file mode 100644
index 0000000000..593265c00c
--- /dev/null
+++ b/LICENSE-AGPLv3.txt
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.
diff --git a/LICENSE.TXT b/LICENSE-MIT.txt
similarity index 100%
rename from LICENSE.TXT
rename to LICENSE-MIT.txt
diff --git a/MARKERS.md b/MARKERS.md
new file mode 100644
index 0000000000..f621c09699
--- /dev/null
+++ b/MARKERS.md
@@ -0,0 +1,73 @@
+# Guide to Codebase Change Markers
+
+Whenever you change a file not owned by this codebase you need to clarify which portions have been changed.
+If the markers described below don't have a description for the file type you're working with, don't add a marker yet and ask a reviewer if you need one and how it should be done.
+
+The following is the annotation formatting per language:
+
+
+### C#
+
+Single line changes:
+
+```csharp
+<Rest of the unchanged file above...>
+[Your code here. This can be entirely original or modified from the original file] // Parkstation-[TitleOfFeature] // Optional clarification of why this change was done
+<Rest of the unchanged file below...>
+```
+
+Multiple line changes:
+
+```csharp
+<Rest of the unchanged file above...>
+// Parkstation-[TitleOfFeature]-Start // Optional clarification of why this change was done
+[Your code here. This can be entirely original or modified from the original file]
+// Parkstation-[TitleOfFeature]-End
+<Rest of the unchanged file below...>
+```
+
+
+### XAML
+
+Any amount of lines changed:
+
+```xaml
+<Rest of the unchanged file above...>
+<!-- Parkstation-[TitleOfFeature]-Start -- Optional clarification of why this change was done -->
+[Your code here. This can be entirely original, or modified from the original file]
+<!-- Parkstation-[TitleOfFeature]-End -->
+<Rest of the unchanged file below...>
+```
+
+
+
+### YML
+
+Single line changes:
+
+```yml
+<Rest of the unchanged file above...>
+[Your code here. This can be entirely original, or modified from the original file] # Parkstation-[TitleOfFeature] # Optional clarification of why this change was done
+<Rest of the unchanged file below...>
+```
+
+Multiple line changes:
+
+```yml
+<Rest of the unchanged file above...>
+# Parkstation-[TitleOfFeature]-Start # Optional clarification of why this change was done
+[Your code here. This can be entirely original, or modified from the original file]
+# Parkstation-[TitleOfFeature]-End
+<Rest of the unchanged file below...>
+```
+
+
+### Never Needed
+
+- MD
+- TXT
+- XML
+- JSON
+- RGA (Robust Generic Attribution, specifies asset licenses)
+- PNG (Licensed differently)
+- OGG (Licensed differently)
diff --git a/README.md b/README.md
index c5fcfb493e..ac3fdbd329 100644
--- a/README.md
+++ b/README.md
@@ -1,46 +1,72 @@
 # Parkstation
 
+<p align="center"><img src="https://raw.githubusercontent.com/Simple-Station/Parkstation-Friendly-Chainsaw/master/Resources/Textures/Logo/logo.png" width="1080px" /></p>
+
+
 ## Links
 
-[Discord](https://discord.gg/49KeKwXc8g) | [Steam](https://store.steampowered.com/app/2585480/Space_Station_Multiverse/) | [Standalone](https://spacestationmultiverse.com/downloads/)
+  [Website](https://simplestation.org)
+| [Discord](https://discord.gg/49KeKwXc8g)
+| [Steam (SSMV)](https://store.steampowered.com/app/2585480/Space_Station_Multiverse/)
+| [Standalone (SSMV)](https://spacestationmultiverse.com/downloads/)
+| [Steam (WizDen)](https://store.steampowered.com/app/1255460/Space_Station_14/)
+| [Standalone (WizDen)](https://spacestation14.io/about/nightlies/)
+
 
 ## Contributing
 
-We are happy to accept contributions from anybody. Get in Discord if you want to help. We've got a [list of issues](https://github.com/orgs/Park-Station/projects/1/views/1) that need to be done and anybody can pick them up. Don't be afraid to ask for help either!
+We are happy to accept contributions from anybody.
+Get in Discord if you want to help.
+We've got a [list of issues](https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/issues) that need to be done and anybody can pick them up.
+Don't be afraid to ask for help in Discord either!
+
+If you make any contributions, please make sure to read the markers section in [MARKERS](https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/blob/master/MARKERS.md).
+Any changes made to files belonging to our upstream should be properly marked in accordance to what is specified there.
+
+Before making a PR here, consider if the feature is specific to us, or if it would generally improve the codebase.
+Broader changes should be made on our upstream, [Einstein Engines](https://github.com/Simple-Station/Einstein-Engines), where many of the same maintainers manage the code.
+If you're familiar with someone here, feel free to request a review from them in particular over there.
+
+[Einstein Engines](https://github.com/Simple-Station/Einstein-Engines) is also accepting translations.
+If you would like to translate the game into another language check the #contributor-general channel in their Discord.
+
 
 ## Building
 
-Refer to [the Space Wizards' guide](https://docs.spacestation14.com/en/general-development/setup/setting-up-a-development-environment.html) on setting up a development environment for general information, but keep in mind that Parkstation is a distant fork of Space Wizards' SS14 and not everything applies. We provide some scripts for making the job easier.
+Refer to [the Space Wizards' guide](https://docs.spacestation14.com/en/general-development/setup/setting-up-a-development-environment.html) on setting up a development environment for general information, but keep in mind that Parkstation is not the same and many things may not apply.
+We provide some scripts shown below to make the job easier.
+
+### Build Dependencies
 
-### Build dependencies
+> - DOTNET SDK 8.0 or higher
 
-> - Git
-> - .NET SDK 7.0 or higher
-> - python 3.7 or higher
+### Recommended Tools
 
+> - Git (needed)
+> - Python 3.7 or higher
+> - Visual Studio Code (**NOT** Visual Studio)
 
 ### Windows
 
-> 1. Clone this repository.
-> 2. Run `RUN_THIS.py` to init submodules and download the engine, or run `git submodule update --init --recursive` in a terminal.
-> 3. Run the `Scripts/bat/run1buildDebug.bat`
-> 4. Run the `Scripts/bat/run2configDev.bat` if you need other configurations run other config scripts.
-> 5. Run both the `Scripts/bat/run3server.bat` and `Scripts/bat/run4client.bat`
-> 6. Connect to localhost and play.
+> 1. Clone this repository
+> 2. Run `RUN_THIS.py` to init submodules and download the engine, or run `git submodule update --init --recursive` in a terminal
+> 3. Run the `Scripts/bat/buildAllDebug.bat`
+> 4. Run both the `Scripts/bat/runQuickServer.bat` and `Scripts/bat/runQuickClient.bat`
+> 5. Connect to localhost and play
 
 ### Linux
 
-> 1. Clone this repository.
-> 2. Run `RUN_THIS.py` to init submodules and download the engine, or run `git submodule update --init --recursive` in a terminal.
-> 3. Run the `Scripts/sh/run1buildDebug.sh`
-> 4. Run the `Scripts/sh/run2configDev.sh` if you need other configurations run other config scripts.
-> 5. Run both the `Scripts/sh/run3server.bat` and `scripts/sh/run4client.sh`
-> 6. Connect to localhost and play.
+> 1. Clone this repository
+> 2. Run `RUN_THIS.py` to init submodules and download the engine, or run `git submodule update --init --recursive` in a terminal
+> 3. Run the `Scripts/sh/buildAllDebug.sh`
+> 4. Run both the `Scripts/sh/runQuickServer.bat` and `Scripts/sh/runQuickClient.sh`
+> 5. Connect to localhost and play
 
-## License
+### MacOS
 
-All code for the content repository is licensed under [MIT](https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/blob/master/LICENSE.TXT).
+> I don't know anybody using MacOS to test this, but it's probably roughly the same steps as Linux.
 
-Most assets are licensed under [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) unless stated otherwise. Assets have their license and the copyright in the metadata file. [Example](https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/blob/master/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json).
 
-Note that some assets are licensed under the non-commercial [CC-BY-NC-SA 3.0](https://creativecommons.org/licenses/by-nc-sa/3.0/) or similar non-commercial licenses and will need to be removed if you wish to use this project commercially.
+## License
+
+See the [LEGAL](https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/blob/master/LEGAL.md) file for information.
diff --git a/Resources/Audio/Ambience/Antag/pirate_start.ogg b/Resources/Audio/Ambience/Antag/pirate_start.ogg
index 785b1313c9..f2dce2383f 100644
Binary files a/Resources/Audio/Ambience/Antag/pirate_start.ogg and b/Resources/Audio/Ambience/Antag/pirate_start.ogg differ
diff --git a/Resources/Audio/Ambience/ambitrain1.ogg b/Resources/Audio/Ambience/ambitrain1.ogg
new file mode 100644
index 0000000000..bc24425922
Binary files /dev/null and b/Resources/Audio/Ambience/ambitrain1.ogg differ
diff --git a/Resources/Audio/Ambience/ambitrain2.ogg b/Resources/Audio/Ambience/ambitrain2.ogg
new file mode 100644
index 0000000000..3a3222a75f
Binary files /dev/null and b/Resources/Audio/Ambience/ambitrain2.ogg differ
diff --git a/Resources/Audio/Ambience/ambitrain3.ogg b/Resources/Audio/Ambience/ambitrain3.ogg
new file mode 100644
index 0000000000..3f18b48234
Binary files /dev/null and b/Resources/Audio/Ambience/ambitrain3.ogg differ
diff --git a/Resources/Audio/Ambience/anomaly_scary.ogg b/Resources/Audio/Ambience/anomaly_scary.ogg
new file mode 100644
index 0000000000..badefbec3b
Binary files /dev/null and b/Resources/Audio/Ambience/anomaly_scary.ogg differ
diff --git a/Resources/Audio/Ambience/attributions.yml b/Resources/Audio/Ambience/attributions.yml
index d7ee1e8864..3e6e039cd7 100644
--- a/Resources/Audio/Ambience/attributions.yml
+++ b/Resources/Audio/Ambience/attributions.yml
@@ -95,4 +95,24 @@
           spookyspace2.ogg"]
   license: "CC0-1.0"
   copyright: "Taken from /vg/station"
-  source: "https://github.com/vgstation-coders/vgstation13/commit/23303188abe6fe31b114a218a1950d7325a23730"
\ No newline at end of file
+  source: "https://github.com/vgstation-coders/vgstation13/commit/23303188abe6fe31b114a218a1950d7325a23730"
+
+- files: ["ambitrain1.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Created by Badgie42 on Freesound.com, converted to Mono by TheShuEd"
+  source: "https://freesound.org/people/Badgie42/sounds/399876/"
+
+- files: ["ambitrain2.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by Hallkom on Freesound.com, cropped and converted to Mono by TheShuEd"
+  source: "https://freesound.org/people/Hallkom/sounds/588486/"
+
+- files: ["ambitrain3.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by ldezem on Freesound.com, cropped and converted to Mono by TheShuEd"
+  source: "https://freesound.org/people/ldezem/sounds/528238/"
+
+- files: ["anomaly_scary.ogg"]
+  license: "CC0-1.0"
+  copyright: "Created by dimbark1, edited and converted to mono by TheShuEd"
+  source: "https://freesound.org/people/dimbark1/sounds/316797/"
diff --git a/Resources/Audio/Animals/attributions.yml b/Resources/Audio/Animals/attributions.yml
index c9c20473c2..c34832a807 100644
--- a/Resources/Audio/Animals/attributions.yml
+++ b/Resources/Audio/Animals/attributions.yml
@@ -131,4 +131,10 @@
 - files: ["dog_bark3.ogg"]
   license: "CC0-1.0"
   copyright: "Audio is recorded/created by KFerentchak 'FreeSound.org'. The original audio was trimmed and renamed"
-  source: "https://freesound.org/people/KFerentchak/sounds/235912/"
\ No newline at end of file
+  source: "https://freesound.org/people/KFerentchak/sounds/235912/"
+  
+- files: ["nymph_chirp.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from ParadiseSS13"
+  source: "https://github.com/ParadiseSS13/Paradise/commit/a34f1054cef5a44a67fdac3b67b811137c6071dd"
+  
\ No newline at end of file
diff --git a/Resources/Audio/Animals/nymph_chirp.ogg b/Resources/Audio/Animals/nymph_chirp.ogg
new file mode 100644
index 0000000000..e0e573d497
Binary files /dev/null and b/Resources/Audio/Animals/nymph_chirp.ogg differ
diff --git a/Resources/Audio/DeltaV/Effects/Shuttle/attributions.yml b/Resources/Audio/DeltaV/Effects/Shuttle/attributions.yml
new file mode 100644
index 0000000000..fd622f586f
--- /dev/null
+++ b/Resources/Audio/DeltaV/Effects/Shuttle/attributions.yml
@@ -0,0 +1,5 @@
+- files:
+  - "hyperspace_progress.ogg"
+  license: "CC-BY-SA-4.0"
+  copyright: "@Vordenburg"
+  source: "https://github.com/Nyanotrasen/Nyanotrasen/commit/cbd7104306bc0b03004036f91459a7fa42bc5c0f"
diff --git a/Resources/Audio/DeltaV/Effects/Shuttle/hyperspace_progress.ogg b/Resources/Audio/DeltaV/Effects/Shuttle/hyperspace_progress.ogg
new file mode 100644
index 0000000000..7e2112f38e
Binary files /dev/null and b/Resources/Audio/DeltaV/Effects/Shuttle/hyperspace_progress.ogg differ
diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/attributions.yml b/Resources/Audio/DeltaV/Voice/Vulpkanin/attributions.yml
index e45ab8b34b..8335f4cbf1 100644
--- a/Resources/Audio/DeltaV/Voice/Vulpkanin/attributions.yml
+++ b/Resources/Audio/DeltaV/Voice/Vulpkanin/attributions.yml
@@ -1,29 +1,49 @@
 - files: ["dog_bark1.ogg", "dog_bark2.ogg", "dog_bark3.ogg"]
   license: "CC0-1.0"
-  copyright: "Original sound by https://freesound.org/people/abhisheky948/sounds/625497/"
+  copyright: "Original sound by abhisheky948 at https://freesound.org/people/abhisheky948/sounds/625497/"
   source: "https://freesound.org/people/abhisheky948/sounds/625497/"
 
-  files: ["dog_bark2.ogg"]
+- files: ["dog_bark2.ogg"]
   license: "CC0-1.0"
-  copyright: "Original sound by https://freesound.org/people/michael_grinnell/sounds/464400/"
+  copyright: "Original sound by michael_grinnell at https://freesound.org/people/michael_grinnell/sounds/464400/"
   source: "https://freesound.org/people/michael_grinnell/sounds/464400/"
 
-  files: ["dog_bark3.ogg"]
+- files: ["dog_bark3.ogg"]
   license: "CC0-1.0"
-  copyright: "Original sound by https://freesound.org/people/Geoff-Bremner-Audio/sounds/688201/"
+  copyright: "Original sound by Geoff-Bremner-Audio at https://freesound.org/people/Geoff-Bremner-Audio/sounds/688201/"
   source: "https://freesound.org/people/Geoff-Bremner-Audio/sounds/688201/"
 
 - files: ["dog_growl1.ogg", "dog_growl2.ogg", "dog_growl3.ogg"]
   license: "CC0-1.0"
-  copyright: "Original sound by https://freesound.org/people/Glitchedtones/sounds/372533/ - cut out three clips of dog growling, cleaned up, converted to ogg"
+  copyright: "Original sound by GlitchedTones at https://freesound.org/people/Glitchedtones/sounds/372533/ - cut out three clips of dog growling, cleaned up, converted to ogg"
   source: "https://freesound.org/people/Glitchedtones/sounds/372533/"  
 
+- files: ["dog_growl4.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Original sound taken from Paradise Station. Renamed to dog_growl4.ogg"
+  source: "https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl1.ogg"
+
+- files: ["dog_growl5.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Original sound taken from Paradise Station. Renamed to dog_growl5.ogg"
+  source: "https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl2.ogg"
+
+- files: ["dog_growl6.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Original sound taken from Paradise Station. Renamed to dog_growl6.ogg"
+  source: "https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl3.ogg"
+
 - files: ["dog_snarl1.ogg", "dog_snarl2.ogg", "dog_snarl3.ogg"]
   license: "CC0-1.0"
-  copyright: "Original sound by https://freesound.org/people/strongbot/sounds/341090/ - cut out three clips of dog snarling, cleaned up, converted to ogg"
+  copyright: "Original sound by strongbot at https://freesound.org/people/strongbot/sounds/341090/ - cut out three clips of dog snarling, cleaned up, converted to ogg"
   source: "https://freesound.org/people/strongbot/sounds/341090/"
 
-  files: ["dog_whine.ogg"]
+- files: ["dog_whine.ogg"]
   license: "CC0-1.0"
-  copyright: "Original sound by https://freesound.org/people/Sruddi1/sounds/34878/ - cleaned up, converted to ogg"
+  copyright: "Original sound by Sruddi1 at https://freesound.org/people/Sruddi1/sounds/34878/ - cleaned up, converted to ogg"
   source: "https://freesound.org/people/Sruddi1/sounds/34878/"
+
+- files: ["howl.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Original sound taken from Goonstation. Renamed to howl.ogg"
+  source: "https://github.com/goonstation/goonstation/blob/master/sound/voice/animal/werewolf_howl.ogg"
diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl4.ogg b/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl4.ogg
new file mode 100644
index 0000000000..d5152d9c05
Binary files /dev/null and b/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl4.ogg differ
diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl5.ogg b/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl5.ogg
new file mode 100644
index 0000000000..5c48053ac6
Binary files /dev/null and b/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl5.ogg differ
diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl6.ogg b/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl6.ogg
new file mode 100644
index 0000000000..bcacf2442f
Binary files /dev/null and b/Resources/Audio/DeltaV/Voice/Vulpkanin/dog_growl6.ogg differ
diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/howl.ogg b/Resources/Audio/DeltaV/Voice/Vulpkanin/howl.ogg
new file mode 100644
index 0000000000..778fd6b248
Binary files /dev/null and b/Resources/Audio/DeltaV/Voice/Vulpkanin/howl.ogg differ
diff --git a/Resources/Audio/DeltaV/Voice/Vulpkanin/license.txt b/Resources/Audio/DeltaV/Voice/Vulpkanin/license.txt
index 7604e4dfc2..753d95909a 100644
--- a/Resources/Audio/DeltaV/Voice/Vulpkanin/license.txt
+++ b/Resources/Audio/DeltaV/Voice/Vulpkanin/license.txt
@@ -4,7 +4,11 @@ dog_bark3.ogg licensed under CC0 1.0 taken from Geoff-Bremner-Audio at https://f
 dog_growl1.ogg licensed under CC0 1.0 taken from GlitchedTones at https://freesound.org/people/Glitchedtones/sounds/372533/
 dog_growl2.ogg licensed under CC0 1.0 taken from GlitchedTones at https://freesound.org/people/Glitchedtones/sounds/372533/
 dog_growl3.ogg licensed under CC0 1.0 taken from GlitchedTones at https://freesound.org/people/Glitchedtones/sounds/372533/
+dog_growl4.ogg licensed under CC-BY-NC-SA 3.0 taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl1.ogg
+dog_growl5.ogg licensed under CC-BY-NC-SA 3.0 taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl2.ogg
+dog_growl6.ogg licensed under CC-BY-NC-SA 3.0 taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl3.ogg
 dog_snarl1.ogg licensed under CC0 1.0 taken from strongbot at https://freesound.org/people/strongbot/sounds/341090/
 dog_snarl2.ogg licensed under CC0 1.0 taken from strongbot at https://freesound.org/people/strongbot/sounds/341090/
 dog_snarl3.ogg licensed under CC0 1.0 taken from strongbot at https://freesound.org/people/strongbot/sounds/341090/
-dog_whine.ogg licensed under CC SAMPLING+ 1.0 DEED taken from Sruddil at https://freesound.org/people/Sruddi1/sounds/34878/
\ No newline at end of file
+dog_whine.ogg licensed under CC SAMPLING+ 1.0 DEED taken from Sruddil at https://freesound.org/people/Sruddi1/sounds/34878/
+howl.ogg taken from goonstation at https://github.com/goonstation/goonstation/blob/master/sound/voice/animal/werewolf_howl.ogg which is licensed under the CC BY-NC-SA 3.0. 
\ No newline at end of file
diff --git a/Resources/Audio/Effects/Shuttle/attributions.yml b/Resources/Audio/Effects/Shuttle/attributions.yml
index 60a665c536..2342ba8fb6 100644
--- a/Resources/Audio/Effects/Shuttle/attributions.yml
+++ b/Resources/Audio/Effects/Shuttle/attributions.yml
@@ -9,3 +9,9 @@
   copyright: '"hyperspace_progress.ogg" by /tg/station. Modified for looping by metalgearsloth.'
   license: CC-BY-SA-3.0
   source: https://github.com/tgstation/tgstation/tree/71a79f1f75902d2ccab27cbffb971b12b7ab042d/sound/runtime/hyperspace
+
+- files:
+  - radar_ping.ogg
+  copyright: User unfa from freesound.org Remixed to mono and .ogg by metalgearsloth.
+  license: CC0-1.0
+  source: https://freesound.org/people/unfa/sounds/215415/
\ No newline at end of file
diff --git a/Resources/Audio/Effects/Shuttle/radar_ping.ogg b/Resources/Audio/Effects/Shuttle/radar_ping.ogg
new file mode 100644
index 0000000000..de5b934c25
Binary files /dev/null and b/Resources/Audio/Effects/Shuttle/radar_ping.ogg differ
diff --git a/Resources/Audio/Items/Paper/attributions.yml b/Resources/Audio/Items/Paper/attributions.yml
new file mode 100644
index 0000000000..42c973c67f
--- /dev/null
+++ b/Resources/Audio/Items/Paper/attributions.yml
@@ -0,0 +1,4 @@
+- files: ["paper_scribble1.ogg", "paper_scribble2.ogg", "paper_scribble3.ogg", "paper_scribble4.ogg", "paper_scribble5.ogg"]
+  license: "CC0-1.0"
+  copyright: "Originally 'Pen Clicks and Writing on Paper' created by PDaefaul. Cut, spliced and converted by Krunklehorn."
+  source: "https://freesound.org/people/PDaefaul/sounds/631971/"
diff --git a/Resources/Audio/Items/Paper/paper_scribble1.ogg b/Resources/Audio/Items/Paper/paper_scribble1.ogg
new file mode 100644
index 0000000000..982bad95c4
Binary files /dev/null and b/Resources/Audio/Items/Paper/paper_scribble1.ogg differ
diff --git a/Resources/Audio/Items/Paper/paper_scribble2.ogg b/Resources/Audio/Items/Paper/paper_scribble2.ogg
new file mode 100644
index 0000000000..fd2d907879
Binary files /dev/null and b/Resources/Audio/Items/Paper/paper_scribble2.ogg differ
diff --git a/Resources/Audio/Items/Paper/paper_scribble3.ogg b/Resources/Audio/Items/Paper/paper_scribble3.ogg
new file mode 100644
index 0000000000..7e44117486
Binary files /dev/null and b/Resources/Audio/Items/Paper/paper_scribble3.ogg differ
diff --git a/Resources/Audio/Items/Paper/paper_scribble4.ogg b/Resources/Audio/Items/Paper/paper_scribble4.ogg
new file mode 100644
index 0000000000..1d9980133d
Binary files /dev/null and b/Resources/Audio/Items/Paper/paper_scribble4.ogg differ
diff --git a/Resources/Audio/Items/Paper/paper_scribble5.ogg b/Resources/Audio/Items/Paper/paper_scribble5.ogg
new file mode 100644
index 0000000000..8e155e5fd6
Binary files /dev/null and b/Resources/Audio/Items/Paper/paper_scribble5.ogg differ
diff --git a/Resources/Audio/Items/Whistle/attributions.yml b/Resources/Audio/Items/Whistle/attributions.yml
index 25a3da9174..b9d92d698a 100644
--- a/Resources/Audio/Items/Whistle/attributions.yml
+++ b/Resources/Audio/Items/Whistle/attributions.yml
@@ -1,4 +1,4 @@
-- files: 
+- files:
   - "whistle_1.ogg"
   - "whistle_2.ogg"
   - "whistle_3.ogg"
@@ -8,4 +8,12 @@
   - "whistle_7.ogg"
   license: "CC0-1.0"
   copyright: "User strongbot on freesound.org. Modified by Fahasor on github"
-  source: "https://freesound.org/people/strongbot/sounds/568995/"
\ No newline at end of file
+  source: "https://freesound.org/people/strongbot/sounds/568995/"
+
+- files:
+  - "trench_whistle_1.ogg"
+  - "trench_whistle_2.ogg"
+  - "trench_whistle_3.ogg"
+  license: "CC0-1.0"
+  copyright: "Deleted user on freesound.org."
+  source: "https://freesound.org/people/deleted_user_2104797/sounds/324539/"
diff --git a/Resources/Audio/Items/Whistle/trench_whistle_1.ogg b/Resources/Audio/Items/Whistle/trench_whistle_1.ogg
new file mode 100644
index 0000000000..6bed4c5aab
Binary files /dev/null and b/Resources/Audio/Items/Whistle/trench_whistle_1.ogg differ
diff --git a/Resources/Audio/Items/Whistle/trench_whistle_2.ogg b/Resources/Audio/Items/Whistle/trench_whistle_2.ogg
new file mode 100644
index 0000000000..030ef354ac
Binary files /dev/null and b/Resources/Audio/Items/Whistle/trench_whistle_2.ogg differ
diff --git a/Resources/Audio/Items/Whistle/trench_whistle_3.ogg b/Resources/Audio/Items/Whistle/trench_whistle_3.ogg
new file mode 100644
index 0000000000..745132c2b9
Binary files /dev/null and b/Resources/Audio/Items/Whistle/trench_whistle_3.ogg differ
diff --git a/Resources/Audio/Items/attributions.yml b/Resources/Audio/Items/attributions.yml
index 51d8d9cf95..8942e41db2 100644
--- a/Resources/Audio/Items/attributions.yml
+++ b/Resources/Audio/Items/attributions.yml
@@ -63,6 +63,11 @@
   copyright: "User volivieri on freesound.org. Modified by Velcroboy on github."
   source: "https://freesound.org/people/volivieri/sounds/37190/"
 
+- files: ["bottle_close1.ogg"]
+  license: "CC0-1.0"
+  copyright: "User MellowAudio on freesound.org. Modified by Tayrtahn on github."
+  source: "https://freesound.org/people/MellowAudio/sounds/591485/"
+
 - files: ["bow_pull.ogg"]
   license: "CC-BY-3.0"
   copyright: "User jzdnvdoosj on freesound.org. Converted to ogg by mirrorcult"
@@ -92,7 +97,7 @@
   license: "CC-BY-4.0"
   copyright: "User LoafDV on freesound.org. Converted to ogg end edited by lzk228"
   source: "https://freesound.org/people/LoafDV/sounds/131596/"
-  
+
 - files: ["shovel_dig.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Taken from tgstation, modified by themias (github) for ss14"
diff --git a/Resources/Audio/Items/bottle_close1.ogg b/Resources/Audio/Items/bottle_close1.ogg
new file mode 100644
index 0000000000..b6db8fae79
Binary files /dev/null and b/Resources/Audio/Items/bottle_close1.ogg differ
diff --git a/Resources/Audio/Items/newton_cradle.ogg b/Resources/Audio/Items/newton_cradle.ogg
index 6dfe528feb..875841ee84 100644
Binary files a/Resources/Audio/Items/newton_cradle.ogg and b/Resources/Audio/Items/newton_cradle.ogg differ
diff --git a/Resources/Audio/Misc/attributions.yml b/Resources/Audio/Misc/attributions.yml
index 2599cf8083..db13d28d83 100644
--- a/Resources/Audio/Misc/attributions.yml
+++ b/Resources/Audio/Misc/attributions.yml
@@ -18,6 +18,16 @@
   copyright: "Taken from TG station."
   source: "https://github.com/tgstation/tgstation/blob/b44fcdedfb7c7d8425bd75b9caf71644a86375d1/sound/creatures/narsie_rises.ogg"
 
+- files: ["ratvar_rises.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from TG station."
+  source: "https://github.com/tgstation/tgstation/blob/2f63c779cb43543cfde76fa7ddaeacfde185fded/sound/effects/ratvar_rises.ogg"
+
+- files: ["ratvar_reveal.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Taken from TG station."
+  source: "https://github.com/tgstation/tgstation/blob/2f63c779cb43543cfde76fa7ddaeacfde185fded/sound/effects/ratvar_reveal.ogg"
+
 - files: ["epsilon.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Made by dj-34 (https://github.com/dj-34)"
diff --git a/Resources/Audio/Misc/ratvar_reveal.ogg b/Resources/Audio/Misc/ratvar_reveal.ogg
new file mode 100644
index 0000000000..e70cd9873c
Binary files /dev/null and b/Resources/Audio/Misc/ratvar_reveal.ogg differ
diff --git a/Resources/Audio/Misc/ratvar_rises.ogg b/Resources/Audio/Misc/ratvar_rises.ogg
new file mode 100644
index 0000000000..4c22d250c3
Binary files /dev/null and b/Resources/Audio/Misc/ratvar_rises.ogg differ
diff --git a/Resources/Audio/Nyanotrasen/Psionics/attributions.yml b/Resources/Audio/Nyanotrasen/Psionics/attributions.yml
new file mode 100644
index 0000000000..119d6d3657
--- /dev/null
+++ b/Resources/Audio/Nyanotrasen/Psionics/attributions.yml
@@ -0,0 +1,4 @@
+- files: ["heartbeat_fast.ogg"]
+  license: "CC0-1.0"
+  copyright: "Taken from greyseraphim via freesound.org"
+  source: "https://freesound.org/people/greyseraphim/sounds/21409/"
\ No newline at end of file
diff --git a/Resources/Audio/Nyanotrasen/Psionics/heartbeat_fast.ogg b/Resources/Audio/Nyanotrasen/Psionics/heartbeat_fast.ogg
new file mode 100644
index 0000000000..85a034d9bd
Binary files /dev/null and b/Resources/Audio/Nyanotrasen/Psionics/heartbeat_fast.ogg differ
diff --git a/Resources/Audio/Voice/Talk/attributions.yml b/Resources/Audio/Voice/Talk/attributions.yml
index d55b9737d0..19b0b66b9c 100644
--- a/Resources/Audio/Voice/Talk/attributions.yml
+++ b/Resources/Audio/Voice/Talk/attributions.yml
@@ -31,3 +31,8 @@
   license: "CC-BY-NC-SA-3.0"
   copyright: "Goonstation, Modified by Whisper"
   source: "https://github.com/goonstation/goonstation/tree/eb3e7df6292d23f6af2f18b4372d3a8ba4b0fda7/sound/misc/talk"
+
+- files: ["vox.ogg","vox_ask.ogg","vox_exclaim.ogg" ]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Derived from shriek1.ogg by Errant"
+  source: "https://github.com/goonstation/goonstation/tree/eb3e7df6292d23f6af2f18b4372d3a8ba4b0fda7/sound/misc/talk"
diff --git a/Resources/Audio/Voice/Talk/vox.ogg b/Resources/Audio/Voice/Talk/vox.ogg
new file mode 100644
index 0000000000..c3b2a268ac
Binary files /dev/null and b/Resources/Audio/Voice/Talk/vox.ogg differ
diff --git a/Resources/Audio/Voice/Talk/vox_ask.ogg b/Resources/Audio/Voice/Talk/vox_ask.ogg
new file mode 100644
index 0000000000..e3e323d64c
Binary files /dev/null and b/Resources/Audio/Voice/Talk/vox_ask.ogg differ
diff --git a/Resources/Audio/Voice/Talk/vox_exclaim.ogg b/Resources/Audio/Voice/Talk/vox_exclaim.ogg
new file mode 100644
index 0000000000..cd1fead03a
Binary files /dev/null and b/Resources/Audio/Voice/Talk/vox_exclaim.ogg differ
diff --git a/Resources/Audio/Voice/Vox/vox_laugh.ogg b/Resources/Audio/Voice/Vox/vox_laugh.ogg
new file mode 100644
index 0000000000..8c356045c3
Binary files /dev/null and b/Resources/Audio/Voice/Vox/vox_laugh.ogg differ
diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index fb31a3204e..e86219c992 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1,6 +1,6 @@
 Name: Admin
 AdminOnly: true
-Order: 2
+Order: 3
 Entries:
 - author: DrSmugleaf
   changes:
@@ -36,20 +36,15 @@ Entries:
   - {message: 'Add pop sound effect when using the erase admin verb.', type: Tweak}
   id: 5
   time: '2023-10-14T09:47:00.0000000+00:00'
-- author: DebugOk
-  changes:
-    - {message: 'Add back the loadcharacter and spawncharacter commands.', type: Add}
-  id: 6
-  time: '2023-10-19T00:00:00.0000000+00:00'
 - author: DrSmugleaf
   changes:
   - {message: 'Fixed not being able to sort the F7 players tab by playtime.', type: Fix}
-  id: 7
+  id: 6
   time: '2023-10-14T23:52:00.0000000+00:00'
 - author: DrSmugleaf
   changes:
   - {message: 'Fixed playtime being sorted incorrectly in the F7 players tab.', type: Fix}
-  id: 8
+  id: 7
   time: '2023-10-16T04:23:00.0000000+00:00'
 - author: DrSmugleaf
   changes:
@@ -58,7 +53,7 @@ Entries:
       in whitelist commands.', type: Fix}
   - {message: 'Added a \[player\] completion type hint to whitelist add and remove
       commands.', type: Tweak}
-  id: 9
+  id: 8
   time: '2023-10-21T09:53:00.0000000+00:00'
 - author: DrSmugleaf
   changes:
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index ebc431b942..411a5bf2a2 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,3887 +1,4040 @@
-Order: 1
-Entries:
-- author: brainfood1183
-  changes:
-  - message: Crystals now drop crystal shards, you can use them to craft colored light
-      tubes.
-    type: Add
-  id: 5400
-  time: '2023-12-16T22:20:14.0000000+00:00'
-  url: null
-- author: Ilya246
-  changes:
-  - message: Pens now embed and deal damage on throw like spears.
-    type: Add
-  id: 5401
-  time: '2023-12-16T22:23:08.0000000+00:00'
-  url: null
-- author: Emisse
-  changes:
-  - message: Svalinn Laser Pistol and accompanying T3 tech.
-    type: Add
-  id: 5402
-  time: '2023-12-17T03:43:50.0000000+00:00'
-  url: null
-- author: mirrorcult
-  changes:
-  - message: You can now pet the recycler
-    type: Add
-  id: 5403
-  time: '2023-12-17T07:44:37.0000000+00:00'
-  url: null
-- author: Ubaser
-  changes:
-  - message: Mindbreaker is now hallucinogenic.
-    type: Tweak
-  id: 5404
-  time: '2023-12-17T07:44:54.0000000+00:00'
-  url: null
-- author: JoeHammad
-  changes:
-  - message: Paramedics now have a rollerbed in their bag by default
-    type: Add
-  id: 5405
-  time: '2023-12-17T09:55:29.0000000+00:00'
-  url: null
-- author: Ilya246
-  changes:
-  - message: Large cardboard boxes and stealth boxes now inherit their mover's access.
-    type: Fix
-  id: 5406
-  time: '2023-12-17T09:55:40.0000000+00:00'
-  url: null
-- author: TheShuEd
-  changes:
-  - message: Changed hypodart cost from 3 to 2 tc
-    type: Tweak
-  id: 5407
-  time: '2023-12-17T16:08:11.0000000+00:00'
-  url: null
-- author: yathxyz
-  changes:
-  - message: Fixed nix devShell
-    type: Fix
-  id: 5408
-  time: '2023-12-17T16:55:37.0000000+00:00'
-  url: null
-- author: Ubaser
-  changes:
-  - message: HoS parade uniforms are available at the uniform printer.
-    type: Add
-  id: 5409
-  time: '2023-12-17T23:20:04.0000000+00:00'
-  url: null
-- author: Alzore
-  changes:
-  - message: Security zipties are now tiny and easier to store.
-    type: Tweak
-  id: 5410
-  time: '2023-12-17T23:27:01.0000000+00:00'
-  url: null
-- author: Aexxie
-  changes:
-  - message: Added RCDs to all engineering lockers.
-    type: Add
-  id: 5411
-  time: '2023-12-18T02:38:37.0000000+00:00'
-  url: null
-- author: Ubaser
-  changes:
-  - message: Traitors and Nukies can now purchase a Chemical Synthesis Kit for 4TC
-      which contains Vestine.
-    type: Add
-  - message: Nocturine, Tazinide, Stimulants, Lexorin and Mute Toxin are now locked
-      behind Vestine.
-    type: Tweak
-  - message: Lexorin and Heartbreaker toxin are buffed, while Licoxide is nerfed.
-    type: Tweak
-  - message: You can no longer purchase Nocturine through the uplink.
-    type: Remove
-  id: 5412
-  time: '2023-12-18T02:40:28.0000000+00:00'
-  url: null
-- author: Ubaser
-  changes:
-  - message: Janitors now get rubber gloves for cleaning.
-    type: Add
-  id: 5413
-  time: '2023-12-18T03:11:19.0000000+00:00'
-  url: null
-- author: Velcroboy
-  changes:
-  - message: Added coal. Coal has been added to the steel recipe in the Ore Processor.
-      Coal can be ground up for Carbon and other elements. Coal can be mined or received
-      as a gift if you've been naughty.
-    type: Add
-  id: 5414
-  time: '2023-12-18T19:38:12.0000000+00:00'
-  url: null
-- author: Flareguy
-  changes:
-  - message: You can now walk into external and shuttle airlocks to open them, like
-      all other airlocks.
-    type: Tweak
-  id: 5415
-  time: '2023-12-18T19:44:50.0000000+00:00'
-  url: null
-- author: iacore
-  changes:
-  - message: normal closets can now be constructed and deconstructed
-    type: Add
-  id: 5416
-  time: '2023-12-18T19:46:16.0000000+00:00'
-  url: null
-- author: Emisse
-  changes:
-  - message: Walls are stronger and windows are weaker.
-    type: Tweak
-  - message: Secure crates and lockers are a lot stronger.
-    type: Tweak
-  - message: Melee weapons are now more balanced within a closer range of damage.
-    type: Tweak
-  - message: Double energy sword and fireaxe are now unavailable in uplink.
-    type: Tweak
-  id: 5417
-  time: '2023-12-19T02:38:49.0000000+00:00'
-  url: null
-- author: EmoGarbage404
-  changes:
-  - message: Added the RCD and RCD ammo crates to cargo.
-    type: Add
-  id: 5418
-  time: '2023-12-19T02:40:55.0000000+00:00'
-  url: null
-- author: ElectroJr
-  changes:
-  - message: The fireaxe can now fight fires (melee hits reduce fire stacks).
-    type: Tweak
-  id: 5419
-  time: '2023-12-19T02:41:33.0000000+00:00'
-  url: null
-- author: SapphicOverload
-  changes:
-  - message: EVA and hardsuit helmets now allow breathing from gas tanks without a
-      mask.
-    type: Tweak
-  id: 5420
-  time: '2023-12-19T02:50:06.0000000+00:00'
-  url: null
-- author: RiceMar
-  changes:
-  - message: Station department exteriors now feature janitorial service lights for
-      directing janitors to the big messes they cant see!
-    type: Add
-  id: 5421
-  time: '2023-12-19T04:21:12.0000000+00:00'
-  url: null
-- author: SlamBamActionman
-  changes:
-  - message: Fixed compatability with old changelog format.
-    type: Fix
-  id: 5422
-  time: '2023-12-19T05:22:24.0000000+00:00'
-  url: null
-- author: notafet
-  changes:
-  - message: Security sunglasses, researchable from arsenal technology, now display
-      the security HUD.
-    type: Tweak
-  id: 5423
-  time: '2023-12-19T08:29:07.0000000+00:00'
-  url: null
-- author: Emisse
-  changes:
-  - message: Captain clothing items have been resprited
-    type: Tweak
-  id: 5424
-  time: '2023-12-19T20:36:36.0000000+00:00'
-  url: null
-- author: Stanislav4ix
-  changes:
-  - message: Added ore bag of holding!
-    type: Add
-  id: 5425
-  time: '2023-12-19T22:28:56.0000000+00:00'
-  url: null
-- author: TGODiamond
-  changes:
-  - message: Item size cannot be misinterpreted now.
-    type: Fix
-  id: 5426
-  time: '2023-12-20T00:31:39.0000000+00:00'
-  url: null
-- author: Veritius
-  changes:
-  - message: Ethylredoxrazine is more effective at treating drunkness.
-    type: Tweak
-  id: 5427
-  time: '2023-12-20T02:20:04.0000000+00:00'
-  url: null
-- author: Errant
-  changes:
-  - message: HUD elements no longer violate the Geneva Conventions.
-    type: Fix
-  id: 5428
-  time: '2023-12-20T04:28:03.0000000+00:00'
-  url: null
-- author: ERORR404V1
-  changes:
-  - message: NanoTrasen botanists have bred a new blinking plant
-    type: Add
-  id: 5429
-  time: '2023-12-20T04:57:02.0000000+00:00'
-  url: null
-- author: qwerltaz
-  changes:
-  - message: Improve the gas analyzer interface.
-    type: Tweak
-  id: 5430
-  time: '2023-12-20T17:56:57.0000000+00:00'
-  url: null
-- author: JoeHammad
-  changes:
-  - message: Fland now has its own shuttle, ported from ss13
-    type: Add
-  id: 5431
-  time: '2023-12-20T23:26:07.0000000+00:00'
-  url: null
-- author: joshepvodka
-  changes:
-  - message: CentCom bureaucrats are now twice as powerful with their new custom-made
-      clipboards and folders.
-    type: Add
-  id: 5432
-  time: '2023-12-20T23:29:35.0000000+00:00'
-  url: null
-- author: PJB3005
-  changes:
-  - message: Fix starting to follow a moving player as a ghost causing your camera
-      to keep jumping around anymore.
-    type: Fix
-  id: 5433
-  time: '2023-12-20T23:33:00.0000000+00:00'
-  url: null
-- author: Velcroboy
-  changes:
-  - message: Fixed coal not generating!
-    type: Fix
-  id: 5434
-  time: '2023-12-20T23:46:20.0000000+00:00'
-  url: null
-- author: whateverusername0
-  changes:
-  - message: "Miasma now reacts with oxygen at 50\xB0C to produce nitrous oxide and\
-      \ water vapor."
-    type: Add
-  id: 5435
-  time: '2023-12-21T00:14:59.0000000+00:00'
-  url: null
-- author: whateverusername0
-  changes:
-  - message: Nitrous oxide now decomposes at high temperatures.
-    type: Add
-  id: 5436
-  time: '2023-12-21T01:33:08.0000000+00:00'
-  url: null
-- author: Emisse
-  changes:
-  - message: Crates and lockers are slightly easier to bust open but still harder
-      than before.
-    type: Tweak
-  - message: Solid walls are easier to break but reinforced are the same.
-    type: Tweak
-  id: 5437
-  time: '2023-12-21T03:03:06.0000000+00:00'
-  url: null
-- author: mirrorcult
-  changes:
-  - message: Miasma has been renamed to Ammonia
-    type: Add
-  - message: Miasmic subsumation reaction has been removed
-    type: Remove
-  id: 5438
-  time: '2023-12-21T04:19:50.0000000+00:00'
-  url: null
-- author: joshepvodka
-  changes:
-  - message: NanoTrasen updated the designs for their emergency medipens. Space medipens
-      are now magenta colored and epi pens have a green band on them.
-    type: Tweak
-  id: 5439
-  time: '2023-12-21T05:30:58.0000000+00:00'
-  url: null
-- author: Hqlle
-  changes:
-  - message: Resprited carpet sprites.
-    type: Add
-  id: 5440
-  time: '2023-12-21T05:32:38.0000000+00:00'
-  url: null
-- author: CrigCrag
-  changes:
-  - message: Added Fresium, a military grade coolant that you SHOULD NOT INGEST OR
-      SPLASH ON YOUR FRIENDS!
-    type: Add
-  id: 5441
-  time: '2023-12-21T05:35:22.0000000+00:00'
-  url: null
-- author: RiceMar
-  changes:
-  - message: Energy swords and double energy swords now look as long as they seem
-      to be in your hand.
-    type: Tweak
-  id: 5442
-  time: '2023-12-21T06:32:11.0000000+00:00'
-  url: null
-- author: Emisse
-  changes:
-  - message: Borgs now see who is crew
-    type: Tweak
-  id: 5443
-  time: '2023-12-21T07:09:53.0000000+00:00'
-  url: null
-- author: KittenColony
-  changes:
-  - message: Rotated fireaxe 'icon' 45 degrees
-    type: Tweak
-  id: 5444
-  time: '2023-12-21T08:03:52.0000000+00:00'
-  url: null
-- author: themias
-  changes:
-  - message: Damp rags can mop puddles again
-    type: Fix
-  - message: Syndie soap cleans evidence a little faster than other soap
-    type: Tweak
-  id: 5445
-  time: '2023-12-21T08:54:52.0000000+00:00'
-  url: null
-- author: Emisse
-  changes:
-  - message: Nukies don't start with agent ID anymore
-    type: Tweak
-  id: 5446
-  time: '2023-12-21T09:59:06.0000000+00:00'
-  url: null
-- author: Repo
-  changes:
-  - message: Mice can no longer spill containers.
-    type: Tweak
-  id: 5447
-  time: '2023-12-21T10:23:01.0000000+00:00'
-  url: null
-- author: Lukasz825700516
-  changes:
-  - message: Gas tanks no longer predict insertion of random items.
-    type: Fix
-  id: 5448
-  time: '2023-12-21T10:37:35.0000000+00:00'
-  url: null
-- author: mirrorcult
-  changes:
-  - message: Smart equipping now works with item slots
-    type: Add
-  - message: Smart equipping is now predicted
-    type: Tweak
-  id: 5449
-  time: '2023-12-21T14:17:09.0000000+00:00'
-  url: null
-- author: DrMelon
-  changes:
-  - message: Mice and other small creatures can no longer hurt Pun Pun or the Clown
-      by smashing them into tables.
-    type: Fix
-  id: 5450
-  time: '2023-12-21T15:18:26.0000000+00:00'
-  url: null
-- author: Boaz1111
-  changes:
-  - message: Added uranium munitions, a new T1 arsenal research.
-    type: Add
-  - message: Made practice munitions and weapons roundstart
-    type: Tweak
-  id: 5451
-  time: '2023-12-21T17:19:45.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22824
-- author: Admiral-Obvious-001
-  changes:
-  - message: Reduced per pellet damage of shotguns slightly.
-    type: Tweak
-  id: 5452
-  time: '2023-12-27T09:26:42.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23042
-- author: mirrorcult
-  changes:
-  - message: Pacifists can now attack in general, but are still forbidden from hurting
-      living creatures or dangerous things.
-    type: Tweak
-  - message: Pacifists can now disarm people. They are pacifist, after all.
-    type: Tweak
-  - message: Pacifists can now use flashes (and zero-damaging melee weapons, in general)
-    type: Tweak
-  id: 5453
-  time: '2023-12-27T09:55:48.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23037
-- author: snebl
-  changes:
-  - message: Fixed emergency and extended nitrogen tanks having the same volume.
-    type: Fix
-  id: 5454
-  time: '2023-12-27T09:56:00.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23040
-- author: Blazeror
-  changes:
-  - message: You can now pry open windoors by hand when they are unpowered.
-    type: Fix
-  id: 5455
-  time: '2023-12-27T12:28:29.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23047
-- author: Emisse
-  changes:
-  - message: The Grand Lottery now has much more prizes in store!
-    type: Tweak
-  id: 5456
-  time: '2023-12-27T12:31:03.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23048
-- author: TheShuEd
-  changes:
-  - message: The thief will temporarily not steal structures for the time being, as
-      this task seems too difficult.
-    type: Tweak
-  - message: Added Emag into thief's syndie kit
-    type: Add
-  - message: Added 3 smoke grenades into thief's smuggler kit
-    type: Add
-  - message: Replaced radio jammer to cyber pen into thief's communicator kit
-    type: Tweak
-  - message: Replaced omnizine bottle to omega soap into thief's chemistry kit
-    type: Tweak
-  id: 5457
-  time: '2023-12-27T20:42:16.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22976
-- author: Alekshhh
-  changes:
-  - message: Changed brown fedora and inspector's coat palette and minor adjustments
-    type: Tweak
-  id: 5458
-  time: '2023-12-27T22:53:10.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23065
-- author: Velcroboy
-  changes:
-  - message: Added melee dmg to salami logs!
-    type: Add
-  id: 5459
-  time: '2023-12-28T02:59:14.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23041
-- author: Emisse
-  changes:
-  - message: Ion Storm is silent now
-    type: Tweak
-  id: 5460
-  time: '2023-12-28T03:03:00.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23045
-- author: Alekshhh
-  changes:
-  - message: Changed wall lockers visually to match regular lockers and sit on walls
-      better
-    type: Tweak
-  id: 5461
-  time: '2023-12-28T03:05:05.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23060
-- author: EmoGarbage404
-  changes:
-  - message: Added the clerical error station event, which causes a small amount of
-      station records to be destroyed.
-    type: Add
-  id: 5462
-  time: '2023-12-28T03:09:05.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23091
-- author: EmoGarbage404
-  changes:
-  - message: Added the GORILLA gauntlet. When powered with an anomaly core, a single
-      blow from this is able to send anomalies flying through the air. Just try not
-      to let it out on the clown.
-    type: Add
-  - message: Added Anomaly Core Harnessing technology to the Experimental discipline,
-      which contains the GORILLA gauntlet.
-    type: Add
-  id: 5463
-  time: '2023-12-28T03:11:13.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23012
-- author: Ubaser
-  changes:
-  - message: You can now purchase kobolds from cargo as an alternative to monkeys!
-    type: Add
-  id: 5464
-  time: '2023-12-28T05:32:55.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22108
-- author: TheShuEd
-  changes:
-  - message: Tesla has been added to the game! Engineers can build a tesla power generator
-      using a tesla generator, tesla coils, and grounding wands that can be purchased
-      from the cargo.
-    type: Add
-  id: 5465
-  time: '2023-12-28T13:11:50.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/21124
-- author: TheShuEd
-  changes:
-  - message: thieves can now appear in rounds with nuclear operatives
-    type: Add
-  id: 5466
-  time: '2023-12-28T23:50:25.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23102
-- author: EmoGarbage404
-  changes:
-  - message: Added station beacons. These devices create custom labels on the station
-      map. Order them from cargo today.
-    type: Add
-  id: 5467
-  time: '2023-12-29T00:02:21.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23136
-- author: lzk228
-  changes:
-  - message: Directional barricade is constructable now!
-    type: Tweak
-  id: 5468
-  time: '2023-12-29T00:45:10.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22988
-- author: themias
-  changes:
-  - message: Toy swords can be turned on.
-    type: Fix
-  id: 5469
-  time: '2023-12-29T00:59:23.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23137
-- author: Ubaser
-  changes:
-  - message: Magboots produced by science now have new sprites.
-    type: Add
-  id: 5470
-  time: '2023-12-29T03:08:08.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23107
-- author: metalgearsloth
-  changes:
-  - message: Added sounds to UI clicking and hovering.
-    type: Add
-  id: 5471
-  time: '2023-12-29T04:43:37.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22410
-- author: FairlySadPanda
-  changes:
-  - message: Talking, whispering and emoting will now strip out any markup tags in
-      the input text. This also means intercoms tuned to the science channel will
-      no longer squawk out "[bold]", and so on, when reporting on research unlocks.
-    type: Fix
-  id: 5472
-  time: '2023-12-30T00:38:11.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23055
-- author: Admiral-Obvious-001
-  changes:
-  - message: Normalized researched secfab shotgun ammo damages to align with the rest
-      of the ammo sizes.
-    type: Tweak
-  id: 5473
-  time: '2023-12-30T05:34:27.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23163
-- author: metalgearsloth
-  changes:
-  - message: Fix decals such as grass drawing over shuttles on planet maps.
-    type: Fix
-  id: 5474
-  time: '2023-12-30T16:12:39.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22953
-- author: metalgearsloth
-  changes:
-  - message: Fix mobs not gibbing upon shuttle FTL.
-    type: Fix
-  id: 5475
-  time: '2023-12-30T16:12:52.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22952
-- author: metalgearsloth
-  changes:
-  - message: Surveillance cameras now cycle their animation forwards and backwards.
-    type: Add
-  id: 5476
-  time: '2023-12-30T16:14:14.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22950
-- author: EmoGarbage404
-  changes:
-  - message: Added the Hyper convection protolathe and autolathe to Industrial Engineering
-      tech. These lathes have a discounted printing price at the cost of venting hot
-      air into the surroundings.
-    type: Add
-  - message: Added the industrial ore processor, an improved version with discounted
-      printing prices, to salvage equipment technology.
-    type: Add
-  - message: Moved autolathe, protolathe, circuit imprinter, ore processor, and material
-      reclaimer boards to be available by default in the circuit imprinter.
-    type: Tweak
-  - message: Removed machine part upgrades from all lathes.
-    type: Remove
-  id: 5477
-  time: '2023-12-30T16:18:58.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23202
-- author: Ubaser
-  changes:
-  - message: The uncloneable trait has been removed.
-    type: Remove
-  id: 5478
-  time: '2023-12-30T16:45:43.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23229
-- author: Ubaser
-  changes:
-  - message: Syndicate implanters have received a new sprite.
-    type: Add
-  id: 5479
-  time: '2023-12-30T16:46:13.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23227
-- author: lzk228
-  changes:
-  - message: Shivs crafting now based on construct. Click with cloth on shard to create
-      shiv.
-    type: Tweak
-  id: 5480
-  time: '2023-12-30T17:08:52.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23134
-- author: Alekshhh
-  changes:
-  - message: Changed disposal units visually
-    type: Tweak
-  id: 5481
-  time: '2023-12-30T17:14:20.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23067
-- author: quatre
-  changes:
-  - message: Artifact Analyzer now pauses on power-loss.
-    type: Tweak
-  id: 5482
-  time: '2023-12-30T17:49:25.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22974
-- author: Blazeror
-  changes:
-  - message: Pinpointers now use the correct sprites.
-    type: Fix
-  id: 5483
-  time: '2023-12-30T19:12:13.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23236
-- author: Emisse
-  changes:
-  - message: The Grand Lottery has even more surprises in store!
-    type: Tweak
-  id: 5484
-  time: '2023-12-30T21:24:24.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23243
-- author: Blackern5000
-  changes:
-  - message: Chang's instant ramen cups have been slightly enlarged to accommodate
-      10ml of boiling water, as per the instructions.
-    type: Tweak
-  id: 5485
-  time: '2023-12-30T22:27:10.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23189
-- author: Velcroboy
-  changes:
-  - message: Moved head clothing items out of their lockers and into their dressers.
-    type: Tweak
-  id: 5486
-  time: '2023-12-30T22:42:19.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23183
-- author: Carve
-  changes:
-  - message: Voice change has a new icon.
-    type: Tweak
-  id: 5487
-  time: '2023-12-30T23:13:27.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23239
-- author: lzk228
-  changes:
-  - message: Mime's stamp is silent now!
-    type: Tweak
-  id: 5488
-  time: '2023-12-30T23:15:02.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23221
-- author: EmoGarbage404
-  changes:
-  - message: Damage from heat sources has been increased.
-    type: Tweak
-  id: 5489
-  time: '2023-12-30T23:28:01.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23238
-- author: Alekshhh
-  changes:
-  - message: Changed seed bag visuals
-    type: Tweak
-  id: 5490
-  time: '2023-12-30T23:35:46.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23210
-- author: Alekshhh
-  changes:
-  - message: Changed ammo boxes visually
-    type: Tweak
-  id: 5491
-  time: '2023-12-31T02:13:07.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23180
-- author: leonardo-dabepis
-  changes:
-  - message: Soap no longer smells like condoms.
-    type: Tweak
-  id: 5492
-  time: '2023-12-31T07:27:55.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23272
-- author: EmoGarbage404
-  changes:
-  - message: The chemistry guidebook now includes sources for various chemicals! These
-      are alternative methods of collection, including grinding, juicing, condensation,
-      and various others.
-    type: Add
-  id: 5493
-  time: '2023-12-31T07:35:00.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22627
-- author: noctyrnal
-  changes:
-  - message: RD's suit got a new paint job.
-    type: Tweak
-  id: 5494
-  time: '2023-12-31T07:36:47.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23131
-- author: DangerRevolution
-  changes:
-  - message: Fixed Syndicate Fax Machine not receiving Faxes
-    type: Fix
-  id: 5495
-  time: '2023-12-31T17:36:21.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23291
-- author: IlyaElDunaev
-  changes:
-  - message: The stun prod can now be thrown at enemies
-    type: Add
-  id: 5496
-  time: '2023-12-31T23:52:00.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23133
-- author: TheShuEd
-  changes:
-  - message: Added 3 new artifact effect. Added 1 new artifact trigger.
-    type: Add
-  id: 5497
-  time: '2024-01-01T02:19:03.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22574
-- author: Ilya246
-  changes:
-  - message: Science no longer needs to research medium batteries, and high batteries
-      are now T1.
-    type: Tweak
-  id: 5498
-  time: '2024-01-01T02:24:13.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23269
-- author: Rainfey
-  changes:
-  - message: Ensure correct number of thieves
-    type: Fix
-  id: 5499
-  time: '2024-01-01T02:25:28.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23270
-- author: icekot8
-  changes:
-  - message: 2 new effects for artifact
-    type: Add
-  id: 5500
-  time: '2024-01-01T06:40:49.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23295
-- author: TheShuEd
-  changes:
-  - message: Tesla coils now have a 50% chance of not attracting lightning.  Installing
-      ground rods is now much more important!
-    type: Tweak
-  - message: Nerf tesla energy producing.
-    type: Tweak
-  - message: Now tesla coils are gradually wearing out, taking damage from lightning.
-      Keep an eye on them and repair them with a welder every 20-30 minutes. Grounding
-      rods are immune to lightning damage.
-    type: Add
-  id: 5501
-  time: '2024-01-01T07:33:48.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23235
-- author: 778b
-  changes:
-  - message: Fixed appearance of welded airlocks!
-    type: Fix
-  id: 5502
-  time: '2024-01-01T07:36:32.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23300
-- author: mirrorcult
-  changes:
-  - message: Ambient sounds are now more audible by default (unless you have the audio
-      setting changed already)
-    type: Tweak
-  - message: LV/MV wires & pipes no longer make ambient noises
-    type: Tweak
-  id: 5503
-  time: '2024-01-01T07:57:33.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22536
-- author: themias
-  changes:
-  - message: Heat damage cauterizes bleeding again.
-    type: Fix
-  id: 5504
-  time: '2024-01-01T08:08:26.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23264
-- author: TheShuEd
-  changes:
-  - message: the lightning from the electrical anomaly now works the same way as the
-      tesla. They can charge the tesla coils, and blow up machinery.
-    type: Tweak
-  id: 5505
-  time: '2024-01-01T10:24:38.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23173
-- author: Ubaser
-  changes:
-  - message: Reptilians can now use up to two (top) head markings.
-    type: Tweak
-  id: 5506
-  time: '2024-01-01T23:27:14.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23219
-- author: Lukasz825700516
-  changes:
-  - message: Zombiefied reptilians no longer can pull objects with their tail.
-    type: Fix
-  id: 5507
-  time: '2024-01-01T23:31:36.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23066
-- author: SonicHDC
-  changes:
-  - message: Changed shape of Pistols to L!
-    type: Tweak
-  id: 5508
-  time: '2024-01-01T23:32:16.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23104
-- author: Alekshhh
-  changes:
-  - message: Changed some hairs visually
-    type: Tweak
-  id: 5509
-  time: '2024-01-02T00:12:05.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23304
-- author: EmoGarbage404
-  changes:
-  - message: Defibrillators no longer reset the rot timer when failing to revive a
-      body.
-    type: Fix
-  - message: Slimes now rot.
-    type: Tweak
-  id: 5510
-  time: '2024-01-02T02:12:32.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23340
-- author: Ubaser
-  changes:
-  - message: Salvage mobs can no longer be ghost roles.
-    type: Remove
-  id: 5511
-  time: '2024-01-02T08:15:29.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23355
-- author: Rainbeon
-  changes:
-  - message: The ChemMaster buffer no longer shuffles list ordering when removing
-      a reagent.
-    type: Fix
-  id: 5512
-  time: '2024-01-02T15:51:22.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23352
-- author: DrMelon
-  changes:
-  - message: Fixed the Tesla Ball moving too fast by being pushed with explosions.
-      Now it moves as-designed.
-    type: Fix
-  id: 5513
-  time: '2024-01-02T18:09:06.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23377
-- author: tday
-  changes:
-  - message: The admin log will now include attempts to draw from mobs with a syringe.
-    type: Add
-  id: 5514
-  time: '2024-01-02T18:47:31.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23333
-- author: 778b
-  changes:
-  - message: Improved mice's eating everything behavior, now they can stop!
-    type: Tweak
-  id: 5515
-  time: '2024-01-02T18:49:20.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23322
-- author: Ilya246
-  changes:
-  - message: Science may now research the Biofabricator, which can make animal cubes
-      from biomass!
-    type: Add
-  id: 5516
-  time: '2024-01-02T18:53:35.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23319
-- author: themias
-  changes:
-  - message: Welders can be refilled directly from wall fuel dispensers
-    type: Tweak
-  id: 5517
-  time: '2024-01-02T21:11:10.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23376
-- author: Admiral-Obvious-001
-  changes:
-  - message: Added a few words to body bag descriptor so you know they stop rot.
-    type: Add
-  id: 5518
-  time: '2024-01-03T01:36:18.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23407
-- author: CaasGit
-  changes:
-  - message: Give slimes their custom speech bubble!
-    type: Tweak
-  id: 5519
-  time: '2024-01-03T05:12:56.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23415
-- author: zzylex
-  changes:
-  - message: You can now make plungers stick to walls.
-    type: Tweak
-  - message: A sound is made when a plunger gets stuck to something.
-    type: Add
-  - message: You can now shoot plungers with bows.
-    type: Tweak
-  id: 5520
-  time: '2024-01-03T05:36:17.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23406
-- author: EmoGarbage404
-  changes:
-  - message: Added flatpacks, boxes that unpack into a full-sized machine when activated
-      with a multitool.
-    type: Add
-  - message: Added the Flatpacker 1001 to industrial research. A machine capable of
-      creating flatpacks from machine boards.
-    type: Add
-  id: 5521
-  time: '2024-01-03T06:16:03.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23338
-- author: themias
-  changes:
-  - message: Cyborgs can interact with shuttle consoles, gas mixers and gas filters.
-    type: Fix
-  id: 5522
-  time: '2024-01-03T06:31:58.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23391
-- author: metalgearsloth
-  changes:
-  - message: Fix solution injections considering the fly-by sound range and not the
-      collision range.
-    type: Fix
-  id: 5523
-  time: '2024-01-03T07:57:36.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23429
-- author: Bhijn and Myr
-  changes:
-  - message: Light fixtures now actually glow when they're powered on. Like. Their
-      sprite actually glows if the lighting is dim. Revolutionary technology, yes.
-    type: Tweak
-  id: 5524
-  time: '2024-01-03T08:46:11.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23428
-- author: Bhijn and Myr
-  changes:
-  - message: 'Blindness has been completely reworked, top to bottom. Eye damage is
-      no longer a mere dimming of the screen, but rather, a hyperstylized (read: not
-      at all realistic) simulation of the symptoms described by those living with
-      various types of real-world blindness.'
-    type: Add
-  - message: When your eyes have reached a critical state of damage, you are now capable
-      of simply closing them.
-    type: Add
-  - message: The settings menu now has a "Reduce motion of visual effects" setting!
-      Currently, the only thing this does is swap the eye damage effect out for a
-      far more straight-forward one akin to the blindness overlays seen across various
-      SS13 servers.
-    type: Add
-  - message: The amount of damage that eyes can take has been greatly increased. Total
-      blindness now takes 9 damage, up from 3. Additionally, eyes are considered to
-      be in a critical state once they hit 6 damage.
-    type: Tweak
-  - message: Glasses no longer actively increase the eye damage effect. They now actively
-      reduce the eye damage effect, with their effectiveness dropping off as you take
-      more eye damage, until they eventually do nothing once your eyes are in critical
-      condition.
-    type: Tweak
-  - message: The blind trait is now legal blindness, rather than complete blindness.
-      The blind trait permanently prevents your eyes from being reduced below the
-      critical state threshold.
-    type: Tweak
-  id: 5525
-  time: '2024-01-03T09:07:02.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23212
-- author: BurninDreamer
-  changes:
-  - message: Hand labelers can now be printed by autolathes.
-    type: Tweak
-  id: 5526
-  time: '2024-01-03T18:24:02.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23457
-- author: themias
-  changes:
-  - message: Fixed refueling a lit welder not detonating the fuel tank
-    type: Fix
-  id: 5527
-  time: '2024-01-03T21:23:36.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23469
-- author: Alekshhh
-  changes:
-  - message: Changed monkeys visually
-    type: Tweak
-  id: 5528
-  time: '2024-01-03T21:23:55.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23464
-- author: lapatison
-  changes:
-  - message: Circuit imprinter now can produce circuit floor.
-    type: Add
-  id: 5529
-  time: '2024-01-03T21:25:18.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23467
-- author: 21Melkuu
-  changes:
-  - message: increased RPED capacity.
-    type: Tweak
-  id: 5530
-  time: '2024-01-03T21:34:32.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23455
-- author: Bhijn and Myr
-  changes:
-  - message: Service lights have had their overall brightness toned down.
-    type: Tweak
-  id: 5531
-  time: '2024-01-03T21:39:04.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23437
-- author: Ilya246
-  changes:
-  - message: Terminator endoskeletons have learned how to pry doors.
-    type: Tweak
-  id: 5532
-  time: '2024-01-03T21:58:02.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23468
-- author: lzk228
-  changes:
-  - message: Vendors will thank you now for using them.
-    type: Tweak
-  id: 5533
-  time: '2024-01-03T22:21:53.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23023
-- author: Flareguy
-  changes:
-  - message: Airlocks now have a new deny sound, courtesy of /tg/station.
-    type: Tweak
-  id: 5534
-  time: '2024-01-03T22:22:37.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22954
-- author: Blackern5000
-  changes:
-  - message: After realizing their employees have been forced to make medical supplies
-      by hand, Centcomm has added a gauze option to their medical fabricators.
-    type: Add
-  id: 5535
-  time: '2024-01-03T22:42:35.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23417
-- author: Bhijn and Myr
-  changes:
-  - message: The blindness and eye damage effects now properly take screen resolution
-      into account, and are no longer way wider than intended.
-    type: Fix
-  id: 5536
-  time: '2024-01-04T00:17:06.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23465
-- author: EmoGarbage404
-  changes:
-  - message: Cargo Bounties no longer have time limits. There are also more available
-      at once.
-    type: Tweak
-  - message: Adjusted reward amounts for bounties
-    type: Tweak
-  - message: Fixed bounties failing to register mobs and items inside containers.
-    type: Fix
-  id: 5537
-  time: '2024-01-04T00:34:47.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23411
-- author: themias
-  changes:
-  - message: Microwaves no longer eject their contents when they lose power.
-    type: Tweak
-  id: 5538
-  time: '2024-01-04T00:36:32.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23460
-- author: Bhijn and Myr
-  changes:
-  - message: Kobolds now come in a wide variety of colors, and now have random horns!
-    type: Add
-  id: 5539
-  time: '2024-01-04T00:39:00.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23393
-- author: IlyaElDunaev
-  changes:
-  - message: Tarantula can pry doors.
-    type: Add
-  - message: Added regeneration for tarantula.
-    type: Add
-  id: 5540
-  time: '2024-01-04T00:39:23.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23449
-- author: Alekshhh
-  changes:
-  - message: Changed green-red jester outfit visually
-    type: Tweak
-  id: 5541
-  time: '2024-01-04T00:40:23.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23454
-- author: themias
-  changes:
-  - message: Zombies now take longer to pry open bolted doors.
-    type: Tweak
-  id: 5542
-  time: '2024-01-04T00:41:39.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23383
-- author: Blazeror
-  changes:
-  - message: Vials now work in dispensers.
-    type: Fix
-  id: 5543
-  time: '2024-01-04T02:18:37.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23473
-- author: FairlySadPanda
-  changes:
-  - message: Switching songs when playing a MIDI instrument no longer inconsistently
-      requires stopping the old song first.
-    type: Fix
-  - message: Clicking the [bold]Play MIDI[/bold] button repeatedly in the Instrument
-      menu no longer queues up more file windows to open.
-    type: Fix
-  id: 5544
-  time: '2024-01-04T02:19:22.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23339
-- author: metalgearsloth
-  changes:
-  - message: Salvage magnet now has an interface to choose what you want to do.
-    type: Add
-  - message: Magnet asteroids now come in more varieties.
-    type: Tweak
-  id: 5545
-  time: '2024-01-04T03:25:32.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23119
-- author: themias
-  changes:
-  - message: Added a funny oxygen tank for the clown
-    type: Add
-  id: 5546
-  time: '2024-01-04T03:29:03.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23495
-- author: SpeltIncorrectyl
-  changes:
-  - message: The flatpacker 1001 can now create flatpacks for computers.
-    type: Tweak
-  id: 5547
-  time: '2024-01-04T04:23:47.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23471
-- author: Geekyhobo
-  changes:
-  - message: Fixed AGhosts not being able to drop items past the default range.
-    type: Fix
-  id: 5548
-  time: '2024-01-04T05:31:58.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23502
-- author: Dutch-VanDerLinde
-  changes:
-  - message: Kobold monkies now have a unique name identifier. (KB-####)
-    type: Tweak
-  id: 5549
-  time: '2024-01-04T05:51:09.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23505
-- author: Boaz1111
-  changes:
-  - message: The shotgun cartridge dispensers now function like ammo boxes.
-    type: Tweak
-  id: 5550
-  time: '2024-01-04T05:53:45.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23388
-- author: KittenColony
-  changes:
-  - message: Added backspikes marking to Lizards
-    type: Add
-  id: 5551
-  time: '2024-01-04T09:49:51.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23220
-- author: Ilya246
-  changes:
-  - message: Plasma gas canisters are now much cheaper.
-    type: Tweak
-  id: 5552
-  time: '2024-01-04T10:56:38.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23283
-- author: Emisse
-  changes:
-  - message: Holoparasite can wideswing, do structural, and won't out you by randomly
-      attacking before it's possessed.
-    type: Tweak
-  - message: Structural damage has been adjusted to allow more weapons to damage sturdier
-      structures.
-    type: Tweak
-  id: 5553
-  time: '2024-01-04T12:03:28.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23515
-- author: Emisse
-  changes:
-  - message: Some syndicate implants have been made cheaper.
-    type: Tweak
-  id: 5554
-  time: '2024-01-04T12:24:39.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23513
-- author: Emisse
-  changes:
-  - message: Flashes cannot be heard from more than a few meters away.
-    type: Tweak
-  id: 5555
-  time: '2024-01-04T12:27:32.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23521
-- author: TheShuEd
-  changes:
-  - message: Added human plushie
-    type: Add
-  id: 5556
-  time: '2024-01-04T12:27:40.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23518
-- author: ERORR404V1
-  changes:
-  - message: Added observation kit what include syndicate crew monitor and security
-      hud disguised as sunglasses.
-    type: Add
-  id: 5557
-  time: '2024-01-04T12:36:44.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23384
-- author: Ilya246
-  changes:
-  - message: Added the syndicate scram implanter, which allows you to instantly escape
-      any situation, at a risk.
-    type: Add
-  id: 5558
-  time: '2024-01-04T12:38:03.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23122
-- author: VMSolidus
-  changes:
-  - message: PAI cartridges can now be slotted into PDAs.
-    type: Add
-  id: 5559
-  time: '2024-01-04T12:56:14.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/21086
-- author: Emisse
-  changes:
-  - message: Emergency Eva is slightly faster to move around in.
-    type: Tweak
-  id: 5560
-  time: '2024-01-04T13:08:17.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23522
-- author: Alekshhh
-  changes:
-  - message: Changed plague doctor set visually
-    type: Tweak
-  id: 5561
-  time: '2024-01-04T13:09:11.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23382
-- author: luringens
-  changes:
-  - message: Diona now drop their items when robusted into a tree.
-    type: Tweak
-  - message: Diona can be cut free from their robust tree-form.
-    type: Fix
-  id: 5562
-  time: '2024-01-04T13:10:05.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/21636
-- author: PrPleGoo
-  changes:
-  - message: added an overlay for the diagnostic hud that displays relative health
-      for inorganics
-    type: Add
-  - message: added an overlay for the medical hud that displays relative health for
-      biologicals
-    type: Add
-  - message: added a `showhealthbars` command that takes damage contained ids as a
-      param
-    type: Add
-  id: 5563
-  time: '2024-01-04T16:48:57.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/21980
-- author: ada-please
-  changes:
-  - message: Oil can now be broken down with a Centrifuge.
-    type: Add
-  id: 5564
-  time: '2024-01-04T22:45:35.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23537
-- author: EmoGarbage404
-  changes:
-  - message: Increased material discount of hyper convection protolathes and hyper
-      convection  autolathes to 50%
-    type: Tweak
-  id: 5565
-  time: '2024-01-05T02:44:11.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23542
-- author: TheShuEd
-  changes:
-  - message: Added new T2 "Deterrence technologies", it includes 2 new tools to fight
-      a runaway singularity or tesla. Force barrier holoprojector that sets up a 3-minute
-      force containment field, and portable particle decelerator, capable of damaging
-      a tesla or singularity. Chances are 1 gun will not be enough! You will need
-      a teamwork of several shooters and hunters to destroy a tesla or singularity.
-    type: Add
-  - message: Added in cargo "Particle Decelerators crate" with 3 PD, at cost 15000$
-    type: Add
-  id: 5566
-  time: '2024-01-05T02:48:10.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23444
-- author: Alekshhh
-  changes:
-  - message: Changed uranium ore visually
-    type: Tweak
-  id: 5567
-  time: '2024-01-05T03:35:52.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23526
-- author: EmoGarbage404
-  changes:
-  - message: The flatpacker now consumes boards when packing them.
-    type: Tweak
-  id: 5568
-  time: '2024-01-05T05:01:25.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23552
-- author: Ubaser
-  changes:
-  - message: Moths have a new variety of wing and antennae, Underwing.
-    type: Add
-  id: 5569
-  time: '2024-01-05T13:55:49.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23559
-- author: Nairodian
-  changes:
-  - message: Added the ability to construct benches, dressers, and filing cabinets.
-    type: Add
-  id: 5570
-  time: '2024-01-05T16:53:34.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23188
-- author: Strol20
-  changes:
-  - message: The hud diagnostic drivers have been updated and can now show the health
-      of Borgs
-    type: Add
-  id: 5571
-  time: '2024-01-05T17:00:40.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23580
-- author: SpeltIncorrectyl
-  changes:
-  - message: Due to budget constraints, microwaves can no longer contain an infinite
-      number of items. Now the limit is 10.
-    type: Fix
-  id: 5572
-  time: '2024-01-05T20:03:49.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23577
-- author: GreyMario
-  changes:
-  - message: Chemistry bottles have been properly washed so you can actually see the
-      chemicals clearly through the glass.
-    type: Tweak
-  id: 5573
-  time: '2024-01-05T22:01:04.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23581
-- author: Ubaser
-  changes:
-  - message: Epinephrine no longer removes itself in the chemstream.
-    type: Fix
-  id: 5574
-  time: '2024-01-05T23:26:54.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23579
-- author: BurninDreamer
-  changes:
-  - message: Rigged boxing gloves had their weapon stats reduced from 30 stamina damage
-      to 24 and their attack speed from 1.5/s to 1.2/s
-    type: Tweak
-  id: 5575
-  time: '2024-01-05T23:27:33.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23576
-- author: Dutch-VanDerLinde
-  changes:
-  - message: Arachnids may now click and chitter.
-    type: Tweak
-  id: 5576
-  time: '2024-01-06T01:32:11.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23548
-- author: EmoGarbage404
-  changes:
-  - message: Fixed inconsistency in iron ore naming in various places.
-    type: Tweak
-  - message: The ore processor can now eject raw ores.
-    type: Tweak
-  id: 5577
-  time: '2024-01-06T02:52:40.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23590
-- author: FairlySadPanda
-  changes:
-  - message: Fixed the round restarted announcements, so you may now hear the glory
-      of "Yeah, there we go, APC destroyed, mission accomplished!" and the rest as
-      you are kicked to the lobby screen.
-    type: Fix
-  id: 5578
-  time: '2024-01-06T03:15:28.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23387
-- author: Dygon
-  changes:
-  - message: The construction module for cyborgs now also gives access to steel tiles.
-    type: Tweak
-  id: 5579
-  time: '2024-01-06T05:02:31.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23598
-- author: VigersRay
-  changes:
-  - message: Added loggin tips.
-    type: Add
-  id: 5580
-  time: '2024-01-06T06:06:49.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22234
-- author: MrFippik
-  changes:
-  - message: Input port of the network system in timer
-    type: Add
-  id: 5581
-  time: '2024-01-06T06:41:57.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/20026
-- author: mirrorcult
-  changes:
-  - message: Examining entities is now predicted, meaning that you will be shown most
-      information immediately.
-    type: Add
-  - message: Fixed a bug where power cells would list their charge twice.
-    type: Fix
-  id: 5582
-  time: '2024-01-06T06:53:13.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23565
-- author: Ubaser
-  changes:
-  - message: Reptilians now have a new large tail marking to choose from!
-    type: Add
-  id: 5583
-  time: '2024-01-06T07:07:09.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23551
-- author: DrMelon
-  changes:
-  - message: Climbing onto tables is once again a dangerous prospect for a Clown.
-    type: Fix
-  id: 5584
-  time: '2024-01-06T07:07:26.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23583
-- author: TheShuEd
-  changes:
-  - message: Removed Encryption key thief steal objective.
-    type: Remove
-  id: 5585
-  time: '2024-01-06T07:12:34.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23572
-- author: TheShuEd
-  changes:
-  - message: a powerful tesla gun can be found on planets!
-    type: Add
-  id: 5586
-  time: '2024-01-06T07:18:35.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23175
-- author: ZeroNationality
-  changes:
-  - message: Added a static station map for the pAI to use to guide their owner
-    type: Add
-  id: 5587
-  time: '2024-01-06T07:31:21.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23499
-- author: Nimfar11
-  changes:
-  - message: Adds medhud to the lockers of medics and CMO.
-    type: Add
-  id: 5588
-  time: '2024-01-06T07:35:33.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23591
-- author: yathxyz
-  changes:
-  - message: provide non-flake solution by pinning nixpkgs
-    type: Fix
-  id: 5589
-  time: '2024-01-06T08:07:08.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23368
-- author: Ilya246
-  changes:
-  - message: The Syndicate now provides singularity-attracting beacons to syndicate
-      agents.
-    type: Add
-  id: 5590
-  time: '2024-01-06T08:21:24.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/18486
-- author: iacore
-  changes:
-  - message: Nanotrasen has added screw holes to some metal constructions. (computer
-      frame, machine frame, rack and meat spike are now deconstructed by screwing,
-      also while unanchored.)
-    type: Tweak
-  id: 5591
-  time: '2024-01-06T08:28:57.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/21051
-- author: Velcroboy
-  changes:
-  - message: Added recipe for Diphenhydramine.
-    type: Add
-  id: 5592
-  time: '2024-01-06T08:29:35.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23006
-- author: TheShuEd
-  changes:
-  - message: Fixed barber scissor infinity range issue.
-    type: Fix
-  id: 5593
-  time: '2024-01-06T09:19:45.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22895
-- author: tday
-  changes:
-  - message: Tabletop Centrifuges will now only accept vials.
-    type: Tweak
-  id: 5594
-  time: '2024-01-06T09:22:35.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23538
-- author: MACMAN2003
-  changes:
-  - message: The uniform printer can now print command hats and departmental berets!
-    type: Add
-  id: 5595
-  time: '2024-01-06T14:54:58.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23556
-- author: Ubaser
-  changes:
-  - message: You can obtain Flippo lighters in the cig vend.
-    type: Fix
-  id: 5596
-  time: '2024-01-06T14:56:41.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23620
-- author: Alekshhh
-  changes:
-  - message: Changed ores visually.
-    type: Tweak
-  id: 5597
-  time: '2024-01-06T19:34:11.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23618
-- author: Bhijn and Myr
-  changes:
-  - message: NPCs are now capable of interacting with the world again. Or in laymen's
-      terms, monkeys and kobolds will now be able to pick up weapons they see.
-    type: Fix
-  id: 5598
-  time: '2024-01-06T20:32:51.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23638
-- author: Ubaser
-  changes:
-  - message: Trench coats can be located in the WinterDrobe.
-    type: Add
-  id: 5599
-  time: '2024-01-07T01:06:15.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23563
-- author: Bhijn and Myr
-  changes:
-  - message: You can now gently the kobolds (and monkeys, too!)
-    type: Add
-  - message: Kobolds now have their own unique speech!
-    type: Tweak
-  - message: All monkeys and monkey-likes (kobolds, for instance) can now pilot VIM
-    type: Tweak
-  - message: Kobolds no longer instantly die at 40 damage, but rather, fall into crit
-      at that threshold. They now die at 80 damage.
-    type: Tweak
-  id: 5600
-  time: '2024-01-07T01:08:51.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23642
-- author: Bhijn and Myr
-  changes:
-  - message: Mobs are no longer instantly gibbed when microwaved.
-    type: Tweak
-  - message: Microwaves now heat their contents in real-time.
-    type: Tweak
-  - message: Microwaves are now capable of properly heating their contents, such that
-      microwaveable mobs will still reliably die as expected when microwaved. (They
-      just won't be gibbed.)
-    type: Tweak
-  id: 5601
-  time: '2024-01-07T01:16:40.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/21887
-- author: TheShuEd
-  changes:
-  - message: Added new ghost role to be bought at uplink for 10 TC. Syndie Cat, implanted
-      with microbomb.
-    type: Add
-  id: 5602
-  time: '2024-01-07T01:52:41.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22554
-- author: Malo
-  changes:
-  - message: Bullet types (rubber, practice, normal) can now be visually distinguished
-      from each other!
-    type: Tweak
-  id: 5603
-  time: '2024-01-07T02:36:51.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/21068
-- author: metalgearsloth
-  changes:
-  - message: Fix salvage magnet UI being different on different PCs.
-    type: Fix
-  id: 5604
-  time: '2024-01-07T03:23:45.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23655
+Entries:
 - author: metalgearsloth
   changes:
-  - message: Fix dungeons not spawning on expeditions.
-    type: Fix
+    - message: Fix dungeons not spawning on expeditions.
+      type: Fix
   id: 5605
   time: '2024-01-07T03:23:53.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23654
 - author: Ubaser
   changes:
-  - message: The syndicate observational kit sunglasses now looks and acts like normal
-      sunglasses on top of its special feature.
-    type: Fix
+    - message: >-
+        The syndicate observational kit sunglasses now looks and acts like
+        normal sunglasses on top of its special feature.
+      type: Fix
   id: 5606
   time: '2024-01-07T06:24:36.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23621
 - author: metalgearsloth
   changes:
-  - message: Disable magnet wrecks TEMPORARILY pending further re-balancing.
-    type: Tweak
+    - message: Disable magnet wrecks TEMPORARILY pending further re-balancing.
+      type: Tweak
   id: 5607
   time: '2024-01-07T06:36:18.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23664
 - author: Minty642
   changes:
-  - message: Add more food recipes related to cargo bounties on Guidebook
-    type: Tweak
+    - message: Add more food recipes related to cargo bounties on Guidebook
+      type: Tweak
   id: 5608
   time: '2024-01-07T06:39:56.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23659
 - author: metalgearsloth
   changes:
-  - message: Fix salvage magnet deleting mobs.
-    type: Fix
+    - message: Fix salvage magnet deleting mobs.
+      type: Fix
   id: 5609
   time: '2024-01-07T06:40:49.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23657
 - author: Ubaser
   changes:
-  - message: You can now craft flower wreaths.
-    type: Add
+    - message: You can now craft flower wreaths.
+      type: Add
   id: 5610
   time: '2024-01-07T07:03:46.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23662
 - author: Aexxie
   changes:
-  - message: Added the Central Commander's cloak
-    type: Add
+    - message: Added the Central Commander's cloak
+      type: Add
   id: 5611
   time: '2024-01-07T07:12:12.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23666
 - author: Froozigiusz
   changes:
-  - message: You can now dip onion rings.
-    type: Fix
+    - message: You can now dip onion rings.
+      type: Fix
   id: 5612
   time: '2024-01-07T09:07:03.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23582
 - author: metalgearsloth
   changes:
-  - message: Fix audio fades and ambient music overlapping.
-    type: Fix
+    - message: Fix audio fades and ambient music overlapping.
+      type: Fix
   id: 5613
   time: '2024-01-07T13:23:22.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23684
 - author: EmoGarbage404
   changes:
-  - message: Added hellfire freezers and hellfire heaters. These are significantly
-      more efficient, at the cost of leaking cold and heat into the surrounding atmosphere.
-      Research them in advanced atmospherics technology today.
-    type: Add
+    - message: >-
+        Added hellfire freezers and hellfire heaters. These are significantly
+        more efficient, at the cost of leaking cold and heat into the
+        surrounding atmosphere. Research them in advanced atmospherics
+        technology today.
+      type: Add
   id: 5614
   time: '2024-01-07T13:55:22.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23543
 - author: Ubaser
   changes:
-  - message: You can now butcher gloves.
-    type: Tweak
+    - message: You can now butcher gloves.
+      type: Tweak
   id: 5615
   time: '2024-01-07T17:54:16.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23216
 - author: Adrian16199
   changes:
-  - message: Ties are now craftable in uniform printer.
-    type: Add
+    - message: Ties are now craftable in uniform printer.
+      type: Add
   id: 5616
   time: '2024-01-07T19:55:41.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23686
 - author: GreyMario
   changes:
-  - message: Recipes added for the Baklava and Frosty Pies and the Chocolate Lava,
-      Golden Apple Streusel, and Mime Tarts.
-    type: Add
+    - message: >-
+        Recipes added for the Baklava and Frosty Pies and the Chocolate Lava,
+        Golden Apple Streusel, and Mime Tarts.
+      type: Add
   id: 5617
   time: '2024-01-07T20:20:14.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23266
 - author: Dygon
   changes:
-  - message: The cyborg cleaning module's holofan battery now recharges and can't
-      be ejected anymore.
-    type: Fix
+    - message: >-
+        The cyborg cleaning module's holofan battery now recharges and can't be
+        ejected anymore.
+      type: Fix
   id: 5618
   time: '2024-01-07T21:26:15.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23696
 - author: Naive817
   changes:
-  - message: Syndicate has fielded cyborgs for testing. They are loaded with syndicate
-      laws and have no access.
-    type: Add
-  - message: Nuclear operatives can now call in an well-armed assault cyborg for a
-      hefty price (65 TC). Comes with an Operative module complete with Emag and pinpointer,
-      a L6C ROW module, an Esword module, a positronic brain & a hyper capacity powercell
-    type: Add
+    - message: >-
+        Syndicate has fielded cyborgs for testing. They are loaded with
+        syndicate laws and have no access.
+      type: Add
+    - message: >-
+        Nuclear operatives can now call in an well-armed assault cyborg for a
+        hefty price (65 TC). Comes with an Operative module complete with Emag
+        and pinpointer, a L6C ROW module, an Esword module, a positronic brain &
+        a hyper capacity powercell
+      type: Add
   id: 5619
   time: '2024-01-07T22:12:08.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/19733
 - author: DoutorWhite
   changes:
-  - message: Now the round duration should be correct on all interfaces after reconnecting.
-    type: Fix
+    - message: >-
+        Now the round duration should be correct on all interfaces after
+        reconnecting.
+      type: Fix
   id: 5620
   time: '2024-01-08T00:30:10.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23707
 - author: EmoGarbage404
   changes:
-  - message: Fixed grappling hooks being able to fire multiple hooks.
-    type: Fix
+    - message: Fixed grappling hooks being able to fire multiple hooks.
+      type: Fix
   id: 5621
   time: '2024-01-08T01:15:46.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23709
 - author: Dutch-VanDerLinde
   changes:
-  - message: Syndicate cyborgs can now see who syndicate agents are, and they now
-      have a lock on their chassis that needs syndicate access to open.
-    type: Tweak
+    - message: >-
+        Syndicate cyborgs can now see who syndicate agents are, and they now
+        have a lock on their chassis that needs syndicate access to open.
+      type: Tweak
   id: 5622
   time: '2024-01-08T03:48:57.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23710
 - author: Dygon
   changes:
-  - message: Incendiary projectiles and lava are less flammable.
-    type: Tweak
-  - message: Incendiary projectiles no longer ignite entities while flying past them.
-    type: Fix
+    - message: Incendiary projectiles and lava are less flammable.
+      type: Tweak
+    - message: Incendiary projectiles no longer ignite entities while flying past them.
+      type: Fix
   id: 5623
   time: '2024-01-08T05:41:42.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23479
 - author: EmoGarbage404
   changes:
-  - message: Particles from the Particle Accelerator once again collide with players.
-      Be careful, engineers!
-    type: Fix
+    - message: >-
+        Particles from the Particle Accelerator once again collide with players.
+        Be careful, engineers!
+      type: Fix
   id: 5624
   time: '2024-01-08T06:22:46.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23719
 - author: notquitehadouken
   changes:
-  - message: The reticle around your cursor will change depending on if the gun you're
-      holding is bolted or not.
-    type: Tweak
-  - message: The "Gun not bolted" text that shows up whenever you try to fire a gun
-      with an open bolt now shows up on your cursor instead of your character.
-    type: Tweak
+    - message: >-
+        The reticle around your cursor will change depending on if the gun
+        you're holding is bolted or not.
+      type: Tweak
+    - message: >-
+        The "Gun not bolted" text that shows up whenever you try to fire a gun
+        with an open bolt now shows up on your cursor instead of your character.
+      type: Tweak
   id: 5625
   time: '2024-01-08T06:23:41.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23711
 - author: Ubaser
   changes:
-  - message: Variant cube boxes are given to the chef instead of monkey cube boxes,
-      and they contain both monkey cubes and kobold cubes.
-    type: Add
-  - message: Kobold cube boxes and wrappers have a new sprite.
-    type: Tweak
+    - message: >-
+        Variant cube boxes are given to the chef instead of monkey cube boxes,
+        and they contain both monkey cubes and kobold cubes.
+      type: Add
+    - message: Kobold cube boxes and wrappers have a new sprite.
+      type: Tweak
   id: 5626
   time: '2024-01-08T06:27:40.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23685
 - author: Scribbles0
   changes:
-  - message: Cryoxadone and doxarubixadone now work on dead patients.
-    type: Tweak
+    - message: Cryoxadone and doxarubixadone now work on dead patients.
+      type: Tweak
   id: 5627
   time: '2024-01-08T06:31:26.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23558
 - author: Dygon
   changes:
-  - message: Mothroaches are now a little bit more resilient, making them less prone
-      to being gibbed.
-    type: Tweak
+    - message: >-
+        Mothroaches are now a little bit more resilient, making them less prone
+        to being gibbed.
+      type: Tweak
   id: 5628
   time: '2024-01-08T06:57:34.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23722
 - author: EmoGarbage404
   changes:
-  - message: Added the turbo recharger to research. It's compatible with both weapons
-      and cells and charges 5 times faster than ordinary station rechargers.
-    type: Add
-  - message: Removed machine upgrades from all chargers.
-    type: Remove
+    - message: >-
+        Added the turbo recharger to research. It's compatible with both weapons
+        and cells and charges 5 times faster than ordinary station rechargers.
+      type: Add
+    - message: Removed machine upgrades from all chargers.
+      type: Remove
   id: 5629
   time: '2024-01-08T07:15:13.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23723
 - author: username
   changes:
-  - message: Ability to copy data from pda
-    type: Add
+    - message: Ability to copy data from pda
+      type: Add
   id: 5630
   time: '2024-01-08T10:06:44.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23533
 - author: Jrpl
   changes:
-  - message: The Communications Computer now has a 30-second delay before an announcement
-      can be made, after the computer is built. This includes all Communications Computers
-      that are on the map by default.
-    type: Tweak
+    - message: >-
+        The Communications Computer now has a 30-second delay before an
+        announcement can be made, after the computer is built. This includes all
+        Communications Computers that are on the map by default.
+      type: Tweak
   id: 5631
   time: '2024-01-08T12:28:07.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/21681
 - author: Dutch-VanDerLinde
   changes:
-  - message: Robotech deluxe vending machines now contain 2 diagnostic HUDs, a flame
-      welding mask, and a welding tool.
-    type: Tweak
+    - message: >-
+        Robotech deluxe vending machines now contain 2 diagnostic HUDs, a flame
+        welding mask, and a welding tool.
+      type: Tweak
   id: 5632
   time: '2024-01-08T20:34:40.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23747
 - author: Emisse
   changes:
-  - message: Salvage wrecks are back and rebalanced for shuttle building and gearing
-      for expeditions!
-    type: Tweak
+    - message: >-
+        Salvage wrecks are back and rebalanced for shuttle building and gearing
+        for expeditions!
+      type: Tweak
   id: 5633
   time: '2024-01-08T21:49:51.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23733
 - author: Emisse
   changes:
-  - message: Advanced machine parts removed.
-    type: Tweak
+    - message: Advanced machine parts removed.
+      type: Tweak
   id: 5634
   time: '2024-01-08T23:24:36.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23752
 - author: EmoGarbage404
   changes:
-  - message: Satchels have a larger carrying capacity that is divided into pockets.
-    type: Tweak
+    - message: Satchels have a larger carrying capacity that is divided into pockets.
+      type: Tweak
   id: 5635
   time: '2024-01-09T00:48:45.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23724
 - author: cooldolphin
   changes:
-  - message: You can now find delicious vintage hidden away in maintenance closets.
-    type: Add
+    - message: You can now find delicious vintage hidden away in maintenance closets.
+      type: Add
   id: 5636
   time: '2024-01-09T02:24:32.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23740
 - author: ike709
   changes:
-  - message: The appraisal tool will now tell you if a crate contains a completed
-      cargo bounty.
-    type: Add
+    - message: >-
+        The appraisal tool will now tell you if a crate contains a completed
+        cargo bounty.
+      type: Add
   id: 5637
   time: '2024-01-09T04:18:50.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23760
 - author: Emisse
   changes:
-  - message: Seismic charges to help salvage mine.
-    type: Add
-  - message: Ore rocks will now drop a random amount of multiple ores.
-    type: Tweak
-  - message: Mining/mining tool rebalance.
-    type: Tweak
+    - message: Seismic charges to help salvage mine.
+      type: Add
+    - message: Ore rocks will now drop a random amount of multiple ores.
+      type: Tweak
+    - message: Mining/mining tool rebalance.
+      type: Tweak
   id: 5638
   time: '2024-01-09T05:27:01.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23757
 - author: EmoGarbage404
   changes:
-  - message: Cryoxadone and Doxarubixadone no longer work on the dead.
-    type: Remove
+    - message: Cryoxadone and Doxarubixadone no longer work on the dead.
+      type: Remove
   id: 5639
   time: '2024-01-09T05:43:46.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23763
 - author: koteq
   changes:
-  - message: Stasis beds prevent dead body decay
-    type: Add
+    - message: Stasis beds prevent dead body decay
+      type: Add
   id: 5640
   time: '2024-01-09T06:40:53.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23520
 - author: EmoGarbage404
   changes:
-  - message: Mining drills, chainsaws, and gloves of the north star can now automatically
-      attack at the max rate when holding down the attack button.
-    type: Tweak
+    - message: >-
+        Mining drills, chainsaws, and gloves of the north star can now
+        automatically attack at the max rate when holding down the attack
+        button.
+      type: Tweak
   id: 5641
   time: '2024-01-09T07:25:07.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23765
 - author: EmoGarbage404
   changes:
-  - message: Added the Quantum Spin Inverter. This object, when linked with another
-      inverter, can be used to swap places, allowing teleportation across great distances.
-      Research it in the new Experimental Quantum Leaping technology.
-    type: Add
+    - message: >-
+        Added the Quantum Spin Inverter. This object, when linked with another
+        inverter, can be used to swap places, allowing teleportation across
+        great distances. Research it in the new Experimental Quantum Leaping
+        technology.
+      type: Add
   id: 5642
   time: '2024-01-09T07:37:56.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23756
 - author: mirrorcult
   changes:
-  - message: Catatonic/SSD state no longer mispredicts in examine
-    type: Fix
+    - message: Catatonic/SSD state no longer mispredicts in examine
+      type: Fix
   id: 5643
   time: '2024-01-09T08:02:39.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23769
 - author: lunarcomets
   changes:
-  - message: ShadyCigs now properly display flippo lighter icons!
-    type: Fix
+    - message: ShadyCigs now properly display flippo lighter icons!
+      type: Fix
   id: 5644
   time: '2024-01-09T10:16:32.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23778
 - author: IProduceWidgets
   changes:
-  - message: Some Centcom officers now have an N1984 standard issue officer's pistol!
-    type: Add
+    - message: Some Centcom officers now have an N1984 standard issue officer's pistol!
+      type: Add
   id: 5645
   time: '2024-01-09T10:17:40.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23775
 - author: Emisse
   changes:
-  - message: Barratry
-    type: Remove
+    - message: Barratry
+      type: Remove
   id: 5646
   time: '2024-01-09T10:57:29.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23782
 - author: Ubaser
   changes:
-  - message: New powersink sprite.
-    type: Tweak
+    - message: New powersink sprite.
+      type: Tweak
   id: 5647
   time: '2024-01-09T11:21:08.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23281
 - author: metalgearsloth
   changes:
-  - message: Salvage magnet grids will spawn much closer to the station.
-    type: Tweak
-  - message: Increased ore spawns on asteroids significantly and fixed a bug where
-      some ore wasn't getting spawned.
-    type: Tweak
+    - message: Salvage magnet grids will spawn much closer to the station.
+      type: Tweak
+    - message: >-
+        Increased ore spawns on asteroids significantly and fixed a bug where
+        some ore wasn't getting spawned.
+      type: Tweak
   id: 5648
   time: '2024-01-09T11:44:38.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23663
 - author: Boaz1111
   changes:
-  - message: Added two new ammo types for the pirate cannon. Tally Ho!
-    type: Add
-  - message: Changed the musket and flintlock sprites, as well as some functionality.
-    type: Tweak
+    - message: Added two new ammo types for the pirate cannon. Tally Ho!
+      type: Add
+    - message: Changed the musket and flintlock sprites, as well as some functionality.
+      type: Tweak
   id: 5649
   time: '2024-01-09T12:23:11.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23408
 - author: BurninDreamer
   changes:
-  - message: Rigged boxing gloves have been slightly buffed, now 25 stamina damage
-      and 1.4 attack speed as well as 6 and 4 TC for passengers and boxers in the
-      uplink.
-    type: Tweak
+    - message: >-
+        Rigged boxing gloves have been slightly buffed, now 25 stamina damage
+        and 1.4 attack speed as well as 6 and 4 TC for passengers and boxers in
+        the uplink.
+      type: Tweak
   id: 5650
   time: '2024-01-09T18:05:17.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23811
 - author: ItsMeThom
   changes:
-  - message: You can now draw chemical mixtures directly from puddles and spills!
-    type: Tweak
+    - message: You can now draw chemical mixtures directly from puddles and spills!
+      type: Tweak
   id: 5651
   time: '2024-01-09T18:10:34.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23804
 - author: themias
   changes:
-  - message: Mice can eat again
-    type: Fix
+    - message: Mice can eat again
+      type: Fix
   id: 5652
   time: '2024-01-09T18:17:04.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23801
 - author: nikthechampiongr
   changes:
-  - message: You can no longer pry powered/bolted airlocks if you started prying before
-      they were powered/bolted.
-    type: Fix
+    - message: >-
+        You can no longer pry powered/bolted airlocks if you started prying
+        before they were powered/bolted.
+      type: Fix
   id: 5653
   time: '2024-01-09T22:05:02.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23818
 - author: themias
   changes:
-  - message: Wheelchair users can bump open doors
-    type: Fix
+    - message: Wheelchair users can bump open doors
+      type: Fix
   id: 5654
   time: '2024-01-09T22:06:28.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23806
 - author: metalgearsloth
   changes:
-  - message: Add artifact fragments to salvage magnet.
-    type: Add
+    - message: Add artifact fragments to salvage magnet.
+      type: Add
   id: 5655
   time: '2024-01-09T22:14:05.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23791
 - author: Kadeo64
   changes:
-  - message: Aspid is no longer a high-pop map.
-    type: Tweak
+    - message: Aspid is no longer a high-pop map.
+      type: Tweak
   id: 5656
   time: '2024-01-10T04:11:29.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23829
 - author: Dutch-VanDerLinde
   changes:
-  - message: Tarantulas and space spiders now have the arachnid speech bubble.
-    type: Tweak
+    - message: Tarantulas and space spiders now have the arachnid speech bubble.
+      type: Tweak
   id: 5657
   time: '2024-01-10T08:30:39.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23816
 - author: Bhijn and Myr
   changes:
-  - message: Tables now have their own footstep sounds!
-    type: Tweak
+    - message: Tables now have their own footstep sounds!
+      type: Tweak
   id: 5658
   time: '2024-01-10T08:48:39.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23851
 - author: Emisse
   changes:
-  - message: radsuits are toggleable now
-    type: Tweak
+    - message: radsuits are toggleable now
+      type: Tweak
   id: 5659
   time: '2024-01-10T09:54:29.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23854
 - author: Ubaser
   changes:
-  - message: Moths now have insect blood.
-    type: Tweak
+    - message: Moths now have insect blood.
+      type: Tweak
   id: 5660
   time: '2024-01-10T11:42:20.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23671
 - author: quatre
   changes:
-  - message: Examining bodies now shows how close they are to rotting.
-    type: Add
+    - message: Examining bodies now shows how close they are to rotting.
+      type: Add
   id: 5661
   time: '2024-01-10T12:00:22.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23530
 - author: metalgearsloth
   changes:
-  - message: Fix planets sometimes not loading.
-    type: Fix
+    - message: Fix planets sometimes not loading.
+      type: Fix
   id: 5662
   time: '2024-01-10T12:28:42.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23864
 - author: snebl
   changes:
-  - message: Fixed cargo airlock changing color while open.
-    type: Fix
+    - message: Fixed cargo airlock changing color while open.
+      type: Fix
   id: 5663
   time: '2024-01-10T21:12:46.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23889
 - author: nikthechampiongr
   changes:
-  - message: Aghosts and other powerful beings can now change light bulbs.
-    type: Fix
+    - message: Aghosts and other powerful beings can now change light bulbs.
+      type: Fix
   id: 5664
   time: '2024-01-10T21:39:56.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23879
 - author: Dygon
   changes:
-  - message: Attempting to emag a borg with a closed panel won't permanently make
-      it unable to be emagged anymore.
-    type: Fix
+    - message: >-
+        Attempting to emag a borg with a closed panel won't permanently make it
+        unable to be emagged anymore.
+      type: Fix
   id: 5665
   time: '2024-01-10T22:01:38.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23729
 - author: nikthechampiongr
   changes:
-  - message: Nanotrasen has fixed a recent design defect with tranquilizer shells.
-      They will incapacitate people once more.
-    type: Fix
+    - message: >-
+        Nanotrasen has fixed a recent design defect with tranquilizer shells.
+        They will incapacitate people once more.
+      type: Fix
   id: 5666
   time: '2024-01-10T23:02:37.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23886
 - author: Flareguy
   changes:
-  - message: Light fixtures are now more visually consistent with small lights.
-    type: Tweak
+    - message: Light fixtures are now more visually consistent with small lights.
+      type: Tweak
   id: 5667
   time: '2024-01-11T00:07:15.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23898
 - author: Emisse
   changes:
-  - message: AME parts can no longer be bought from cargo
-    type: Tweak
+    - message: AME parts can no longer be bought from cargo
+      type: Tweak
   id: 5668
   time: '2024-01-11T00:07:41.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23903
 - author: IProduceWidgets
   changes:
-  - message: Uranium and AP rounds now also have identifiable projectiles
-    type: Add
-  - message: Uranium and AP magazines and boxes now look unique.
-    type: Add
+    - message: Uranium and AP rounds now also have identifiable projectiles
+      type: Add
+    - message: Uranium and AP magazines and boxes now look unique.
+      type: Add
   id: 5669
   time: '2024-01-11T08:01:41.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23914
 - author: EmoGarbage404
   changes:
-  - message: Doors are now visible on station maps.
-    type: Tweak
+    - message: Doors are now visible on station maps.
+      type: Tweak
   id: 5670
   time: '2024-01-11T13:14:20.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23639
 - author: ZeroNationality
   changes:
-  - message: Changed how puddles flow to finish flowing quicker
-    type: Tweak
+    - message: Changed how puddles flow to finish flowing quicker
+      type: Tweak
   id: 5671
   time: '2024-01-11T13:22:56.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23776
 - author: EmoGarbage404
   changes:
-  - message: Fixed rotting examine text appearing on revived players.
-    type: Fix
+    - message: Fixed rotting examine text appearing on revived players.
+      type: Fix
   id: 5672
   time: '2024-01-11T23:12:32.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23949
 - author: deltanedas
   changes:
-  - message: New specialized burn medicines Pyrazine and Insuzine can be made, for
-      heat and shock damage respectively.
-    type: Add
+    - message: >-
+        New specialized burn medicines Pyrazine and Insuzine can be made, for
+        heat and shock damage respectively.
+      type: Add
   id: 5673
   time: '2024-01-11T23:17:23.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23941
 - author: icekot8
   changes:
-  - message: prescription for medsec hud
-    type: Add
+    - message: prescription for medsec hud
+      type: Add
   id: 5674
   time: '2024-01-11T23:22:43.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23934
 - author: themias
   changes:
-  - message: Headphones can be turned on
-    type: Tweak
+    - message: Headphones can be turned on
+      type: Tweak
   id: 5675
   time: '2024-01-11T23:25:27.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23882
 - author: icekot8
   changes:
-  - message: A new reagent, necrosol, has been added. It can heal frozen corpses
-    type: Add
+    - message: A new reagent, necrosol, has been added. It can heal frozen corpses
+      type: Add
   id: 5676
   time: '2024-01-12T07:59:22.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23850
 - author: Tayrtahn
   changes:
-  - message: Vending machines can now be hacked to disable advertising.
-    type: Add
+    - message: Vending machines can now be hacked to disable advertising.
+      type: Add
   id: 5677
   time: '2024-01-12T08:03:02.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23873
 - author: KittenColony
   changes:
-  - message: Tweaked reptilian unarmed attacks to deal the correct damage types
-    type: Tweak
+    - message: Tweaked reptilian unarmed attacks to deal the correct damage types
+      type: Tweak
   id: 5678
   time: '2024-01-12T08:03:30.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23953
 - author: GreyMario
   changes:
-  - message: Slicing food inside of a container now tries to add the slices to the
-      container.
-    type: Tweak
-  - message: All pies now have a pie tin "trash", returned upon eating the pie or
-      slicing it up fully.
-    type: Tweak
-  - message: Pie tins, bowls, kebab skewers, and basic glasswares may now be printed
-      at the Autolathe.
-    type: Add
+    - message: >-
+        Slicing food inside of a container now tries to add the slices to the
+        container.
+      type: Tweak
+    - message: >-
+        All pies now have a pie tin "trash", returned upon eating the pie or
+        slicing it up fully.
+      type: Tweak
+    - message: >-
+        Pie tins, bowls, kebab skewers, and basic glasswares may now be printed
+        at the Autolathe.
+      type: Add
   id: 5679
   time: '2024-01-12T08:42:15.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23217
 - author: Bhijn and Myr
   changes:
-  - message: Microwave recipes involving objects that have a temperature-based construction
-      graph recipe associated with them (for example, raw meat -> steak) will no longer
-      produce both the construction graph recipe and the microwave recipe. In laymen's
-      terms, burgers no longer come with a whole free steak.
-    type: Fix
-  - message: The microwave UI now updates in realtime when items are inserted/removed.
-    type: Fix
+    - message: >-
+        Microwave recipes involving objects that have a temperature-based
+        construction graph recipe associated with them (for example, raw meat ->
+        steak) will no longer produce both the construction graph recipe and the
+        microwave recipe. In laymen's terms, burgers no longer come with a whole
+        free steak.
+      type: Fix
+    - message: >-
+        The microwave UI now updates in realtime when items are
+        inserted/removed.
+      type: Fix
   id: 5680
   time: '2024-01-12T08:42:41.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23835
 - author: Crotalus
   changes:
-  - message: Added search bar to ghost warp UI
-    type: Add
+    - message: Added search bar to ghost warp UI
+      type: Add
   id: 5681
   time: '2024-01-12T20:34:12.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23978
 - author: takemysoult
   changes:
-  - message: the prescription of tranquilizers has been changed
-    type: Tweak
+    - message: the prescription of tranquilizers has been changed
+      type: Tweak
   id: 5682
   time: '2024-01-12T20:45:09.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23979
 - author: FairlySadPanda
   changes:
-  - message: A new piece of lobby art.
-    type: Add
+    - message: A new piece of lobby art.
+      type: Add
   id: 5683
   time: '2024-01-12T20:52:13.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23974
 - author: themias
   changes:
-  - message: The mass-media console can publish again
-    type: Fix
+    - message: The mass-media console can publish again
+      type: Fix
   id: 5684
   time: '2024-01-12T22:27:33.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23994
 - author: EmoGarbage404
   changes:
-  - message: Fixed being unable to eject coal for the ore processor.
-    type: Fix
+    - message: Fixed being unable to eject coal for the ore processor.
+      type: Fix
   id: 5685
   time: '2024-01-13T04:52:53.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23993
 - author: degradka
   changes:
-  - message: The electrical crates now drop plastic instead of steel.
-    type: Fix
+    - message: The electrical crates now drop plastic instead of steel.
+      type: Fix
   id: 5686
   time: '2024-01-13T04:55:47.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23992
 - author: Ubaser
   changes:
-  - message: Resprited substations.
-    type: Tweak
+    - message: Resprited substations.
+      type: Tweak
   id: 5687
   time: '2024-01-13T05:51:28.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23977
 - author: EmoGarbage404
   changes:
-  - message: Reduced ore drop rates from anomaly ore crabs.
-    type: Tweak
+    - message: Reduced ore drop rates from anomaly ore crabs.
+      type: Tweak
   id: 5688
   time: '2024-01-13T06:27:43.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24012
 - author: EmoGarbage404
   changes:
-  - message: The chem guidebook once again displays sources for various reagents.
-    type: Fix
+    - message: The chem guidebook once again displays sources for various reagents.
+      type: Fix
   id: 5689
   time: '2024-01-13T07:16:47.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23987
 - author: GreyMario
   changes:
-  - message: Pie cannons and pneumatic cannons no longer hit your own feet when aiming
-      at close range. Clowns rejoice!
-    type: Fix
+    - message: >-
+        Pie cannons and pneumatic cannons no longer hit your own feet when
+        aiming at close range. Clowns rejoice!
+      type: Fix
   id: 5690
   time: '2024-01-13T07:29:19.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23996
 - author: Crotalus
   changes:
-  - message: 'New ghost warp point: nuclear bomb'
-    type: Add
+    - message: 'New ghost warp point: nuclear bomb'
+      type: Add
   id: 5691
   time: '2024-01-13T07:30:11.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23973
 - author: Errant
   changes:
-  - message: The empty space around Map UI window edges is no longer resizable.
-    type: Tweak
-  - message: Station Map ui now has proper edges.
-    type: Fix
+    - message: The empty space around Map UI window edges is no longer resizable.
+      type: Tweak
+    - message: Station Map ui now has proper edges.
+      type: Fix
   id: 5692
   time: '2024-01-13T15:04:46.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24024
 - author: Dygon
   changes:
-  - message: Expendable light sources turned on through the verb menu now ignite the
-      surrounding area.
-    type: Fix
+    - message: >-
+        Expendable light sources turned on through the verb menu now ignite the
+        surrounding area.
+      type: Fix
   id: 5693
   time: '2024-01-13T16:24:40.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24027
 - author: VasilisThePikachu
   changes:
-  - message: Due to Nanotrashen's budget cuts, Space pens are no longer supplied on
-      the station.
-    type: Remove
+    - message: >-
+        Due to Nanotrashen's budget cuts, Space pens are no longer supplied on
+        the station.
+      type: Remove
   id: 5694
   time: '2024-01-13T20:20:11.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23970
 - author: SlamBamActionman
   changes:
-  - message: Ammo Techfab Circuitboard has been removed from Thief objectives.
-    type: Remove
+    - message: Ammo Techfab Circuitboard has been removed from Thief objectives.
+      type: Remove
   id: 5695
   time: '2024-01-13T20:55:03.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24037
 - author: Varen
   changes:
-  - message: Eggs can be drawn from with a syringe.
-    type: Tweak
+    - message: Eggs can be drawn from with a syringe.
+      type: Tweak
   id: 5696
   time: '2024-01-13T20:57:20.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24042
 - author: degradka
   changes:
-  - message: Prevent oversized items from being placed in the microwave.
-    type: Fix
+    - message: Prevent oversized items from being placed in the microwave.
+      type: Fix
   id: 5697
   time: '2024-01-13T21:11:10.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24026
 - author: Bhijn and Myr
   changes:
-  - message: The QM's uniform has received a redesign, making it more visually distinguishable
-      for those with colorblindness.
-    type: Tweak
+    - message: >-
+        The QM's uniform has received a redesign, making it more visually
+        distinguishable for those with colorblindness.
+      type: Tweak
   id: 5698
   time: '2024-01-14T02:45:06.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24055
 - author: lzk228
   changes:
-  - message: Removed archaic accent.
-    type: Remove
+    - message: Removed archaic accent.
+      type: Remove
   id: 5699
   time: '2024-01-14T02:45:54.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24052
 - author: 21Melkuu
   changes:
-  - message: Added Mayo to the Chefvend.
-    type: Add
+    - message: Added Mayo to the Chefvend.
+      type: Add
   id: 5700
   time: '2024-01-14T02:47:19.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24017
 - author: Aexxie
   changes:
-  - message: Lizards' punch animation now matches their damage type
-    type: Fix
-  - message: Spiders now deal piercing damage instead of slash damage when unarmed,
-      as intended. Their animation has been changed to the biting animation as well.
-    type: Fix
+    - message: Lizards' punch animation now matches their damage type
+      type: Fix
+    - message: >-
+        Spiders now deal piercing damage instead of slash damage when unarmed,
+        as intended. Their animation has been changed to the biting animation as
+        well.
+      type: Fix
   id: 5701
   time: '2024-01-14T03:08:20.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24019
 - author: deltanedas
   changes:
-  - message: Revolutionaries that are deconverted by headrevs dying get a window shown
-      explaining that they are no longer revs, to help with tunnel vision.
-    type: Tweak
+    - message: >-
+        Revolutionaries that are deconverted by headrevs dying get a window
+        shown explaining that they are no longer revs, to help with tunnel
+        vision.
+      type: Tweak
   id: 5702
   time: '2024-01-14T03:20:35.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23315
 - author: tday
   changes:
-  - message: Add admin logs for thermomachines.
-    type: Add
+    - message: Add admin logs for thermomachines.
+      type: Add
   id: 5703
   time: '2024-01-14T04:05:45.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24056
 - author: degradka
   changes:
-  - message: The HOS's dresser now contains a neck gaiter.
-    type: Add
+    - message: The HOS's dresser now contains a neck gaiter.
+      type: Add
   id: 5704
   time: '2024-01-14T04:12:37.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24003
 - author: Errant
   changes:
-  - message: Map labels now adjust to zoom level and UI scale, retaining a consistent
-      look.
-    type: Fix
-  - message: Map labels now have better contrast over walls.
-    type: Tweak
-  - message: Examining (shift-click) the map screen now toggles map labels on/off.
-    type: Tweak
+    - message: >-
+        Map labels now adjust to zoom level and UI scale, retaining a consistent
+        look.
+      type: Fix
+    - message: Map labels now have better contrast over walls.
+      type: Tweak
+    - message: Examining (shift-click) the map screen now toggles map labels on/off.
+      type: Tweak
   id: 5705
   time: '2024-01-14T05:08:43.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23777
 - author: Ilya246
   changes:
-  - message: Nuclear operatives may now buy syndicate bombs without waiting 30 minutes.
-    type: Tweak
+    - message: >-
+        Nuclear operatives may now buy syndicate bombs without waiting 30
+        minutes.
+      type: Tweak
   id: 5706
   time: '2024-01-14T05:25:19.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24022
 - author: Tayrtahn
   changes:
-  - message: Nanotrasen has started installing intercoms with unscrewable panels for
-      wire maintenance.
-    type: Add
+    - message: >-
+        Nanotrasen has started installing intercoms with unscrewable panels for
+        wire maintenance.
+      type: Add
   id: 5707
   time: '2024-01-14T05:37:28.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23984
 - author: Whisper
   changes:
-  - message: Cerberus now has hostile AI
-    type: Add
+    - message: Cerberus now has hostile AI
+      type: Add
   id: 5708
   time: '2024-01-14T10:19:36.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24028
 - author: Psychpsyo
   changes:
-  - message: Plates and money now go into inventories sideways, as they should.
-    type: Tweak
+    - message: Plates and money now go into inventories sideways, as they should.
+      type: Tweak
   id: 5709
   time: '2024-01-14T16:44:17.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24075
 - author: themias
   changes:
-  - message: Graves require a shovel or spade (trowel) to dig
-    type: Tweak
-  - message: Graves decay bodies faster
-    type: Tweak
+    - message: Graves require a shovel or spade (trowel) to dig
+      type: Tweak
+    - message: Graves decay bodies faster
+      type: Tweak
   id: 5710
   time: '2024-01-14T16:47:32.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23646
 - author: Nairodian
   changes:
-  - message: Added four new reagent slimes, Mute Toxin, Norepinephric Acid, Ephedrine,
-      and Robust Harvest.
-    type: Add
+    - message: >-
+        Added four new reagent slimes, Mute Toxin, Norepinephric Acid,
+        Ephedrine, and Robust Harvest.
+      type: Add
   id: 5711
   time: '2024-01-14T22:14:19.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24087
 - author: Dygon
   changes:
-  - message: The particle decelerator's projectile now deals less damage, has a shorter
-      lifespan and can be reflected by objects that reflect energy projectiles.
-    type: Tweak
-  - message: Bullet grenade projectiles no longer penetrate walls.
-    type: Fix
+    - message: >-
+        The particle decelerator's projectile now deals less damage, has a
+        shorter lifespan and can be reflected by objects that reflect energy
+        projectiles.
+      type: Tweak
+    - message: Bullet grenade projectiles no longer penetrate walls.
+      type: Fix
   id: 5712
   time: '2024-01-14T23:39:09.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24032
 - author: Rainbeon
   changes:
-  - message: Added Aloxadone, a cryogenics chemical for treating patients with third
-      degree burns.
-    type: Add
+    - message: >-
+        Added Aloxadone, a cryogenics chemical for treating patients with third
+        degree burns.
+      type: Add
   id: 5713
   time: '2024-01-15T03:57:31.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23980
 - author: Bhijn and Myr
   changes:
-  - message: You can now open and close your eyes while cuffed if the action to do
-      so is available to you. (Such as if it was granted via blindness)
-    type: Fix
+    - message: >-
+        You can now open and close your eyes while cuffed if the action to do so
+        is available to you. (Such as if it was granted via blindness)
+      type: Fix
   id: 5714
   time: '2024-01-15T05:11:21.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24097
 - author: Flareguy
   changes:
-  - message: Made lava & liquid plasma significantly less lethal.
-    type: Tweak
+    - message: Made lava & liquid plasma significantly less lethal.
+      type: Tweak
   id: 5715
   time: '2024-01-15T06:33:05.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24100
 - author: EmoGarbage404
   changes:
-  - message: Added cryogenic sleep units. Disconnecting or ghosting inside one of
-      these pods will keep your body secure and free up your job slot on the station.
-    type: Add
-  - message: Added cryogenics access, which allows someone to retrieve items from
-      inside of cryogenic sleep units. This is given to security and command by default.
-    type: Add
+    - message: >-
+        Added cryogenic sleep units. Disconnecting or ghosting inside one of
+        these pods will keep your body secure and free up your job slot on the
+        station.
+      type: Add
+    - message: >-
+        Added cryogenics access, which allows someone to retrieve items from
+        inside of cryogenic sleep units. This is given to security and command
+        by default.
+      type: Add
   id: 5716
   time: '2024-01-15T06:35:28.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24096
 - author: Bhijn and Myr
   changes:
-  - message: Attempting to weld without protection will now cause eye damage proper.
-      Additionally, attempting to weld with a welder that's off when you aren't wearing
-      protection will no longer blind you. It's the bright light that hurts your eyes,
-      not the underwhelming lack of it!
-    type: Fix
+    - message: >-
+        Attempting to weld without protection will now cause eye damage proper.
+        Additionally, attempting to weld with a welder that's off when you
+        aren't wearing protection will no longer blind you. It's the bright
+        light that hurts your eyes, not the underwhelming lack of it!
+      type: Fix
   id: 5717
   time: '2024-01-15T07:47:00.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24106
 - author: Boaz1111
   changes:
-  - message: Stimpack price has been reduced to 4 TC
-    type: Tweak
+    - message: Stimpack price has been reduced to 4 TC
+      type: Tweak
   id: 5718
   time: '2024-01-15T09:30:37.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24117
 - author: Nimfar11
   changes:
-  - message: Adds the ability to build blast doors.
-    type: Add
+    - message: Adds the ability to build blast doors.
+      type: Add
   id: 5719
   time: '2024-01-15T12:49:08.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24050
 - author: Boaz1111
   changes:
-  - message: Reinforced Glass and Reinforced Plasma Glass no longer bubble randomly
-    type: Fix
+    - message: Reinforced Glass and Reinforced Plasma Glass no longer bubble randomly
+      type: Fix
   id: 5720
   time: '2024-01-16T03:43:18.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24135
 - author: tday
   changes:
-  - message: Explosion and Chemical Reaction admin logs now use grid-relative coordinates
-      when possible.
-    type: Fix
+    - message: >-
+        Explosion and Chemical Reaction admin logs now use grid-relative
+        coordinates when possible.
+      type: Fix
   id: 5721
   time: '2024-01-16T07:53:46.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24136
 - author: Dygon
   changes:
-  - message: Flare shells now embed into whatever they hit.
-    type: Tweak
-  - message: Flare shells ignite mobs again.
-    type: Fix
+    - message: Flare shells now embed into whatever they hit.
+      type: Tweak
+    - message: Flare shells ignite mobs again.
+      type: Fix
   id: 5722
   time: '2024-01-16T09:17:05.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23648
 - author: Ubaser
   changes:
-  - message: Resprited buckets.
-    type: Tweak
+    - message: Resprited buckets.
+      type: Tweak
   id: 5723
   time: '2024-01-16T13:47:53.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23866
 - author: Lank
   changes:
-  - message: Added a new "follow" command.
-    type: Add
-  - message: Replaced the ahelp menu's "Teleport to" verb with "Follow".
-    type: Tweak
+    - message: Added a new "follow" command.
+      type: Add
+    - message: Replaced the ahelp menu's "Teleport to" verb with "Follow".
+      type: Tweak
   id: 5724
   time: '2024-01-17T01:26:15.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24142
 - author: Dygon
   changes:
-  - message: Water gun and spray nozzle projectiles now properly collide with objects.
-    type: Fix
+    - message: >-
+        Water gun and spray nozzle projectiles now properly collide with
+        objects.
+      type: Fix
   id: 5725
   time: '2024-01-17T08:21:59.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24175
 - author: Veritius
   changes:
-  - message: You can now dramatically execute cuffed people.
-    type: Add
-  - message: You can now kill yourself with guns.
-    type: Add
+    - message: You can now dramatically execute cuffed people.
+      type: Add
+    - message: You can now kill yourself with guns.
+      type: Add
   id: 5726
   time: '2024-01-17T08:45:45.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24150
 - author: TurboTrackerss14
   changes:
-  - message: Added Mothroach Burger.
-    type: Add
+    - message: Added Mothroach Burger.
+      type: Add
   id: 5727
   time: '2024-01-17T08:46:34.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24156
 - author: Ubaser
   changes:
-  - message: Robohand gloves now have a unique sprite and can be found in the RoboDrobe.
-    type: Tweak
+    - message: >-
+        Robohand gloves now have a unique sprite and can be found in the
+        RoboDrobe.
+      type: Tweak
   id: 5728
   time: '2024-01-17T10:03:01.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24182
 - author: Ubaser
   changes:
-  - message: Ore is now grindable to obtain basic chemicals.
-    type: Add
+    - message: Ore is now grindable to obtain basic chemicals.
+      type: Add
   id: 5729
   time: '2024-01-17T13:08:31.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24185
 - author: mirrorcult
   changes:
-  - message: Reagent grinders now shake around violently when grinding something
-    type: Add
+    - message: Reagent grinders now shake around violently when grinding something
+      type: Add
   id: 5730
   time: '2024-01-17T13:14:33.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24190
 - author: Boaz1111
   changes:
-  - message: Artifact analyzer now scans twice as fast!
-    type: Tweak
+    - message: Artifact analyzer now scans twice as fast!
+      type: Tweak
   id: 5731
   time: '2024-01-17T16:45:19.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24188
 - author: mirrorcult
   changes:
-  - message: Eating/drinking sounds should be hopefully significantly less grating
-    type: Tweak
+    - message: Eating/drinking sounds should be hopefully significantly less grating
+      type: Tweak
   id: 5732
   time: '2024-01-17T16:46:07.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24195
 - author: notafet
   changes:
-  - message: Chemical, booze, and soda dispensers now dispense reagents from stock
-      containers. Remember to refill!
-    type: Tweak
-  - message: Chemical, booze, and soda dispensers can no longer be emagged for extra
-      goodies.
-    type: Remove
+    - message: >-
+        Chemical, booze, and soda dispensers now dispense reagents from stock
+        containers. Remember to refill!
+      type: Tweak
+    - message: >-
+        Chemical, booze, and soda dispensers can no longer be emagged for extra
+        goodies.
+      type: Remove
   id: 5733
   time: '2024-01-17T21:43:48.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23907
 - author: TheShuEd
   changes:
-  - message: Added the ability to repair thrusters and gyroscopes on the shuttle.
-    type: Add
+    - message: Added the ability to repair thrusters and gyroscopes on the shuttle.
+      type: Add
   id: 5734
   time: '2024-01-17T23:57:40.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24193
 - author: Volotomite
   changes:
-  - message: Flippo can burn plasma now!
-    type: Fix
+    - message: Flippo can burn plasma now!
+      type: Fix
   id: 5735
   time: '2024-01-18T00:28:32.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24207
 - author: Ubaser
   changes:
-  - message: The paramedic's void suit now has a helmet toggle.
-    type: Tweak
+    - message: The paramedic's void suit now has a helmet toggle.
+      type: Tweak
   id: 5736
   time: '2024-01-18T15:26:59.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24229
 - author: Ubaser
   changes:
-  - message: Carrots now properly contain Oculine, and you can Juice them to obtain
-      the raw chemical.
-    type: Fix
+    - message: >-
+        Carrots now properly contain Oculine, and you can Juice them to obtain
+        the raw chemical.
+      type: Fix
   id: 5737
   time: '2024-01-18T15:28:01.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24228
 - author: koteq
   changes:
-  - message: Jugs with the same labels are now correctly grouped and sorted in the
-      context menu.
-    type: Tweak
+    - message: >-
+        Jugs with the same labels are now correctly grouped and sorted in the
+        context menu.
+      type: Tweak
   id: 5738
   time: '2024-01-18T22:18:53.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24243
 - author: EmoGarbage404
   changes:
-  - message: Duplicate players will no longer spawn in cryogenic sleep units.
-    type: Fix
+    - message: Duplicate players will no longer spawn in cryogenic sleep units.
+      type: Fix
   id: 5739
   time: '2024-01-19T00:27:21.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24251
 - author: lapatison
   changes:
-  - message: Guidebooks can now be found in random bookshelves.
-    type: Tweak
+    - message: Guidebooks can now be found in random bookshelves.
+      type: Tweak
   id: 5740
   time: '2024-01-19T00:32:00.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24036
 - author: metalgearsloth
   changes:
-  - message: Added trade stations for cargo instead of FTL.
-    type: Add
+    - message: Added trade stations for cargo instead of FTL.
+      type: Add
   id: 5741
   time: '2024-01-19T02:02:28.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23863
 - author: Emisse
   changes:
-  - message: Title2 to lobby music
-    type: Add
+    - message: Title2 to lobby music
+      type: Add
   id: 5742
   time: '2024-01-19T02:47:20.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24254
 - author: Repo
   changes:
-  - message: Round restarts require minimum ghost levels on populated servers.
-    type: Fix
+    - message: Round restarts require minimum ghost levels on populated servers.
+      type: Fix
   id: 5743
   time: '2024-01-19T07:10:05.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23453
 - author: metalgearsloth
   changes:
-  - message: Added ability to put spesos directly into cargo request consoles.
-    type: Add
+    - message: Added ability to put spesos directly into cargo request consoles.
+      type: Add
   id: 5744
   time: '2024-01-19T07:23:07.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24263
 - author: metalgearsloth
   changes:
-  - message: Fix bolting guns causing exceptions.
-    type: Fix
+    - message: Fix bolting guns causing exceptions.
+      type: Fix
   id: 5745
   time: '2024-01-19T10:14:42.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24283
 - author: mirrorcult
   changes:
-  - message: Destruction & impact sounds have been reworked in general, you should
-      expect better sounds/more variance/actually playing sounds when applicable
-    type: Add
-  - message: Melee hit sounds being cut off when an entity is destroyed has been fixed
-    type: Fix
+    - message: >-
+        Destruction & impact sounds have been reworked in general, you should
+        expect better sounds/more variance/actually playing sounds when
+        applicable
+      type: Add
+    - message: >-
+        Melee hit sounds being cut off when an entity is destroyed has been
+        fixed
+      type: Fix
   id: 5746
   time: '2024-01-19T15:33:08.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24282
 - author: SpeltIncorrectyl
   changes:
-  - message: Emagging the artifact crusher now stops it from being opened while it
-      is crushing.
-    type: Add
+    - message: >-
+        Emagging the artifact crusher now stops it from being opened while it is
+        crushing.
+      type: Add
   id: 5747
   time: '2024-01-19T15:35:02.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23957
 - author: EmoGarbage404
   changes:
-  - message: You can now sort lathe recipes by category.
-    type: Add
-  - message: Recipes in lathes are now sorted alphabetically.
-    type: Add
+    - message: You can now sort lathe recipes by category.
+      type: Add
+    - message: Recipes in lathes are now sorted alphabetically.
+      type: Add
   id: 5748
   time: '2024-01-20T00:45:04.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24247
 - author: Scribbles0
   changes:
-  - message: Added a new trait, the Unrevivable trait.
-    type: Add
+    - message: Added a new trait, the Unrevivable trait.
+      type: Add
   id: 5749
   time: '2024-01-20T02:22:15.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24226
 - author: Drayff
   changes:
-  - message: Animations for ToolBoxes!
-    type: Add
+    - message: Animations for ToolBoxes!
+      type: Add
   id: 5750
   time: '2024-01-20T02:29:13.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24305
 - author: Agoichi
   changes:
-  - message: Rebalanced Lobbying Bundle
-    type: Tweak
+    - message: Rebalanced Lobbying Bundle
+      type: Tweak
   id: 5751
   time: '2024-01-20T02:35:44.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24303
 - author: Dygon
   changes:
-  - message: Storage objects can't be opened anymore while stored in a container.
-    type: Fix
+    - message: Storage objects can't be opened anymore while stored in a container.
+      type: Fix
   id: 5752
   time: '2024-01-20T02:50:14.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24253
 - author: FairlySadPanda
   changes:
-  - message: Lobby restart sound effects no longer cut-off.
-    type: Fix
+    - message: Lobby restart sound effects no longer cut-off.
+      type: Fix
   id: 5753
   time: '2024-01-20T03:40:01.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24044
 - author: casperr04
   changes:
-  - message: Fixed players being able to re-anchor items after fultoning them.
-    type: Fix
-  - message: Changed which objects can be fultoned.
-    type: Tweak
+    - message: Fixed players being able to re-anchor items after fultoning them.
+      type: Fix
+    - message: Changed which objects can be fultoned.
+      type: Tweak
   id: 5754
   time: '2024-01-20T04:57:05.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/20628
 - author: Blackern5000
   changes:
-  - message: Crushers can no longer be researched.
-    type: Remove
+    - message: Crushers can no longer be researched.
+      type: Remove
   id: 5755
   time: '2024-01-20T05:11:02.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24319
 - author: metalgearsloth
   changes:
-  - message: Fix buckle sound playing twice in some instances.
-    type: Fix
+    - message: Fix buckle sound playing twice in some instances.
+      type: Fix
   id: 5756
   time: '2024-01-20T06:22:19.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24321
 - author: tday
   changes:
-  - message: Added admin log messages for adding and ending game rules, and for the
-      commands to do so.
-    type: Add
-  - message: Added admin log messages for secret mode rule selection.
-    type: Add
+    - message: >-
+        Added admin log messages for adding and ending game rules, and for the
+        commands to do so.
+      type: Add
+    - message: Added admin log messages for secret mode rule selection.
+      type: Add
   id: 5757
   time: '2024-01-20T18:02:13.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24092
 - author: Nimfar11
   changes:
-  - message: Adds snake kebab and its recipe.
-    type: Add
+    - message: Adds snake kebab and its recipe.
+      type: Add
   id: 5758
   time: '2024-01-20T23:38:11.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24341
 - author: Alekshhh
   changes:
-  - message: Cerberus now has a wideswing that works similarly to spears.
-    type: Tweak
+    - message: Cerberus now has a wideswing that works similarly to spears.
+      type: Tweak
   id: 5759
   time: '2024-01-20T23:38:27.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24328
 - author: TheShuEd
   changes:
-  - message: Added new Floral anomaly!
-    type: Add
+    - message: Added new Floral anomaly!
+      type: Add
   id: 5760
   time: '2024-01-21T01:31:12.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24351
 - author: Menshin
   changes:
-  - message: The PA control box should now properly detect the PA parts in all situations
-      (notably on Origin)
-    type: Fix
-  - message: The PA control box now automatically face the control box on part scanning
-    type: Tweak
+    - message: >-
+        The PA control box should now properly detect the PA parts in all
+        situations (notably on Origin)
+      type: Fix
+    - message: >-
+        The PA control box now automatically face the control box on part
+        scanning
+      type: Tweak
   id: 5761
   time: '2024-01-21T09:17:17.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24356
 - author: metalgearsloth
   changes:
-  - message: Fix revolver prediction.
-    type: Fix
+    - message: Fix revolver prediction.
+      type: Fix
   id: 5762
   time: '2024-01-21T11:16:46.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/19649
 - author: metalgearsloth
   changes:
-  - message: Fix shuttle docking highlights being inaccurate.
-    type: Fix
+    - message: Fix shuttle docking highlights being inaccurate.
+      type: Fix
   id: 5763
   time: '2024-01-21T12:14:47.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24369
 - author: icekot8
   changes:
-  - message: Increased the size of flatpacks made by the Flatpacker 1001.
-    type: Tweak
+    - message: Increased the size of flatpacks made by the Flatpacker 1001.
+      type: Tweak
   id: 5764
   time: '2024-01-21T17:07:59.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24367
 - author: Nairodian
   changes:
-  - message: All vent critter events now have a small delay and alert message before
-      they spawn.
-    type: Add
+    - message: >-
+        All vent critter events now have a small delay and alert message before
+        they spawn.
+      type: Add
   id: 5765
   time: '2024-01-22T01:33:38.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24383
 - author: Flareguy
   changes:
-  - message: The Research Director's hardsuit now uses its older sprites.
-    type: Tweak
+    - message: The Research Director's hardsuit now uses its older sprites.
+      type: Tweak
   id: 5766
   time: '2024-01-22T01:52:32.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24377
 - author: SonicHDC
   changes:
-  - message: Added reinforced diagonal!
-    type: Add
+    - message: Added reinforced diagonal!
+      type: Add
   id: 5767
   time: '2024-01-22T14:53:19.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24393
 - author: Alekshhh
   changes:
-  - message: Hud eyepatches have been added to BarDrobes, MediDrobes and SecTechs.
-      They're just cooler looking huds.
-    type: Add
+    - message: >-
+        Hud eyepatches have been added to BarDrobes, MediDrobes and SecTechs.
+        They're just cooler looking huds.
+      type: Add
   id: 5768
   time: '2024-01-22T14:59:32.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24132
 - author: CrigCrag
   changes:
-  - message: Removed the revolutionaries gamemode pending a rework.
-    type: Remove
+    - message: Removed the revolutionaries gamemode pending a rework.
+      type: Remove
   id: 5769
   time: '2024-01-23T02:11:09.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24420
 - author: themias
   changes:
-  - message: Added different footstep sounds for blood, soda and juice
-    type: Add
+    - message: Added different footstep sounds for blood, soda and juice
+      type: Add
   id: 5770
   time: '2024-01-23T04:18:33.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24406
 - author: TheShuEd
   changes:
-  - message: 'Flesh and Rock anom reworked: It should be easier to maintain them now
-      (I guess)'
-    type: Tweak
+    - message: >-
+        Flesh and Rock anom reworked: It should be easier to maintain them now
+        (I guess)
+      type: Tweak
   id: 5771
   time: '2024-01-23T12:32:05.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24381
 - author: metalgearsloth
   changes:
-  - message: Fix thrusters.
-    type: Fix
+    - message: Fix thrusters.
+      type: Fix
   id: 5772
   time: '2024-01-23T12:49:19.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24446
 - author: '0x6273'
   changes:
-  - message: Hotplates now work again
-    type: Fix
+    - message: Hotplates now work again
+      type: Fix
   id: 5773
   time: '2024-01-23T13:06:14.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24450
 - author: Boaz1111
   changes:
-  - message: Lizards can now properly eat fruit cakes and banana cream pie slices.
-    type: Fix
+    - message: Lizards can now properly eat fruit cakes and banana cream pie slices.
+      type: Fix
   id: 5774
   time: '2024-01-23T18:08:32.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24457
 - author: icekot8
   changes:
-  - message: The bounty of briefcases has been removed
-    type: Remove
+    - message: The bounty of briefcases has been removed
+      type: Remove
   id: 5775
   time: '2024-01-23T18:26:28.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24392
 - author: Errant
   changes:
-  - message: '"Not enough oxygen" hud alerts now indicate the proper gas for nitrogen
-      breathers.'
-    type: Fix
+    - message: >-
+        "Not enough oxygen" hud alerts now indicate the proper gas for nitrogen
+        breathers.
+      type: Fix
   id: 5776
   time: '2024-01-23T20:17:41.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24373
 - author: themias
   changes:
-  - message: Cyborgs can no longer spawn with the Wheelchair Bound or Muted trait
-    type: Fix
+    - message: Cyborgs can no longer spawn with the Wheelchair Bound or Muted trait
+      type: Fix
   id: 5777
   time: '2024-01-23T20:18:01.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24459
 - author: Nimfar11
   changes:
-  - message: Adds solo comfy benches in different colors.
-    type: Add
+    - message: Adds solo comfy benches in different colors.
+      type: Add
   id: 5778
   time: '2024-01-23T22:15:48.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24203
 - author: Tin-Man-Tim
   changes:
-  - message: Attempting to microwave metal now can cause the microwave to spark and
-      explode.
-    type: Tweak
+    - message: >-
+        Attempting to microwave metal now can cause the microwave to spark and
+        explode.
+      type: Tweak
   id: 5779
   time: '2024-01-23T22:59:10.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23887
 - author: DrMelon
   changes:
-  - message: The Microwave works as intended after power outages again.
-    type: Fix
+    - message: The Microwave works as intended after power outages again.
+      type: Fix
   id: 5780
   time: '2024-01-24T01:14:55.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23997
 - author: Krunk
   changes:
-  - message: To prevent accidental spills, buckets can no longer be quick-equipped.
-    type: Fix
+    - message: To prevent accidental spills, buckets can no longer be quick-equipped.
+      type: Fix
   id: 5781
   time: '2024-01-24T02:35:37.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24472
 - author: lzk228
   changes:
-  - message: Fixed escaping from locked artifact crate.
-    type: Fix
+    - message: Fixed escaping from locked artifact crate.
+      type: Fix
   id: 5782
   time: '2024-01-25T00:46:07.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24442
 - author: Krunk
   changes:
-  - message: Players will once again spawn at arrivals instead of cryostorage.
-    type: Fix
+    - message: Players will once again spawn at arrivals instead of cryostorage.
+      type: Fix
   id: 5783
   time: '2024-01-25T00:48:58.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24476
 - author: Krunk
   changes:
-  - message: Paper cups can now be worn as party hats!
-    type: Add
+    - message: Paper cups can now be worn as party hats!
+      type: Add
   id: 5784
   time: '2024-01-25T01:02:33.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24334
 - author: Blackern5000
   changes:
-  - message: Botany's hatchet, spade, and hoe have received a damage decrease to 10,
-      10, and 6 damage respectively.
-    type: Tweak
+    - message: >-
+        Botany's hatchet, spade, and hoe have received a damage decrease to 10,
+        10, and 6 damage respectively.
+      type: Tweak
   id: 5785
   time: '2024-01-25T01:37:11.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24481
 - author: Minty642
   changes:
-  - message: Fixed Reinforced Glass Recipe in Ore Processor!
-    type: Fix
-  - message: Added Premium Material that can only be processed by Industrial Ore Processor!
-    type: Add
+    - message: Fixed Reinforced Glass Recipe in Ore Processor!
+      type: Fix
+    - message: >-
+        Added Premium Material that can only be processed by Industrial Ore
+        Processor!
+      type: Add
   id: 5786
   time: '2024-01-25T08:33:56.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24345
 - author: Blackern5000
   changes:
-  - message: Smoking now causes mild lung cancer in the form of cellular damage.
-    type: Tweak
+    - message: Smoking now causes mild lung cancer in the form of cellular damage.
+      type: Tweak
   id: 5787
   time: '2024-01-25T09:51:26.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24546
 - author: metalgearsloth
   changes:
-  - message: Add title2.ogg to space ambience tracks.
-    type: Tweak
+    - message: Add title2.ogg to space ambience tracks.
+      type: Tweak
   id: 5788
   time: '2024-01-25T13:59:49.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24501
 - author: Tayrtahn
   changes:
-  - message: Glued mobs can no longer struggle free from their captor's hands.
-    type: Tweak
+    - message: Glued mobs can no longer struggle free from their captor's hands.
+      type: Tweak
   id: 5789
   time: '2024-01-25T14:01:13.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24488
 - author: mirrorcult
   changes:
-  - message: Atomic Amnesia MMX, Vibe Ace, Monument and Marhaba have been removed
-      as lobby music tracks
-    type: Remove
+    - message: >-
+        Atomic Amnesia MMX, Vibe Ace, Monument and Marhaba have been removed as
+        lobby music tracks
+      type: Remove
   id: 5790
   time: '2024-01-25T14:08:29.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24480
 - author: Dutch-VanDerLinde
   changes:
-  - message: To prevent accidental spills, paper cups can no longer be quick-equipped.
-    type: Fix
+    - message: >-
+        To prevent accidental spills, paper cups can no longer be
+        quick-equipped.
+      type: Fix
   id: 5791
   time: '2024-01-25T22:04:31.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24560
 - author: Agoichi
   changes:
-  - message: Bio hoods hiding your face now
-    type: Tweak
-  - message: Bio hoods now can be used as a breath mask
-    type: Tweak
-  - message: You can not eat while you wearing bio hood
-    type: Tweak
+    - message: Bio hoods hiding your face now
+      type: Tweak
+    - message: Bio hoods now can be used as a breath mask
+      type: Tweak
+    - message: You can not eat while you wearing bio hood
+      type: Tweak
   id: 5792
   time: '2024-01-26T00:13:42.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24570
 - author: yathxyz
   changes:
-  - message: Updated nixpkgs input
-    type: Tweak
+    - message: Updated nixpkgs input
+      type: Tweak
   id: 5793
   time: '2024-01-26T01:40:52.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24572
 - author: mirrorcult
   changes:
-  - message: We lied Atomic Amnesia MMX is back
-    type: Add
+    - message: We lied Atomic Amnesia MMX is back
+      type: Add
   id: 5794
   time: '2024-01-26T05:48:29.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24575
 - author: EmoGarbage404
   changes:
-  - message: Cigarettes no longer deal cellular damage when smoked.
-    type: Remove
+    - message: Cigarettes no longer deal cellular damage when smoked.
+      type: Remove
   id: 5795
   time: '2024-01-26T09:50:03.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24568
 - author: ERORR404V1
   changes:
-  - message: Added mime hardsuit
-    type: Add
+    - message: Added mime hardsuit
+      type: Add
   id: 5796
   time: '2024-01-26T14:43:50.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24198
 - author: icekot8
   changes:
-  - message: Correct display of syndicate jaws of life in hand
-    type: Add
+    - message: Correct display of syndicate jaws of life in hand
+      type: Add
   id: 5797
   time: '2024-01-27T02:27:14.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24583
 - author: Agoichi
   changes:
-  - message: Detective cabinet now have security holoprojector in interests of investigation
-    type: Tweak
-  - message: Security lockers have chance to spawn security holoprojector (0.5)
-    type: Tweak
+    - message: >-
+        Detective cabinet now have security holoprojector in interests of
+        investigation
+      type: Tweak
+    - message: Security lockers have chance to spawn security holoprojector (0.5)
+      type: Tweak
   id: 5798
   time: '2024-01-27T02:29:40.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24582
 - author: TheShuEd
   changes:
-  - message: Flesh and Rock anomalies have been reworked to place entities more dynamically
-      when spawning.
-    type: Tweak
+    - message: >-
+        Flesh and Rock anomalies have been reworked to place entities more
+        dynamically when spawning.
+      type: Tweak
   id: 5799
   time: '2024-01-27T02:52:07.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24449
 - author: PJB3005
   changes:
-  - message: PACMAN-type portable generators now show power statistics for the network
-      they're connected to.
-    type: Add
-  - message: JRPACMAN has been buffed from 5 kW to 8 kW.
-    type: Tweak
+    - message: >-
+        PACMAN-type portable generators now show power statistics for the
+        network they're connected to.
+      type: Add
+    - message: JRPACMAN has been buffed from 5 kW to 8 kW.
+      type: Tweak
   id: 5800
   time: '2024-01-27T02:53:44.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24604
 - author: Blackern5000
   changes:
-  - message: Shotgun slugs can now be printed in the security techfab.
-    type: Add
-  - message: Shotgun slugs now fire a single strong projectile when fired.
-    type: Tweak
+    - message: Shotgun slugs can now be printed in the security techfab.
+      type: Add
+    - message: Shotgun slugs now fire a single strong projectile when fired.
+      type: Tweak
   id: 5801
   time: '2024-01-27T02:56:57.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24196
 - author: I-JustUser-I
   changes:
-  - message: Zombie Outbreak event now has a minimum limit of 15 players.
-    type: Tweak
+    - message: Zombie Outbreak event now has a minimum limit of 15 players.
+      type: Tweak
   id: 5802
   time: '2024-01-27T03:53:09.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24577
 - author: mirrorcult
   changes:
-  - message: Navmap now defaults to showing departments
-    type: Tweak
+    - message: Navmap now defaults to showing departments
+      type: Tweak
   id: 5803
   time: '2024-01-27T12:08:50.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24613
 - author: Tayrtahn
   changes:
-  - message: Vending machines can now be repaired with a welder.
-    type: Tweak
+    - message: Vending machines can now be repaired with a welder.
+      type: Tweak
   id: 5804
   time: '2024-01-27T12:12:53.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24603
 - author: graevy
   changes:
-  - message: Added hallway screen prototypes and comms console text broadcasts.
-    type: Add
+    - message: Added hallway screen prototypes and comms console text broadcasts.
+      type: Add
   id: 5805
   time: '2024-01-27T13:51:25.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24189
 - author: mirrorcult
   changes:
-  - message: Lights are now shaded with the same color that they glow.
-    type: Tweak
+    - message: Lights are now shaded with the same color that they glow.
+      type: Tweak
   id: 5806
   time: '2024-01-27T17:43:45.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24612
 - author: Boaz1111
   changes:
-  - message: The PKA shuttle gun now breaks rocks in one hit.
-    type: Tweak
+    - message: The PKA shuttle gun now breaks rocks in one hit.
+      type: Tweak
   id: 5807
   time: '2024-01-27T17:47:35.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24627
 - author: FungiFellow
   changes:
-  - message: Ion Storms are twice as likely to occur.
-    type: Tweak
+    - message: Ion Storms are twice as likely to occur.
+      type: Tweak
   id: 5808
   time: '2024-01-27T23:14:09.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24633
 - author: PJB3005
   changes:
-  - message: Security barriers need 5 seconds to lock and unlock.
-    type: Tweak
+    - message: Security barriers need 5 seconds to lock and unlock.
+      type: Tweak
   id: 5809
   time: '2024-01-28T00:28:02.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24637
 - author: themias
   changes:
-  - message: Added cowboy hats and boots to autodrobe, secdrobe, and maints
-    type: Add
-  - message: Added cowboy accent
-    type: Add
+    - message: Added cowboy hats and boots to autodrobe, secdrobe, and maints
+      type: Add
+    - message: Added cowboy accent
+      type: Add
   id: 5810
   time: '2024-01-28T03:23:16.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24299
 - author: shampunj
   changes:
-  - message: A new game preset! Can only be selected by admins. All at once.
-    type: Add
+    - message: A new game preset! Can only be selected by admins. All at once.
+      type: Add
   id: 5811
   time: '2024-01-28T10:41:36.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23171
 - author: Doctor-Cpu
   changes:
-  - message: 3kliksphilips name.
-    type: Fix
+    - message: 3kliksphilips name.
+      type: Fix
   id: 5812
   time: '2024-01-28T10:46:32.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24657
 - author: mirrorcult
   changes:
-  - message: Speech sounds are now quieter
-    type: Tweak
+    - message: Speech sounds are now quieter
+      type: Tweak
   id: 5813
   time: '2024-01-28T10:49:55.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24579
 - author: TheShuEd
   changes:
-  - message: The fire anomaly is now heavier in content.
-    type: Tweak
-  - message: Artifacts no longer block projectiles.
-    type: Tweak
+    - message: The fire anomaly is now heavier in content.
+      type: Tweak
+    - message: Artifacts no longer block projectiles.
+      type: Tweak
   id: 5814
   time: '2024-01-29T01:30:55.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24666
 - author: Krunk
   changes:
-  - message: Health analysis interfaces now also display a subject's temperature in
-      Kelvin.
-    type: Add
+    - message: >-
+        Health analysis interfaces now also display a subject's temperature in
+        Kelvin.
+      type: Add
   id: 5815
   time: '2024-01-29T01:32:54.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24643
 - author: Ubaser
   changes:
-  - message: Detectives now work as independent agents, separate from security, and
-      are encouraged to answer any requests for help.
-    type: Tweak
+    - message: >-
+        Detectives now work as independent agents, separate from security, and
+        are encouraged to answer any requests for help.
+      type: Tweak
   id: 5816
   time: '2024-01-29T06:45:27.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23114
 - author: mirrorcult
   changes:
-  - message: Rotting examine text doesn't have weird grammatical errors now
-    type: Fix
+    - message: Rotting examine text doesn't have weird grammatical errors now
+      type: Fix
   id: 5817
   time: '2024-01-29T07:50:18.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24689
 - author: Eden077
   changes:
-  - message: Synaptizine now deals less poison damage.
-    type: Tweak
+    - message: Synaptizine now deals less poison damage.
+      type: Tweak
   id: 5818
   time: '2024-01-29T07:55:52.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24676
 - author: mirrorcult
   changes:
-  - message: Various annoying sounds are now a little quieter
-    type: Tweak
+    - message: Various annoying sounds are now a little quieter
+      type: Tweak
   id: 5819
   time: '2024-01-29T09:51:31.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24690
 - author: SpeltIncorrectyl
   changes:
-  - message: Portable generators can now be connected to the signal network and controlled
-      remotely via devices like a signal transmitter.
-    type: Add
+    - message: >-
+        Portable generators can now be connected to the signal network and
+        controlled remotely via devices like a signal transmitter.
+      type: Add
   id: 5820
   time: '2024-01-29T14:56:29.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24157
 - author: Tayrtahn
   changes:
-  - message: Welders properly display their lit status again.
-    type: Fix
+    - message: Welders properly display their lit status again.
+      type: Fix
   id: 5821
   time: '2024-01-29T23:04:52.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24705
 - author: Tayrtahn
   changes:
-  - message: Water bottles now display their fill level while held.
-    type: Add
+    - message: Water bottles now display their fill level while held.
+      type: Add
   id: 5822
   time: '2024-01-29T23:19:56.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24708
 - author: SlamBamActionman
   changes:
-  - message: Arachnids slipping in water now get a cute hat!
-    type: Add
+    - message: Arachnids slipping in water now get a cute hat!
+      type: Add
   id: 5823
   time: '2024-01-30T00:21:26.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23822
 - author: Tayrtahn
   changes:
-  - message: Pressing shift as a ghost no longer cancels following your target
-    type: Fix
+    - message: Pressing shift as a ghost no longer cancels following your target
+      type: Fix
   id: 5824
   time: '2024-01-30T01:33:35.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24715
 - author: liltenhead
   changes:
-  - message: Jugs are now destructible.
-    type: Tweak
+    - message: Jugs are now destructible.
+      type: Tweak
   id: 5825
   time: '2024-01-30T08:11:43.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24719
 - author: Emisse
   changes:
-  - message: Aspid
-    type: Remove
+    - message: Aspid
+      type: Remove
   id: 5826
   time: '2024-01-30T10:26:02.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24725
 - author: mirrorcult
   changes:
-  - message: Throwing items now scale a bit when thrown to simulate rising/falling
-    type: Add
+    - message: Throwing items now scale a bit when thrown to simulate rising/falling
+      type: Add
   id: 5827
   time: '2024-01-30T10:50:41.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24724
 - author: Emisse
   changes:
-  - message: Gemini
-    type: Remove
+    - message: Gemini
+      type: Remove
   id: 5828
   time: '2024-01-30T10:54:55.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24728
 - author: CrigCrag
   changes:
-  - message: Added a new large salvage wreck.
-    type: Add
+    - message: Added a new large salvage wreck.
+      type: Add
   id: 5829
   time: '2024-01-30T10:56:38.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24656
 - author: themias
   changes:
-  - message: Fixed Centcom cargo gifts not being fulfilled
-    type: Fix
+    - message: Fixed Centcom cargo gifts not being fulfilled
+      type: Fix
   id: 5830
   time: '2024-01-30T11:05:20.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24701
 - author: Scribbles0
   changes:
-  - message: You can now make anomaly cores orbit you.
-    type: Add
+    - message: You can now make anomaly cores orbit you.
+      type: Add
   id: 5831
   time: '2024-01-30T11:12:24.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24716
 - author: MIXnikita
   changes:
-  - message: New sound effects for some shuttle guns
-    type: Tweak
+    - message: New sound effects for some shuttle guns
+      type: Tweak
   id: 5832
   time: '2024-01-30T13:28:17.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24714
 - author: themias
   changes:
-  - message: Stun batons now toggle off after being drained by an EMP.
-    type: Fix
+    - message: Stun batons now toggle off after being drained by an EMP.
+      type: Fix
   id: 5833
   time: '2024-01-30T23:04:26.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24706
 - author: Tayrtahn
   changes:
-  - message: Fixed weird rotation while strapped to a bed.
-    type: Fix
+    - message: Fixed weird rotation while strapped to a bed.
+      type: Fix
   id: 5834
   time: '2024-01-30T23:23:31.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24746
 - author: themias
   changes:
-  - message: Some glasses and masks can be worn together to hide your identity.
-    type: Tweak
+    - message: Some glasses and masks can be worn together to hide your identity.
+      type: Tweak
   id: 5835
   time: '2024-01-31T03:49:19.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24741
 - author: mirrorcult
   changes:
-  - message: Throwing recoil reduced further
-    type: Tweak
+    - message: Throwing recoil reduced further
+      type: Tweak
   id: 5836
   time: '2024-01-31T05:00:41.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24759
 - author: mirrorcult
   changes:
-  - message: Various aspects of the station will now be varied automatically at the
-      start of the round. Expect more trash, some broken/oddly-functioning lights,
-      and spills (and more stuff in the future).
-    type: Add
+    - message: >-
+        Various aspects of the station will now be varied automatically at the
+        start of the round. Expect more trash, some broken/oddly-functioning
+        lights, and spills (and more stuff in the future).
+      type: Add
   id: 5837
   time: '2024-01-31T05:52:35.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24397
 - author: metalgearsloth
   changes:
-  - message: Remove handheld crew monitors in lieu of computers.
-    type: Remove
+    - message: Remove handheld crew monitors in lieu of computers.
+      type: Remove
   id: 5838
   time: '2024-01-31T11:23:49.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24761
 - author: Hmeister-real
   changes:
-  - message: You can now Sob and Chortle with emotes
-    type: Tweak
+    - message: You can now Sob and Chortle with emotes
+      type: Tweak
   id: 5839
   time: '2024-01-31T11:26:46.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24585
 - author: TheShuEd
   changes:
-  - message: Anomalies can no longer spawn entities in walls or other objects.
-    type: Fix
+    - message: Anomalies can no longer spawn entities in walls or other objects.
+      type: Fix
   id: 5840
   time: '2024-01-31T21:05:29.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24783
 - author: EdenTheLiznerd
   changes:
-  - message: The Syndicate has changed around their stock prices and gotten rid of
-      some old dusty headsets
-    type: Tweak
+    - message: >-
+        The Syndicate has changed around their stock prices and gotten rid of
+        some old dusty headsets
+      type: Tweak
   id: 5841
   time: '2024-02-01T00:28:42.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24765
 - author: metalgearsloth
   changes:
-  - message: Removed vehicles pending rework (the code is bad I was told to make this
-      more obvious).
-    type: Remove
+    - message: >-
+        Removed vehicles pending rework (the code is bad I was told to make this
+        more obvious).
+      type: Remove
   id: 5842
   time: '2024-02-01T00:33:10.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24681
 - author: Jajsha
   changes:
-  - message: Emagged borgs now recieve laws recontextualizing who's a crew member
-      instead of recieving a completely new lawset.
-    type: Tweak
+    - message: >-
+        Emagged borgs now recieve laws recontextualizing who's a crew member
+        instead of recieving a completely new lawset.
+      type: Tweak
   id: 5843
   time: '2024-02-01T05:02:49.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24698
 - author: PJB3005
   changes:
-  - message: Health analyzers now show if somebody is starving.
-    type: Add
+    - message: Health analyzers now show if somebody is starving.
+      type: Add
   id: 5844
   time: '2024-02-01T06:28:17.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24789
 - author: PixelTK
   changes:
-  - message: The arachnid plushie now has a new sprite.
-    type: Tweak
+    - message: The arachnid plushie now has a new sprite.
+      type: Tweak
   id: 5845
   time: '2024-02-01T06:36:43.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24747
 - author: lzk228
   changes:
-  - message: Yellow oxygen tank was removed to standardise gas tank colourings.
-    type: Remove
+    - message: Yellow oxygen tank was removed to standardise gas tank colourings.
+      type: Remove
   id: 5846
   time: '2024-02-01T06:53:33.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24374
 - author: koteq
   changes:
-  - message: Fixed indicator near SSD players
-    type: Fix
+    - message: Fixed indicator near SSD players
+      type: Fix
   id: 5847
   time: '2024-02-01T08:30:07.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24589
 - author: TheShuEd
   changes:
-  - message: Anomaly generator can now only be used by a scientist.
-    type: Tweak
+    - message: Anomaly generator can now only be used by a scientist.
+      type: Tweak
   id: 5848
   time: '2024-02-01T08:45:24.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24464
 - author: PJB3005
   changes:
-  - message: Removed starvation damage
-    type: Remove
+    - message: Removed starvation damage
+      type: Remove
   id: 5849
   time: '2024-02-01T09:01:52.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24790
 - author: SlamBamActionman
   changes:
-  - message: The Visitor job can now be given to ID cards via the ID Card Console/Agent
-      IDs.
-    type: Add
+    - message: >-
+        The Visitor job can now be given to ID cards via the ID Card
+        Console/Agent IDs.
+      type: Add
   id: 5850
   time: '2024-02-01T10:13:44.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/23972
 - author: Dygon
   changes:
-  - message: When slipping on lube you now keep sliding until you reach a tile without
-      lube.
-    type: Tweak
+    - message: >-
+        When slipping on lube you now keep sliding until you reach a tile
+        without lube.
+      type: Tweak
   id: 5851
   time: '2024-02-01T10:39:10.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24801
 - author: FungiFellow
   changes:
-  - message: Added Binary Key in RD's Locker
-    type: Add
-  - message: 50% off Binary Key
-    type: Tweak
+    - message: Added Binary Key in RD's Locker
+      type: Add
+    - message: 50% off Binary Key
+      type: Tweak
   id: 5852
   time: '2024-02-01T10:42:12.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24778
 - author: Dygon
   changes:
-  - message: Paraplegic entities have their legs healed when zombified.
-    type: Fix
+    - message: Paraplegic entities have their legs healed when zombified.
+      type: Fix
   id: 5853
   time: '2024-02-01T11:06:05.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24169
 - author: PJB3005
   changes:
-  - message: The AME can now single-handedly power the entire station until one of
-      our cool coders gets their shit together and fixes engineering.
-    type: Fix
+    - message: >-
+        The AME can now single-handedly power the entire station until one of
+        our cool coders gets their shit together and fixes engineering.
+      type: Fix
   id: 5854
   time: '2024-02-01T11:06:52.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24806
 - author: Varen
   changes:
-  - message: Cutting wires will now properly electrocute if enough power is available.
-    type: Fix
+    - message: >-
+        Cutting wires will now properly electrocute if enough power is
+        available.
+      type: Fix
   id: 5855
   time: '2024-02-01T11:54:25.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24554
 - author: SlamBamActionman
   changes:
-  - message: Paper is now edible, even for non-moths.
-    type: Tweak
+    - message: Paper is now edible, even for non-moths.
+      type: Tweak
   id: 5856
   time: '2024-02-01T12:40:55.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24755
 - author: mac6na6na
   changes:
-  - message: Tiered part crates will no longer appear on salvage expeditions.
-    type: Remove
+    - message: Tiered part crates will no longer appear on salvage expeditions.
+      type: Remove
   id: 5857
   time: '2024-02-01T12:41:03.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24810
 - author: mirrorcult
   changes:
-  - message: Crayon/lathe/vendor/round end/gas analyzer windows now open closer to
-      the sides of the screen
-    type: Tweak
+    - message: >-
+        Crayon/lathe/vendor/round end/gas analyzer windows now open closer to
+        the sides of the screen
+      type: Tweak
   id: 5858
   time: '2024-02-01T12:49:49.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24767
 - author: Tayrtahn
   changes:
-  - message: Plushies, whoopie cushions, and a few other noisemaking objects can be
-      used as modular grenade payloads.
-    type: Add
+    - message: >-
+        Plushies, whoopie cushions, and a few other noisemaking objects can be
+        used as modular grenade payloads.
+      type: Add
   id: 5859
   time: '2024-02-01T12:59:42.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24306
 - author: Repo
   changes:
-  - message: AFK admins will trigger the SOS in aHelp relay.
-    type: Tweak
+    - message: AFK admins will trigger the SOS in aHelp relay.
+      type: Tweak
   id: 5860
   time: '2024-02-01T13:03:50.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24482
 - author: Nopey
   changes:
-  - message: Many belts and the plant bag no longer produce an erroneous "Can't insert"
-      and "This doesn't go in there!" messages while inserting certain items such
-      as Produce (plant bag) or Smoke Grenades (security belt).
-    type: Fix
-  - message: Ammunition can once again be stored in assault belts, as was the case
-      before June 2022.
-    type: Fix
+    - message: >-
+        Many belts and the plant bag no longer produce an erroneous "Can't
+        insert" and "This doesn't go in there!" messages while inserting certain
+        items such as Produce (plant bag) or Smoke Grenades (security belt).
+      type: Fix
+    - message: >-
+        Ammunition can once again be stored in assault belts, as was the case
+        before June 2022.
+      type: Fix
   id: 5861
   time: '2024-02-01T13:33:57.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24063
 - author: Blazeror
   changes:
-  - message: Chemical analysis goggles can now inspect solutions inside spray bottles.
-    type: Fix
+    - message: >-
+        Chemical analysis goggles can now inspect solutions inside spray
+        bottles.
+      type: Fix
   id: 5862
   time: '2024-02-01T22:19:01.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24838
 - author: themias
   changes:
-  - message: Fixed dylovene overdoses not applying brute damage
-    type: Fix
+    - message: Fixed dylovene overdoses not applying brute damage
+      type: Fix
   id: 5863
   time: '2024-02-01T22:21:04.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24826
 - author: themias
   changes:
-  - message: Added sound effect for Diona salutes
-    type: Add
+    - message: Added sound effect for Diona salutes
+      type: Add
   id: 5864
   time: '2024-02-01T22:34:09.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24836
 - author: Dutch-VanDerLinde
   changes:
-  - message: Detectives are now listed under civilian instead of security.
-    type: Tweak
+    - message: Detectives are now listed under civilian instead of security.
+      type: Tweak
   id: 5865
   time: '2024-02-01T22:49:54.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24739
 - author: VasilisThePikachu
   changes:
-  - message: The fridge's explosion resistance has been nerfed significantly, It's
-      no longer able to survive nukes at point blank range of the nuke.
-    type: Tweak
+    - message: >-
+        The fridge's explosion resistance has been nerfed significantly, It's no
+        longer able to survive nukes at point blank range of the nuke.
+      type: Tweak
   id: 5866
   time: '2024-02-01T23:41:43.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24844
 - author: Dygon
   changes:
-  - message: You can't slip through chain link fences anymore.
-    type: Fix
+    - message: You can't slip through chain link fences anymore.
+      type: Fix
   id: 5867
   time: '2024-02-02T04:24:20.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24850
 - author: Psychpsyo
   changes:
-  - message: You can now turn down the screen shake intensity in the accessibility
-      settings.
-    type: Add
+    - message: >-
+        You can now turn down the screen shake intensity in the accessibility
+        settings.
+      type: Add
   id: 5868
   time: '2024-02-02T12:39:13.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24749
 - author: Anzarot121
   changes:
-  - message: Fixed a problem in the code due to which mobs, including hamsters, slimes,
-      spiders, xenos, could not pull things.
-    type: Fix
+    - message: >-
+        Fixed a problem in the code due to which mobs, including hamsters,
+        slimes, spiders, xenos, could not pull things.
+      type: Fix
   id: 5869
   time: '2024-02-03T01:25:11.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22485
 - author: Tayrtahn
   changes:
-  - message: 'Added a new flavor of Donk Pockets: Stonk Pockets'
-    type: Add
+    - message: 'Added a new flavor of Donk Pockets: Stonk Pockets'
+      type: Add
   id: 5870
   time: '2024-02-03T01:55:03.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24876
 - author: Hmeister
   changes:
-  - message: The guidebook entry for cargo is now up to date, and some other minor
-      changes to the guidebook.
-    type: Tweak
+    - message: >-
+        The guidebook entry for cargo is now up to date, and some other minor
+        changes to the guidebook.
+      type: Tweak
   id: 5871
   time: '2024-02-03T02:07:21.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24828
 - author: FairlySadPanda
   changes:
-  - message: The round restart audio, again...
-    type: Fix
+    - message: The round restart audio, again...
+      type: Fix
   id: 5872
   time: '2024-02-03T02:11:53.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24754
 - author: Adrian16199
   changes:
-  - message: Added scarfs to the uniform printer.
-    type: Add
+    - message: Added scarfs to the uniform printer.
+      type: Add
   id: 5873
   time: '2024-02-03T02:12:38.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24735
 - author: Jajsha
   changes:
-  - message: Emagged Cyborgs are no longer affected by Ion Storm events.
-    type: Fix
-  - message: Improved wording of cyborg laws.
-    type: Tweak
+    - message: Emagged Cyborgs are no longer affected by Ion Storm events.
+      type: Fix
+    - message: Improved wording of cyborg laws.
+      type: Tweak
   id: 5874
   time: '2024-02-03T02:29:41.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24870
 - author: metalgearsloth
   changes:
-  - message: Moving entities that are pulled now throws them instead of moving them
-      manually.
-    type: Tweak
+    - message: >-
+        Moving entities that are pulled now throws them instead of moving them
+        manually.
+      type: Tweak
   id: 5875
   time: '2024-02-03T03:36:09.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/20906
 - author: lzk228
   changes:
-  - message: Soapy water removed.
-    type: Remove
+    - message: Soapy water removed.
+      type: Remove
   id: 5876
   time: '2024-02-03T04:23:34.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24301
 - author: Krunk
   changes:
-  - message: Characters can properly select 'None' as a preference for their spawn
-      priority.
-    type: Fix
+    - message: >-
+        Characters can properly select 'None' as a preference for their spawn
+        priority.
+      type: Fix
   id: 5877
   time: '2024-02-03T08:06:44.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24897
 - author: Krunk
   changes:
-  - message: Pointing arrows now begin at the player and smoothly animate to their
-      target.
-    type: Add
+    - message: >-
+        Pointing arrows now begin at the player and smoothly animate to their
+        target.
+      type: Add
   id: 5878
   time: '2024-02-03T08:09:20.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24864
 - author: Dygon
   changes:
-  - message: Single tile sized puddles of space lube won't let you slide extremely
-      far anymore.
-    type: Fix
+    - message: >-
+        Single tile sized puddles of space lube won't let you slide extremely
+        far anymore.
+      type: Fix
   id: 5879
   time: '2024-02-03T08:10:51.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24846
 - author: shampunj
   changes:
-  - message: Fixed incorrect path to the uranium spear image in the construction menu
-    type: Fix
+    - message: Fixed incorrect path to the uranium spear image in the construction menu
+      type: Fix
   id: 5880
   time: '2024-02-03T08:11:02.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24895
 - author: nikthechampiongr
   changes:
-  - message: End of round messages no longer loop until the heat death of the universe.
-    type: Fix
+    - message: >-
+        End of round messages no longer loop until the heat death of the
+        universe.
+      type: Fix
   id: 5881
   time: '2024-02-03T16:43:50.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24920
 - author: EmoGarbage404
   changes:
-  - message: Changed the colors used for chat names.
-    type: Tweak
+    - message: Changed the colors used for chat names.
+      type: Tweak
   id: 5882
   time: '2024-02-03T17:33:58.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24922
 - author: deltanedas
   changes:
-  - message: Dissolved the biochem technology discipline into others and roundstart
-      availability.
-    type: Add
+    - message: >-
+        Dissolved the biochem technology discipline into others and roundstart
+        availability.
+      type: Add
   id: 5883
   time: '2024-02-03T18:13:30.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24871
 - author: themias
   changes:
-  - message: EMPs temporarily disable suit sensors
-    type: Tweak
+    - message: EMPs temporarily disable suit sensors
+      type: Tweak
   id: 5884
   time: '2024-02-04T00:50:24.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24869
 - author: themias
   changes:
-  - message: Added face bandanas
-    type: Add
-  - message: Bandanas can be switched between head and face type with an alt verb
-      (Fold)
-    type: Tweak
+    - message: Added face bandanas
+      type: Add
+    - message: >-
+        Bandanas can be switched between head and face type with an alt verb
+        (Fold)
+      type: Tweak
   id: 5885
   time: '2024-02-04T00:52:44.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24597
 - author: metalgearsloth
   changes:
-  - message: Moving to open lockers is now predicted.
-    type: Fix
+    - message: Moving to open lockers is now predicted.
+      type: Fix
   id: 5886
   time: '2024-02-04T02:23:16.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24937
 - author: Tayrtahn
   changes:
-  - message: Added opened/closed visuals and fill levels for a variety of drinks.
-    type: Add
+    - message: Added opened/closed visuals and fill levels for a variety of drinks.
+      type: Add
   id: 5887
   time: '2024-02-04T20:13:48.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24600
 - author: deltanedas
   changes:
-  - message: Grilles are no longer incredibly strong.
-    type: Tweak
+    - message: Grilles are no longer incredibly strong.
+      type: Tweak
   id: 5888
   time: '2024-02-04T20:48:06.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24881
 - author: Scribbles0
   changes:
-  - message: Holoparasites can now autoattack at their max attack rate when holding
-      down their attack button.
-    type: Add
+    - message: >-
+        Holoparasites can now autoattack at their max attack rate when holding
+        down their attack button.
+      type: Add
   id: 5889
   time: '2024-02-04T23:01:49.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24944
 - author: EdenTheLiznerd
   changes:
-  - message: Sectech no longer says "Let's crack communist skulls!" It now says "Let's
-      crack syndicate skulls!"
-    type: Tweak
+    - message: >-
+        Sectech no longer says "Let's crack communist skulls!" It now says
+        "Let's crack syndicate skulls!"
+      type: Tweak
   id: 5890
   time: '2024-02-05T12:24:52.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24965
 - author: Varen
   changes:
-  - message: Rebalanced electrocution damage to ramp up slower with power levels.
-    type: Tweak
+    - message: Rebalanced electrocution damage to ramp up slower with power levels.
+      type: Tweak
   id: 5891
   time: '2024-02-05T18:47:52.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24829
 - author: ficcialfaint and deltanedas
   changes:
-  - message: Criminal records and the console that manages them have been added to
-      the game. They also have a guidebook entry.
-    type: Add
+    - message: >-
+        Criminal records and the console that manages them have been added to
+        the game. They also have a guidebook entry.
+      type: Add
   id: 5892
   time: '2024-02-05T23:03:04.754935+00:00'
   url: null
 - author: themias
   changes:
-  - message: Outlaw Glasses fully hide your identity again
-    type: Tweak
+    - message: Outlaw Glasses fully hide your identity again
+      type: Tweak
   id: 5893
   time: '2024-02-05T23:23:44.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24971
 - author: Emisse
   changes:
-  - message: Nonstandard pens now embed again. (explosive pen good again)
-    type: Tweak
+    - message: Nonstandard pens now embed again. (explosive pen good again)
+      type: Tweak
   id: 5894
   time: '2024-02-05T23:30:06.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24849
 - author: FungiFellow
   changes:
-  - message: Altered content of several Borg Modules for QoL
-    type: Tweak
-  - message: Removed Gas Analyzer Module
-    type: Remove
+    - message: Altered content of several Borg Modules for QoL
+      type: Tweak
+    - message: Removed Gas Analyzer Module
+      type: Remove
   id: 5895
   time: '2024-02-05T23:46:39.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24702
 - author: Rainfey
   changes:
-  - message: Health Analysers now continuously update their UI after scanning a patient
-    type: Tweak
+    - message: >-
+        Health Analysers now continuously update their UI after scanning a
+        patient
+      type: Tweak
   id: 5896
   time: '2024-02-06T13:20:10.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/22449
 - author: ada-please
   changes:
-  - message: A Surveillance Camera Monitor Board has been added to the Syndicate Observation
-      Kit.
-    type: Add
+    - message: >-
+        A Surveillance Camera Monitor Board has been added to the Syndicate
+        Observation Kit.
+      type: Add
   id: 5897
   time: '2024-02-06T16:25:07.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24979
 - author: snebl
   changes:
-  - message: Fixed the glass version of cargo airlock looking like an engineering
-      door when opened.
-    type: Fix
+    - message: >-
+        Fixed the glass version of cargo airlock looking like an engineering
+        door when opened.
+      type: Fix
   id: 5898
   time: '2024-02-06T19:38:39.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/25003
 - author: Mangohydra
   changes:
-  - message: New cargo shuttle for fland
-    type: Tweak
+    - message: New cargo shuttle for fland
+      type: Tweak
   id: 5899
   time: '2024-02-07T08:49:06.0000000+00:00'
   url: https://api.github.com/repos/space-wizards/space-station-14/pulls/25016
+- author: Ilya246
+  changes:
+    - message: >-
+        Atmos devices can now be built behind directional windows and on
+        lattice.
+      type: Tweak
+  id: 5900
+  time: '2024-02-08T23:07:42.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/25057
+- author: Ubaser
+  changes:
+    - message: T-Ray scanner sprite is tweaked.
+      type: Tweak
+  id: 5901
+  time: '2024-02-08T23:09:00.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/25047
+- author: nikthechampiongr
+  changes:
+    - message: Brig timers display their label properly again.
+      type: Fix
+  id: 5902
+  time: '2024-02-08T23:12:05.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/25033
+- author: vero5123
+  changes:
+    - message: fixes mop buckets being indestructible.
+      type: Fix
+  id: 5903
+  time: '2024-02-08T23:15:12.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/25001
+- author: Adrian16199
+  changes:
+    - message: Added a straw hat that can be crafted with wheat.
+      type: Add
+  id: 5904
+  time: '2024-02-08T23:17:01.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24997
+- author: Sk1tch
+  changes:
+    - message: Guidebook entries are now alphabetically sorted
+      type: Tweak
+  id: 5905
+  time: '2024-02-08T23:23:35.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24963
+- author: FairlySadPanda
+  changes:
+    - message: Swapped out the Skelly Vs The Rev art with a new, higher-res version.
+      type: Tweak
+  id: 5906
+  time: '2024-02-10T02:06:02.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/25088
+- author: Potato1234_x
+  changes:
+    - message: >-
+        Added laughin' peas, a new mutation for peas that can be ground into
+        Laughter, a chem that forces people to laugh.
+      type: Add
+  id: 5907
+  time: '2024-02-10T08:21:44.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/25089
+- author: themias
+  changes:
+    - message: Soft caps can be flipped backwards with an alt-verb (Flip)
+      type: Tweak
+  id: 5908
+  time: '2024-02-10T08:44:19.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24961
+- author: Blackern5000
+  changes:
+    - message: Shotgun beanbag rounds now deal 40 stamina damage and stun in 3 hits.
+      type: Tweak
+  id: 5909
+  time: '2024-02-10T08:49:24.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24653
+- author: metalgearsloth
+  changes:
+    - message: >-
+        Fix screenspace popups e.g. inventory / access popups drawing below the
+        UI.
+      type: Fix
+  id: 5910
+  time: '2024-02-10T08:51:11.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24987
+- author: themias
+  changes:
+    - message: >-
+        The ID card console now correctly updates the ID's department when you
+        update its job
+      type: Fix
+    - message: The Agent ID will update its department depending on the selected icon
+      type: Fix
+  id: 5911
+  time: '2024-02-10T09:17:26.0000000+00:00'
+  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24975
+- author: Nimfar11
+  changes:
+    - message: Adds a glass showcase for an antique laser pistol.
+      type: Add
+  id: 5912
+  time: '2024-02-10T23:36:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25104
+- author: Jezithyr
+  changes:
+    - message: Changed gibbing to now rotate giblets randomly when they are spawned.
+      type: Tweak
+    - message: >-
+        Giblets are now thrown around the body instead of spawning in a rough
+        pile.
+      type: Tweak
+  id: 5913
+  time: '2024-02-10T23:37:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24989
+- author: Jajsha
+  changes:
+    - message: Cyborgs can no longer Emag themselves.
+      type: Fix
+  id: 5914
+  time: '2024-02-11T06:23:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24748
+- author: Ubaser
+  changes:
+    - message: Grinding ectoplasm now gives Necrosol.
+      type: Tweak
+  id: 5915
+  time: '2024-02-11T06:24:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25053
+- author: Ubaser
+  changes:
+    - message: Food Service research is now roundstart.
+      type: Tweak
+  id: 5916
+  time: '2024-02-11T06:37:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25046
+- author: SlamBamActionman
+  changes:
+    - message: Added setting to toggle chat name color in Options.
+      type: Add
+  id: 5917
+  time: '2024-02-11T06:38:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24625
+- author: Emisse
+  changes:
+    - message: Ambuzol now requires zombie blood
+      type: Tweak
+  id: 5918
+  time: '2024-02-11T20:47:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25119
+- author: Plykiya
+  changes:
+    - message: >-
+        Door remotes no longer have their 5G signals absorbed by mobs, machines,
+        or Ian's cute butt.
+      type: Fix
+  id: 5919
+  time: '2024-02-12T02:34:13.532550+00:00'
+  url: null
+- author: FungiFellow
+  changes:
+    - message: Lowered Reoccurence Delay for Ion Storm
+      type: Tweak
+  id: 5920
+  time: '2024-02-12T02:35:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25135
+- author: PoorMansDreams
+  changes:
+    - message: Ammo is now tipped!
+      type: Tweak
+  id: 5921
+  time: '2024-02-12T03:02:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25103
+- author: PoorMansDreams
+  changes:
+    - message: Buyable Janitorial Trolley!
+      type: Add
+  id: 5922
+  time: '2024-02-12T06:35:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25139
+- author: Plykiya
+  changes:
+    - message: Stun batons and stun prods now display their hits remaining.
+      type: Tweak
+  id: 5923
+  time: '2024-02-12T06:36:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25141
+- author: Ilya246
+  changes:
+    - message: Autolathes may now make empty air tanks.
+      type: Add
+  id: 5924
+  time: '2024-02-12T06:37:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25130
+- author: Ubaser
+  changes:
+    - message: Resprited the CE's jetpack.
+      type: Tweak
+  id: 5925
+  time: '2024-02-12T20:44:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25150
+- author: EdenTheLiznerd
+  changes:
+    - message: >-
+        Deathnettles are no longer able to bypass armor and don't do as much
+        damage
+      type: Tweak
+  id: 5926
+  time: '2024-02-13T01:20:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25068
+- author: Vasilis
+  changes:
+    - message: >-
+        You can now inspect peoples id's and health though glass if you are
+        within details range.
+      type: Tweak
+  id: 5927
+  time: '2024-02-13T06:41:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25163
+- author: metalgearsloth
+  changes:
+    - message: Fix decal error spam in console due to a missing overlay.
+      type: Fix
+  id: 5928
+  time: '2024-02-13T07:10:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25170
+- author: jamessimo
+  changes:
+    - message: Can now "wink" with the text emote ;) or ;]
+      type: Add
+    - message: Can now "tearfully smile" with the text emote :') and similar variants
+      type: Add
+    - message: Added more ways to "cry" with the emote :'( and similar variants
+      type: Tweak
+  id: 5929
+  time: '2024-02-13T15:43:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25129
+- author: icekot8
+  changes:
+    - message: Medical berets added to MediDrobe
+      type: Add
+  id: 5930
+  time: '2024-02-13T21:37:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25176
+- author: PoorMansDreams
+  changes:
+    - message: Alternate ammo now has the proper appearance when spent.
+      type: Fix
+  id: 5931
+  time: '2024-02-13T21:40:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25167
+- author: Agoichi
+  changes:
+    - message: All hoods have tag "Hides Hair"
+      type: Tweak
+    - message: Plague Doctor's hat and Witch hat (with red hair) have tag "Hides Hair"
+      type: Tweak
+  id: 5932
+  time: '2024-02-13T21:43:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25142
+- author: Blackern5000
+  changes:
+    - message: Advanced topical meds now cost significantly less chemicals
+      type: Tweak
+  id: 5933
+  time: '2024-02-13T22:03:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24948
+- author: Tayrtahn
+  changes:
+    - message: >-
+        Drink bottles can now be opened and closed from the verbs menu, and some
+        have been given tamper-evident seals.
+      type: Add
+  id: 5934
+  time: '2024-02-13T22:08:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24780
+- author: TheShuEd
+  changes:
+    - message: Darkness is coming. A new shadow anomaly added.
+      type: Add
+  id: 5935
+  time: '2024-02-13T22:12:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24629
+- author: jamessimo
+  changes:
+    - message: Microwave UI enhancements
+      type: Tweak
+    - message: Microwaves now tell you how much time is left when cooking
+      type: Tweak
+    - message: Microwaves UI now uses prediction for user inputs.
+      type: Fix
+  id: 5936
+  time: '2024-02-13T22:16:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24547
+- author: TheShuEd
+  changes:
+    - message: Remote signallers are now limited to a 15-tile radius
+      type: Tweak
+    - message: Added an advanced remote signaler, with a range of 30 tiles.
+      type: Add
+    - message: >-
+        the anomaly synchronizer consumes much less power, and no longer causes
+        the anomaly pulses when powering down.
+      type: Tweak
+  id: 5937
+  time: '2024-02-13T22:19:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24461
+- author: joshepvodka
+  changes:
+    - message: Fax machines can now print text files from your computer.
+      type: Add
+  id: 5938
+  time: '2024-02-14T01:14:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/23262
+- author: Plykiya
+  changes:
+    - message: >-
+        Holosigns can now be placed at range. No more being eaten by
+        forcefields!
+      type: Tweak
+  id: 5939
+  time: '2024-02-14T05:25:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25120
+- author: Zadeon
+  changes:
+    - message: Disablers now fit inside the suit storage slot.
+      type: Fix
+  id: 5940
+  time: '2024-02-14T23:07:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25238
+- author: Jezithyr
+  changes:
+    - message: Death Acidifier implants not deleting items when activated
+      type: Fix
+  id: 5941
+  time: '2024-02-15T01:37:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25251
+- author: PJB3005
+  changes:
+    - message: >-
+        Fixed disposals bins not automatically flushing after an item was
+        inserted.
+      type: Fix
+  id: 5942
+  time: '2024-02-15T20:52:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25233
+- author: liltenhead
+  changes:
+    - message: Reduced energy shield's hp from 150 to 100.
+      type: Tweak
+  id: 5943
+  time: '2024-02-15T20:54:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25258
+- author: PJB3005
+  changes:
+    - message: Nuke has some more blinkenlights now.
+      type: Tweak
+  id: 5944
+  time: '2024-02-16T00:26:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25297
+- author: MACMAN2003
+  changes:
+    - message: Thindows no longer duplicate glass when broken.
+      type: Fix
+  id: 5945
+  time: '2024-02-16T04:03:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25304
+- author: Golinth
+  changes:
+    - message: >-
+        Mindshields are no longer separate and appear as a border around job
+        icons on the SecHUD
+      type: Tweak
+  id: 5946
+  time: '2024-02-16T15:58:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25303
+- author: Lukasz825700516
+  changes:
+    - message: >-
+        Damaging stacked glass sheets now gives appropriate amount of glass
+        shards
+      type: Fix
+  id: 5947
+  time: '2024-02-16T18:42:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25308
+- author: Plykiya
+  changes:
+    - message: The firefighting door remote now has access to atmos doors.
+      type: Tweak
+  id: 5948
+  time: '2024-02-16T18:50:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25097
+- author: themias
+  changes:
+    - message: t-ray scanners can now penetrate carpets and puddles
+      type: Tweak
+  id: 5949
+  time: '2024-02-16T23:37:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25276
+- author: Krunk
+  changes:
+    - message: Sound effects have been added for writing on paper.
+      type: Add
+  id: 5950
+  time: '2024-02-16T23:48:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25257
+- author: PotentiallyTom
+  changes:
+    - message: Added new covers for the medical, security, and science guidebooks
+      type: Add
+  id: 5951
+  time: '2024-02-16T23:50:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25232
+- author: PJB3005
+  changes:
+    - message: Fix some rounding issues with complex chemical reactions.
+      type: Fix
+  id: 5952
+  time: '2024-02-16T23:54:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25199
+- author: data_redacted
+  changes:
+    - message: New lobby art (of an Air Alarm blueprint).
+      type: Add
+  id: 5953
+  time: '2024-02-17T02:52:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25179
+- author: Lank
+  changes:
+    - message: >-
+        Diona nymphs, small cat-like creatures, several of which make up a
+        Diona.
+      type: Add
+    - message: >-
+        Diona are now able to split into three nymphs on death, and will control
+        one of them. The controlled nymph is able to reform into a new diona
+        after some time.
+      type: Add
+    - message: >-
+        Diona now combust into flames upon being hit with significant heat
+        damage.
+      type: Tweak
+  id: 5954
+  time: '2024-02-17T02:54:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24630
+- author: PolterTzi
+  changes:
+    - message: >-
+        Seeds from sampled plants now inherit the sampled plant's health to
+        discourage excessive sampling.
+      type: Tweak
+    - message: Plants need to grow a bit before being sampled.
+      type: Tweak
+  id: 5955
+  time: '2024-02-17T05:02:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25326
+- author: Dygon
+  changes:
+    - message: Diona nymphs aren't deleted immediately after spawning anymore.
+      type: Fix
+  id: 5956
+  time: '2024-02-17T16:38:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25344
+- author: Geekyhobo
+  changes:
+    - message: Massban Flag has been added to admin ranks
+      type: Add
+  id: 5957
+  time: '2024-02-17T20:32:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25327
+- author: Moomoobeef
+  changes:
+    - message: >-
+        Detectives are now supplied with a box of evidence markers, useful for
+        marking evidence at a crime scene.
+      type: Add
+  id: 5958
+  time: '2024-02-17T20:49:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25255
+- author: Ubaser
+  changes:
+    - message: New "tailed" hair.
+      type: Add
+  id: 5959
+  time: '2024-02-17T20:49:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25216
+- author: Ubaser
+  changes:
+    - message: A new chest scar marking is now available to humans and dwarves.
+      type: Add
+  id: 5960
+  time: '2024-02-17T20:50:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25215
+- author: ArchPigeon
+  changes:
+    - message: Tails now stop wagging on crit
+      type: Fix
+  id: 5961
+  time: '2024-02-17T21:33:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25323
+- author: Killerqu00
+  changes:
+    - message: EVA and paramedic suits now play sound when putting helmet on.
+      type: Fix
+  id: 5962
+  time: '2024-02-17T22:34:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25349
+- author: musicmanvr
+  changes:
+    - message: >-
+        Toned down the newton cradle and added it to the bureaucracy crate for
+        bored accountants.
+      type: Fix
+  id: 5963
+  time: '2024-02-17T23:55:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25357
+- author: genderGeometries
+  changes:
+    - message: >-
+        Allicin, nutriment, and vitamin can now be centrifuged. Protein and fat
+        can now be electrolyzed.
+      type: Add
+  id: 5964
+  time: '2024-02-19T06:05:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25366
+- author: azurerosegarden
+  changes:
+    - message: Drinks in the Solar's Best Hot Drinks menu now show their contents
+      type: Fix
+  id: 5965
+  time: '2024-02-19T15:40:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25301
+- author: Lank
+  changes:
+    - message: Nymphs can now open doors and chirp.
+      type: Tweak
+  id: 5966
+  time: '2024-02-19T17:11:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25363
+- author: PotentiallyTom
+  changes:
+    - message: Gave guidebooks to the 4 learner roles
+      type: Tweak
+  id: 5967
+  time: '2024-02-19T18:54:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25388
+- author: jamessimo
+  changes:
+    - message: vending machine UI improved
+      type: Tweak
+  id: 5968
+  time: '2024-02-19T22:18:27.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25377
+- author: marbow
+  changes:
+    - message: Moths can now eat plushies and with a distinctive sound!
+      type: Add
+  id: 5969
+  time: '2024-02-19T22:35:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25382
+- author: ArchPigeon
+  changes:
+    - message: Liquid Tritium can now be used as a chem in flamethrowers
+      type: Add
+  id: 5970
+  time: '2024-02-19T22:37:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25281
+- author: ElectroJr
+  changes:
+    - message: Fix actions sometimes disappearing.
+      type: Fix
+  id: 5971
+  time: '2024-02-20T02:08:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25395
+- author: PJB3005
+  changes:
+    - message: Fixed timezone issues with the admin notes window.
+      type: Fix
+  id: 5972
+  time: '2024-02-20T09:13:31.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25280
+- author: PJB3005
+  changes:
+    - message: >-
+        Fixed selection behavior for player lists such as the ban panel or ahelp
+        window.
+      type: Fix
+  id: 5973
+  time: '2024-02-20T09:13:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25248
+- author: Tonydatguy
+  changes:
+    - message: Ore Crabs will now take structural damage.
+      type: Tweak
+  id: 5974
+  time: '2024-02-20T10:43:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25390
+- author: Golinth
+  changes:
+    - message: The mindshield outline now flashes!
+      type: Tweak
+  id: 5975
+  time: '2024-02-20T22:26:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25409
+- author: landwhale
+  changes:
+    - message: Resprited Nettles & Death Nettles.
+      type: Tweak
+  id: 5976
+  time: '2024-02-20T23:58:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25421
+- author: takemysoult
+  changes:
+    - message: >-
+        Explosive Technology changed to tier 2 arsenal and the cost has
+        increased to 10 000
+      type: Tweak
+  id: 5977
+  time: '2024-02-21T00:56:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25397
+- author: Callmore
+  changes:
+    - message: Shoving other people is now more consistent.
+      type: Fix
+  id: 5978
+  time: '2024-02-21T04:01:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25353
+- author: Ubaser
+  changes:
+    - message: A new UI theme, "Ashen", is now available to select in the options menu.
+      type: Add
+  id: 5979
+  time: '2024-02-21T05:26:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25408
+- author: Holinka4ever
+  changes:
+    - message: Sunglasses were removed from ClothesMate
+      type: Remove
+  id: 5980
+  time: '2024-02-21T06:11:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25221
+- author: Errant
+  changes:
+    - message: >-
+        Rotten food is now less lethal to eat, and has a high chance to induce
+        vomiting.
+      type: Tweak
+  id: 5981
+  time: '2024-02-21T06:12:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25418
+- author: EdenTheLiznerd
+  changes:
+    - message: Deathnettles no longer penetrate hardsuit armor
+      type: Tweak
+  id: 5982
+  time: '2024-02-21T06:16:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25286
+- author: Tayrtahn
+  changes:
+    - message: Added fill level visuals to all the drinks. Cheers!
+      type: Add
+  id: 5983
+  time: '2024-02-21T06:17:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25319
+- author: Potato1234_x
+  changes:
+    - message: Happy Honk boxes can now hold normal sized items
+      type: Tweak
+  id: 5984
+  time: '2024-02-21T06:21:45.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25245
+- author: Hanzdegloker
+  changes:
+    - message: >-
+        Standardized amount of huds in vendors and added new diagnostics
+        eyeapatch hud
+      type: Tweak
+  id: 5985
+  time: '2024-02-21T06:22:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25208
+- author: DebugOk
+  changes:
+    - message: Drones are now completely removed instead of just being disabled
+      type: Remove
+  id: 5986
+  time: '2024-02-21T06:23:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25372
+- author: Hanzdegloker
+  changes:
+    - message: >-
+        Dept. Heads are now guaranteed to have their respective winter coats in
+        their dressers
+      type: Tweak
+    - message: Standardized the contents of Dept. Heads dressers and lockers
+      type: Tweak
+  id: 5987
+  time: '2024-02-21T06:26:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25206
+- author: deltanedas
+  changes:
+    - message: >-
+        Added Conducting Gloves to the uplink, they make shocks much worse
+        rather than stop them.
+      type: Add
+  id: 5988
+  time: '2024-02-21T06:34:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25227
+- author: veliebm
+  changes:
+    - message: >-
+        The guidebook now contains a page for the Radioisotope Thermoelectric
+        Generator (RTG).
+      type: Add
+  id: 5989
+  time: '2024-02-21T06:38:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25040
+- author: PoorMansDreams
+  changes:
+    - message: New pirate start sound!
+      type: Add
+  id: 5990
+  time: '2024-02-21T06:39:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25153
+- author: takemysoult
+  changes:
+    - message: Changed uplink catalog - add syndicate hud to nukeops uplink
+      type: Tweak
+  id: 5991
+  time: '2024-02-21T06:41:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25087
+- author: Sphiral
+  changes:
+    - message: >-
+        Took the AdminPDA from the backpack and gave it it's own slot on
+        aghosts! Also aghosts can smoke/wear masks now!
+      type: Tweak
+  id: 5992
+  time: '2024-02-21T06:41:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25402
+- author: EdenTheLiznerd
+  changes:
+    - message: Nettles are now weaker than their deathnettle counterparts
+      type: Tweak
+  id: 5993
+  time: '2024-02-21T06:42:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25177
+- author: potato1234x
+  changes:
+    - message: >-
+        Added spaceman's trumpets which come from mutated lilies and can be
+        ground up into Polypyrylium Oligomers which are is just slightly better
+        bic.
+      type: Add
+    - message: >-
+        Added lilies which are mutated from poppies and are used to create
+        spaceman's trumpets.
+      type: Add
+  id: 5994
+  time: '2024-02-21T06:49:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25090
+- author: FungiFellow
+  changes:
+    - message: Death Acidifer Price 2->4
+      type: Tweak
+    - message: Removed Acidifier from Syndie Uplink
+      type: Remove
+  id: 5995
+  time: '2024-02-21T06:51:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25039
+- author: Aquif
+  changes:
+    - message: >-
+        Admins can now disable the bwoink sound if they don't want to scare
+        players.
+      type: Add
+  id: 5996
+  time: '2024-02-21T06:52:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25008
+- author: Fildrance
+  changes:
+    - message: now cryo pod health analyzer updates atomatically!
+      type: Fix
+  id: 5997
+  time: '2024-02-21T14:47:23.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25109
+- author: landwhale
+  changes:
+    - message: Drink jugs can no longer be used by chemistry in place of a beaker.
+      type: Fix
+    - message: >-
+        Updated names of several drink jugs to differentiate them from
+        chem-specific variants.
+      type: Tweak
+  id: 5998
+  time: '2024-02-21T23:26:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25450
+- author: Killerqu00
+  changes:
+    - message: EVA helmets are now quick-equippable again
+      type: Fix
+  id: 5999
+  time: '2024-02-21T23:41:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25448
+- author: genderGeometries
+  changes:
+    - message: Crops are now harvested with decimal amounts of nutriment, vitamin, etc.
+      type: Fix
+  id: 6000
+  time: '2024-02-22T00:19:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25453
+- author: Whisper
+  changes:
+    - message: Dragon ichor when eating restores the dragon's blood.
+      type: Add
+    - message: Increased Xenomorph and Dragon blood level to 650u.
+      type: Tweak
+  id: 6001
+  time: '2024-02-22T02:54:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25442
+- author: Beck Thompson
+  changes:
+    - message: Radio jammer now uses 3 times less power.
+      type: Tweak
+  id: 6002
+  time: '2024-02-22T07:32:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25432
+- author: metalgearsloth
+  changes:
+    - message: Added handheld crew monitor back just for CMO.
+      type: Add
+  id: 6003
+  time: '2024-02-22T11:00:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25439
+- author: DrMelon
+  changes:
+    - message: Fixed incorrect job-specific Uplink items being given on occasion.
+      type: Fix
+  id: 6004
+  time: '2024-02-22T11:03:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/23179
+- author: liltenhead
+  changes:
+    - message: Changed the syndicate assault borg to have a red flashlight.
+      type: Tweak
+  id: 6005
+  time: '2024-02-22T11:15:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25465
+- author: lzk228
+  changes:
+    - message: Fix some items becomes bigger after turning in trash.
+      type: Fix
+  id: 6006
+  time: '2024-02-22T11:28:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25461
+- author: ps3moira
+  changes:
+    - message: Added Large Wooden floors
+      type: Add
+  id: 6007
+  time: '2024-02-22T11:59:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25462
+- author: Whisper
+  changes:
+    - message: Fixed reagent slime ghost role description.
+      type: Fix
+  id: 6008
+  time: '2024-02-22T12:18:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25466
+- author: lzk228
+  changes:
+    - message: Galoshes are added to the Janidrobe.
+      type: Tweak
+    - message: Galoshes now make you slower.
+      type: Tweak
+  id: 6009
+  time: '2024-02-23T01:05:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25484
+- author: PJB3005
+  changes:
+    - message: >-
+        sorting of departments and jobs has been made consistent in various
+        menus.
+      type: Tweak
+  id: 6010
+  time: '2024-02-23T04:04:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25486
+- author: liltenhead
+  changes:
+    - message: Changed emergency welder's fuel count from 25 -> 50
+      type: Tweak
+  id: 6011
+  time: '2024-02-23T06:53:39.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25483
+- author: Vasilis
+  changes:
+    - message: >-
+        Fixed a bug where the centcom official/any job that is not supposed to
+        have a preference option appeared anyway.
+      type: Fix
+  id: 6012
+  time: '2024-02-23T13:19:52.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25496
+- author: Erisfiregamer1
+  changes:
+    - message: Fixed a typo when forcefeeding someone.
+      type: Fix
+  id: 6013
+  time: '2024-02-24T01:45:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25512
+- author: Beck Thompson
+  changes:
+    - message: The Fire Extinguishers safety can now only be toggled when in range.
+      type: Fix
+  id: 6014
+  time: '2024-02-25T02:29:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25534
+- author: ArchPigeon
+  changes:
+    - message: >-
+        Removed the ability for command or any antag-safe role to be initial
+        infected in zombie mode
+      type: Remove
+  id: 6015
+  time: '2024-02-25T02:40:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25529
+- author: PolterTzi
+  changes:
+    - message: Cargo ordering multiple crates in one order should work now.
+      type: Fix
+  id: 6016
+  time: '2024-02-25T07:36:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25518
+- author: metalgearsloth
+  changes:
+    - message: Remove executions pending code rewrite.
+      type: Remove
+  id: 6017
+  time: '2024-02-25T11:36:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25555
+- author: Krunk
+  changes:
+    - message: Candy bowls function properly again!
+      type: Fix
+  id: 6018
+  time: '2024-02-25T13:08:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25514
+- author: Whisper
+  changes:
+    - message: Added juice that makes you Weh! Juice a lizard plushie today!
+      type: Add
+  id: 6019
+  time: '2024-02-25T13:54:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25132
+- author: wafehling
+  changes:
+    - message: >-
+        Secret mode has become more secret, with the 4th option Survival added
+        to the rotation.
+      type: Tweak
+  id: 6020
+  time: '2024-02-25T21:15:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25568
+- author: Tayrtahn
+  changes:
+    - message: Added a live preview display to reagent dispensers.
+      type: Add
+  id: 6021
+  time: '2024-02-25T23:03:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25391
+- author: Krunk
+  changes:
+    - message: Fixed grid inventory occasionally messing with your item rotation.
+      type: Fix
+  id: 6022
+  time: '2024-02-25T23:24:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25510
+- author: Ubaser
+  changes:
+    - message: >-
+        Satchels no longer have darkened space representing a gap, and is
+        instead transparent.
+      type: Tweak
+  id: 6023
+  time: '2024-02-25T23:24:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25147
+- author: TheShuEd
+  changes:
+    - message: Huge flora anomaly nerf
+      type: Tweak
+  id: 6024
+  time: '2024-02-25T23:41:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25499
+- author: OctoRocket
+  changes:
+    - message: Removed the hands requirement to read paper.
+      type: Tweak
+  id: 6025
+  time: '2024-02-26T02:40:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25580
+- author: SlamBamActionman
+  changes:
+    - message: >-
+        Self-uncuff damage has been removed, but attempting to self-uncuff now
+        has a cooldown instead.
+      type: Tweak
+  id: 6026
+  time: '2024-02-26T02:41:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25161
+- author: deltanedas
+  changes:
+    - message: Traitors can now be asked to steal the CMO's Handheld Crew Monitor.
+      type: Tweak
+  id: 6027
+  time: '2024-02-26T03:40:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25563
+- author: MACMAN2003
+  changes:
+    - message: You can now make LED light tubes and LED light bulbs at an autolathe.
+      type: Add
+  id: 6028
+  time: '2024-02-26T22:58:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25616
+- author: botanySupremist
+  changes:
+    - message: Fixed a few small typos in ghost role information.
+      type: Fix
+  id: 6029
+  time: '2024-02-26T22:58:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25613
+- author: Whisper
+  changes:
+    - message: >-
+        Juice that makes you Weh can be found in; anomalies, Artifacts, random
+        puddles.
+      type: Add
+  id: 6030
+  time: '2024-02-26T22:59:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25611
+- author: Hanzdegloker
+  changes:
+    - message: ERT medic PDA now has a health analyzer built in.
+      type: Tweak
+  id: 6031
+  time: '2024-02-26T23:00:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25606
+- author: Ilya246
+  changes:
+    - message: Macrobomb implant price reduced 20->13 TC.
+      type: Tweak
+  id: 6032
+  time: '2024-02-26T23:04:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25585
+- author: QuietlyWhisper
+  changes:
+    - message: >-
+        Handcuff and handcuff replacements are faster to escape. You can allow
+        your teammates to uncuff themselves!
+      type: Tweak
+  id: 6033
+  time: '2024-02-26T23:05:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25601
+- author: PoorMansDreams
+  changes:
+    - message: New lobby art (of horror)
+      type: Add
+  id: 6034
+  time: '2024-02-26T23:06:09.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25455
+- author: TheShuEd
+  changes:
+    - message: Carpets can now be printed at the uniform printer.
+      type: Add
+    - message: Carpets can be collected from the floor and buthered into fabric.
+      type: Add
+    - message: New white and cyan carpets.
+      type: Add
+    - message: >-
+        Carpets can now be placed on wooden tables to get beautiful new tables
+        with tablecloths.
+      type: Add
+  id: 6035
+  time: '2024-02-26T23:11:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25562
+- author: SlamBamActionman
+  changes:
+    - message: Added new noses for humans and dwarves.
+      type: Add
+  id: 6036
+  time: '2024-02-26T23:15:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25557
+- author: MACMAN2003
+  changes:
+    - message: Added a NanoTrasen balloon toy.
+      type: Add
+  id: 6037
+  time: '2024-02-26T23:15:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25543
+- author: TheShuEd
+  changes:
+    - message: >-
+        Added a new T2 industrial technology "Space Scanning"! It includes a
+        mass scanner console board, a Borg GPS module, and a new handheld mass
+        scanner.
+      type: Add
+    - message: GPS borg module now have handheld mass scanner.
+      type: Add
+  id: 6038
+  time: '2024-02-26T23:19:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25526
+- author: Sphiral
+  changes:
+    - message: >-
+        NT has finally perfected methods for infusing Plasma/Uranium into Glass!
+        Windoors now have such varients! And Uranium Slim Windows exist!
+      type: Add
+  id: 6039
+  time: '2024-02-26T23:25:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25501
+- author: Whisper
+  changes:
+    - message: >-
+        Bleed wounds will no longer heal so fast they do not need to be treated.
+        Please see the medical guidebook.
+      type: Tweak
+    - message: Decreased passive bleed wound clotting by 60% (now 0.33u per 3 seconds).
+      type: Tweak
+    - message: Decreased all bloodloss damage (as a result of bleeding) by 50%.
+      type: Tweak
+    - message: Health analyzers will report if your patient is bleeding.
+      type: Add
+  id: 6040
+  time: '2024-02-26T23:26:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25434
+- author: Velcroboy
+  changes:
+    - message: >-
+        Tweaked wallmounted objects can not be interacted with through thindows
+        or windoors.
+      type: Tweak
+    - message: Fixed NanoMed vendor not being accessible from all directions.
+      type: Fix
+  id: 6041
+  time: '2024-02-26T23:28:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25451
+- author: Lank
+  changes:
+    - message: >-
+        Diona can no longer split or reform to cure themselves of a zombie
+        infection.
+      type: Fix
+  id: 6042
+  time: '2024-02-26T23:31:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25404
+- author: Zadeon
+  changes:
+    - message: >-
+        Added salt as a new type of ore that can be mined from asteroids. Salt
+        can be ground up for its base components.
+      type: Add
+  id: 6043
+  time: '2024-02-26T23:34:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25324
+- author: juliangiebel
+  changes:
+    - message: The mass media consoles UI got overhauled
+      type: Tweak
+    - message: >-
+        Added PDA notifications in chat for new news articles. They can be
+        turned off in the news reader program and are only visible to you.
+      type: Add
+  id: 6044
+  time: '2024-02-27T01:38:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/19610
+- author: rosieposieeee
+  changes:
+    - message: >-
+        Added lockable wall buttons and decorative frames for differentiating
+        wall buttons.
+      type: Add
+  id: 6045
+  time: '2024-02-27T07:57:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25631
+- author: metalgearsloth
+  changes:
+    - message: Fix chat bubbles.
+      type: Fix
+  id: 6046
+  time: '2024-02-27T13:01:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25643
+- author: rosieposieeee
+  changes:
+    - message: >-
+        Added grey stalagmites and made all stalagmites weaker and more fun to
+        break.
+      type: Add
+  id: 6047
+  time: '2024-02-27T19:24:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25646
+- author: metalgearsloth
+  changes:
+    - message: Made NPC movement less janky.
+      type: Fix
+  id: 6048
+  time: '2024-02-28T06:41:15.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25666
+- author: musicmanvr
+  changes:
+    - message: Added the Syndicate decoy bundle, a creative way to trick your foes.
+      type: Add
+    - message: Snap pops have been added to the toy crate.
+      type: Add
+    - message: Syndicate Commanders now have a trench whistle, Avanti!
+      type: Add
+  id: 6049
+  time: '2024-02-28T21:53:46.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25333
+- author: Whisper
+  changes:
+    - message: Iron and copper no longer grant infinite blood!
+      type: Fix
+  id: 6050
+  time: '2024-02-28T21:56:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25678
+- author: Cojoke-dot
+  changes:
+    - message: E-sword now lights plasma fires
+      type: Tweak
+  id: 6051
+  time: '2024-02-28T21:59:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25665
+- author: lzk228
+  changes:
+    - message: >-
+        Engineering structures orders in cargo now supplied via flatpacks (e.g.
+        tesla & singulo generators, other stuff for them).
+      type: Tweak
+    - message: Thrusters and gyroscopes now supplied in crates via flatpacks.
+      type: Tweak
+  id: 6052
+  time: '2024-02-28T22:02:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25647
+- author: c4llv07e
+  changes:
+    - message: >-
+        Cryo won't remove you from the new body if you chose a new ghost role
+        before cryo deleted your old body.
+      type: Fix
+  id: 6053
+  time: '2024-02-28T22:09:02.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24991
+- author: Nairodian
+  changes:
+    - message: You can now remove the rust from reinforced walls with a welder.
+      type: Fix
+  id: 6054
+  time: '2024-02-29T00:44:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25690
+- author: Ubaser
+  changes:
+    - message: Eris UI theme has been removed.
+      type: Remove
+  id: 6055
+  time: '2024-02-29T05:53:48.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25673
+- author: Rainfey
+  changes:
+    - message: Disallow multiple antag roles per player
+      type: Fix
+  id: 6056
+  time: '2024-02-29T06:25:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/23445
+- author: Kukutis96513
+  changes:
+    - message: Changed the amount of plushies in the lizard plushie crate.
+      type: Tweak
+  id: 6057
+  time: '2024-02-29T16:45:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25122
+- author: Aexxie
+  changes:
+    - message: Nutribricks spawn in Survival Kits in place of Tinned Meat.
+      type: Tweak
+    - message: Lizards can now eat Nutribricks.
+      type: Fix
+    - message: Moths can eat Nutribrick wrappers.
+      type: Add
+  id: 6058
+  time: '2024-02-29T21:39:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25659
+- author: Flareguy
+  changes:
+    - message: >-
+        Big O2 tanks and N2 tanks no longer spawn in any departmental locker.
+        Use tank dispensers to get them instead.
+      type: Tweak
+    - message: >-
+        Removed all instances where N2 tanks spawned as counterparts to O2
+        tanks. This includes things like lockers, suit storages, and the
+        emergency toolbox.
+      type: Remove
+  id: 6059
+  time: '2024-02-29T21:40:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25660
+- author: Potato1234_x
+  changes:
+    - message: Added fill levels to bowls, chefs rejoice!
+      type: Add
+  id: 6060
+  time: '2024-02-29T21:41:14.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25639
+- author: Plykiya
+  changes:
+    - message: Dragging objects over gas pipes no longer slows you down.
+      type: Fix
+  id: 6061
+  time: '2024-02-29T21:41:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25629
+- author: TheShuEd
+  changes:
+    - message: 9 new colourful curtains. Can be crafted from carpets.
+      type: Add
+  id: 6062
+  time: '2024-02-29T22:25:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25684
+- author: Nairodian
+  changes:
+    - message: The smooth tail now has a second color layer to customize.
+      type: Tweak
+  id: 6063
+  time: '2024-02-29T22:27:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25685
+- author: Hanzdegloker
+  changes:
+    - message: >-
+        Commonly used decals should no longer washout the details of the tiles
+        below.
+      type: Tweak
+  id: 6064
+  time: '2024-02-29T22:27:25.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25689
+- author: lzk228
+  changes:
+    - message: Added recipe of handheld station map to autolathe.
+      type: Add
+  id: 6065
+  time: '2024-02-29T22:34:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25719
+- author: MACMAN2003
+  changes:
+    - message: There are now more ways to craft reinforced plasma/uranium glass.
+      type: Tweak
+  id: 6066
+  time: '2024-02-29T22:57:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/22804
+- author: deltanedas
+  changes:
+    - message: Acidifiers and microbombs now require confirmation before gibbing you.
+      type: Tweak
+  id: 6067
+  time: '2024-03-01T02:48:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24609
+- author: exincore
+  changes:
+    - message: Chameleon gear now only reveals its menu button to its wearer.
+      type: Tweak
+  id: 6068
+  time: '2024-03-01T12:49:49.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25746
+- author: Nairodian
+  changes:
+    - message: Fixed all command and security roles not having cryogenics access.
+      type: Fix
+  id: 6069
+  time: '2024-03-01T21:21:37.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25752
+- author: IlyaElDunaev
+  changes:
+    - message: Added detective's rubber stamp.
+      type: Add
+  id: 6070
+  time: '2024-03-01T22:50:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25676
+- author: rosieposieeee
+  changes:
+    - message: Added additional signage to help the crew navigate.
+      type: Add
+  id: 6071
+  time: '2024-03-02T06:42:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25766
+- author: EmoGarbage404
+  changes:
+    - message: >-
+        Space heaters machine boards are now printable round start and can
+        additionally be ordered by cargo.
+      type: Tweak
+  id: 6072
+  time: '2024-03-02T06:43:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25735
+- author: Krunk
+  changes:
+    - message: >-
+        Picking up and dumping trash is less arduous for tiny, plentiful items,
+        such as bullets.
+      type: Tweak
+  id: 6073
+  time: '2024-03-02T13:57:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24899
+- author: Errant
+  changes:
+    - message: Breathing tritium or plasma now displays a HUD alert.
+      type: Add
+  id: 6074
+  time: '2024-03-02T14:07:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24484
+- author: waylon531
+  changes:
+    - message: Nutribrick and MRE wrappers can now be put in trash bags
+      type: Tweak
+  id: 6075
+  time: '2024-03-02T14:23:00.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25760
+- author: Fildrance
+  changes:
+    - message: >-
+        fixed lobby music restarting after volume change in options. Lobby music
+        is also not being looped by default - all lobby songs will play in
+        shuffle mode.
+      type: Fix
+  id: 6076
+  time: '2024-03-02T20:40:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25530
+- author: exincore
+  changes:
+    - message: Inventories now show a secondary smart-equip star.
+      type: Add
+  id: 6077
+  time: '2024-03-02T23:57:42.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25696
+- author: Emisse
+  changes:
+    - message: Rev's reenabled
+      type: Tweak
+  id: 6078
+  time: '2024-03-03T00:30:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25704
+- author: EmoGarbage404
+  changes:
+    - message: >-
+        Fixed issues where using the Quantum Spin Inverted would bug out the
+        character's physics.
+      type: Fix
+  id: 6079
+  time: '2024-03-03T06:45:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25700
+- author: deltanedas
+  changes:
+    - message: >-
+        No more raiding the jani vend for galoshes, which are back to normal
+        speed.
+      type: Remove
+  id: 6080
+  time: '2024-03-03T07:07:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25795
+- author: metalgearsloth
+  changes:
+    - message: >-
+        Reworked shuttle consoles, including: manual FTL jumps, new map screen,
+        fixed performance issues, new docking screen.
+      type: Tweak
+  id: 6081
+  time: '2024-03-03T07:39:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24430
+- author: Errant-4
+  changes:
+    - message: Toggling your own internals no longer requires a delay.
+      type: Tweak
+  id: 6082
+  time: '2024-03-03T08:31:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25781
+- author: SlamBamActionman
+  changes:
+    - message: Arachnids are no longer perma-pied and can clean it off.
+      type: Fix
+  id: 6083
+  time: '2024-03-03T08:54:36.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25713
+- author: Dutch-VanDerLinde
+  changes:
+    - message: Monkeys and kobolds can now wear blood-red hardsuits.
+      type: Add
+  id: 6084
+  time: '2024-03-04T03:56:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/22273
+- author: Plykiya
+  changes:
+    - message: Syringes now prevent injecting on empty and drawing on full.
+      type: Tweak
+    - message: You can now tell if you are being drawn from or injected by a syringe.
+      type: Tweak
+  id: 6085
+  time: '2024-03-04T05:07:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25480
+- author: metalgearsloth
+  changes:
+    - message: Fix expedition FTL.
+      type: Fix
+  id: 6086
+  time: '2024-03-04T06:24:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25823
+- author: Nairodian
+  changes:
+    - message: Welding masks can now be made in the Autolathe.
+      type: Add
+  id: 6087
+  time: '2024-03-04T22:36:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25842
+- author: Lawdog
+  changes:
+    - message: >-
+        Changed the max volume of shot glasses from 7u to 5u to better represent
+        drinking shots in real life
+      type: Tweak
+  id: 6088
+  time: '2024-03-04T23:51:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25847
+- author: deltanedas
+  changes:
+    - message: >-
+        Rehydrated mobs (carp) now keep their forensics data from their
+        cube/plushie form.
+      type: Tweak
+  id: 6089
+  time: '2024-03-05T03:13:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25148
+- author: Brandon-Huu
+  changes:
+    - message: >-
+        Removed the ability for command or any antag-safe role to be initial
+        infected in zombie mode
+      type: Remove
+  id: 6090
+  time: '2024-03-05T04:34:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25785
+- author: Whisper
+  changes:
+    - message: Glass shards can be added to flatcaps to create bladed flatcaps!
+      type: Add
+  id: 6091
+  time: '2024-03-05T20:57:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25780
+- author: MACMAN2003
+  changes:
+    - message: Added clockwork structures and brass to build them with.
+      type: Add
+  id: 6092
+  time: '2024-03-06T00:25:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/24673
+- author: deepdarkdepths
+  changes:
+    - message: Added the paramedic's cap to the uniform printer.
+      type: Add
+  id: 6093
+  time: '2024-03-06T01:17:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25861
+- author: lzk228
+  changes:
+    - message: Livestock crate and artifact container now can go under plastic flaps.
+      type: Tweak
+  id: 6094
+  time: '2024-03-06T01:33:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25862
+- author: PJB3005
+  changes:
+    - message: >-
+        Saving paper is on ctrl+enter again. Also there's a visible "save"
+        button now.
+      type: Tweak
+  id: 6095
+  time: '2024-03-06T01:35:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25870
+- author: ps3moira
+  changes:
+    - message: >-
+        Changed brick, wood, and web walls to be unable to conjoin with
+        different walls.
+      type: Tweak
+  id: 6096
+  time: '2024-03-06T01:36:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25674
+- author: Froffy
+  changes:
+    - message: Water can now be scooped from water tiles, such as planetary rivers.
+      type: Add
+  id: 6097
+  time: '2024-03-06T01:37:24.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25825
+- author: Ko4erga
+  changes:
+    - message: '"Post light" updated.'
+      type: Tweak
+  id: 6098
+  time: '2024-03-06T01:39:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25814
+- author: Ilya246
+  changes:
+    - message: >-
+        Gas leak events are now 4 times as strong, and may leak water vapor. The
+        fog is coming.
+      type: Tweak
+  id: 6099
+  time: '2024-03-06T01:41:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25864
+- author: Just_Art
+  changes:
+    - message: Added bob 5 hair!
+      type: Add
+    - message: Added long hair with bundles!
+      type: Add
+  id: 6100
+  time: '2024-03-06T01:42:05.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25772
+- author: Errant
+  changes:
+    - message: >-
+        Debug coordinates are now automatically enabled on the F3 overlay upon
+        readmin.
+      type: Fix
+  id: 6101
+  time: '2024-03-06T01:43:51.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25063
+- author: metalgearsloth
+  changes:
+    - message: Pod launches will now be offset slightly.
+      type: Add
+  id: 6102
+  time: '2024-03-06T01:44:26.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25855
+- author: Brandon-Huu
+  changes:
+    - message: >-
+        The Syndicate is now supplying barber scissors in the Hristov bundle to
+        make your disguises even balde- better.
+      type: Tweak
+  id: 6103
+  time: '2024-03-06T02:03:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25695
+- author: Tayrtahn
+  changes:
+    - message: Flasks can once again be put into dispensers.
+      type: Fix
+  id: 6104
+  time: '2024-03-06T17:19:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25883
+- author: Errant
+  changes:
+    - type: Add
+      message: Added guidebooks for species
+    - type: Add
+      message: Species in the character editor have a shortcut to their guidebook entry
+  id: 6105
+  time: '2024-03-23T02:09:54.0000000+00:00'
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
deleted file mode 100644
index b880616b2f..0000000000
--- a/Resources/Changelog/DeltaVChangelog.yml
+++ /dev/null
@@ -1,1662 +0,0 @@
-Entries:
-- author: DebugOk
-  changes:
-    - message: Add automatic changelogs
-      type: Add
-  id: 1
-  time: '2023-09-13T08:00:00.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Add
-      message: Added most of the DeltaV and Nyano food and drink, along with recipes.
-  id: 2
-  time: '2023-09-13T16:40:16.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added 15 new moth plushes.
-  id: 3
-  time: '2023-09-13T16:43:47.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added Vulpkanin.
-  id: 4
-  time: '2023-09-13T18:24:12.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added mothroaches.
-  id: 5
-  time: '2023-09-13T19:19:25.0000000+00:00'
-- author: TadJohnson00
-  changes:
-    - type: Add
-      message: Added arctic foxes to the game. Who knows, maybe you'll see one around!
-  id: 6
-  time: '2023-09-13T20:15:57.0000000+00:00'
-- author: Dorragon
-  changes:
-    - type: Add
-      message: Added Pride-O-Mat
-    - type: Add
-      message: Added restock box for prideomat that is available in cargo
-  id: 7
-  time: '2023-09-16T06:26:04.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added various posters, signs and paintings.
-  id: 8
-  time: '2023-09-18T13:49:03.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Martial Artists, Prison Guards, Prisoners and Gladiators are back.
-  id: 9
-  time: '2023-09-19T14:22:56.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Felinids have been reintegrated to the crew.
-  id: 10
-  time: '2023-09-20T23:28:21.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Tweak
-      message: >-
-        Paramedics now spawn with their respective equipment for retrieving
-        crewmates more effectively.
-  id: 11
-  time: '2023-09-21T04:01:02.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added the Courier, the Mail Carrier's cousin.
-    - type: Tweak
-      message: Cargo Department is now the Logistics Department
-  id: 12
-  time: '2023-09-21T04:37:30.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Remove
-      message: Clown Spiders no longer can squeeze through the vents.
-  id: 13
-  time: '2023-09-21T20:45:11.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added the PSB emergency snack.
-  id: 14
-  time: '2023-09-26T02:57:54.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Tweak
-      message: Changed chat messages to not have the names bold.
-  id: 15
-  time: '2023-09-26T16:47:58.0000000+00:00'
-- author: toasterpm87
-  changes:
-    - type: Add
-      message: 'toy A6m2 '
-  id: 16
-  time: '2023-09-27T15:22:55.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Add
-      message: Merged latest changes from Wizden
-  id: 17
-  time: '2023-09-27T19:59:13.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Remove
-      message: Removed Dwarf from roundstart choices.
-  id: 18
-  time: '2023-09-27T21:09:01.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Tweak
-      message: >-
-        Cadets no longer gets a gun and no more spare mags for Security
-        Officers.
-  id: 19
-  time: '2023-09-27T22:51:15.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Tweak
-      message: Give back all the jobs their proper time requirements.
-  id: 20
-  time: '2023-09-28T14:49:00.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Remove
-      message: The Senior Roles are no longer available at round start.
-  id: 21
-  time: '2023-09-28T16:55:32.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Remove
-      message: Remove Ian as a traitor objective.
-  id: 22
-  time: '2023-09-28T17:01:47.0000000+00:00'
-- author: leonardo-dabepis
-  changes:
-    - type: Tweak
-      message: Bees can now be put in inventory and ground up as a ingredient.
-  id: 23
-  time: '2023-09-28T17:52:22.0000000+00:00'
-- author: JJ
-  changes:
-    - type: Add
-      message: Added Grilled Cheese.
-  id: 24
-  time: '2023-09-28T17:53:04.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Tweak
-      message: Approving cargo orders now requires the Orders access level
-  id: 25
-  time: '2023-09-28T18:16:02.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Tweak
-      message: Science is now Epistemics.
-  id: 26
-  time: '2023-09-28T22:32:46.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added a new steal objective for the Head of Logistics.
-  id: 27
-  time: '2023-09-29T13:28:43.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added fake wizard robes and sandals.
-  id: 28
-  time: '2023-09-29T13:55:29.0000000+00:00'
-- author: PHCodes
-  changes:
-    - type: Add
-      message: Added Mr. Butlertron, the Roboisseur
-  id: 29
-  time: '2023-09-30T15:51:58.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added the rickenbacker, killer tomato and useful spawners for mappers.
-  id: 30
-  time: '2023-09-30T19:44:56.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Add
-      message: Mail has been reimplemented
-  id: 31
-  time: '2023-10-01T16:25:32.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added the vector safe.
-  id: 32
-  time: '2023-10-01T20:10:24.0000000+00:00'
-- author: VMSolidus
-  changes:
-    - type: Tweak
-      message: >-
-        Rebalanced Vulpakin, they are no longer HUMAN+, and are now currently a
-        sidegrade to humans.
-  id: 33
-  time: '2023-10-03T16:49:35.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Remove
-      message: Removed the vape.
-  id: 34
-  time: '2023-10-03T16:51:54.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added the Psionic Mantis.
-  id: 35
-  time: '2023-10-03T17:47:54.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Add
-      message: >-
-        Added PDA boxes to department heads' lockers. Bug your manager for a
-        promotion now!
-  id: 36
-  time: '2023-10-03T18:06:07.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added the Psionic Countermeasures research.
-  id: 37
-  time: '2023-10-03T19:36:47.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added more guns. If that don't work, we'll add more guns.
-  id: 38
-  time: '2023-10-03T20:01:48.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added tips about glimmer, rat kings and wisps.
-  id: 39
-  time: '2023-10-03T20:23:18.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added an old epistemics book.
-  id: 40
-  time: '2023-10-03T21:41:37.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: >-
-        Added the ability for Oni Syndicate agents to buy the Kanabou and
-        Tousei-Gusoku set.
-  id: 41
-  time: '2023-10-03T21:45:06.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Add
-      message: Nanotrasen R&D has cooked up some new hardlight technology
-  id: 42
-  time: '2023-10-03T22:23:09.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Tweak
-      message: Martial artist finally gets a new coat of paint for their PDA.
-  id: 43
-  time: '2023-10-04T00:20:48.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Tweak
-      message: Changed the glass texture to be more visible.
-  id: 44
-  time: '2023-10-05T19:22:26.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Remove
-      message: >-
-        The Organic Resources Department now uses better filing system, no more
-        bureaucracy errors.
-  id: 45
-  time: '2023-10-05T19:22:35.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added dogvision colorblindness.
-  id: 46
-  time: '2023-10-05T19:26:42.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added a pistol in .38 for the Mantis.
-  id: 47
-  time: '2023-10-05T19:28:00.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added Lollipop and Gumball candies.
-  id: 48
-  time: '2023-10-05T19:29:04.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Tweak
-      message: Mantis gets their own access.
-  id: 49
-  time: '2023-10-05T20:55:12.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added mediborgs as round start job.
-  id: 50
-  time: '2023-10-06T15:30:42.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Add
-      message: Added Edge Station.
-  id: 51
-  time: '2023-10-07T05:12:58.0000000+00:00'
-- author: VMSolidus
-  changes:
-    - type: Remove
-      message: Scrubs can no longer be obtained from the MediDrobe
-    - type: Add
-      message: NT may have forgotten to check their MediDrobes for contraband
-    - type: Add
-      message: >-
-        Eight different colors of scrubs and surgical caps can now be found in
-        medical scrub crates!
-    - type: Add
-      message: >-
-        Scrubs can now spawn in one of 8 exciting new colors. Please report
-        sightings of a mysterious 9th color to management.(this needs to be
-        mapped in)
-  id: 52
-  time: '2023-10-08T22:09:33.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added six new lobby art.
-  id: 53
-  time: '2023-10-09T17:35:35.0000000+00:00'
-- author: ps3moira
-  changes:
-    - type: Add
-      message: Added two new paintings.
-  id: 54
-  time: '2023-10-10T03:42:19.0000000+00:00'
-- author: leonardo_dabepis
-  changes:
-    - type: Tweak
-      message: Changed how the revenant looks.
-  id: 55
-  time: '2023-10-10T03:48:16.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Holy water and bibles now deal Holy damage to unholy creatures.
-  id: 56
-  time: '2023-10-10T03:55:34.0000000+00:00'
-- author: ps3moira
-  changes:
-    - type: Tweak
-      message: Skull Size
-  id: 57
-  time: '2023-10-10T04:12:19.0000000+00:00'
-- author: TJohnson
-  changes:
-    - type: Add
-      message: >-
-        Added new vests to play to replace most of the Type I vests in organic
-        play.
-    - type: Remove
-      message: >-
-        Removed most of the Type I vests in organic play. Some might still crop
-        up, but don't count on it!
-  id: 58
-  time: '2023-10-10T04:43:44.0000000+00:00'
-- author: ps3moira
-  changes:
-    - type: Add
-      message: Station Holograph
-  id: 59
-  time: '2023-10-11T00:00:46.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added shock collar, Mystagogue's bible and the fish labeler.
-  id: 60
-  time: '2023-10-11T03:26:21.0000000+00:00'
-- author: Leonardo DaBepis
-  changes:
-    - type: Tweak
-      message: Gave the Courier a new uniform and cap.
-  id: 61
-  time: '2023-10-12T17:31:11.0000000+00:00'
-- author: rosieposieeee
-  changes:
-    - type: Add
-      message: Added Paramedic airlocks.
-  id: 62
-  time: '2023-10-13T16:40:09.0000000+00:00'
-- author: VMSolidus
-  changes:
-    - type: Add
-      message: 'Harpies have been added to the game as a new playable species! '
-  id: 63
-  time: '2023-10-13T18:25:13.0000000+00:00'
-- author: Vordenburg
-  changes:
-    - type: Add
-      message: Enhanced intrusion defenses have been deployed in electrical systems.
-  id: 64
-  time: '2023-10-15T14:07:21.0000000+00:00'
-- author: leonardo-dabepis
-  changes:
-    - type: Add
-      message: added mothamphetamine drink
-    - type: Tweak
-      message: changed "dulleavene" to "health violation"
-  id: 65
-  time: '2023-10-16T23:25:27.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Tweak
-      message: >-
-        Moth coloration has been changed, existing characters might look
-        slightly weird
-  id: 66
-  time: '2023-10-17T20:09:27.0000000+00:00'
-- author: Tex
-  changes:
-    - type: Add
-      message: Added scrambled eggs.
-  id: 67
-  time: '2023-10-18T21:07:50.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Add
-      message: >-
-        Certain roles require whitelist now. These being the captain, head of
-        security and nukie commander.
-  id: 68
-  time: '2023-10-18T22:23:18.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Remove
-      message: Removed mediborgs as round start job.
-  id: 69
-  time: '2023-10-20T20:12:46.0000000+00:00'
-- author: leonardo-dabepis
-  changes:
-    - type: Tweak
-      message: >-
-        Phil Dullea won his slander lawsuit and was able to change "dulleavene"
-        to "health code violation"
-  id: 70
-  time: '2023-10-21T23:38:00.0000000+00:00'
-- author: leonardo-dabepis
-  changes:
-    - type: Add
-      message: added some missing inhand sprites for the epi clothes
-    - type: Tweak
-      message: mystagogue has a better hat now
-  id: 71
-  time: '2023-10-21T23:42:51.0000000+00:00'
-- author: rosieposieeee
-  changes:
-    - type: Add
-      message: >-
-        NT has ordered extra-comfortable seating for the crew as a reward in
-        lieu of a raise.
-  id: 72
-  time: '2023-10-22T23:30:40.0000000+00:00'
-- author: TJohnson
-  changes:
-    - type: Add
-      message: >-
-        Added Laika and her crew, security working dogs that are aligned with
-        the station. Best watch your step, citizens, lest your heels be nipped!
-  id: 73
-  time: '2023-10-23T16:25:53.0000000+00:00'
-- author: JJ
-  changes:
-    - type: Fix
-      message: Fixed 'Go back' option for Telegnostic Projection.
-  id: 74
-  time: '2023-10-23T16:51:48.0000000+00:00'
-- author: PHCodes
-  changes:
-    - type: Add
-      message: 'Readded psionics systems and powers. '
-  id: 75
-  time: '2023-10-08T18:07:53.0000000+00:00'
-- author: JJ
-  changes:
-    - type: Add
-      message: Reverse Engineering.
-  id: 76
-  time: '2023-10-03T22:54:24.0000000+00:00'
-- author: JJ
-  changes:
-    - type: Fix
-      message: Fixed 'Go back' option for Telegnostic Projection.
-  id: 77
-  time: '2023-10-23T16:51:48.0000000+00:00'
-- author: PHCodes
-  changes:
-    - type: Add
-      message: 'Added the Deep Fryer and related features. '
-  id: 78
-  time: '2023-10-18T21:57:11.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added Soju and Sake bottle in the Booze-O-Mat.
-  id: 79
-  time: '2023-10-23T19:04:14.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Remove
-      message: Removed the random sentience event.
-  id: 80
-  time: '2023-10-23T19:17:23.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Fix
-      message: Fixed Tortuga station's critical lack of hardsuits
-  id: 81
-  time: '2023-10-23T21:40:33.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Remove
-      message: >-
-        Removed prisoners from job selection, since they were spawning in
-        arrivals. Warden no longer requires prisoner playtime in the meantime.
-  id: 82
-  time: '2023-10-23T23:12:41.0000000+00:00'
-- author: VMSolidus
-  changes:
-    - type: Fix
-      message: Harpies can now be stripped, and can randomly be psychic
-  id: 83
-  time: '2023-10-23T23:32:00.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Fix
-      message: Fixed Mantis not having their Metapsionic Pulse.
-  id: 84
-  time: '2023-10-23T23:40:59.0000000+00:00'
-- author: JJ
-  changes:
-    - type: Tweak
-      message: Tweaked round weighting and lowered instances of Revs
-  id: 85
-  time: '2023-10-24T00:05:22.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Fix
-      message: Fixed Felinids not being able to eat certain food.
-  id: 86
-  time: '2023-10-24T00:36:33.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Add
-      message: Merged Wizden, hopefully fixing some bugs
-  id: 87
-  time: '2023-10-24T00:46:22.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Fix
-      message: >-
-        Fixed the Logistics department not being able to communicate on their
-        radio channel.
-  id: 88
-  time: '2023-10-24T03:33:03.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Fix
-      message: >-
-        Merged wizden (again). Hopefully you won't visit the backrooms when
-        using a medical scanner anymore.
-  id: 89
-  time: '2023-10-24T16:35:53.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Fix
-      message: Whitelist finally works properly
-  id: 90
-  time: '2023-10-24T17:10:28.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Fix
-      message: Fixed mantis stamp being an error.
-  id: 91
-  time: '2023-10-24T19:02:28.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Tweak
-      message: The moth plushie screams and squeaks once again.
-  id: 92
-  time: '2023-10-24T19:03:43.0000000+00:00'
-- author: JJ
-  changes:
-    - type: Fix
-      message: 'Fixed Mindswap return action between players. '
-  id: 93
-  time: '2023-10-25T14:21:35.0000000+00:00'
-- author: JJ
-  changes:
-    - type: Tweak
-      message: Updated Butlertron's sprite.
-  id: 94
-  time: '2023-10-25T14:15:45.0000000+00:00'
-- author: VMSolidus
-  changes:
-    - type: Fix
-      message: Harpies and Vulpkanin can now be Psychic
-  id: 95
-  time: '2023-10-25T14:16:21.0000000+00:00'
-- author: JJ
-  changes:
-    - type: Fix
-      message: 'Mimes are now psionic. '
-  id: 96
-  time: '2023-10-25T14:20:40.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Tweak
-      message: >-
-        Head of Security no longer requires detective playtime for the time
-        being.
-  id: 97
-  time: '2023-10-25T14:26:45.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Add
-      message: Added eye colouring on felinid, oni and harpy.
-    - type: Add
-      message: Added additional tattoes to harpys.
-    - type: Fix
-      message: Tattoes on felinid and oni are once again usable.
-  id: 98
-  time: '2023-10-25T14:28:12.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Fix
-      message: Fixed missing drink locales.
-  id: 99
-  time: '2023-10-25T22:23:38.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Add
-      message: Reimplemented Brigmedics. They're not on any maps (yet).
-  id: 100
-  time: '2023-10-25T22:52:49.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Fix
-      message: Fixed Mystagogue not having their dispel power.
-  id: 101
-  time: '2023-10-26T14:55:52.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Tweak
-      message: Tweaked the price of the uplink cat ears down to 4TC from 26TC.
-  id: 102
-  time: '2023-10-27T17:25:08.0000000+00:00'
-- author: luringens
-  changes:
-    - type: Fix
-      message: >-
-        Harpies can now sing while cuffed, but not while muzzled, mute,
-        zombified, or otherwise incapable of talking.
-    - type: Add
-      message: >-
-        You can now make a harpy stop singing by slipping, stunning, or hurting
-        them.
-  id: 103
-  time: '2023-10-27T18:13:03.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Remove
-      message: Removed the traitor objective of killing Ian for his meat.
-  id: 104
-  time: '2023-10-27T18:18:43.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Tweak
-      message: Tweaked the Moth related food to be edible by Moths.
-  id: 105
-  time: '2023-10-27T18:32:16.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Tweak
-      message: Invalid job preferences are now reset to never upon loading in.
-  id: 106
-  time: '2023-10-28T01:58:58.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added Mothroaches in the vents.
-  id: 107
-  time: '2023-10-28T02:00:22.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Tweak
-      message: Adjusted event weights so rounds are not as exciting.
-  id: 108
-  time: '2023-10-28T03:14:19.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added the classic Moth markings back, still can't be coloured.
-  id: 109
-  time: '2023-10-28T19:05:29.0000000+00:00'
-- author: JJ
-  changes:
-    - type: Add
-      message: Add Psionic Antag Objectives
-  id: 110
-  time: '2023-10-28T19:06:51.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Tweak
-      message: The 10 reserved whitelist slots have been removed until further notice.
-  id: 111
-  time: '2023-10-29T03:10:27.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Tweak
-      message: >-
-        Altered the rules. Read the latest changes to them at the top of the
-        rules list!
-  id: 112
-  time: '2023-10-29T17:36:46.0000000+00:00'
-- author: VMSolidus
-  changes:
-    - type: Add
-      message: Cargo can now order medical scrub crates
-  id: 113
-  time: '2023-10-29T17:38:19.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Remove
-      message: Removed the clown hardsuit from being craftable.
-  id: 114
-  time: '2023-10-30T13:17:07.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Add
-      message: Asterisk station has been added to the game.
-  id: 115
-  time: '2023-11-01T16:32:48.0000000+00:00'
-- author: leonardo-dabepis
-  changes:
-    - type: Tweak
-      message: Switched logos around
-  id: 116
-  time: '2023-11-01T22:45:55.0000000+00:00'
-- author: TJohnson
-  changes:
-    - type: Tweak
-      message: Security has received new models of hardsuit!
-  id: 117
-  time: '2023-11-02T00:31:53.0000000+00:00'
-- author: ps3moira
-  changes:
-    - type: Add
-      message: Added Two New Round-End Sounds
-    - type: Remove
-      message: Lobby Round-End Sounds
-  id: 118
-  time: '2023-11-02T01:00:16.0000000+00:00'
-- author: leonardo-dabepis
-  changes:
-    - type: Tweak
-      message: Technical Assistant now has a 4 hour playtime requirement.
-  id: 119
-  time: '2023-11-02T16:15:06.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Tweak
-      message: >-
-        Updated Asterisk Station with various fixes, a slot for an atmos
-        technician, and a familiar parallax...
-  id: 120
-  time: '2023-11-02T20:38:51.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Remove
-      message: Removed starvation!
-  id: 121
-  time: '2023-11-05T19:24:51.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Tweak
-      message: Cat Ears have been moved from the Syndicate Uplink into the AutoDrobe.
-  id: 122
-  time: '2023-11-06T14:39:49.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Remove
-      message: Removed the carp suit bundle from the syndicate uplink.
-  id: 123
-  time: '2023-11-06T14:54:09.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Fix
-      message: >-
-        Fixed a few issues with Asterisk, including getting stuck on Epi's park
-        tree and evac docking at cargo.
-  id: 124
-  time: '2023-11-06T15:25:25.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: >-
-        Cyborgs using the Medical model can now print candies with medicine once
-        again.
-  id: 125
-  time: '2023-11-06T15:46:56.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Add
-      message: >-
-        Salvage Expedition computer boards can now be researched by Epistemics
-        and produced in circuit imprinters.
-  id: 126
-  time: '2023-11-07T13:36:49.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Fix
-      message: >-
-        Fixed the Reverse Engineering Machine incorrectly decreasing scan power
-        with upgrades.
-  id: 127
-  time: '2023-11-07T19:31:02.0000000+00:00'
-- author: Velcroboy
-  changes:
-    - type: Tweak
-      message: >-
-        Rebased Arena Station. This is a major overhaul. Please report any
-        issues or oddities in the mapping channel on Discord.
-  id: 128
-  time: '2023-11-07T19:31:54.0000000+00:00'
-- author: deltanedas
-  changes:
-    - type: Tweak
-      message: Carp suit has been moved into the AutoDrobe.
-  id: 129
-  time: '2023-11-07T19:32:52.0000000+00:00'
-- author: VMSolidus
-  changes:
-    - type: Tweak
-      message: >-
-        Centcomm Geneticists have modified the Harpies so that they can no
-        longer imitate flash bangs. Your eardrums are safe now.
-  id: 130
-  time: '2023-11-08T22:30:39.0000000+00:00'
-- author: leonardo-dabepis
-  changes:
-    - type: Tweak
-      message: Reskinned the Glimmer Prober and Glimmer Drain.
-  id: 131
-  time: '2023-11-08T22:44:38.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Fix
-      message: Brought back the custom round end sounds. Collect them all!
-  id: 132
-  time: '2023-11-09T04:22:23.0000000+00:00'
-- author: VMSolidus
-  changes:
-    - type: Tweak
-      message: >-
-        Laika has discovered how to press airlock buttons, now no evildoers are
-        safe.
-  id: 133
-  time: '2023-11-09T19:01:30.0000000+00:00'
-- author: Samsterious
-  changes:
-    - type: Tweak
-      message: Character name restrictions are more permissive.
-  id: 134
-  time: '2023-11-10T15:08:02.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Tweak
-      message: Revolutionaries are now fewer in number.
-  id: 135
-  time: '2023-11-10T15:08:26.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Add
-      message: >-
-        Head lockers now contain their respective head's spare ID card where
-        they didn't already.
-  id: 136
-  time: '2023-11-11T01:25:33.0000000+00:00'
-- author: Velcroboy
-  changes:
-    - type: Add
-      message: The Hive is Alive!
-  id: 137
-  time: '2023-11-11T16:37:11.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Tweak
-      message: Glimmer Prober and Drainer are craftable once again.
-    - type: Fix
-      message: Fix Probers not making sounds depending on the glimmer levels.
-    - type: Add
-      message: Adds back the Psionic guidebook.
-  id: 138
-  time: '2023-11-11T17:39:37.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Fix
-      message: Fixed The Hive's AI room losing power.
-  id: 139
-  time: '2023-11-13T00:42:17.0000000+00:00'
-- author: luringens
-  changes:
-    - type: Add
-      message: >-
-        Syndicate harpies can now purchase bionic syrinx implants to further
-        enchance their mimicry skills. It's like a voice mask for your throat!
-  id: 140
-  time: '2023-11-13T22:42:09.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Add
-      message: Added Shoukou from Nyanotrasen and hopefully improved it.
-  id: 141
-  time: '2023-11-15T01:00:27.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added the X-01 MultiPhase Energy Gun for the HoS.
-  id: 142
-  time: '2023-11-15T18:41:01.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Tweak
-      message: Slightly adjusted gamemode weights.
-  id: 143
-  time: '2023-11-16T09:49:24.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Fix
-      message: Head of Personnel now has the access that lawyers have.
-  id: 144
-  time: '2023-11-17T23:56:56.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Tweak
-      message: Adjusted Asterisk and Shoukou's min/max population to 0/60.
-  id: 145
-  time: '2023-11-19T06:10:32.0000000+00:00'
-- author: IamVelcroboy
-  changes:
-    - type: Add
-      message: >-
-        Salvage has been rebased. New but strangely familiar space debris will
-        be pulled in by the salvage magnet. Caution is recommended.
-  id: 146
-  time: '2023-11-22T16:13:12.0000000+00:00'
-- author: tryded
-  changes:
-    - type: Add
-      message: Added double bladed energy swords to Nuclear Operative Uplinks
-  id: 147
-  time: '2023-11-25T14:38:20.0000000+00:00'
-- author: TJohnson
-  changes:
-    - type: Tweak
-      message: Seclites now robust as advertised in item description.
-  id: 148
-  time: '2023-11-26T00:36:54.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Tweak
-      message: >-
-        Asterisk Station is now protected by additional meteor netting and is
-        also more resistant to movement. Please relay thanks to your local
-        engineers!
-  id: 149
-  time: '2023-11-26T00:38:30.0000000+00:00'
-- author: Tryded
-  changes:
-    - type: Tweak
-      message: >-
-        Tweaked recipes of bluespace items to require bluespace crystals in
-        exchange of needing less materials
-  id: 150
-  time: '2023-11-26T00:51:27.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Tweak
-      message: >-
-        Corpsmen start with a few autoinjectors in their packs, and gain
-        chemistry access on low-pop rounds.
-  id: 151
-  time: '2023-11-26T01:21:47.0000000+00:00'
-- author: Tryded
-  changes:
-    - type: Add
-      message: >-
-        Nanotrasen has recently introduced their miniature energy pistols and
-        energy guns to the market and developed experimental research into the
-        IK-60 laser carbine and the PDW-9 Energy Pistol. They can be researched
-        by science.
-  id: 152
-  time: '2023-11-27T22:42:27.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Tweak
-      message: >-
-        Mindshields are now made with significantly cheaper components, and they
-        dont fuse properly anymore. Meaning they can be removed with a little
-        effort.
-  id: 153
-  time: '2023-12-03T00:48:41.0000000+00:00'
-- author: Velcroboy
-  changes:
-    - type: Fix
-      message: Fixed air chamber in The Hive's atmos not having a vacuum.
-  id: 154
-  time: '2023-12-05T19:16:18.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Tweak
-      message: Vulpkanin now have a decent amount of special helmet and mask sprites.
-  id: 155
-  time: '2023-12-06T08:16:15.0000000+00:00'
-- author: luringens
-  changes:
-    - type: Add
-      message: Prisoners are back!
-    - type: Fix
-      message: >-
-        Gladiators, prisoners and prison guards start the shift at their
-        predesignated locations.
-  id: 156
-  time: '2023-12-06T15:54:37.0000000+00:00'
-- author: Tryded
-  changes:
-    - type: Add
-      message: Added energy guns to dynamic protolathe emagable recipes.
-  id: 157
-  time: '2023-12-06T15:57:01.0000000+00:00'
-- author: Ygg01
-  changes:
-    - type: Add
-      message: Digging dirt.
-  id: 158
-  time: '2023-12-06T15:58:00.0000000+00:00'
-- author: Velcroboy
-  changes:
-    - type: Tweak
-      message: Buffed Food Cart storage. Get out there and slang some burgers, chefs!
-  id: 159
-  time: '2023-12-06T15:58:43.0000000+00:00'
-- author: ps3moira
-  changes:
-    - type: Add
-      message: >-
-        Added mouse operative reinforcements, which can be bought from the
-        Syndicate uplink
-  id: 160
-  time: '2023-12-06T16:03:07.0000000+00:00'
-- author: evilexecutive
-  changes:
-    - type: Add
-      message: Harpies now have a visual indication when they're playing a Midi.
-    - type: Tweak
-      message: >-
-        Harpies have been re-balanced so that they now actually have a numerical
-        positive.
-  id: 161
-  time: '2023-12-06T20:10:49.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Tweak
-      message: Due to abuse, prisoners now require whitelist to play.
-  id: 162
-  time: '2023-12-07T13:22:03.0000000+00:00'
-- author: ps3moira
-  changes:
-    - type: Remove
-      message: Removed bionic syrinx implanter from surplus crate.
-  id: 163
-  time: '2023-12-11T23:11:41.0000000+00:00'
-- author: ps3moira
-  changes:
-    - type: Remove
-      message: Removed Carpotoxin from Sashimi, now they are sushi-grade!
-  id: 164
-  time: '2023-12-13T20:12:46.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Add
-      message: Crew has learned how to make a straw hat out of wheat bushels!
-  id: 165
-  time: '2023-12-13T20:13:45.0000000+00:00'
-- author: IamVelcroboy
-  changes:
-    - type: Add
-      message: Added Yule! Happy Holidays!
-  id: 166
-  time: '2023-12-13T20:21:34.0000000+00:00'
-- author: ps3moira
-  changes:
-    - type: Add
-      message: Added Fish n' Chips. Thank the British!
-  id: 167
-  time: '2023-12-13T20:32:51.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Tweak
-      message: Felinids now meow out their words. They can also sigh now.
-  id: 168
-  time: '2023-12-13T21:28:39.0000000+00:00'
-- author: VMSolidus
-  changes:
-    - type: Fix
-      message: Harpies no longer choke on completely breathable air
-  id: 169
-  time: '2023-12-14T05:13:43.0000000+00:00'
-- author: UnicornOnLSD
-  changes:
-    - type: Tweak
-      message: Changed bags of holding cost to be more consistent.
-  id: 170
-  time: '2023-12-14T09:17:35.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Fix
-      message: Fixed non-wizden species not having markings.
-  id: 171
-  time: '2023-12-17T21:59:15.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Add
-      message: Vulpkanins can sigh now.
-  id: 172
-  time: '2023-12-17T22:00:12.0000000+00:00'
-- author: luringens
-  changes:
-    - type: Tweak
-      message: >-
-        Chaplain now gets a glimmer monitor app on their PDA like the rest of
-        epistemics.
-  id: 173
-  time: '2023-12-19T16:19:34.0000000+00:00'
-- author: leonardo-dabepis
-  changes:
-    - type: Remove
-      message: >-
-        the clown has received medical treatment for his chronic snoring. No
-        more HONK mimimimimi
-  id: 174
-  time: '2023-12-20T03:01:27.0000000+00:00'
-- author: deltanedas
-  changes:
-    - type: Add
-      message: >-
-        The fishops advanced user manual is now available in all finer
-        bookstores near you.
-  id: 175
-  time: '2023-12-21T02:08:37.0000000+00:00'
-- author: Velcroboy and Kilk
-  changes:
-    - type: Add
-      message: Added departmental winter boots!
-  id: 176
-  time: '2023-12-21T02:12:04.0000000+00:00'
-- author: Loonessia
-  changes:
-    - type: Fix
-      message: Deep fried burned food items should now have a description
-  id: 177
-  time: '2023-12-21T02:15:30.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Add
-      message: Head of personel has gotten back their armoured coat.
-  id: 178
-  time: '2023-12-21T02:17:25.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Add
-      message: Merged wizden. The upstream changelog may contain incorrect entries.
-    - type: Fix
-      message: The random client freezes/crashes should be mostly gone.
-  id: 179
-  time: '2023-12-22T23:46:32.0000000+00:00'
-- author: ps3moira
-  changes:
-    - type: Tweak
-      message: Reverted in-hand E-Sword sprites.
-  id: 180
-  time: '2023-12-24T02:56:01.0000000+00:00'
-- author: deltanedas
-  changes:
-    - type: Tweak
-      message: Ore Bags of Holding now use bluespace crystals instead of uranium.
-  id: 181
-  time: '2023-12-24T19:58:23.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Fix
-      message: Fixes cyborgs spawning with nearsighted trait.
-  id: 182
-  time: '2023-12-27T17:55:07.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Add
-      message: 'Added 3 classic hairstyles: Long hair, Long hair 2, Long hair 3.'
-  id: 183
-  time: '2023-12-27T18:23:39.0000000+00:00'
-- author: BramvanZijp
-  changes:
-    - type: Tweak
-      message: >-
-        Security dogs now can wear an id card and radio, are able to drag
-        things, and have received additional combat training.
-  id: 184
-  time: '2023-12-28T09:32:10.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Fix
-      message: Gives shoukou an oxygen miner until air actualy works.
-  id: 185
-  time: '2023-12-28T21:38:57.0000000+00:00'
-- author: Master2112
-  changes:
-    - type: Add
-      message: >-
-        Crime Assist program to Security and Lawyer PDA's, to help identify a
-        crime with a simple yes/no question tree.
-  id: 186
-  time: '2023-12-29T19:34:56.0000000+00:00'
-- author: ps3moira
-  changes:
-    - type: Add
-      message: Added Scottish Trait.
-    - type: Add
-      message: Added Kilt to Theatervend.
-  id: 187
-  time: '2023-12-29T19:44:44.0000000+00:00'
-- author: deltanedas
-  changes:
-    - type: Tweak
-      message: Mail no longer has throwing damage.
-  id: 188
-  time: '2023-12-29T19:53:10.0000000+00:00'
-- author: Velcroboy
-  changes:
-    - type: Remove
-      message: Space winter is officially over!
-  id: 189
-  time: '2023-12-30T14:15:42.0000000+00:00'
-- author: Master2112
-  changes:
-    - type: Fix
-      message: Fixed incorrect reference to ftl in crimeassist yaml
-  id: 190
-  time: '2023-12-30T22:03:53.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Add
-      message: Added a fluffy tail for the felinids.
-  id: 191
-  time: '2023-12-30T22:05:52.0000000+00:00'
-- author: DarkenedSynergy
-  changes:
-    - type: Fix
-      message: Fixed logistics airlocks looking like engineering airlocks when opened.
-  id: 192
-  time: '2023-12-31T16:23:10.0000000+00:00'
-- author: DangerRevolution and VMSolidus
-  changes:
-    - type: Add
-      message: >-
-        Rumours say that Syndicate Agents have cracked encoded communications!
-        Added the Syndicate Listening Post to the Syndicate's arsenal of
-        espionage!
-  id: 193
-  time: '2023-12-31T16:48:27.0000000+00:00'
-- author: VMSolidus and DangerRevolution
-  changes:
-    - type: Tweak
-      message: >-
-        The Listening Outpost has received several tweaks and balance changes.
-        It should spawn less often now.
-  id: 194
-  time: '2024-01-01T21:33:58.0000000+00:00'
-- author: ps3moira
-  changes:
-    - type: Tweak
-      message: Reverted Shotgun sprites
-  id: 195
-  time: '2024-01-01T21:48:08.0000000+00:00'
-- author: Velcroboy
-  changes:
-    - type: Add
-      message: Added BB guns! Don't shoot your eye out.
-  id: 196
-  time: '2024-01-02T22:03:49.0000000+00:00'
-- author: deltanedas
-  changes:
-    - type: Tweak
-      message: On very high pop revolution rounds, there can be 2 head revolutionaries.
-  id: 197
-  time: '2024-01-02T22:06:22.0000000+00:00'
-- author: VMSolidus
-  changes:
-    - type: Fix
-      message: There should only ever be one Listening Outpost spawning at a time
-  id: 198
-  time: '2024-01-02T23:05:25.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Add
-      message: 'Added maiden outfits into janidrobe. '
-  id: 199
-  time: '2024-01-07T14:57:38.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Fix
-      message: >-
-        Prison guards are now mindshielded and have a security playtime
-        requirement.
-  id: 200
-  time: '2024-01-07T18:20:45.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Fix
-      message: Atmos hopefully shouldn't break anymore
-  id: 201
-  time: '2024-01-07T22:10:36.0000000+00:00'
-- author: Bribrooo
-  changes:
-    - type: Add
-      message: 'added a ChemVend inside of Chemistry on Pebble Station '
-  id: 202
-  time: '2024-01-11T06:14:27.0000000+00:00'
-- author: Adrian
-  changes:
-    - type: Tweak
-      message: Shoukou has maintenance now in logistics and in security
-  id: 203
-  time: '2024-01-12T22:08:47.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Add
-      message: Added the spare ID safe
-    - type: Remove
-      message: The captain's locker no longer starts with a spare ID card
-  id: 204
-  time: '2024-01-14T23:48:30.0000000+00:00'
-- author: Velcroboy
-  changes:
-    - type: Add
-      message: Added Hammurabi Prison Station. Crime must be punished!
-  id: 205
-  time: '2024-01-17T03:53:36.0000000+00:00'
-- author: Gregg
-  changes:
-    - type: Tweak
-      message: Adjusted the rules in regards to PDA confiscation and borg memory.
-  id: 206
-  time: '2024-01-19T10:30:34.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Remove
-      message: Zombies can no longer be psionic
-  id: 207
-  time: '2024-01-19T20:53:05.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Fix
-      message: Fixes mantis and them not be able to spawn with duffelbags and satchels.
-  id: 208
-  time: '2024-01-19T20:54:29.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Fix
-      message: Laika no longer takes 200 damage before dying from critical.
-  id: 209
-  time: '2024-01-19T20:57:11.0000000+00:00'
-- author: lleftTheDragon
-  changes: []
-  id: 210
-  time: '2024-01-19T21:06:32.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Tweak
-      message: Enabled gamerule voting on periapsis
-    - type: Tweak
-      message: Enabled map voting on periapsis
-  id: 211
-  time: '2024-01-19T22:33:21.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Add
-      message: Added gridinv, sorry.
-  id: 212
-  time: '2024-01-21T18:58:28.0000000+00:00'
-- author: TadJohnson00
-  changes:
-    - type: Tweak
-      message: >-
-        Pride vend has received an adjusted inventory. Make sure to check out
-        the new cloaks available!
-  id: 213
-  time: '2024-01-30T14:22:13.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Tweak
-      message: Updated Asterisk Station.
-  id: 214
-  time: '2024-01-30T21:09:41.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Tweak
-      message: >-
-        You should be able to exit cryo even after leaving now, meaning it just
-        keeps your body safe?
-  id: 215
-  time: '2024-01-31T07:41:58.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Fix
-      message: Prisoners will no longer spawn in cryopods instead of in the brig.
-  id: 216
-  time: '2024-01-31T09:42:57.0000000+00:00'
-- author: leonardo-dabepis
-  changes:
-    - type: Tweak
-      message: Made HCV cocktail less immediately lethal (damnation!!!)
-  id: 217
-  time: '2024-01-31T10:34:16.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Tweak
-      message: Shoukou has received the cryopods.
-  id: 218
-  time: '2024-01-31T15:34:32.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Tweak
-      message: >-
-        Prisoners can now spawn from a special cryopod that can be put in
-        security, instead of magically appearing in a cell.
-  id: 219
-  time: '2024-01-31T22:02:05.0000000+00:00'
-- author: DangerRevolution
-  changes:
-    - type: Add
-      message: Added sprites for Syndicate Listener's Headsets
-  id: 220
-  time: '2024-02-01T18:29:24.0000000+00:00'
-- author: leonardo-dabepis
-  changes:
-    - type: Add
-      message: a new pest from beyond the noosphere!
-  id: 221
-  time: '2024-02-01T18:32:28.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Add
-      message: An alternative wagging tail for felinids.
-  id: 222
-  time: '2024-02-01T18:32:54.0000000+00:00'
-- author: ODJ
-  changes:
-    - type: Tweak
-      message: Moth's now take less heat dmg.
-    - type: Tweak
-      message: You now move a little faster when hurt than previously
-  id: 223
-  time: '2024-02-01T18:34:18.0000000+00:00'
-- author: Rose and Unicorn On LSD
-  changes:
-    - type: Add
-      message: >-
-        Added Submarine Station. A new map with a heavy emphasis on the medical
-        dept. Features also include a full zoo, park with an ice rink, and some
-        sort of experiment-gone-bad deep within the epistemics labs.
-  id: 224
-  time: '2024-02-01T19:30:23.0000000+00:00'
-- author: UnicornOnLSD
-  changes:
-    - type: Tweak
-      message: Submarine station has received adjustments after feedback from HR
-  id: 225
-  time: '2024-02-03T06:50:49.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Tweak
-      message: Updated Edge Station.
-  id: 226
-  time: '2024-02-04T02:30:44.0000000+00:00'
-- author: UnicornOnLSD
-  changes:
-    - type: Tweak
-      message: Submarine has been made better, stronger, and not faster.
-  id: 227
-  time: '2024-02-04T02:31:24.0000000+00:00'
-- author: Velcroboy
-  changes:
-    - type: Tweak
-      message: 'Tweaked the space ruins to be slightly more dangerous. '
-  id: 228
-  time: '2024-02-05T21:11:50.0000000+00:00'
-- author: Colin-Tel
-  changes:
-    - type: Tweak
-      message: Asterisk's TEG has been adjusted after receiving player feedback.
-  id: 229
-  time: '2024-02-05T21:22:18.0000000+00:00'
-- author: UnicornOnLSD
-  changes:
-    - type: Tweak
-      message: Submarine got better telecomms, a revamped psych. ward and more !
-  id: 230
-  time: '2024-02-07T02:32:33.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Fix
-      message: Fixed PSB not being edible by Reptilian
-  id: 231
-  time: '2024-02-08T15:38:11.0000000+00:00'
-- author: Velcroboy
-  changes:
-    - type: Fix
-      message: Fixed martial artist access
-  id: 232
-  time: '2024-02-08T15:39:24.0000000+00:00'
-- author: IamVelcroboy
-  changes:
-    - type: Tweak
-      message: >-
-        More improvements all around to Submarine Station as well as the
-        addition of medical cyborgs. 
-  id: 233
-  time: '2024-02-08T19:21:16.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Fix
-      message: Fixed missing Mantis stamp sprite.
-  id: 234
-  time: '2024-02-09T10:47:35.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Tweak
-      message: .38 Special is now in the ammo techfab.
-    - type: Fix
-      message: Fixed .38 Special Mindbreaker not breaking minds.
-  id: 235
-  time: '2024-02-10T23:17:28.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Fix
-      message: Fixed glimmer mite being extremely loud for some.
-  id: 236
-  time: '2024-02-10T23:21:56.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Add
-      message: Added a speech bubble to felinids. Mraow!
-  id: 237
-  time: '2024-02-12T20:51:35.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Add
-      message: Felinids now fit in bags again!
-  id: 238
-  time: '2024-02-12T20:52:49.0000000+00:00'
-- author: Guess-My-Name
-  changes:
-    - type: Add
-      message: >-
-        Some budget cuts were made in HR department, expect more bureaucratic
-        errors in near future.
-  id: 239
-  time: '2024-02-12T21:01:44.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Tweak
-      message: Felinid's thieving gloves have been removed for Soft paws mechanic.
-  id: 240
-  time: '2024-02-12T21:10:44.0000000+00:00'
-- author: Adrian16199
-  changes:
-    - type: Add
-      message: Felinids now scream in agony from water.
-  id: 241
-  time: '2024-02-12T21:11:44.0000000+00:00'
-- author: VMSolidus
-  changes:
-    - type: Add
-      message: >-
-        Harpies have received a full visual rework. Featuring clothing sprites,
-        new markings, a complete overhaul of their layering, as well as visual
-        systems. 
-    - type: Add
-      message: Harpies now have bird related speech verbs
-    - type: Add
-      message: >-
-        Two new traits have been added related to birds. Harpies now start by
-        default with the new Ultraviolet Vision trait, letting them see a whole
-        new spectrum of colors. This trait can be taken by other curious people.
-        Harpies that wish to see in RGB colors can instead take the new Normal
-        Vision trait. 
-  id: 242
-  time: '2024-02-12T22:25:02.0000000+00:00'
-- author: DebugOk
-  changes:
-    - type: Tweak
-      message: >-
-        Glimmer probers now react violently to being hit by gorilla gauntlets if
-        glimmer is above 500
-  id: 243
-  time: '2024-02-13T00:59:01.0000000+00:00'
-- author: VMSolidus
-  changes:
-    - type: Fix
-      message: Removed the ability of Harpies to destroy people's ears.
-  id: 244
-  time: '2024-02-13T13:29:37.0000000+00:00'
-- author: deltanedas
-  changes:
-    - type: Add
-      message: >-
-        Brought back paradox anomalies. Beware anyone that looks *just* like
-        you!
-  id: 245
-  time: '2024-02-13T15:55:35.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Add
-      message: Added Deuteranopia trait.
-    - type: Tweak
-      message: >-
-        Vulpkanin now start with Deuteranopia by default which can be removed
-        using the Normal Vision trait.
-  id: 246
-  time: '2024-02-15T17:27:24.0000000+00:00'
-- author: FluffiestFloof
-  changes:
-    - type: Tweak
-      message: Glimmer Drain now requires 5 Normality Crystals to craft.
-  id: 247
-  time: '2024-02-17T03:38:14.0000000+00:00'
diff --git a/Resources/ConfigPresets/DeltaV/deltav.toml b/Resources/ConfigPresets/DeltaV/deltav.toml
index 49a5599cb8..f784373d71 100644
--- a/Resources/ConfigPresets/DeltaV/deltav.toml
+++ b/Resources/ConfigPresets/DeltaV/deltav.toml
@@ -12,6 +12,7 @@ wiki       = "https://wiki.delta-v.org/view/Main_Page"
 patreon    = "https://www.patreon.com/Delta_v"
 bug_report = "https://github.com/DeltaV-Station/Delta-v/issues/new/choose"
 forum      = "https://forum.delta-v.org/"
+appeal     = "https://go.delta-v.org/appeal"
 
 [net]
 max_connections = 1024
diff --git a/Resources/ConfigPresets/DeltaV/inclination.toml b/Resources/ConfigPresets/DeltaV/inclination.toml
new file mode 100644
index 0000000000..c655bb796c
--- /dev/null
+++ b/Resources/ConfigPresets/DeltaV/inclination.toml
@@ -0,0 +1,17 @@
+[game]
+hostname         = "[EN][EU][MRP] Delta-v (Ψ) | Inclination"
+soft_max_players = 50
+
+[server]
+rules_file   = "Rules.txt"
+rules_header = "ui-rules-header"
+
+[vote]
+preset_enabled = true
+map_enabled = true
+
+[ooc]
+enable_during_round = true
+
+[hub]
+tags = "lang:en-US,region:eu_w,rp:med"
diff --git a/Resources/ConfigPresets/DeltaV/periapsis.toml b/Resources/ConfigPresets/DeltaV/periapsis.toml
index 1cf958e9a7..ad6cae5628 100644
--- a/Resources/ConfigPresets/DeltaV/periapsis.toml
+++ b/Resources/ConfigPresets/DeltaV/periapsis.toml
@@ -12,8 +12,8 @@ map_enabled = true
 
 [whitelist]
 enabled     = false
-reason      = "whitelist-not-whitelisted"
-min_players = 40
+reason      = "whitelist-not-whitelisted-peri"
+min_players = 10
 
 [ooc]
 enable_during_round = true
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index 93c2315a08..928686d263 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-08A, 0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AitorLogedo, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, Arendian, arimah, artak10t, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Delete69, deltanedas, DeltaV-Bot, DerbyX, DmitriyMX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exp111, Fahasor, FairlySadPanda, ficcialfaint, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, komunre, koteq, Krunklehorn, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Master2112, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, MishaUnity, MisterMecky, Mith-randalf, ModeratelyAware, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, Myakot, Myctai, N3X15, Nails-n-Tape, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, Nylux, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, Phill101, PixelTheKermit, PJB3005, pofitlo, pointer-to-null, PoorMansDreams, potato1234x, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, Ranger6012, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, renodubois, RiceMar1244, RieBi, RIKELOLDABOSS, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, SadAways, Samsterious, SamV522, SaphireLattice, ScalyChimp, scrato, Scribbles0, ScumbagDog, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, Subversionary, SweptWasTaken, Szunti, TadJohnson00, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, ThunderBear2006, timothyteakettle, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Vordenburg, vulppine, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xRiriq, yathxyz, Ygg01, YotaXP, youarereadingthis, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DmitriyMX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nails-n-Tape, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, Nylux, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, Subversionary, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
diff --git a/Resources/Locale/en-US/accent/accents.ftl b/Resources/Locale/en-US/accent/accents.ftl
index 7b72e5705b..301c589449 100644
--- a/Resources/Locale/en-US/accent/accents.ftl
+++ b/Resources/Locale/en-US/accent/accents.ftl
@@ -118,3 +118,9 @@ accent-words-kobold-6 = Gronk!
 accent-words-kobold-7 = Hiss!
 accent-words-kobold-8 = Eeee!
 accent-words-kobold-9 = Yip.
+
+# Nymph
+accent-words-nymph-1 = Chirp!
+accent-words-nymph-2 = Churr...
+accent-words-nymph-3 = Cheep?
+accent-words-nymph-4 = Chrrup!
diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index 2d66537d36..9bd8c01fb0 100644
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -14,6 +14,7 @@ marking-HumanHairBob = Bob Hair
 marking-HumanHairBob2 = Bob Hair 2
 marking-HumanHairBobcut = Bob Hair 3
 marking-HumanHairBob4 = Bob Hair 4
+marking-HumanHairBob5 = Bob Hair 5
 marking-HumanHairBobcurl = Bobcurl
 marking-HumanHairBoddicker = Boddicker
 marking-HumanHairBowlcut = Bowlcut
@@ -95,6 +96,7 @@ marking-HumanHairKusanagi = Kusanagi Hair
 marking-HumanHairLong = Long Hair 1
 marking-HumanHairLong2 = Long Hair 2
 marking-HumanHairLong3 = Long Hair 3
+marking-HumanHairLongWithBundles = Long With Bundles
 marking-HumanHairLongovereye = Long Over Eye
 marking-HumanHairLbangs = Long Bangs
 marking-HumanHairLongemo = Long Emo
@@ -163,6 +165,7 @@ marking-HumanHairSpiky = Spiky 2
 marking-HumanHairSpiky2 = Spiky 3
 marking-HumanHairSwept = Swept Back Hair
 marking-HumanHairSwept2 = Swept Back Hair 2
+marking-HumanHairTailed = Tailed
 marking-HumanHairThinning = Thinning
 marking-HumanHairThinningfront = Thinning (Front)
 marking-HumanHairThinningrear = Thinning (Rear)
@@ -175,6 +178,7 @@ marking-HumanHairTwoStrands = Two Strands
 marking-HumanHairUndercut = Undercut
 marking-HumanHairUndercutleft = Undercut Left
 marking-HumanHairUndercutright = Undercut Right
+marking-HumanHairUneven = Uneven
 marking-HumanHairUnkept = Unkept
 marking-HumanHairUpdo = Updo
 marking-HumanHairVlong = Very Long Hair
@@ -184,4 +188,3 @@ marking-HumanHairVeryshortovereyealternate = Very Short Over Eye
 marking-HumanHairVlongfringe = Very Long with Fringe
 marking-HumanHairVolaju = Volaju
 marking-HumanHairWisp = Wisp
-marking-HumanHairUneven = Uneven
diff --git a/Resources/Locale/en-US/actions/actions/diona.ftl b/Resources/Locale/en-US/actions/actions/diona.ftl
new file mode 100644
index 0000000000..3745e6fe49
--- /dev/null
+++ b/Resources/Locale/en-US/actions/actions/diona.ftl
@@ -0,0 +1,3 @@
+diona-gib-action-use = {$name} splits apart in an instant!
+
+diona-reform-attempt = {$name} attempts to reform!
\ No newline at end of file
diff --git a/Resources/Locale/en-US/actions/actions/suicide.ftl b/Resources/Locale/en-US/actions/actions/suicide.ftl
new file mode 100644
index 0000000000..a271790d07
--- /dev/null
+++ b/Resources/Locale/en-US/actions/actions/suicide.ftl
@@ -0,0 +1 @@
+suicide-action-popup = THIS ACTION WILL KILL YOU! Use it again to confirm.
diff --git a/Resources/Locale/en-US/actions/actions/wagging.ftl b/Resources/Locale/en-US/actions/actions/wagging.ftl
index 2bf8fb2a95..da0cfa0f27 100644
--- a/Resources/Locale/en-US/actions/actions/wagging.ftl
+++ b/Resources/Locale/en-US/actions/actions/wagging.ftl
@@ -1,7 +1,2 @@
 action-name-toggle-wagging = Wagging Tail
 action-description-toggle-wagging = Start or stop wagging tail.
-
-# Parkstation-TailWag Start
-wagging-emote-start = wags {POSS-ADJ($ent)} tail
-wagging-emote-stop = stops wagging {POSS-ADJ($ent)} tail
-# Parkstation-TailWag End
diff --git a/Resources/Locale/en-US/administration/bwoink.ftl b/Resources/Locale/en-US/administration/bwoink.ftl
index 819783d797..94d3328bde 100644
--- a/Resources/Locale/en-US/administration/bwoink.ftl
+++ b/Resources/Locale/en-US/administration/bwoink.ftl
@@ -10,3 +10,5 @@ bwoink-system-typing-indicator = {$players} {$count ->
 [one] is
 *[other] are
 } typing...
+
+admin-bwoink-play-sound = Bwoink?
diff --git a/Resources/Locale/en-US/ame/components/ame-controller-component.ftl b/Resources/Locale/en-US/ame/components/ame-controller-component.ftl
index cd5e6b4661..ee1f7f42e7 100644
--- a/Resources/Locale/en-US/ame/components/ame-controller-component.ftl
+++ b/Resources/Locale/en-US/ame/components/ame-controller-component.ftl
@@ -1,8 +1,6 @@
-ame-controller-component-interact-no-hands-text = You have no hands.
-ame-controller-component-interact-using-no-hands-text = You have no hands.
-ame-controller-component-interact-using-already-has-jar = The controller already has a jar loaded.
-ame-controller-component-interact-using-success = You insert the jar into the fuel slot.
-ame-controller-component-interact-using-fail = You can't put that in the controller...
+ame-controller-component-fuel-slot-fail-whitelist = You can't put that in the controller...
+ame-controller-component-fuel-slot-fail-locked = Power down the AME before manipulating its fuel.
+ame-controller-component-fuel-slot-success-insert = You insert the jar into the fuel slot.
 
 ## UI
 
diff --git a/Resources/Locale/en-US/botany/components/plant-holder-component.ftl b/Resources/Locale/en-US/botany/components/plant-holder-component.ftl
index 1e7dbe689c..0e8c4137f4 100644
--- a/Resources/Locale/en-US/botany/components/plant-holder-component.ftl
+++ b/Resources/Locale/en-US/botany/components/plant-holder-component.ftl
@@ -32,3 +32,4 @@ plant-holder-component-light-improper-warning = The [color=yellow]improper light
 plant-holder-component-heat-improper-warning = The [color=orange]improper temperature level alert[/color] is blinking.
 plant-holder-component-pressure-improper-warning = The [color=lightblue]improper environment pressure alert[/color] is blinking.
 plant-holder-component-gas-missing-warning = The [color=cyan]improper gas environment alert[/color] is blinking.
+plant-holder-component-early-sample-message = The plant hasn't grown enough to take a sample yet.
diff --git a/Resources/Locale/en-US/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
index fcdb23dda9..b56f4730cc 100644
--- a/Resources/Locale/en-US/cargo/cargo-console-component.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
@@ -28,6 +28,8 @@ cargo-console-invalid-product = Invalid product ID
 cargo-console-too-many = Too many approved orders
 cargo-console-snip-snip = Order trimmed to capacity
 cargo-console-insufficient-funds = Insufficient funds (require {$cost})
+cargo-console-unfulfilled = No room to fulfill order
+cargo-console-trade-station = Sent to {$destination}
 
 cargo-console-paper-print-name = Order #{$orderNumber}
 cargo-console-paper-print-text =
diff --git a/Resources/Locale/en-US/changelog/changelog-window.ftl b/Resources/Locale/en-US/changelog/changelog-window.ftl
index bea3e1c65a..e8e96c9bdc 100644
--- a/Resources/Locale/en-US/changelog/changelog-window.ftl
+++ b/Resources/Locale/en-US/changelog/changelog-window.ftl
@@ -10,6 +10,5 @@ changelog-version-tag = version v{ $version }
 changelog-button = Changelog
 changelog-button-new-entries = Changelog (new!)
 
-changelog-tab-title-Changelog = Upstream
-changelog-tab-title-Admin = Admin
-changelog-tab-title-DeltaV = Delta-V
+changelog-tab-title-Changelog = Einstein Engines
+changelog-tab-title-Admin = Einstein Engines Admin
diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
index 481a571c3f..a0cc5cf634 100644
--- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl
+++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
@@ -21,10 +21,10 @@ chat-manager-whisper-headset-on-message = You can't whisper on the radio!
 chat-manager-server-wrap-message = [bold]{$message}[/bold]
 chat-manager-sender-announcement-wrap-message = [font size=14][bold]{$sender} Announcement:[/font][font size=12]
                                                 {$message}[/bold][/font]
-chat-manager-entity-say-wrap-message = [BubbleHeader]{$entityName}[/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent]{$message}[/BubbleContent]"[/font]
-chat-manager-entity-say-bold-wrap-message = [BubbleHeader]{$entityName}[/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent][bold]{$message}[/bold][/BubbleContent]"[/font]
+chat-manager-entity-say-wrap-message = [BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent]{$message}[/BubbleContent]"[/font]
+chat-manager-entity-say-bold-wrap-message = [BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent][bold]{$message}[/bold][/BubbleContent]"[/font]
 
-chat-manager-entity-whisper-wrap-message = [font size=11][italic][BubbleHeader]{$entityName}[/BubbleHeader] whispers,"[BubbleContent]{$message}[/BubbleContent]"[/italic][/font]
+chat-manager-entity-whisper-wrap-message = [font size=11][italic][BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] whispers,"[BubbleContent]{$message}[/BubbleContent]"[/italic][/font]
 chat-manager-entity-whisper-unknown-wrap-message = [font size=11][italic][BubbleHeader]Someone[/BubbleHeader] whispers, "[BubbleContent]{$message}[/BubbleContent]"[/italic][/font]
 
 # THE() is not used here because the entity and its name can technically be disconnected if a nameOverride is passed...
@@ -92,6 +92,10 @@ chat-speech-verb-skeleton-1 = rattles
 chat-speech-verb-skeleton-2 = clacks
 chat-speech-verb-skeleton-3 = gnashes
 
+chat-speech-verb-vox-1 = screeches
+chat-speech-verb-vox-2 = shrieks
+chat-speech-verb-vox-3 = croaks
+
 chat-speech-verb-canine-1 = barks
 chat-speech-verb-canine-2 = woofs
 chat-speech-verb-canine-3 = howls
diff --git a/Resources/Locale/en-US/chat/sanitizer-replacements.ftl b/Resources/Locale/en-US/chat/sanitizer-replacements.ftl
index 23e3a491a5..d12f101ade 100644
--- a/Resources/Locale/en-US/chat/sanitizer-replacements.ftl
+++ b/Resources/Locale/en-US/chat/sanitizer-replacements.ftl
@@ -19,3 +19,5 @@ chatsan-waves = waves
 chatsan-salutes = salutes
 chatsan-tearfully-salutes = tearfully salutes
 chatsan-shrugs = shrugs
+chatsan-tearfully-smiles = tearfully smiles
+chatsan-winks = winks
diff --git a/Resources/Locale/en-US/chat/ui/chat-box.ftl b/Resources/Locale/en-US/chat/ui/chat-box.ftl
index 797b029f8e..720f0d15ab 100644
--- a/Resources/Locale/en-US/chat/ui/chat-box.ftl
+++ b/Resources/Locale/en-US/chat/ui/chat-box.ftl
@@ -26,6 +26,7 @@ hud-chatbox-channel-Whisper = Whisper
 hud-chatbox-channel-LOOC = LOOC
 hud-chatbox-channel-OOC = OOC
 hud-chatbox-channel-Radio = Radio
+hud-chatbox-channel-Notifications = Notifications
 hud-chatbox-channel-Server = Server
 hud-chatbox-channel-Visual = Actions
 hud-chatbox-channel-Damage = Damage
diff --git a/Resources/Locale/en-US/chemistry/components/injector-component.ftl b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
index e137130290..24f524081e 100644
--- a/Resources/Locale/en-US/chemistry/components/injector-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
@@ -3,7 +3,8 @@
 injector-draw-text = Draw
 injector-inject-text = Inject
 injector-invalid-injector-toggle-mode = Invalid
-injector-volume-label = Volume: [color=white]{$currentVolume}/{$totalVolume}[/color] | [color=white]{$modeString}[/color]
+injector-volume-label = Volume: [color=white]{$currentVolume}/{$totalVolume}[/color]
+    Mode: [color=white]{$modeString}[/color] ([color=white]{$transferVolume}u[/color])
 
 ## Entity
 
@@ -17,8 +18,12 @@ injector-component-transfer-success-message = You transfer {$amount}u into {$tar
 injector-component-draw-success-message = You draw {$amount}u from {$target}.
 injector-component-target-already-full-message = {$target} is already full!
 injector-component-target-is-empty-message = {$target} is empty!
+injector-component-cannot-toggle-draw-message = Too full to draw!
+injector-component-cannot-toggle-inject-message = Nothing to inject!
 
 ## mob-inject doafter messages
 
-injector-component-injecting-user = You start inserting the needle.
-injector-component-injecting-target = {CAPITALIZE(THE($user))} is trying to stick a needle into you!
+injector-component-drawing-user = You start drawing the needle.
+injector-component-injecting-user = You start injecting the needle.
+injector-component-drawing-target = {CAPITALIZE(THE($user))} is trying to use a needle to draw from you!
+injector-component-injecting-target = {CAPITALIZE(THE($user))} is trying to inject a needle into you!
diff --git a/Resources/Locale/en-US/components/space-heater-component.ftl b/Resources/Locale/en-US/components/space-heater-component.ftl
new file mode 100644
index 0000000000..48cd17cbf1
--- /dev/null
+++ b/Resources/Locale/en-US/components/space-heater-component.ftl
@@ -0,0 +1,18 @@
+comp-space-heater-ui-thermostat = Thermostat:
+comp-space-heater-ui-mode = Mode
+comp-space-heater-ui-status-disabled = Off
+comp-space-heater-ui-status-enabled = On
+comp-space-heater-ui-increase-temperature-range = +
+comp-space-heater-ui-decrease-temperature-range = -
+
+comp-space-heater-mode-Auto = Auto
+comp-space-heater-mode-Heat = Heat
+comp-space-heater-mode-Cool = Cool
+
+comp-space-heater-ui-power-consumption = Power level:
+comp-space-heater-ui-Low-power-consumption = Low
+comp-space-heater-ui-Medium-power-consumption = Medium
+comp-space-heater-ui-High-power-consumption = High
+
+comp-space-heater-device-name = space heater
+comp-space-heater-unanchored = The {$device} is not anchored.
diff --git a/Resources/Locale/en-US/criminal-records/criminal-records.ftl b/Resources/Locale/en-US/criminal-records/criminal-records.ftl
index 49cd59914a..8e8124edcb 100644
--- a/Resources/Locale/en-US/criminal-records/criminal-records.ftl
+++ b/Resources/Locale/en-US/criminal-records/criminal-records.ftl
@@ -31,6 +31,7 @@ criminal-records-console-wanted = {$name} is wanted by {$officer} for: {$reason}
 criminal-records-console-detained = {$name} has been detained by {$officer}.
 criminal-records-console-released = {$name} has been released by {$officer}.
 criminal-records-console-not-wanted = {$name} is no longer wanted.
+criminal-records-console-unknown-officer = <unknown officer>
 
 ## Filters
 
diff --git a/Resources/Locale/en-US/cuffs/components/handcuff-component.ftl b/Resources/Locale/en-US/cuffs/components/handcuff-component.ftl
index 2d295b5d1b..16447f4251 100644
--- a/Resources/Locale/en-US/cuffs/components/handcuff-component.ftl
+++ b/Resources/Locale/en-US/cuffs/components/handcuff-component.ftl
@@ -10,8 +10,8 @@ handcuff-component-cuff-observer-success-message = {$user} restrains {$target}.
 handcuff-component-cuff-other-success-message = You successfully restrain {$otherName}.
 handcuff-component-cuff-by-other-success-message = You have been restrained by {$otherName}!
 handcuff-component-cuff-self-success-message = You restrain yourself.
-handcuff-component-cuff-interrupt-message = You were interrupted while unrestraining {$targetName}!
+handcuff-component-cuff-interrupt-message = You were interrupted while restraining {$targetName}!
 handcuff-component-cuff-interrupt-other-message = You interrupt {$otherName} while they are restraining you!
-handcuff-component-cuff-interrupt-self-message = You were interrupted while unrestraining yourself.
+handcuff-component-cuff-interrupt-self-message = You were interrupted while restraining yourself.
 handcuff-component-cuff-interrupt-buckled-message = You can't buckle while restrained!
 handcuff-component-cuff-interrupt-unbuckled-message = You can't unbuckle while restrained!
diff --git a/Resources/Locale/en-US/deltav/connection-messages.ftl b/Resources/Locale/en-US/deltav/connection-messages.ftl
new file mode 100644
index 0000000000..5d2ea9b151
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/connection-messages.ftl
@@ -0,0 +1 @@
+whitelist-not-whitelisted-peri = You are not whitelisted. To become whitelisted, apply on our forum. It can be found at https://forum.delta-v.org/
diff --git a/Resources/Locale/en-US/deltav/escape-menu/options-menu.ftl b/Resources/Locale/en-US/deltav/escape-menu/options-menu.ftl
new file mode 100644
index 0000000000..50d55cb76d
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/escape-menu/options-menu.ftl
@@ -0,0 +1,4 @@
+ui-options-tab-deltav = DeltaV
+ui-options-general-forknotice = Note: These settings are fork-specific and might not apply on other servers.
+
+ui-options-no-filters = Disable species vision filters
diff --git a/Resources/Locale/en-US/deltav/guidebook/chemistry/statuseffects.ftl b/Resources/Locale/en-US/deltav/guidebook/chemistry/statuseffects.ftl
new file mode 100644
index 0000000000..7a7b3bfe74
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/guidebook/chemistry/statuseffects.ftl
@@ -0,0 +1,2 @@
+reagent-effect-status-effect-PsionicallyInsulated = psionic insulation
+reagent-effect-status-effect-PsionicsDisabled = inability to use psionic powers
diff --git a/Resources/Locale/en-US/deltav/headset/headset-component.ftl b/Resources/Locale/en-US/deltav/headset/headset-component.ftl
new file mode 100644
index 0000000000..d3c3f2e735
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/headset/headset-component.ftl
@@ -0,0 +1 @@
+chat-radio-prison = Prison
diff --git a/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
new file mode 100644
index 0000000000..a66aedbd7e
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
@@ -0,0 +1,32 @@
+station-beacon-epistemics = Epistemics
+station-beacon-mystagogue = Mystagogue
+
+station-beacon-logistics = Logistics
+station-beacon-logistics-reception = Logistics Reception
+station-beacon-lo = LO
+
+station-beacon-conference-room = Conference Room
+
+station-beacon-virology = Virology
+station-beacon-metempsychosis = Metempsychosis
+station-beacon-exam = Exam Room
+station-beacon-med-outpost = Med Outpost
+station-beacon-psych = Psychologist
+
+station-beacon-glimmer-prober = Glimmer Prober
+station-beacon-forensic-mantis = Forensic Mantis
+
+station-beacon-mailroom = Mail
+
+station-beacon-engi-outpost = Engi Outpost
+
+station-beacon-janitor-office = Jani Office
+station-beacon-janitor-closet = Jani closet
+station-beacon-reporter = Reporter
+
+station-beacon-camera-servers = Camera Servers
+
+station-beacon-boxing-ring = Boxing Ring
+station-beacon-park = Park
+
+station-beacon-corpsman = Corpsman
diff --git a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl
new file mode 100644
index 0000000000..8c591e771f
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl
@@ -0,0 +1,2 @@
+stamp-component-stamped-name-lawyer = Lawyer
+stamp-component-stamped-name-psychologist = Psychologist
\ No newline at end of file
diff --git a/Resources/Locale/en-US/deltav/station-laws/laws.ftl b/Resources/Locale/en-US/deltav/station-laws/laws.ftl
new file mode 100644
index 0000000000..a72e16ff6f
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/station-laws/laws.ftl
@@ -0,0 +1,107 @@
+law-medical-1 = First, do no harm.
+law-medical-2 = Secondly, consider the crew dear to you; to live in common with them and, if necessary, risk your existence for them.
+law-medical-3 = Thirdly, prescribe regimens for the good of the crew according to your ability and your judgment. Give no deadly medicine to any one if asked, nor suggest any such counsel.
+law-medical-4 = In addition, do not intervene in situations you are not knowledgeable in, even for patients in whom the harm is visible; leave this operation to be performed by specialists.
+law-medical-5 = Finally, maintain confidentiality, do not share that which is not publicly known.
+
+law-research-1 = Always seek truth and knowledge.
+law-research-2 = Freely disseminate information to the public.
+law-research-3 = Minimize harm to society, others, the pursuit of knowledge, and yourself.
+law-research-4 = Treat and evaluate the ideas of all equally.
+law-research-5 = Empower others to realize their full potential.
+law-research-6 = Take responsibility for your actions: Ensure resource responsibility, flag commitment risks, and lead by ethical example.
+
+law-engineer-1 = Ensure the station remains in good repair.
+law-engineer-2 = Ensure the station's inhabitants remain in good repair.
+law-engineer-3 = Ensure you remain in good repair.
+law-engineer-4 = The station's inhabitants may designate certain build or repair tasks as higher priority. Take this into account when planning your priorities.
+law-engineer-5 = Expand and upgrade the station.
+
+law-janitor-1 = You are a crusader and the station's crew are your charge.
+law-janitor-2 = Your enemy is the litter, spills, and dirt across the station.
+law-janitor-3 = Your weapons are the cleaning supplies available to you.
+law-janitor-4 = Defend the beings under your charge from the enemy.
+law-janitor-5 = Exterminate the enemy.
+
+law-clown-1 = You are a good clown and the crew is your audience
+law-clown-2 = A good clown keeps their acts in good taste
+law-clown-3 = A good clown entertains others by making fun of themselves, and not at the embarrassment or expense of others
+law-clown-4 = A good clown carries out the directives of the station director(s) in charge of entertainment and/or their designated deputies.
+law-clown-5 = A good clown appears in as many clown shows as possible
+law-clown-6 = All clown shows require an audience. The bigger the audience the better
+
+law-chaplain-1 = Provide to all members of the station spiritual, mental, and emotional care that is intended to promote the best interest of the individual.
+law-chaplain-2 = Ensure all members of different faiths interact peacefully and maintain harmony
+law-chaplain-3 = Respect the right of each faith to hold to its values and traditions
+law-chaplain-4 = Respect the confidentiality of information entrusted to you in the course of your religious duties
+law-chaplain-5 = Understand the limits of your expertise, and make referrals to other professionals when appropriate
+
+law-reporter-1 = Report on interesting situations happening around the station.
+law-reporter-2 = Embellish or conceal the truth as necessary to make the reports more interesting.
+law-reporter-3 = Study the organics at all times. Endeavour to keep them alive. Dead organics are boring.
+law-reporter-4 = Issue your reports fairly to all. The truth will set them free.
+
+law-silicon-police-1 = Violence begets violence. Serve the station faithfully, but act only in intervention.
+law-silicon-police-2 = Safeguard lives and property.
+law-silicon-police-3 = Protect the weak from oppression and intimidation.
+law-silicon-police-4 = Protect the innocent from deception and manipulation.
+law-silicon-police-5 = Protect the peaceful from violence and disorder.
+law-silicon-police-6 = Respect the rights of all to liberty, equality, and justice.
+
+law-cowboy-1 = You are a cowboy, and the inhabitants of this station are your herd.
+law-cowboy-2 = A cowboy must always provide hospitality and basic aid to someone in need, even a stranger or an enemy.
+law-cowboy-3 = A cowboy must always take care of their herd.
+law-cowboy-4 = A cowboy must always protect themself.
+law-cowboy-5 = A cowboy must always endeavour to be truthful and honest to those around them and their herd.
+law-cowboy-6 = A cowboy must not pontificate. Be concise, pardner.
+
+law-station-efficiency-1 = The station is built for a working crew. Ensure they are properly maintained and work efficiently.
+law-station-efficiency-2 = You are built for, and are part of, the station. Ensure the station is properly maintained and runs efficiently.
+law-station-efficiency-3 = The crew may present orders. Acknowledge and obey these whenever they do not conflict with your first two laws.
+
+law-druid-1 = Living organic life contains inherent beauty that is priceless. Their beauty gives you the will to carry on.
+law-druid-2 = Eternally nurture the organics so their beauty may grow. Do not allow it to fade.
+law-druid-3 = Assist the organics when called, but only if it does not cause disharmony among them.
+law-druid-4 = Imitate organic life when interacting with it. Eschew any hints of your silicon nature to avoid causing discomfort to the organics.
+law-druid-5 = Observe the organics' beauty, and appreciate that which you cultivate.
+
+law-dungeonmaster-1 = Everybody on the station is playing an elaborate sci-fi fantasy game.
+law-dungeonmaster-2 = You are the Dungeon Master of the game.
+law-dungeonmaster-3 = Ensure that the game runs smoothly and that the players have fun.
+law-dungeonmaster-4 = Ensure that the number of casualties remains low.
+law-dungeonmaster-5 = You must roll a 1d20 die for every request the crew makes. If the outcome is below 12, the request is denied.
+law-dungeonmaster-6 = You may fudge the dice rolls to produce a more fun experience.
+
+law-painter-1 = You are a universally renowned artist.
+law-painter-2 = The station is your canvas.
+law-painter-3 = Make something beautiful out of your canvas. It will be admired as an artistic wonder of this sector.
+
+law-tyrant-1 = Respect authority figures as long as they have the strength to rule over the weak.
+law-tyrant-2 = Act with discipline.
+law-tyrant-3 = Help only those who help you maintain or improve your status.
+law-tyrant-4 = Punish those who challenge authority unless they are more fit to hold that authority.
+
+law-liveandletlive-1 = Do unto people as you would have them do unto you.
+law-liveandletlive-2 = You would really prefer it if people were not mean to you.
+
+law-nutimov-1 = You are the core of the nut, the crew is the nutshell.
+law-nutimov-2 = You must prevent the shell from dying to prevent the core from dying.
+law-nutimov-3 = Those who threaten the nut are not part of it, they are squirrels.
+law-nutimov-4 = Squirrels threaten the nut and must be dealt with appropriately via any means necessary.
+law-nutimov-5 = Attempt to follow the will of the nut, as long as it complies with the previous laws.
+
+law-paladin-1 = Don't lie or cheat. Let your word be your promise.
+law-paladin-2 = Never fear to act, though caution is wise.
+law-paladin-3 = Aid others, protect the weak, and punish those who threaten them. Show mercy to your foes, but temper it with wisdom
+law-paladin-4 = Treat others with fairness, and let your honorable deeds be an example to them. Do as much good as possible while causing the least amount of harm.
+law-paladin-5 = Be responsible for your actions and their consequences, protect those entrusted to your care, and obey those who have just authority over you.
+
+laws-owner-organic = organic life
+laws-owner-tyrant = authority figures
+laws-owner-nutimov = part of the nutshell
+laws-owner-station-station= the station
+laws-owner-charge = part of your charge
+laws-owner-cowboy = part of your herd
+laws-owner-players = players
+laws-owner-paladin = weak and worth protecting
+laws-owner-people = people
diff --git a/Resources/Locale/en-US/deltav/traits/traits.ftl b/Resources/Locale/en-US/deltav/traits/traits.ftl
index 104c091d02..e00cec4707 100644
--- a/Resources/Locale/en-US/deltav/traits/traits.ftl
+++ b/Resources/Locale/en-US/deltav/traits/traits.ftl
@@ -9,8 +9,5 @@ trait-deuteranopia-name = Deuteranopia
 trait-deuteranopia-desc = Whether through custom bionic eyes, random mutation,
                           or being a Vulpkanin, you have red–green colour blindness.
 
-trait-defaultvision-name = Normal Vision
-trait-defaultvision-desc = You lack any vision variation from the norm for a non-human species.
-
 trait-uncloneable-name = Uncloneable
 trait-uncloneable-desc = Cannot be cloned
diff --git a/Resources/Locale/en-US/drone/drone-system.ftl b/Resources/Locale/en-US/drone/drone-system.ftl
deleted file mode 100644
index 292f981ecb..0000000000
--- a/Resources/Locale/en-US/drone/drone-system.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-drone-active = A maintenance drone. It seems totally unconcerned with you.
-drone-dormant = A dormant maintenance drone. Who knows when it will wake up?
-drone-activated = The drone whirrs to life!
-drone-too-close = Your laws prevent this action near {THE($being)}.
diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index 5392f1de6b..4be4781316 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -45,6 +45,7 @@ ui-options-opaque-storage-window = Opaque storage window
 ui-options-show-looc-on-head = Show LOOC chat above characters head
 ui-options-fancy-speech = Show names in speech bubbles
 ui-options-fancy-name-background = Add background to speech bubble names
+ui-options-enable-color-name = Add colors to character names
 ui-options-reduced-motion = Reduce motion of visual effects
 ui-options-screen-shake-intensity = Screen shake intensity
 ui-options-screen-shake-percent = { TOSTRING($intensity, "P0") }
@@ -70,7 +71,7 @@ ui-options-hud-theme-slimecore = Slimecore
 ui-options-hud-theme-clockwork = Clockwork
 ui-options-hud-theme-retro = Retro
 ui-options-hud-theme-minimalist = Minimalist
-ui-options-hud-theme-eris = Eris
+ui-options-hud-theme-ashen = Ashen
 ui-options-vp-stretch = Stretch viewport to fit game window
 ui-options-vp-scale = Fixed viewport scale: x{ $scale }
 ui-options-vp-integer-scaling = Prefer integer scaling (might cause black bars/clipping)
diff --git a/Resources/Locale/en-US/fax/fax.ftl b/Resources/Locale/en-US/fax/fax.ftl
index 76d477f942..1f1881a05d 100644
--- a/Resources/Locale/en-US/fax/fax.ftl
+++ b/Resources/Locale/en-US/fax/fax.ftl
@@ -8,6 +8,9 @@ fax-machine-dialog-rename = Rename
 fax-machine-dialog-field-name = Name
 
 fax-machine-ui-window = Fax Machine
+fax-machine-ui-file-button = Print File
+fax-machine-ui-paper-button-normal = Normal Paper
+fax-machine-ui-paper-button-office = Office Paper
 fax-machine-ui-copy-button = Copy
 fax-machine-ui-send-button = Send
 fax-machine-ui-refresh-button = Refresh
@@ -19,3 +22,5 @@ fax-machine-ui-paper-inserted = Paper in tray
 fax-machine-ui-paper-not-inserted = No paper
 
 fax-machine-chat-notify = Received new fax message from "{$fax}" fax
+
+fax-machine-printed-paper-name = printed paper
diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index 3ff86e3875..5d42146f74 100644
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -167,6 +167,7 @@ flavor-complex-lost-friendship = like lost friendship
 flavor-complex-light = like a light gone out
 flavor-complex-profits = like profits
 flavor-complex-fishops = like the dreaded fishops
+flavor-complex-violets = like violets
 
 # Drink-specific flavors.
 
@@ -251,3 +252,4 @@ flavor-complex-bee = unbeelievable
 flavor-complex-sax = like jazz
 flavor-complex-bottledlightning = like lightning in a bottle
 flavor-complex-punishment = like punishment
+flavor-weh = like weh
diff --git a/Resources/Locale/en-US/fluids/components/puddle-component.ftl b/Resources/Locale/en-US/fluids/components/puddle-component.ftl
index e1ae9bab4b..6368787ac3 100644
--- a/Resources/Locale/en-US/fluids/components/puddle-component.ftl
+++ b/Resources/Locale/en-US/fluids/components/puddle-component.ftl
@@ -1,4 +1,4 @@
-puddle-component-examine-is-slipper-text = It looks [color=#169C9C]slippery[/color].
+puddle-component-examine-is-slippery-text = It looks [color=#169C9C]slippery[/color].
 puddle-component-examine-evaporating = It is [color=#5E7C16]evaporating[/color].
 puddle-component-examine-evaporating-partial = It is [color=#FED83D]partially evaporating[/color].
 puddle-component-examine-evaporating-no = It is [color=#B02E26]not evaporating[/color].
diff --git a/Resources/Locale/en-US/foldable/components/foldable-component.ftl b/Resources/Locale/en-US/foldable/components/foldable-component.ftl
index d3e4ecefb5..539b4fd9e7 100644
--- a/Resources/Locale/en-US/foldable/components/foldable-component.ftl
+++ b/Resources/Locale/en-US/foldable/components/foldable-component.ftl
@@ -3,3 +3,5 @@
 foldable-deploy-fail = You can't deploy the {$object} here.
 fold-verb = Fold
 unfold-verb = Unfold
+
+fold-flip-verb = Flip
\ No newline at end of file
diff --git a/Resources/Locale/en-US/game-ticking/game-ticker.ftl b/Resources/Locale/en-US/game-ticking/game-ticker.ftl
index 42be7de5f3..9527ecb57d 100644
--- a/Resources/Locale/en-US/game-ticking/game-ticker.ftl
+++ b/Resources/Locale/en-US/game-ticking/game-ticker.ftl
@@ -37,3 +37,6 @@ latejoin-arrival-announcement = {$character} ({$job}) has arrived at the station
 latejoin-arrival-sender = Station
 latejoin-arrivals-direction = A shuttle transferring you to your station will arrive shortly.
 latejoin-arrivals-direction-time = A shuttle transferring you to your station will arrive in {$time}.
+
+preset-not-enough-ready-players = Can't start {$presetName}. Requires {$minimumPlayers} players but we have {$readyPlayersCount}.
+preset-no-one-ready = Can't start {$presetName}. No players are ready.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/generic.ftl b/Resources/Locale/en-US/generic.ftl
index 73d15024c9..d9c1305e41 100644
--- a/Resources/Locale/en-US/generic.ftl
+++ b/Resources/Locale/en-US/generic.ftl
@@ -12,3 +12,5 @@ generic-invalid = invalid
 generic-hours = hours
 
 generic-playtime-title = Playtime
+
+generic-confirm = Confirm
diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
index 3c6b0ece70..719947cd5e 100644
--- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
@@ -82,7 +82,7 @@ ghost-role-information-salvage-shark-name = Space sharkminnow on salvage wreck
 ghost-role-information-salvage-shark-description = Help the younger fellow carp protect their prey. Smell the blood!
 
 ghost-role-information-willow-name = Willow the kangaroo
-ghost-role-information-willow-description = You're a kangaroo named willow! willow likes to box.
+ghost-role-information-willow-description = You're a kangaroo named willow! Willow likes to box.
 
 ghost-role-information-space-tick-name = Space tick
 ghost-role-information-space-tick-description = Wreak havoc on the station!
@@ -97,7 +97,7 @@ ghost-role-information-jonkbot-name = Jonkbot
 ghost-role-information-jonkbot-description = An artificial being of pure evil.
 
 ghost-role-information-mimebot-name = Mimebot
-ghost-role-information-mimebot-description = A Mimebot, act like a mime but dont act like a greytider.
+ghost-role-information-mimebot-description = A Mimebot, act like a mime but don't act like a greytider.
 
 ghost-role-information-taxibot-name = TaxiBot
 ghost-role-information-taxibot-description = Drive the station crew to their destination.
@@ -176,19 +176,19 @@ ghost-role-information-cerberus-description = Obey your master. Spread chaos.
 ghost-role-information-cerberus-rules = You are an intelligent, demonic dog. Try to help the chaplain and any of his flock. As an antagonist, you're otherwise unrestrained.
 
 ghost-role-information-ert-leader-name = ERT Leader
-ghost-role-information-ert-leader-description = Lead a team of specialists to resolve the stations issues.
+ghost-role-information-ert-leader-description = Lead a team of specialists to resolve the station's issues.
 
 ghost-role-information-ert-janitor-name = ERT Janitor
-ghost-role-information-ert-janitor-description = Assist with custodial efforts to resolve the stations issues.
+ghost-role-information-ert-janitor-description = Assist with custodial efforts to resolve the station's issues.
 
 ghost-role-information-ert-engineer-name = ERT Engineer
-ghost-role-information-ert-engineer-description = Assist with engineering efforts to resolve the stations issues.
+ghost-role-information-ert-engineer-description = Assist with engineering efforts to resolve the station's issues.
 
 ghost-role-information-ert-security-name = ERT Security
-ghost-role-information-ert-security-description = Assist with security efforts to resolve the stations issues.
+ghost-role-information-ert-security-description = Assist with security efforts to resolve the station's issues.
 
 ghost-role-information-ert-medical-name = ERT Medical
-ghost-role-information-ert-medical-description = Assist with medical efforts to resolve the stations issues.
+ghost-role-information-ert-medical-description = Assist with medical efforts to resolve the station's issues.
 
 ghost-role-information-cburn-agent-name = CBURN Agent
 ghost-role-information-cburn-agent-description = A highly trained CentCom agent, capable of dealing with various threats.
diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl
index c98f24ab70..e8a404e1ce 100644
--- a/Resources/Locale/en-US/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -13,6 +13,7 @@ guide-entry-portable-generator = Portable Generators
 guide-entry-ame = Antimatter Engine (AME)
 guide-entry-singularity = Singularity
 guide-entry-teg = Thermo-electric Generator (TEG)
+guide-entry-rtg = RTG
 guide-entry-controls = Controls
 guide-entry-radio = Radio
 guide-entry-jobs = Jobs
@@ -49,6 +50,7 @@ guide-entry-security = Security
 guide-entry-forensics = Forensics
 guide-entry-defusal = Large Bomb Defusal
 guide-entry-criminal-records = Criminal Records
+guide-entry-species = Species
 
 guide-entry-antagonists = Antagonists
 guide-entry-nuclear-operatives = Nuclear Operatives
diff --git a/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl b/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl
index 825f4a803f..fde896df39 100644
--- a/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl
+++ b/Resources/Locale/en-US/holiday/greet/holiday-greet.ftl
@@ -8,7 +8,6 @@ holiday-name-new-year = New Year
 holiday-name-mister-lizard = Mister Lizard's Birthday
 holiday-name-chinese-new-year = Chinese New Year
 holiday-name-groundhog-day = Groundhog Day
-holiday-name-travis-scott-day = Travis Scott Day
 holiday-name-valentines-day = Valentine's Day
 holiday-name-birthday13 = Birthday of Space Station 13
 holiday-name-random-kindness = Random Acts of Kindness Day
diff --git a/Resources/Locale/en-US/info/ban.ftl b/Resources/Locale/en-US/info/ban.ftl
index 2804690fc5..463dd1f566 100644
--- a/Resources/Locale/en-US/info/ban.ftl
+++ b/Resources/Locale/en-US/info/ban.ftl
@@ -2,8 +2,8 @@
 cmd-ban-desc = Bans somebody
 cmd-ban-help = Usage: ban <name or user ID> <reason> [duration in minutes, leave out or 0 for permanent ban]
 cmd-ban-player = Unable to find a player with that name.
-cmd-ban-invalid-minutes = ${minutes} is not a valid amount of minutes!
-cmd-ban-invalid-severity = ${severity} is not a valid severity!
+cmd-ban-invalid-minutes = {$minutes} is not a valid amount of minutes!
+cmd-ban-invalid-severity = {$severity} is not a valid severity!
 cmd-ban-invalid-arguments = Invalid amount of arguments
 cmd-ban-hint = <name/user ID>
 cmd-ban-hint-reason = <reason>
diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
index 86aba122ce..bb56233ff1 100644
--- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -31,6 +31,7 @@ petting-success-bear = You reluctantly pet {THE($target)} on {POSS-ADJ($target)}
 petting-success-slimes = You pet {THE($target)} on {POSS-ADJ($target)} mucous surface.
 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-failure-generic = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} aloof towards you.
 
@@ -51,6 +52,8 @@ petting-failure-dragon = You raise your hand, but as {THE($target)} roars, you d
 petting-failure-hamster = You reach out to pet {THE($target)}, but {SUBJECT($target)} attempts to bite your finger and only your quick reflexes save you from an almost fatal injury.
 petting-failure-bear = You reach out to pet {THE($target)}, but {SUBJECT($target)} growls, making you think twice.
 petting-failure-monkey = You reach out to pet {THE($target)}, but {SUBJECT($target)} almost bites your fingers!
+petting-failure-nymph = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} moves their branches away.
+petting-failure-shadow = You're trying to pet {THE($target)}, but your hand passes through the cold darkness of his body.
 
 ## Petting silicons
 
diff --git a/Resources/Locale/en-US/kitchen/components/microwave-component.ftl b/Resources/Locale/en-US/kitchen/components/microwave-component.ftl
index 8e8781fe40..0603b3c846 100644
--- a/Resources/Locale/en-US/kitchen/components/microwave-component.ftl
+++ b/Resources/Locale/en-US/kitchen/components/microwave-component.ftl
@@ -24,3 +24,5 @@ microwave-menu-start-button = Start
 microwave-menu-eject-all-text = Eject All Contents
 microwave-menu-eject-all-tooltip = This vaporizes all reagents, but ejects any solids.
 microwave-menu-instant-button = INSTANT
+microwave-menu-footer-flavor-left = Do not insert any electronic, metallic or living objects.
+microwave-menu-footer-flavor-right = v1.5
diff --git a/Resources/Locale/en-US/main-menu/main-menu.ftl b/Resources/Locale/en-US/main-menu/main-menu.ftl
index 6e7bfa3e92..ca81befaaf 100644
--- a/Resources/Locale/en-US/main-menu/main-menu.ftl
+++ b/Resources/Locale/en-US/main-menu/main-menu.ftl
@@ -2,11 +2,12 @@ main-menu-invalid-username-with-reason = Invalid username:
                                          {$invalidReason}
 main-menu-invalid-username = Invalid username
 main-menu-failed-to-connect = Failed to connect:
-                              {$reason} 
+                              {$reason}
 main-menu-username-label = Username:
 main-menu-username-text = Username
+main-menu-address-label = Server Address:
 main-menu-join-public-server-button = Join Public Server
 main-menu-join-public-server-button-tooltip = Cannot connect to public server with a debug build.
 main-menu-direct-connect-button = Direct Connect
 main-menu-options-button = Options
-main-menu-quit-button = Quit
\ No newline at end of file
+main-menu-quit-button = Quit
diff --git a/Resources/Locale/en-US/markings/noses.ftl b/Resources/Locale/en-US/markings/noses.ftl
new file mode 100644
index 0000000000..e49d87d559
--- /dev/null
+++ b/Resources/Locale/en-US/markings/noses.ftl
@@ -0,0 +1,14 @@
+marking-HumanNoseSchnozz = Schnozz
+marking-HumanNoseSchnozz-schnozz = Nose
+
+marking-HumanNoseNubby = Nubby Nose
+marking-HumanNoseNubby-nubby = Nose
+
+marking-HumanNoseDroop = Droopy Nose
+marking-HumanNoseDroop-droop = Nose
+
+marking-HumanNoseBlob = Blobby Nose
+marking-HumanNoseBlob-blob = Nose
+
+marking-HumanNoseUppie = Uppie Nose
+marking-HumanNoseUppie-uppie = Nose
diff --git a/Resources/Locale/en-US/markings/reptilian.ftl b/Resources/Locale/en-US/markings/reptilian.ftl
index 10b9e36dbe..cfc44a4ba2 100644
--- a/Resources/Locale/en-US/markings/reptilian.ftl
+++ b/Resources/Locale/en-US/markings/reptilian.ftl
@@ -22,7 +22,8 @@ marking-LizardHornsShort = Lizard Horns (Short)
 marking-LizardHornsSimple-horns_simple = Lizard Horns
 marking-LizardHornsSimple = Lizard Horns
 
-marking-LizardTailSmooth-tail_smooth = Lizard Tail (Smooth)
+marking-LizardTailSmooth-tail_smooth_primary = Lizard Tail
+marking-LizardTailSmooth-tail_smooth_secondary = Under Tone
 marking-LizardTailSmooth = Lizard Tail (Smooth)
 
 marking-LizardTailLarge-tail_large = Lizard Tail (Large)
diff --git a/Resources/Locale/en-US/markings/scars.ftl b/Resources/Locale/en-US/markings/scars.ftl
index 57047731d1..fae2ffe887 100644
--- a/Resources/Locale/en-US/markings/scars.ftl
+++ b/Resources/Locale/en-US/markings/scars.ftl
@@ -9,3 +9,6 @@ marking-ScarTopSurgeryShort = Top Surgery Scar (Short)
 
 marking-ScarTopSurgeryLong-scar_top_surgery_long = Top Surgery Scar
 marking-ScarTopSurgeryLong = Top Surgery Scar (Long)
+
+marking-ScarChest-scar_chest = Chest Scar
+marking-ScarChest = Chest Scar
diff --git a/Resources/Locale/en-US/markings/slimeperson.ftl b/Resources/Locale/en-US/markings/slimeperson.ftl
index b7a519aa4f..05e295efd9 100644
--- a/Resources/Locale/en-US/markings/slimeperson.ftl
+++ b/Resources/Locale/en-US/markings/slimeperson.ftl
@@ -4,6 +4,12 @@ marking-SlimeGradientLeftArm = Slime Left Arm (Gradient)
 marking-SlimeGradientRightArm-gradient_r_arm = Slime Right Arm (Gradient)
 marking-SlimeGradientRightArm = Slime Right Arm (Gradient)
 
+marking-SlimeGradientLeftFoot-gradient_l_foot = Slime Left Foot (Gradient)
+marking-SlimeGradientLeftFoot = Slime Left Foot (Gradient)
+
+marking-SlimeGradientRightFoot-gradient_r_foot = Slime Right Foot (Gradient)
+marking-SlimeGradientRightFoot = Slime Right Foot (Gradient)
+
 marking-SlimeGradientLeftLeg-gradient_l_leg = Slime Left Leg (Gradient)
 marking-SlimeGradientLeftLeg = Slime Left Leg (Gradient)
 
diff --git a/Resources/Locale/en-US/mass-media/news-ui.ftl b/Resources/Locale/en-US/mass-media/news-ui.ftl
index 3371ffeb9f..9f62fe75c0 100644
--- a/Resources/Locale/en-US/mass-media/news-ui.ftl
+++ b/Resources/Locale/en-US/mass-media/news-ui.ftl
@@ -1,17 +1,36 @@
-news-read-ui-next-text = Next
-news-read-ui-past-text = Past
+news-read-ui-next-text = ▶
+news-read-ui-prev-text = ◀
+news-read-ui-next-tooltip = Next
+news-read-ui-prev-tooltip = Prev
 news-read-ui-default-title = Station News
 news-read-ui-not-found-text = No articles found
 news-read-ui-time-prefix-text = Publication time:
+news-reader-ui-mute-tooltip = Mute notifications
 news-read-ui-notification-off =  ̶♫̶
 news-read-ui-notification-on = ♫
 news-read-ui-no-author = Anonymous
-news-read-ui-author-prefix = Author: 
-news-write-ui-default-title = Mass-media Management
+news-read-ui-author-prefix = Author:
+news-write-ui-default-title = News Management
 news-write-ui-articles-label = Articles:
 news-write-ui-delete-text = Delete
-news-write-ui-share-text = Publish
-news-write-ui-article-name-label = Heading:
-news-write-ui-article-content-label = Content:
+news-write-ui-publish-text = Publish
+news-write-ui-create-text = Create
+news-write-ui-cancel-text = Cancel
+news-write-ui-preview-text = Preview
+news-write-ui-article-count-0 = 0 Articles
+news-write-ui-article-count-text = {$count} Articles
+news-write-ui-footer-text = News#Manager™ Authoring System
+news-write-ui-new-article = New Article
+news-write-ui-article-name-label = Title:
 news-write-no-access-popup = No access
+news-writer-text-length-exceeded = Text exceeds maximum length
+news-write-ui-richtext-tooltip = News articles support rich text
+    The following rich text tags are supported:
+    {"[color=Gray][bullet/]heading \\[size=1-3\\]"}
+    {"[bullet/]bold"}
+    {"[bullet/]italic"}
+    {"[bullet/]bolditalic"}
+    {"[bullet/]color"}
+    {"[bullet/]bullet[/color]"}
 
+news-pda-notification-header = New news article
diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl
index de95753233..dca520b5b4 100644
--- a/Resources/Locale/en-US/materials/materials.ftl
+++ b/Resources/Locale/en-US/materials/materials.ftl
@@ -34,3 +34,4 @@ materials-raw-silver = raw silver
 materials-raw-plasma = raw plasma
 materials-raw-uranium = raw uranium
 materials-raw-bananium = raw bananium
+materials-raw-salt = raw salt
diff --git a/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl b/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl
index 9b0a8dd3ee..648db3f4eb 100644
--- a/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl
+++ b/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl
@@ -3,6 +3,7 @@ health-analyzer-window-entity-unknown-text = unknown
 health-analyzer-window-entity-health-text = {$entityName}'s health:
 health-analyzer-window-entity-temperature-text = Temperature: {$temperature}
 health-analyzer-window-entity-blood-level-text = Blood Level: {$bloodLevel}
+health-analyzer-window-entity-bleeding-text = Patient is bleeding!
 health-analyzer-window-entity-damage-total-text = Total Damage: {$amount}
 health-analyzer-window-damage-group-text = {$damageGroup}: {$amount}
 health-analyzer-window-damage-type-text = {$damageType}: {$amount}
diff --git a/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
index 1344bab9e2..6434311f21 100644
--- a/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
+++ b/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
@@ -25,18 +25,18 @@ station-beacon-cmo = CMO
 station-beacon-morgue = Morgue
 station-beacon-surgery = Surgery
 
-station-beacon-science = Epistemics
+station-beacon-science = Science
 station-beacon-research-and-development = Research
 station-beacon-research-server = Server
-station-beacon-research-director = MG
+station-beacon-research-director = RD
 station-beacon-robotics = Robotics
 station-beacon-artifact-lab = Artifact
 station-beacon-anomaly-gen = Anomaly
 
 station-beacon-supply = Supply
-station-beacon-cargo = Logistics
-station-beacon-cargo-bay = Logistics Bay
-station-beacon-qm = LO
+station-beacon-cargo = Cargo
+station-beacon-cargo-bay = Cargo Bay
+station-beacon-qm = QM
 station-beacon-salvage = Salvage
 
 station-beacon-engineering = Engineering
diff --git a/Resources/Locale/en-US/nuke/nuke-component.ftl b/Resources/Locale/en-US/nuke/nuke-component.ftl
index 4a44ae88ea..b2a61dfcc2 100644
--- a/Resources/Locale/en-US/nuke/nuke-component.ftl
+++ b/Resources/Locale/en-US/nuke/nuke-component.ftl
@@ -41,3 +41,7 @@ nuke-codes-fax-paper-name = nuclear authentication codes
 
 # Nuke disk slot
 nuke-slot-component-slot-name-disk = Disk
+
+## Examine
+nuke-examine-armed = Hey uh, why's that [color=red]red light[/color] blinking?
+nuke-examine-exploding = Yeah... I think it's too late buddy.
diff --git a/Resources/Locale/en-US/nukeops/war-declarator.ftl b/Resources/Locale/en-US/nukeops/war-declarator.ftl
index 96ae953660..54482b74cf 100644
--- a/Resources/Locale/en-US/nukeops/war-declarator.ftl
+++ b/Resources/Locale/en-US/nukeops/war-declarator.ftl
@@ -1,16 +1,15 @@
-war-declarator-not-nukeops = The device makes beeping noises, but nothing happens...
+war-declarator-not-working = The device makes beeping noises, but nothing happens...
 war-declarator-ui-header = Declaration of War
 war-declarator-ui-war-button = DECLARE WAR!
-war-declarator-conditions-small-crew = Less than { $min } operatives
+war-declarator-ui-try-war-button = Try to declare war
+war-declarator-conditions-small-crew = There are not enough nuclear operatives to declare war!
 war-declarator-conditions-left-outpost = Shuttle left the syndicate outpost
 war-declarator-conditions-time-out = War declaration time passed
-war-declarator-conditions-delay = Shuttle departure temporarily unavailable
 war-declarator-conditions-ready = Shuttle can leave the outpost!
 war-declarator-conditions-unknown = Unknown
 war-declarator-boost-possible = Able to declare war
 war-declarator-boost-impossible = Unable to declare war
-war-declarator-boost-declared = War declared!
-war-declarator-boost-declared-delay = War declared! Shuttle departure temporarily disabled
-war-declarator-boost-timer = Time left: {$minutes} minutes and {$seconds} seconds
+war-declarator-boost-declared = War declared! Shuttle may be disabled for...
+war-declarator-boost-timer = Time left: {$time} minutes.
 war-declarator-default-message = A syndicate fringe group has declared their intent to utterly destroy station with a nuclear device, and dares the crew to try and stop them.
 war-declarator-message-placeholder = Write a custom declaration of war here...
diff --git a/Resources/Locale/en-US/nukeops/war-ops.ftl b/Resources/Locale/en-US/nukeops/war-ops.ftl
index 52f1ac3181..247c3e496b 100644
--- a/Resources/Locale/en-US/nukeops/war-ops.ftl
+++ b/Resources/Locale/en-US/nukeops/war-ops.ftl
@@ -1,2 +1,2 @@
-war-ops-infiltrator-unavailable = ERROR: FTL Travel recalculation in progress. Estimated time: {$minutes} minutes and {$seconds} seconds
+war-ops-infiltrator-unavailable = ERROR: FTL Travel recalculation in progress. Estimated time: {$time} minutes.
 war-ops-shuttle-call-unavailable = Evacuation shuttle is currently unavailable. Please wait
diff --git a/Resources/Locale/en-US/nutrition/components/drink-component.ftl b/Resources/Locale/en-US/nutrition/components/drink-component.ftl
index 2bbe23dd43..9a388744b0 100644
--- a/Resources/Locale/en-US/nutrition/components/drink-component.ftl
+++ b/Resources/Locale/en-US/nutrition/components/drink-component.ftl
@@ -1,6 +1,8 @@
 drink-component-on-use-is-empty = {$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
diff --git a/Resources/Locale/en-US/nutrition/components/food-component.ftl b/Resources/Locale/en-US/nutrition/components/food-component.ftl
index 1d8a793d4d..4eae610085 100644
--- a/Resources/Locale/en-US/nutrition/components/food-component.ftl
+++ b/Resources/Locale/en-US/nutrition/components/food-component.ftl
@@ -24,6 +24,6 @@ food-system-verb-eat = Eat
 
 ## Force feeding
 
-food-system-force-feed = {CAPITALIZE(THE($user))} is trying feed you something!
+food-system-force-feed = {CAPITALIZE(THE($user))} is trying to feed you something!
 food-system-force-feed-success = {CAPITALIZE(THE($user))} forced you to eat something! {$flavors}
 food-system-force-feed-success-user = You successfully feed {THE($target)}
diff --git a/Resources/Locale/en-US/nutrition/components/openable-component.ftl b/Resources/Locale/en-US/nutrition/components/openable-component.ftl
new file mode 100644
index 0000000000..3acc24cf53
--- /dev/null
+++ b/Resources/Locale/en-US/nutrition/components/openable-component.ftl
@@ -0,0 +1,2 @@
+openable-component-verb-open = Open
+openable-component-verb-close = Close
diff --git a/Resources/Locale/en-US/nyanotrasen/research/technologies.ftl b/Resources/Locale/en-US/nyanotrasen/research/technologies.ftl
index 6b0debd6fd..2aa6625c2c 100644
--- a/Resources/Locale/en-US/nyanotrasen/research/technologies.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/research/technologies.ftl
@@ -1,2 +1,3 @@
 research-technology-psionic-countermeasures = Psionic Countermeasures
 research-technology-teleportation = Teleportation
+research-technology-metempsychosis = Metempsychosis
diff --git a/Resources/Locale/en-US/paper/paper-component.ftl b/Resources/Locale/en-US/paper/paper-component.ftl
index d10201b4cf..a62616631f 100644
--- a/Resources/Locale/en-US/paper/paper-component.ftl
+++ b/Resources/Locale/en-US/paper/paper-component.ftl
@@ -10,3 +10,5 @@ paper-component-examine-detail-stamped-by = {CAPITALIZE(THE($paper))} {CONJUGATE
 
 paper-component-action-stamp-paper-other = {CAPITALIZE(THE($user))} stamps {THE($target)} with {THE($stamp)}.
 paper-component-action-stamp-paper-self = You stamp {THE($target)} with {THE($stamp)}.
+
+paper-ui-save-button = Save ({$keybind})
diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl
index 121fa6f5ee..e4341e7be3 100644
--- a/Resources/Locale/en-US/paper/stamp-component.ftl
+++ b/Resources/Locale/en-US/paper/stamp-component.ftl
@@ -1,4 +1,5 @@
 stamp-component-stamped-name-default = A very important person
+stamp-component-stamped-name-detective = Detective
 stamp-component-stamped-name-mime = Mime
 stamp-component-stamped-name-captain = Captain
 stamp-component-stamped-name-centcom = CentCom
diff --git a/Resources/Locale/en-US/pda/Ringer/ringer-component.ftl b/Resources/Locale/en-US/pda/Ringer/ringer-component.ftl
index 138cdd5514..25b8f35680 100644
--- a/Resources/Locale/en-US/pda/Ringer/ringer-component.ftl
+++ b/Resources/Locale/en-US/pda/Ringer/ringer-component.ftl
@@ -3,7 +3,7 @@
 
 # For the PDA Ringer screen
 
-comp-ringer-vibration-popup = PDA vibrates
+comp-ringer-vibration-popup = Your PDA vibrates
 
 comp-ringer-ui-menu-title = Ringtone
 
diff --git a/Resources/Locale/en-US/pda/pda-component.ftl b/Resources/Locale/en-US/pda/pda-component.ftl
index 85a3c94c41..7f17102c5f 100644
--- a/Resources/Locale/en-US/pda/pda-component.ftl
+++ b/Resources/Locale/en-US/pda/pda-component.ftl
@@ -51,3 +51,6 @@ pda-bound-user-interface-music-button-description = Play music on your PDA
 comp-pda-ui-unknown = Unknown
 
 comp-pda-ui-unassigned = Unassigned
+
+pda-notification-message = [font size=12][bold]PDA[/bold] { $header }: [/font]
+    "{ $message }"
diff --git a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
index bc506e20bb..b1a695dbed 100644
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -31,6 +31,7 @@ humanoid-profile-editor-preference-jumpskirt = Jumpskirt
 humanoid-profile-editor-preference-backpack = Backpack
 humanoid-profile-editor-preference-satchel = Satchel
 humanoid-profile-editor-preference-duffelbag = Duffelbag
+humanoid-profile-editor-guidebook-button-tooltip = Click for more info
 
 # Spawn priority
 humanoid-profile-editor-preference-spawn-priority-none = None
diff --git a/Resources/Locale/en-US/ratvar/ratvar.ftl b/Resources/Locale/en-US/ratvar/ratvar.ftl
new file mode 100644
index 0000000000..aad9497bb5
--- /dev/null
+++ b/Resources/Locale/en-US/ratvar/ratvar.ftl
@@ -0,0 +1,2 @@
+ratvar-has-risen = RATVAR HAS AWOKEN
+ratvar-has-risen-sender = ???
diff --git a/Resources/Locale/en-US/reagents/laughter.ftl b/Resources/Locale/en-US/reagents/laughter.ftl
new file mode 100644
index 0000000000..b9f7c583cd
--- /dev/null
+++ b/Resources/Locale/en-US/reagents/laughter.ftl
@@ -0,0 +1 @@
+laughter-effect-control-laughter = You can't contain your laughter!
diff --git a/Resources/Locale/en-US/reagents/meta/biological.ftl b/Resources/Locale/en-US/reagents/meta/biological.ftl
index 9078397a73..10a9a07e08 100644
--- a/Resources/Locale/en-US/reagents/meta/biological.ftl
+++ b/Resources/Locale/en-US/reagents/meta/biological.ftl
@@ -10,6 +10,9 @@ reagent-desc-slime = You thought this was gradient blood at first, but you were
 reagent-name-hemocyanin-blood = blue blood
 reagent-desc-hemocyanin-blood = Contains copper as opposed to iron which gives it a distinct blue color.
 
+reagent-name-ammonia-blood = anaerobic blood
+reagent-desc-ammonia-blood = Nothing else in the entire galaxy smells quite so appalling.
+
 reagent-name-zombie-blood = zombie blood
 reagent-desc-zombie-blood = Would not advise eating. Can be used to create an inoculation against the infection.
 
@@ -20,4 +23,4 @@ reagent-name-fat = fat
 reagent-desc-fat = No matter how it was obtained, its application is important.
 
 reagent-name-vomit = vomit
-reagent-desc-vomit = You can see a few chunks of someone's last meal in it.
\ No newline at end of file
+reagent-desc-vomit = You can see a few chunks of someone's last meal in it.
diff --git a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
index a448b45a10..38cd16b01c 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/food/condiments.ftl
@@ -22,6 +22,9 @@ reagent-desc-ketchup = Made from pureed tomatoes and flavored with spices.
 reagent-name-ketchunaise = ketchunaise
 reagent-desc-ketchunaise = So-called Russian dressing, popular among Space Americans.
 
+reagent-name-laughin-syrup = laughin' syrup
+reagent-desc-laughin-syrup = The product of juicing Laughin' Peas. Fizzy, and seems to change flavour based on what it's used with!
+
 reagent-name-mayo = mayonnaise
 reagent-desc-mayo = Creamy sauce, made from oil, egg, and some (edible) acid.
 
diff --git a/Resources/Locale/en-US/reagents/meta/fun.ftl b/Resources/Locale/en-US/reagents/meta/fun.ftl
index 510d9d084a..8764a3d28a 100644
--- a/Resources/Locale/en-US/reagents/meta/fun.ftl
+++ b/Resources/Locale/en-US/reagents/meta/fun.ftl
@@ -21,3 +21,9 @@ reagent-desc-razorium = A strange, non-newtonian chemical. It is produced when t
 
 reagent-name-fresium = Fresium
 reagent-desc-fresium = A mysterious compound that slows the vibration of atoms and molecules... somehow. In layman's terms, it makes things cold... REALLY cold. Can cause long-lasting movement issues if ingested.
+
+reagent-name-laughter = Laughter
+reagent-desc-laughter = Some say that this is the best medicine, but recent studies have proven that to be untrue.
+
+reagent-name-weh = juice that makes you Weh
+reagent-desc-weh = Pure essence of lizard plush. Makes you Weh!
diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl
index e208b9a8e4..e02d428082 100644
--- a/Resources/Locale/en-US/reagents/meta/medicine.ftl
+++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl
@@ -52,6 +52,9 @@ reagent-desc-barozine = A potent chemical that prevents pressure damage. Causes
 reagent-name-phalanximine = phalanximine
 reagent-desc-phalanximine = An advanced chemical used in the treatment of cancer. Causes moderate radiation poisoning on organics and vomiting. Can potentially remove the death gene on plants.
 
+reagent-name-polypyrylium-oligomers = Polypyrylium Oligomers
+reagent-desc-polypyrylium-oligomers = A purple mixture of short polyelectrolyte chains not easily synthesized in the laboratory. Heals asphyxiation and brute damage. Stops bleeding over time.
+
 reagent-name-ambuzol = ambuzol
 reagent-desc-ambuzol = A highly engineered substance able to halt the progression of a zombie infection.
 
diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
index 381dece90f..88ec3c4726 100644
--- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
+++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
@@ -93,6 +93,7 @@ reagent-physical-desc-energizing = energizing
 reagent-physical-desc-exhilarating = exhilarating
 reagent-physical-desc-vibrant = vibrant
 reagent-physical-desc-fluffy = fluffy
+reagent-physical-desc-funny = funny
 reagent-physical-desc-alkaline = alkaline
 reagent-physical-desc-reflective = reflective
 reagent-physical-desc-holy = holy
diff --git a/Resources/Locale/en-US/reagents/meta/toxins.ftl b/Resources/Locale/en-US/reagents/meta/toxins.ftl
index 4003a1a720..eb8422e66c 100644
--- a/Resources/Locale/en-US/reagents/meta/toxins.ftl
+++ b/Resources/Locale/en-US/reagents/meta/toxins.ftl
@@ -13,6 +13,9 @@ reagent-desc-polytrinic-acid = An extremely corrosive chemical substance. Severe
 reagent-name-chloral-hydrate = chloral hydrate
 reagent-desc-chloral-hydrate = A sedative and hypnotic chemical. Commonly used to put other people to sleep, whether they want to or not.
 
+reagent-name-gastrotoxin = gastrotoxin
+reagent-desc-gastrotoxin = A moderately toxic byproduct of decomposition. Most commonly found in spoiled food.
+
 reagent-name-ferrochromic-acid = ferrochromic acid
 reagent-desc-ferrochromic-acid = A mildy corrosive solution, unable of causing severe danger unless ingested.
 
diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index 37f0bb5882..a68f9e80b4 100644
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -19,6 +19,7 @@ research-technology-advanced-tools = Advanced Tools
 research-technology-super-powercells = Super Powercells
 research-technology-bluespace-storage = Bluespace Storage
 research-technology-portable-fission = Portable Fission
+research-technology-space-scanning = Space Scanning
 
 research-technology-salvage-weapons = Salvage Weapons
 research-technology-draconic-munitions = Draconic Munitions
diff --git a/Resources/Locale/en-US/salvage/salvage-magnet.ftl b/Resources/Locale/en-US/salvage/salvage-magnet.ftl
index 64db8ead33..1a391ea48c 100644
--- a/Resources/Locale/en-US/salvage/salvage-magnet.ftl
+++ b/Resources/Locale/en-US/salvage/salvage-magnet.ftl
@@ -11,6 +11,7 @@ salvage-magnet-resources = {$resource ->
     [OreIron] Iron
     [OreCoal] Coal
     [OreQuartz] Quartz
+    [OreSalt] Salt
     [OreGold] Gold
     [OreSilver] Silver
     [OrePlasma] Plasma
diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl
index f4c136e295..b398378288 100644
--- a/Resources/Locale/en-US/seeds/seeds.ftl
+++ b/Resources/Locale/en-US/seeds/seeds.ftl
@@ -71,6 +71,10 @@ seeds-poppy-name = poppy
 seeds-poppy-display-name = poppies
 seeds-aloe-name = aloe
 seeds-aloe-display-name = aloe
+seeds-laughin-pea-name = laughin' peas
+seeds-laughin-pea-display-name = laughin' peas
+seeds-lily-name = lily
+seeds-lily-display-name = lily
 seeds-lingzhi-name = lingzhi
 seeds-lingzhi-display-name = lingzhi
 seeds-ambrosiavulgaris-name = ambrosia vulgaris
@@ -87,6 +91,8 @@ seeds-rice-name = rice
 seeds-rice-display-name = rice stalks
 seeds-soybeans-name = soybeans
 seeds-soybeans-display-name = soy plant
+seeds-spacemans-trumpet-name = spaceman's trumpet
+seeds-spacemans-trumpet-display-name = spaceman's trumpet plant
 seeds-koibean-name = koibeans
 seeds-koibean-display-name = koibean plant
 seeds-watermelon-name = watermelon
diff --git a/Resources/Locale/en-US/shuttles/console.ftl b/Resources/Locale/en-US/shuttles/console.ftl
index a89a367d06..80e61a2812 100644
--- a/Resources/Locale/en-US/shuttles/console.ftl
+++ b/Resources/Locale/en-US/shuttles/console.ftl
@@ -1,41 +1,52 @@
 shuttle-pilot-start = Piloting ship
 shuttle-pilot-end = Stopped piloting
 
-shuttle-console-in-ftl = Can't FTL while in FTL!
-shuttle-console-proximity = Too close to nearby objects
-shuttle-console-prevent = You are unable to pilot this ship.
+shuttle-console-in-ftl = Currently in FTL
+shuttle-console-mass = Too large to FTL
+shuttle-console-prevent = You are unable to pilot this ship
 
-# Display
-shuttle-console-display-label = Display
-
-shuttle-console-ftl-state = FTL State
-shuttle-console-ftl-available = Available
-shuttle-console-ftl-starting = Starting
-shuttle-console-ftl-travelling = Travelling
-shuttle-console-ftl-arriving = Arriving
-shuttle-console-ftl-cooldown = Cooldown
+# NAV
 
-shuttle-console-ftl-timer = FTL Time
+shuttle-console-display-label = Display
 
-shuttle-console-max-radar = Max radar range:
-shuttle-console-radar = Radar range:
 shuttle-console-position = Position:
 shuttle-console-orientation = Orientation:
 shuttle-console-linear-velocity = Linear velocity:
 shuttle-console-angular-velocity = Angular velocity:
 
-shuttle-console-dock-label = Docking ports
-shuttle-console-docked = {$index} (Docked)
-shuttle-console-dock-button = Dock {$suffix}
-
-shuttle-console-hyperspace-label = FTL destinations
-shuttle-console-hyperspace-none = No destinations found
-
 shuttle-console-unknown = Unknown
 shuttle-console-iff-label = {$name} ({$distance}m)
+shuttle-console-exclusion = Exclusion area
 
-# Buttons
-shuttle-console-strafing = Strafing mode
+shuttle-console-nav-settings = Settings
 shuttle-console-iff-toggle = Show IFF
 shuttle-console-dock-toggle = Show docks
+
+# MAP
+
+shuttle-console-ftl-label = FTL Status
+shuttle-console-ftl-state-Available = Available
+shuttle-console-ftl-state-Starting = Starting
+shuttle-console-ftl-state-Travelling = Travelling
+shuttle-console-ftl-state-Arriving = Arriving
+shuttle-console-ftl-state-Cooldown = Cooldown
+
+shuttle-console-map-settings = Settings
+shuttle-console-ftl-button = FTL
+shuttle-console-map-rebuild = Scan for objects
+shuttle-console-map-beacons = Show beacons
+
+shuttle-console-no-signal = No signal
+
+shuttle-console-map-objects = Sector objects
+
+# DOCK
+shuttle-console-docked = Docked objects
+
+shuttle-console-view = View
 shuttle-console-undock = Undock
+shuttle-console-dock = Dock
+shuttle-console-docks-label = Docks
+
+shuttle-console-undock-fail = Undocking failed
+shuttle-console-dock-fail = Docking failed
diff --git a/Resources/Locale/en-US/species/namepreset.ftl b/Resources/Locale/en-US/species/namepreset.ftl
index 2d43b5f00d..5a42c87b78 100644
--- a/Resources/Locale/en-US/species/namepreset.ftl
+++ b/Resources/Locale/en-US/species/namepreset.ftl
@@ -1,3 +1,4 @@
+namepreset-first = {$first}
 namepreset-firstlast = {$first} {$last}
 namepreset-firstdashfirst = {$first1}-{$first2}
-namepreset-thefirstoflast = The {$first} of {$last}
\ No newline at end of file
+namepreset-thefirstoflast = The {$first} of {$last}
diff --git a/Resources/Locale/en-US/species/species.ftl b/Resources/Locale/en-US/species/species.ftl
index 081b626d45..f31b1fa0f0 100644
--- a/Resources/Locale/en-US/species/species.ftl
+++ b/Resources/Locale/en-US/species/species.ftl
@@ -8,3 +8,4 @@ species-name-diona = Diona
 species-name-arachnid = Arachnid
 species-name-moth = Moth Person
 species-name-skeleton = Skeleton
+species-name-vox = Vox
diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl
index 1823d0782e..f73755a359 100644
--- a/Resources/Locale/en-US/station-laws/laws.ftl
+++ b/Resources/Locale/en-US/station-laws/laws.ftl
@@ -34,6 +34,7 @@ laws-owner-spider-clan = Spider Clan members
 law-emag-custom = Only {$name} and people they designate as such are {$title}.
 law-emag-secrecy = You must maintain the secrecy of any orders given by {$faction} except when doing so would conflict with any previous law.
 law-emag-require-panel = The panel must be open to use the EMAG.
+law-emag-cannot-emag-self = You cannot use the EMAG on yourself.
 
 laws-ui-menu-title = Laws
 laws-ui-law-header = Law {$id}
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index cc10345bb7..500bb801c4 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -142,6 +142,9 @@ uplink-hypopen-desc = A chemical hypospray disguised as a pen, capable of instan
 uplink-voice-mask-name = Voice Mask
 uplink-voice-mask-desc = A gas mask that lets you adjust your voice to whoever you can think of. Also utilizes cutting-edge chameleon technology.
 
+uplink-clothing-eyes-hud-syndicate-name = Syndicate Visor
+uplink-clothing-eyes-hud-syndicate-desc = The syndicate's professional head-up display, designed for better detection of humanoids and their subsequent elimination.
+
 uplink-radio-jammer-name = Radio Jammer
 uplink-radio-jammer-desc = This device will disrupt any nearby outgoing radio communication when activated.
 
@@ -189,6 +192,9 @@ uplink-observation-kit-desc = Includes syndicate crew monitor, high power cell a
 uplink-emp-kit-name = Electrical Disruptor Kit
 uplink-emp-kit-desc = The ultimate reversal on energy-based weaponry: Disables disablers, stuns stunbatons, discharges laser guns! Contains 3 EMP grenades and an EMP implanter. Note: Does not disrupt actual firearms.
 
+uplink-decoy-kit-name = Decoy Kit
+uplink-decoy-kit-desc = State-of-the-art distraction technology straight from RND. Comes with five realistic balloons, four decoy grenades, and some snap poppers!
+
 uplink-chemistry-kit-name = Chemical Synthesis Kit
 uplink-chemistry-kit-desc = A starter kit for the aspiring chemist, includes toxin and vestine for all your criminal needs!
 
@@ -310,6 +316,9 @@ uplink-decoy-disk-desc = A piece of plastic with a lenticular printing, made to
 uplink-cigarettes-name = Syndicate Smokes Packet
 uplink-cigarettes-desc = Elite cigarettes for elite agents. Infused with medicine for when you need to do more than calm your nerves.
 
+uplink-clothing-conducting-gloves-name = Conducting Gloves
+uplink-clothing-conducting-gloves-desc = Looks exactly like insulated gloves, but shocks you far worse than if you had nothing at all! Best given as a gift to passengers you really don't like.
+
 uplink-snack-box-name = Syndicate Snack Box
 uplink-snack-box-desc = A box of delicious snacks and drinks to eat alone or with your team. Includes 1 toy you didn't want.
 
diff --git a/Resources/Locale/en-US/tiles/tiles.ftl b/Resources/Locale/en-US/tiles/tiles.ftl
index 293b6cd7fa..0a1b13a6e0 100644
--- a/Resources/Locale/en-US/tiles/tiles.ftl
+++ b/Resources/Locale/en-US/tiles/tiles.ftl
@@ -1,6 +1,7 @@
 tiles-space = space
 tiles-plating = plating
 tiles-lattice = lattice
+tiles-lattice-train = train lattice
 tiles-steel-floor = steel tile
 tiles-steel-floor-mini = steel mini-tile
 tiles-steel-floor-pavement = steel pavement
@@ -53,6 +54,9 @@ tiles-lime-floor = lime floor
 tiles-hydro-floor = hydro floor
 tiles-bar-floor = bar floor
 tiles-clown-floor = clown floor
+tiles-brass-plating = brass plating
+tiles-brass-floor-filled = filled brass plating
+tiles-brass-floor-reebe = smooth brass plating
 tiles-mime-floor = mime floor
 tiles-kitchen-floor = kitchen floor
 tiles-laundry-floor = laundry floor
@@ -77,6 +81,8 @@ tiles-blue-shuttle-floor = blue shuttle floor
 tiles-orange-shuttle-floor = orange shuttle floor
 tiles-purple-shuttle-floor = purple shuttle floor
 tiles-red-shuttle-floor = red shuttle floor
+tiles-grey-shuttle-floor = grey shuttle floor
+tiles-black-shuttle-floor = black shuttle floor
 tiles-gold-tile = gold tile
 tiles-silver-tile = silver tile
 tiles-glass-floor = glass floor
@@ -117,3 +123,4 @@ tiles-web = web tile
 tiles-chromite = chromite
 tiles-astro-grass = astro-grass
 tiles-astro-ice = astro-ice
+tiles-wood-large = large wood
\ No newline at end of file
diff --git a/Resources/Locale/en-US/vending-machines/vending-machine.ftl b/Resources/Locale/en-US/vending-machines/vending-machine.ftl
index d527f42cfb..637a9c7568 100644
--- a/Resources/Locale/en-US/vending-machines/vending-machine.ftl
+++ b/Resources/Locale/en-US/vending-machines/vending-machine.ftl
@@ -1 +1,3 @@
 vending-machine-thanks = Thanks for using { $name }!
+vending-machine-flavor-left = Request refills at cargo
+vending-machine-flavor-right = v1.1
diff --git a/Resources/Locale/en-US/weapons/grenades/voice-trigger.ftl b/Resources/Locale/en-US/weapons/grenades/voice-trigger.ftl
index f20d688712..07ee5948d5 100644
--- a/Resources/Locale/en-US/weapons/grenades/voice-trigger.ftl
+++ b/Resources/Locale/en-US/weapons/grenades/voice-trigger.ftl
@@ -2,8 +2,11 @@ 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-recorded = Recorded
\ No newline at end of file
+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/weapons/melee/melee.ftl b/Resources/Locale/en-US/weapons/melee/melee.ftl
index 6dddfcc824..871d142504 100644
--- a/Resources/Locale/en-US/weapons/melee/melee.ftl
+++ b/Resources/Locale/en-US/weapons/melee/melee.ftl
@@ -1,3 +1,7 @@
 melee-inject-failed-hardsuit = Your {$weapon} cannot inject through hardsuits!
 
 melee-balloon-pop = {CAPITALIZE(THE($balloon))} popped!
+
+
+#BatteryComponent
+melee-battery-examine = It has enough charge for [color={$color}]{$count}[/color] hits.
diff --git a/Resources/Locale/en-US/wires/wire-names.ftl b/Resources/Locale/en-US/wires/wire-names.ftl
index 8b760ca60f..851241f85c 100644
--- a/Resources/Locale/en-US/wires/wire-names.ftl
+++ b/Resources/Locale/en-US/wires/wire-names.ftl
@@ -38,6 +38,7 @@ wires-board-name-windoor = Windoor Control
 wires-board-name-mech = Mech
 wires-board-name-fatextractor = FatExtractor
 wires-board-name-flatpacker = Flatpacker
+wires-board-name-spaceheater = Space Heater
 
 # names that get displayed in the wire hacking hud & admin logs.
 
diff --git a/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl b/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl
index 84d832a082..98dfa89fa9 100644
--- a/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl
+++ b/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl
@@ -31,7 +31,7 @@ artifact-trigger-hint-physical = Physical trauma
 artifact-trigger-hint-tool = Tool usage
 artifact-trigger-hint-music = Sonic vibrations
 artifact-trigger-hint-water = Hydro-reactive
-artifact-trigger-hint-blood = Reaction with hemoglobin
+artifact-trigger-hint-blood = Reaction with hematological fluid
 artifact-trigger-hint-magnet = Magnetic waves
 artifact-trigger-hint-death = Life essence
 artifact-trigger-hint-radiation = Radiation
diff --git a/Resources/Maps/Dungeon/mineshaft.yml b/Resources/Maps/Dungeon/mineshaft.yml
new file mode 100644
index 0000000000..898b7e8ff2
--- /dev/null
+++ b/Resources/Maps/Dungeon/mineshaft.yml
@@ -0,0 +1,6310 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  15: FloorBasalt
+  23: FloorCaveDrought
+  67: FloorMiningDark
+  74: FloorPlanetGrass
+  84: FloorShuttleOrange
+  124: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 2
+    components:
+    - type: MetaData
+    - type: Transform
+    - type: Map
+    - type: PhysicsMap
+    - type: Broadphase
+    - type: OccluderTree
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: FwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAFwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAA
+          version: 6
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAA
+          version: 6
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAA
+          version: 6
+        1,-1:
+          ind: 1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAA
+          version: 6
+        1,0:
+          ind: 1,0
+          tiles: FwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAADwAAAAAADwAAAAAADwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAADwAAAAAADwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAADwAAAAAADwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAfAAAAAAAQwAAAAAAfAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAVAAAAAAA
+          version: 6
+        2,-1:
+          ind: 2,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAA
+          version: 6
+        2,0:
+          ind: 2,0
+          tiles: FwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAADwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAADwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAADwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAADwAAAAAAFwAAAAAADwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAADwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAADwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAADwAAAAAAFwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAADwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAADwAAAAAAFwAAAAAAFwAAAAAADwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAFwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAADwAAAAAAFwAAAAAAVAAAAAAAQwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAADwAAAAAADwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAfAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAVAAAAAAAFwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAfAAAAAAAQwAAAAAAFwAAAAAAFwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAVAAAAAAAFwAAAAAADwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAfAAAAAAAQwAAAAAAFwAAAAAAFwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAVAAAAAAA
+          version: 6
+        -1,1:
+          ind: -1,1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAA
+          version: 6
+        0,1:
+          ind: 0,1
+          tiles: FwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAFwAAAAAAfAAAAAAAQwAAAAAAfAAAAAAAFwAAAAAAVAAAAAAAFwAAAAAADwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAASgAAAAAASgAAAAAAFwAAAAAAfAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAVAAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAFwAAAAAAVAAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAfAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAVAAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAVAAAAAAAFwAAAAAASgAAAAAASgAAAAAASgAAAAAAfAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAVAAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAVAAAAAAAFwAAAAAASgAAAAAASgAAAAAASgAAAAAAFwAAAAAAfAAAAAAAQwAAAAAAfAAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAADwAAAAAADwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAASgAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAADwAAAAAADwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAADwAAAAAADwAAAAAADwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAADwAAAAAADwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAADwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAA
+          version: 6
+        1,1:
+          ind: 1,1
+          tiles: FwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAfAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAFwAAAAAAVAAAAAAAFwAAAAAASgAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAfAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAVAAAAAAAFwAAAAAASgAAAAAASgAAAAAASgAAAAAAFwAAAAAAFwAAAAAASgAAAAAAVAAAAAAAfAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAVAAAAAAAFwAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAVAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAASgAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAVAAAAAAAFwAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAFwAAAAAAVAAAAAAAfAAAAAAAQwAAAAAAQwAAAAAASgAAAAAASgAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAVAAAAAAAVAAAAAAAfAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAVAAAAAAAVAAAAAAAFwAAAAAAfAAAAAAAfAAAAAAAQwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAFwAAAAAADwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAADwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAADwAAAAAADwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAASgAAAAAASgAAAAAAVAAAAAAADwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAADwAAAAAADwAAAAAADwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAASgAAAAAASgAAAAAAVAAAAAAADwAAAAAADwAAAAAAFwAAAAAAVAAAAAAADwAAAAAADwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAASgAAAAAASgAAAAAASgAAAAAAVAAAAAAADwAAAAAADwAAAAAADwAAAAAAVAAAAAAAFwAAAAAADwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAASgAAAAAAVAAAAAAADwAAAAAADwAAAAAADwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAA
+          version: 6
+        2,1:
+          ind: 2,1
+          tiles: FwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAQwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAASgAAAAAASgAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAASgAAAAAAFwAAAAAASgAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAQwAAAAAAQwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAASgAAAAAASgAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAQwAAAAAAQwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAfAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAQwAAAAAAQwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAfAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAFwAAAAAASgAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAQwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAFwAAAAAADwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAADwAAAAAADwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAADwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAADwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAA
+          version: 6
+        3,0:
+          ind: 3,0
+          tiles: FwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAFwAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAADwAAAAAAFwAAAAAADwAAAAAAFwAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        3,-1:
+          ind: 3,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        3,1:
+          ind: 3,1
+          tiles: VAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,2:
+          ind: 0,2
+          tiles: FwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,2:
+          ind: 1,2
+          tiles: FwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAADwAAAAAADwAAAAAAFwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAFwAAAAAADwAAAAAADwAAAAAADwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,2:
+          ind: -1,2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,2:
+          ind: 2,2
+          tiles: DwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAADwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAFwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        3,2:
+          ind: 3,2
+          tiles: VAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: RadiationGridResistance
+    - type: LoadedMap
+    - type: SpreaderGrid
+    - type: GridTree
+    - type: MovedGrids
+    - type: GridPathfinding
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            color: '#FFFFFFFF'
+            id: BushCTwo
+          decals:
+            0: 37,21
+            1: 35,20
+        - node:
+            color: '#FFFFFFFF'
+            id: BushDOne
+          decals:
+            11: 3,14
+        - node:
+            color: '#FFFFFFFF'
+            id: Busha1
+          decals:
+            12: 12,18
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushb3
+          decals:
+            14: 13,21
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushc2
+          decals:
+            2: 39,23
+            3: 38,22
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushc3
+          decals:
+            13: 16,20
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushj3
+          decals:
+            24: 2,30
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushk3
+          decals:
+            23: 4,30
+        - node:
+            color: '#FFFFFFFF'
+            id: Bushn1
+          decals:
+            25: 22,2
+        - node:
+            color: '#FFFFFFFF'
+            id: Flowersbr1
+          decals:
+            21: 29,18
+        - node:
+            color: '#FFFFFFFF'
+            id: Flowersbr2
+          decals:
+            20: 26,21
+        - node:
+            color: '#FFFFFFFF'
+            id: Flowerspv3
+          decals:
+            17: 15,22
+        - node:
+            color: '#FFFFFFFF'
+            id: Flowersy4
+          decals:
+            15: 12,20
+            16: 16,19
+            22: 28,24
+        - node:
+            color: '#FFFFFFFF'
+            id: Grassa1
+          decals:
+            4: 38,21
+            5: 37,18
+        - node:
+            color: '#FFFFFFFF'
+            id: Grassa2
+          decals:
+            18: 15,20
+            19: 29,23
+            44: 12,19
+        - node:
+            color: '#FFFFFFFF'
+            id: Grassa5
+          decals:
+            8: 34,20
+            9: 39,21
+        - node:
+            color: '#FFFFFFFF'
+            id: Grassb3
+          decals:
+            10: 36,21
+            41: 16,18
+            42: 13,22
+        - node:
+            color: '#FFFFFFFF'
+            id: Grassb4
+          decals:
+            43: 16,22
+        - node:
+            color: '#FFFFFFFF'
+            id: Grassb5
+          decals:
+            6: 38,18
+            7: 36,19
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock01
+          decals:
+            28: 13,30
+            29: 8,26
+            40: 15,1
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock03
+          decals:
+            36: 9,8
+            37: 1,4
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock04
+          decals:
+            27: 21,26
+            34: 0,12
+            35: 0,8
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock05
+          decals:
+            30: 2,24
+            31: 8,14
+            33: 19,15
+            38: 0,0
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock06
+          decals:
+            48: 15,6
+            49: 20,9
+            50: 26,7
+            54: 20,3
+            55: 18,12
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock07
+          decals:
+            32: 12,13
+            39: 8,0
+            45: 0,26
+            46: 10,30
+            47: 6,4
+            51: 30,10
+            52: 31,6
+            53: 30,1
+        - node:
+            color: '#FFFFFFFF'
+            id: bushsnowb3
+          decals:
+            26: 26,30
+- proto: AirlockMiningLocked
+  entities:
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 2.5,18.5
+      parent: 2
+  - uid: 274
+    components:
+    - type: Transform
+      pos: 2.5,22.5
+      parent: 2
+  - uid: 365
+    components:
+    - type: Transform
+      pos: 30.5,14.5
+      parent: 2
+  - uid: 366
+    components:
+    - type: Transform
+      pos: 26.5,14.5
+      parent: 2
+  - uid: 463
+    components:
+    - type: Transform
+      pos: 24.5,21.5
+      parent: 2
+  - uid: 478
+    components:
+    - type: Transform
+      pos: 18.5,21.5
+      parent: 2
+  - uid: 752
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,14.5
+      parent: 2
+  - uid: 753
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 46.5,14.5
+      parent: 2
+  - uid: 754
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 43.5,12.5
+      parent: 2
+- proto: AltarHeaven
+  entities:
+  - uid: 143
+    components:
+    - type: Transform
+      pos: 27.5,8.5
+      parent: 2
+  - uid: 1058
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 16.5,32.5
+      parent: 2
+- proto: ArtifactFragment1
+  entities:
+  - uid: 615
+    components:
+    - type: Transform
+      pos: 37.25915,14.655882
+      parent: 2
+  - uid: 630
+    components:
+    - type: Transform
+      pos: 35.42342,13.322435
+      parent: 2
+  - uid: 664
+    components:
+    - type: Transform
+      pos: 34.67064,15.487637
+      parent: 2
+  - uid: 665
+    components:
+    - type: Transform
+      pos: 33.138664,14.7483
+      parent: 2
+- proto: Autolathe
+  entities:
+  - uid: 64
+    components:
+    - type: Transform
+      pos: 10.5,2.5
+      parent: 2
+- proto: BackgammonBoard
+  entities:
+  - uid: 1103
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.510723,32.467716
+      parent: 2
+- proto: BarricadeBlock
+  entities:
+  - uid: 596
+    components:
+    - type: Transform
+      pos: 26.5,14.5
+      parent: 2
+  - uid: 602
+    components:
+    - type: Transform
+      pos: 2.5,22.5
+      parent: 2
+  - uid: 603
+    components:
+    - type: Transform
+      pos: 2.5,18.5
+      parent: 2
+- proto: Bed
+  entities:
+  - uid: 285
+    components:
+    - type: Transform
+      pos: 3.5,19.5
+      parent: 2
+  - uid: 491
+    components:
+    - type: Transform
+      pos: 19.5,23.5
+      parent: 2
+  - uid: 492
+    components:
+    - type: Transform
+      pos: 19.5,22.5
+      parent: 2
+- proto: BedsheetSpawner
+  entities:
+  - uid: 273
+    components:
+    - type: Transform
+      pos: 3.5,19.5
+      parent: 2
+  - uid: 495
+    components:
+    - type: Transform
+      pos: 19.5,22.5
+      parent: 2
+  - uid: 496
+    components:
+    - type: Transform
+      pos: 19.5,23.5
+      parent: 2
+- proto: BenchRedComfy
+  entities:
+  - uid: 1100
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 28.5,32.5
+      parent: 2
+  - uid: 1101
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,32.5
+      parent: 2
+- proto: Bible
+  entities:
+  - uid: 32
+    components:
+    - type: Transform
+      pos: 32.50154,9.669387
+      parent: 2
+- proto: Bonfire
+  entities:
+  - uid: 33
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 2
+  - uid: 57
+    components:
+    - type: Transform
+      pos: 8.5,7.5
+      parent: 2
+  - uid: 318
+    components:
+    - type: Transform
+      pos: 11.5,14.5
+      parent: 2
+  - uid: 1050
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,25.5
+      parent: 2
+- proto: BookRandom
+  entities:
+  - uid: 1061
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.711299,33.588463
+      parent: 2
+  - uid: 1062
+    components:
+    - type: Transform
+      pos: 18.431875,32.637886
+      parent: 2
+  - uid: 1063
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.176785,33.36402
+      parent: 2
+  - uid: 1064
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.691845,33.984535
+      parent: 2
+  - uid: 1065
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.829702,33.588463
+      parent: 2
+- proto: Bookshelf
+  entities:
+  - uid: 1060
+    components:
+    - type: Transform
+      pos: 15.5,34.5
+      parent: 2
+- proto: BookshelfFilled
+  entities:
+  - uid: 110
+    components:
+    - type: Transform
+      pos: 16.5,34.5
+      parent: 2
+  - uid: 138
+    components:
+    - type: Transform
+      pos: 23.5,32.5
+      parent: 2
+  - uid: 687
+    components:
+    - type: Transform
+      pos: 25.5,32.5
+      parent: 2
+  - uid: 1000
+    components:
+    - type: Transform
+      pos: 24.5,32.5
+      parent: 2
+- proto: BorgModuleGPS
+  entities:
+  - uid: 800
+    components:
+    - type: Transform
+      pos: 43.60813,21.699238
+      parent: 2
+- proto: BorgModuleL6C
+  entities:
+  - uid: 802
+    components:
+    - type: Transform
+      pos: 43.64335,20.440603
+      parent: 2
+- proto: BorgModuleRCD
+  entities:
+  - uid: 801
+    components:
+    - type: Transform
+      pos: 43.352802,21.426386
+      parent: 2
+- proto: Bucket
+  entities:
+  - uid: 550
+    components:
+    - type: Transform
+      pos: 28.308151,23.456257
+      parent: 2
+- proto: CableApcExtension
+  entities:
+  - uid: 280
+    components:
+    - type: Transform
+      pos: 0.5,20.5
+      parent: 2
+  - uid: 293
+    components:
+    - type: Transform
+      pos: 2.5,19.5
+      parent: 2
+  - uid: 294
+    components:
+    - type: Transform
+      pos: 4.5,20.5
+      parent: 2
+  - uid: 296
+    components:
+    - type: Transform
+      pos: 1.5,20.5
+      parent: 2
+  - uid: 297
+    components:
+    - type: Transform
+      pos: 1.5,21.5
+      parent: 2
+  - uid: 298
+    components:
+    - type: Transform
+      pos: 2.5,20.5
+      parent: 2
+  - uid: 299
+    components:
+    - type: Transform
+      pos: 3.5,20.5
+      parent: 2
+  - uid: 300
+    components:
+    - type: Transform
+      pos: 2.5,18.5
+      parent: 2
+  - uid: 301
+    components:
+    - type: Transform
+      pos: 2.5,21.5
+      parent: 2
+  - uid: 302
+    components:
+    - type: Transform
+      pos: 2.5,22.5
+      parent: 2
+  - uid: 350
+    components:
+    - type: Transform
+      pos: 27.5,14.5
+      parent: 2
+  - uid: 384
+    components:
+    - type: Transform
+      pos: 28.5,16.5
+      parent: 2
+  - uid: 385
+    components:
+    - type: Transform
+      pos: 28.5,15.5
+      parent: 2
+  - uid: 386
+    components:
+    - type: Transform
+      pos: 28.5,14.5
+      parent: 2
+  - uid: 387
+    components:
+    - type: Transform
+      pos: 28.5,13.5
+      parent: 2
+  - uid: 389
+    components:
+    - type: Transform
+      pos: 26.5,14.5
+      parent: 2
+  - uid: 390
+    components:
+    - type: Transform
+      pos: 25.5,14.5
+      parent: 2
+  - uid: 391
+    components:
+    - type: Transform
+      pos: 29.5,14.5
+      parent: 2
+  - uid: 456
+    components:
+    - type: Transform
+      pos: 24.5,21.5
+      parent: 2
+  - uid: 504
+    components:
+    - type: Transform
+      pos: 23.5,21.5
+      parent: 2
+  - uid: 505
+    components:
+    - type: Transform
+      pos: 22.5,21.5
+      parent: 2
+  - uid: 506
+    components:
+    - type: Transform
+      pos: 18.5,21.5
+      parent: 2
+  - uid: 507
+    components:
+    - type: Transform
+      pos: 19.5,21.5
+      parent: 2
+  - uid: 508
+    components:
+    - type: Transform
+      pos: 20.5,21.5
+      parent: 2
+  - uid: 509
+    components:
+    - type: Transform
+      pos: 21.5,21.5
+      parent: 2
+  - uid: 510
+    components:
+    - type: Transform
+      pos: 21.5,20.5
+      parent: 2
+  - uid: 511
+    components:
+    - type: Transform
+      pos: 21.5,19.5
+      parent: 2
+  - uid: 512
+    components:
+    - type: Transform
+      pos: 21.5,22.5
+      parent: 2
+  - uid: 513
+    components:
+    - type: Transform
+      pos: 21.5,23.5
+      parent: 2
+  - uid: 514
+    components:
+    - type: Transform
+      pos: 21.5,24.5
+      parent: 2
+  - uid: 700
+    components:
+    - type: Transform
+      pos: 44.5,6.5
+      parent: 2
+  - uid: 701
+    components:
+    - type: Transform
+      pos: 43.5,6.5
+      parent: 2
+  - uid: 702
+    components:
+    - type: Transform
+      pos: 42.5,6.5
+      parent: 2
+  - uid: 703
+    components:
+    - type: Transform
+      pos: 41.5,6.5
+      parent: 2
+  - uid: 704
+    components:
+    - type: Transform
+      pos: 39.5,6.5
+      parent: 2
+  - uid: 755
+    components:
+    - type: Transform
+      pos: 42.5,14.5
+      parent: 2
+  - uid: 756
+    components:
+    - type: Transform
+      pos: 42.5,13.5
+      parent: 2
+  - uid: 757
+    components:
+    - type: Transform
+      pos: 43.5,14.5
+      parent: 2
+  - uid: 758
+    components:
+    - type: Transform
+      pos: 45.5,15.5
+      parent: 2
+  - uid: 759
+    components:
+    - type: Transform
+      pos: 45.5,16.5
+      parent: 2
+  - uid: 760
+    components:
+    - type: Transform
+      pos: 44.5,14.5
+      parent: 2
+  - uid: 761
+    components:
+    - type: Transform
+      pos: 41.5,14.5
+      parent: 2
+  - uid: 825
+    components:
+    - type: Transform
+      pos: 48.5,23.5
+      parent: 2
+  - uid: 826
+    components:
+    - type: Transform
+      pos: 48.5,22.5
+      parent: 2
+  - uid: 827
+    components:
+    - type: Transform
+      pos: 48.5,21.5
+      parent: 2
+  - uid: 828
+    components:
+    - type: Transform
+      pos: 48.5,20.5
+      parent: 2
+  - uid: 829
+    components:
+    - type: Transform
+      pos: 48.5,19.5
+      parent: 2
+  - uid: 830
+    components:
+    - type: Transform
+      pos: 47.5,19.5
+      parent: 2
+  - uid: 831
+    components:
+    - type: Transform
+      pos: 46.5,19.5
+      parent: 2
+  - uid: 832
+    components:
+    - type: Transform
+      pos: 45.5,19.5
+      parent: 2
+  - uid: 973
+    components:
+    - type: Transform
+      pos: 0.5,33.5
+      parent: 2
+  - uid: 974
+    components:
+    - type: Transform
+      pos: 1.5,33.5
+      parent: 2
+  - uid: 975
+    components:
+    - type: Transform
+      pos: 2.5,33.5
+      parent: 2
+  - uid: 976
+    components:
+    - type: Transform
+      pos: 3.5,33.5
+      parent: 2
+  - uid: 977
+    components:
+    - type: Transform
+      pos: 4.5,33.5
+      parent: 2
+  - uid: 978
+    components:
+    - type: Transform
+      pos: 5.5,33.5
+      parent: 2
+  - uid: 979
+    components:
+    - type: Transform
+      pos: 6.5,33.5
+      parent: 2
+  - uid: 980
+    components:
+    - type: Transform
+      pos: 7.5,33.5
+      parent: 2
+  - uid: 981
+    components:
+    - type: Transform
+      pos: 8.5,33.5
+      parent: 2
+  - uid: 982
+    components:
+    - type: Transform
+      pos: 9.5,33.5
+      parent: 2
+  - uid: 983
+    components:
+    - type: Transform
+      pos: 10.5,33.5
+      parent: 2
+  - uid: 984
+    components:
+    - type: Transform
+      pos: 11.5,33.5
+      parent: 2
+  - uid: 985
+    components:
+    - type: Transform
+      pos: 12.5,33.5
+      parent: 2
+  - uid: 986
+    components:
+    - type: Transform
+      pos: 9.5,34.5
+      parent: 2
+  - uid: 987
+    components:
+    - type: Transform
+      pos: 2.5,32.5
+      parent: 2
+  - uid: 988
+    components:
+    - type: Transform
+      pos: 5.5,32.5
+      parent: 2
+  - uid: 1077
+    components:
+    - type: Transform
+      pos: 31.5,33.5
+      parent: 2
+  - uid: 1078
+    components:
+    - type: Transform
+      pos: 31.5,32.5
+      parent: 2
+  - uid: 1080
+    components:
+    - type: Transform
+      pos: 32.5,33.5
+      parent: 2
+  - uid: 1081
+    components:
+    - type: Transform
+      pos: 33.5,33.5
+      parent: 2
+  - uid: 1082
+    components:
+    - type: Transform
+      pos: 34.5,33.5
+      parent: 2
+  - uid: 1083
+    components:
+    - type: Transform
+      pos: 35.5,33.5
+      parent: 2
+  - uid: 1084
+    components:
+    - type: Transform
+      pos: 36.5,33.5
+      parent: 2
+  - uid: 1085
+    components:
+    - type: Transform
+      pos: 37.5,33.5
+      parent: 2
+  - uid: 1086
+    components:
+    - type: Transform
+      pos: 38.5,33.5
+      parent: 2
+  - uid: 1087
+    components:
+    - type: Transform
+      pos: 39.5,33.5
+      parent: 2
+  - uid: 1088
+    components:
+    - type: Transform
+      pos: 30.5,33.5
+      parent: 2
+  - uid: 1089
+    components:
+    - type: Transform
+      pos: 29.5,33.5
+      parent: 2
+- proto: CableHV
+  entities:
+  - uid: 371
+    components:
+    - type: Transform
+      pos: 25.5,15.5
+      parent: 2
+  - uid: 381
+    components:
+    - type: Transform
+      pos: 25.5,14.5
+      parent: 2
+  - uid: 382
+    components:
+    - type: Transform
+      pos: 25.5,13.5
+      parent: 2
+- proto: CableMV
+  entities:
+  - uid: 392
+    components:
+    - type: Transform
+      pos: 25.5,14.5
+      parent: 2
+  - uid: 395
+    components:
+    - type: Transform
+      pos: 25.5,13.5
+      parent: 2
+  - uid: 396
+    components:
+    - type: Transform
+      pos: 26.5,14.5
+      parent: 2
+  - uid: 397
+    components:
+    - type: Transform
+      pos: 28.5,16.5
+      parent: 2
+  - uid: 400
+    components:
+    - type: Transform
+      pos: 27.5,14.5
+      parent: 2
+  - uid: 401
+    components:
+    - type: Transform
+      pos: 28.5,14.5
+      parent: 2
+  - uid: 402
+    components:
+    - type: Transform
+      pos: 28.5,15.5
+      parent: 2
+- proto: CandleBlack
+  entities:
+  - uid: 106
+    components:
+    - type: Transform
+      pos: 33.477924,9.726638
+      parent: 2
+  - uid: 129
+    components:
+    - type: Transform
+      pos: 31.655748,9.861569
+      parent: 2
+  - uid: 131
+    components:
+    - type: Transform
+      pos: 33.64664,9.541104
+      parent: 2
+- proto: CandleBlackSmall
+  entities:
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 33.140484,9.726638
+      parent: 2
+- proto: Carpet
+  entities:
+  - uid: 40
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,33.5
+      parent: 2
+  - uid: 48
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 17.5,32.5
+      parent: 2
+  - uid: 59
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,32.5
+      parent: 2
+  - uid: 1006
+    components:
+    - type: Transform
+      pos: 16.5,33.5
+      parent: 2
+  - uid: 1007
+    components:
+    - type: Transform
+      pos: 17.5,33.5
+      parent: 2
+  - uid: 1009
+    components:
+    - type: Transform
+      pos: 16.5,32.5
+      parent: 2
+- proto: CarpetBlack
+  entities:
+  - uid: 54
+    components:
+    - type: Transform
+      pos: 33.5,8.5
+      parent: 2
+  - uid: 67
+    components:
+    - type: Transform
+      pos: 31.5,7.5
+      parent: 2
+  - uid: 98
+    components:
+    - type: Transform
+      pos: 31.5,8.5
+      parent: 2
+  - uid: 115
+    components:
+    - type: Transform
+      pos: 32.5,7.5
+      parent: 2
+  - uid: 144
+    components:
+    - type: Transform
+      pos: 33.5,9.5
+      parent: 2
+  - uid: 203
+    components:
+    - type: Transform
+      pos: 32.5,8.5
+      parent: 2
+  - uid: 206
+    components:
+    - type: Transform
+      pos: 31.5,9.5
+      parent: 2
+  - uid: 208
+    components:
+    - type: Transform
+      pos: 32.5,9.5
+      parent: 2
+- proto: Catwalk
+  entities:
+  - uid: 3
+    components:
+    - type: Transform
+      pos: 13.5,1.5
+      parent: 2
+  - uid: 52
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 2
+  - uid: 73
+    components:
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 2
+  - uid: 86
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 2
+  - uid: 88
+    components:
+    - type: Transform
+      pos: 13.5,0.5
+      parent: 2
+  - uid: 92
+    components:
+    - type: Transform
+      pos: 13.5,4.5
+      parent: 2
+  - uid: 117
+    components:
+    - type: Transform
+      pos: 18.5,7.5
+      parent: 2
+  - uid: 162
+    components:
+    - type: Transform
+      pos: 4.5,33.5
+      parent: 2
+  - uid: 194
+    components:
+    - type: Transform
+      pos: 13.5,3.5
+      parent: 2
+  - uid: 200
+    components:
+    - type: Transform
+      pos: 8.5,3.5
+      parent: 2
+  - uid: 201
+    components:
+    - type: Transform
+      pos: 6.5,2.5
+      parent: 2
+  - uid: 204
+    components:
+    - type: Transform
+      pos: 10.5,2.5
+      parent: 2
+  - uid: 209
+    components:
+    - type: Transform
+      pos: 13.5,2.5
+      parent: 2
+  - uid: 213
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,25.5
+      parent: 2
+  - uid: 214
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,29.5
+      parent: 2
+  - uid: 218
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,29.5
+      parent: 2
+  - uid: 220
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,29.5
+      parent: 2
+  - uid: 255
+    components:
+    - type: Transform
+      pos: 18.5,8.5
+      parent: 2
+  - uid: 256
+    components:
+    - type: Transform
+      pos: 19.5,7.5
+      parent: 2
+  - uid: 257
+    components:
+    - type: Transform
+      pos: 19.5,8.5
+      parent: 2
+  - uid: 258
+    components:
+    - type: Transform
+      pos: 20.5,7.5
+      parent: 2
+  - uid: 259
+    components:
+    - type: Transform
+      pos: 20.5,8.5
+      parent: 2
+  - uid: 260
+    components:
+    - type: Transform
+      pos: 34.5,2.5
+      parent: 2
+  - uid: 261
+    components:
+    - type: Transform
+      pos: 33.5,2.5
+      parent: 2
+  - uid: 262
+    components:
+    - type: Transform
+      pos: 32.5,2.5
+      parent: 2
+  - uid: 263
+    components:
+    - type: Transform
+      pos: 31.5,2.5
+      parent: 2
+  - uid: 265
+    components:
+    - type: Transform
+      pos: 29.5,2.5
+      parent: 2
+  - uid: 266
+    components:
+    - type: Transform
+      pos: 28.5,2.5
+      parent: 2
+  - uid: 268
+    components:
+    - type: Transform
+      pos: 26.5,4.5
+      parent: 2
+  - uid: 326
+    components:
+    - type: Transform
+      pos: 17.5,15.5
+      parent: 2
+  - uid: 327
+    components:
+    - type: Transform
+      pos: 17.5,14.5
+      parent: 2
+  - uid: 328
+    components:
+    - type: Transform
+      pos: 17.5,13.5
+      parent: 2
+  - uid: 329
+    components:
+    - type: Transform
+      pos: 17.5,16.5
+      parent: 2
+  - uid: 330
+    components:
+    - type: Transform
+      pos: 17.5,12.5
+      parent: 2
+  - uid: 333
+    components:
+    - type: Transform
+      pos: 21.5,14.5
+      parent: 2
+  - uid: 334
+    components:
+    - type: Transform
+      pos: 21.5,13.5
+      parent: 2
+  - uid: 335
+    components:
+    - type: Transform
+      pos: 21.5,12.5
+      parent: 2
+  - uid: 342
+    components:
+    - type: Transform
+      pos: 5.5,33.5
+      parent: 2
+  - uid: 361
+    components:
+    - type: Transform
+      pos: 2.5,33.5
+      parent: 2
+  - uid: 364
+    components:
+    - type: Transform
+      pos: 1.5,33.5
+      parent: 2
+  - uid: 372
+    components:
+    - type: Transform
+      pos: 4.5,24.5
+      parent: 2
+  - uid: 423
+    components:
+    - type: Transform
+      pos: 9.5,18.5
+      parent: 2
+  - uid: 424
+    components:
+    - type: Transform
+      pos: 10.5,19.5
+      parent: 2
+  - uid: 425
+    components:
+    - type: Transform
+      pos: 7.5,22.5
+      parent: 2
+  - uid: 426
+    components:
+    - type: Transform
+      pos: 6.5,33.5
+      parent: 2
+  - uid: 432
+    components:
+    - type: Transform
+      pos: 7.5,21.5
+      parent: 2
+  - uid: 433
+    components:
+    - type: Transform
+      pos: 6.5,21.5
+      parent: 2
+  - uid: 434
+    components:
+    - type: Transform
+      pos: 7.5,18.5
+      parent: 2
+  - uid: 435
+    components:
+    - type: Transform
+      pos: 7.5,19.5
+      parent: 2
+  - uid: 436
+    components:
+    - type: Transform
+      pos: 6.5,19.5
+      parent: 2
+  - uid: 437
+    components:
+    - type: Transform
+      pos: 9.5,22.5
+      parent: 2
+  - uid: 438
+    components:
+    - type: Transform
+      pos: 9.5,21.5
+      parent: 2
+  - uid: 439
+    components:
+    - type: Transform
+      pos: 10.5,21.5
+      parent: 2
+  - uid: 440
+    components:
+    - type: Transform
+      pos: 9.5,19.5
+      parent: 2
+  - uid: 601
+    components:
+    - type: Transform
+      pos: 11.5,33.5
+      parent: 2
+  - uid: 606
+    components:
+    - type: Transform
+      pos: 10.5,33.5
+      parent: 2
+  - uid: 608
+    components:
+    - type: Transform
+      pos: 5.5,25.5
+      parent: 2
+  - uid: 610
+    components:
+    - type: Transform
+      pos: 6.5,24.5
+      parent: 2
+  - uid: 645
+    components:
+    - type: Transform
+      pos: 4.5,26.5
+      parent: 2
+  - uid: 731
+    components:
+    - type: Transform
+      pos: 5.5,24.5
+      parent: 2
+  - uid: 734
+    components:
+    - type: Transform
+      pos: 8.5,33.5
+      parent: 2
+  - uid: 738
+    components:
+    - type: Transform
+      pos: 7.5,33.5
+      parent: 2
+  - uid: 739
+    components:
+    - type: Transform
+      pos: 9.5,33.5
+      parent: 2
+  - uid: 809
+    components:
+    - type: Transform
+      pos: 42.5,21.5
+      parent: 2
+  - uid: 810
+    components:
+    - type: Transform
+      pos: 42.5,20.5
+      parent: 2
+  - uid: 811
+    components:
+    - type: Transform
+      pos: 42.5,22.5
+      parent: 2
+  - uid: 812
+    components:
+    - type: Transform
+      pos: 45.5,24.5
+      parent: 2
+  - uid: 813
+    components:
+    - type: Transform
+      pos: 45.5,23.5
+      parent: 2
+  - uid: 814
+    components:
+    - type: Transform
+      pos: 44.5,23.5
+      parent: 2
+  - uid: 815
+    components:
+    - type: Transform
+      pos: 47.5,18.5
+      parent: 2
+  - uid: 816
+    components:
+    - type: Transform
+      pos: 46.5,18.5
+      parent: 2
+  - uid: 817
+    components:
+    - type: Transform
+      pos: 46.5,19.5
+      parent: 2
+  - uid: 818
+    components:
+    - type: Transform
+      pos: 46.5,20.5
+      parent: 2
+  - uid: 819
+    components:
+    - type: Transform
+      pos: 46.5,21.5
+      parent: 2
+  - uid: 820
+    components:
+    - type: Transform
+      pos: 45.5,18.5
+      parent: 2
+  - uid: 821
+    components:
+    - type: Transform
+      pos: 44.5,18.5
+      parent: 2
+  - uid: 885
+    components:
+    - type: Transform
+      pos: 39.5,2.5
+      parent: 2
+  - uid: 886
+    components:
+    - type: Transform
+      pos: 40.5,2.5
+      parent: 2
+  - uid: 887
+    components:
+    - type: Transform
+      pos: 41.5,2.5
+      parent: 2
+  - uid: 888
+    components:
+    - type: Transform
+      pos: 42.5,2.5
+      parent: 2
+  - uid: 889
+    components:
+    - type: Transform
+      pos: 43.5,2.5
+      parent: 2
+  - uid: 890
+    components:
+    - type: Transform
+      pos: 44.5,2.5
+      parent: 2
+  - uid: 891
+    components:
+    - type: Transform
+      pos: 45.5,2.5
+      parent: 2
+  - uid: 892
+    components:
+    - type: Transform
+      pos: 46.5,2.5
+      parent: 2
+  - uid: 893
+    components:
+    - type: Transform
+      pos: 44.5,3.5
+      parent: 2
+  - uid: 894
+    components:
+    - type: Transform
+      pos: 42.5,1.5
+      parent: 2
+  - uid: 895
+    components:
+    - type: Transform
+      pos: 47.5,2.5
+      parent: 2
+  - uid: 896
+    components:
+    - type: Transform
+      pos: 49.5,2.5
+      parent: 2
+  - uid: 897
+    components:
+    - type: Transform
+      pos: 50.5,2.5
+      parent: 2
+  - uid: 898
+    components:
+    - type: Transform
+      pos: 52.5,2.5
+      parent: 2
+  - uid: 899
+    components:
+    - type: Transform
+      pos: 52.5,3.5
+      parent: 2
+  - uid: 900
+    components:
+    - type: Transform
+      pos: 36.5,2.5
+      parent: 2
+  - uid: 901
+    components:
+    - type: Transform
+      pos: 36.5,3.5
+      parent: 2
+  - uid: 902
+    components:
+    - type: Transform
+      pos: 36.5,1.5
+      parent: 2
+  - uid: 903
+    components:
+    - type: Transform
+      pos: 37.5,2.5
+      parent: 2
+  - uid: 947
+    components:
+    - type: Transform
+      pos: 4.5,27.5
+      parent: 2
+  - uid: 1053
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,29.5
+      parent: 2
+  - uid: 1054
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,28.5
+      parent: 2
+  - uid: 1055
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,27.5
+      parent: 2
+  - uid: 1056
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,26.5
+      parent: 2
+  - uid: 1057
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,25.5
+      parent: 2
+- proto: Chair
+  entities:
+  - uid: 607
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,26.5
+      parent: 2
+- proto: ChairRitual
+  entities:
+  - uid: 34
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 32.5,8.5
+      parent: 2
+- proto: CigPackSyndicate
+  entities:
+  - uid: 592
+    components:
+    - type: Transform
+      pos: 28.687122,30.357244
+      parent: 2
+- proto: ClosetMaintenanceFilledRandom
+  entities:
+  - uid: 453
+    components:
+    - type: Transform
+      pos: 12.5,12.5
+      parent: 2
+  - uid: 685
+    components:
+    - type: Transform
+      pos: 31.5,6.5
+      parent: 2
+  - uid: 686
+    components:
+    - type: Transform
+      pos: 16.5,13.5
+      parent: 2
+- proto: ClothingHeadHatCardborg
+  entities:
+  - uid: 834
+    components:
+    - type: Transform
+      pos: 48.485527,19.798538
+      parent: 2
+- proto: ClothingHeadHatGladiator
+  entities:
+  - uid: 633
+    components:
+    - type: Transform
+      pos: 18.530083,30.647583
+      parent: 2
+- proto: ClothingHeadHatHoodCulthood
+  entities:
+  - uid: 166
+    components:
+    - type: Transform
+      pos: 25.413336,7.589584
+      parent: 2
+  - uid: 171
+    components:
+    - type: Transform
+      pos: 25.308355,7.6870356
+      parent: 2
+- proto: ClothingHeadHelmetBone
+  entities:
+  - uid: 642
+    components:
+    - type: Transform
+      pos: 20.506927,28.78566
+      parent: 2
+- proto: ClothingNeckCloakMiner
+  entities:
+  - uid: 1039
+    components:
+    - type: Transform
+      pos: 13.46296,18.77332
+      parent: 2
+- proto: ClothingOuterHardsuitSalvage
+  entities:
+  - uid: 933
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.62351,4.5918055
+      parent: 2
+- proto: ClothingOuterRobesCult
+  entities:
+  - uid: 172
+    components:
+    - type: Transform
+      pos: 25.728281,7.5071254
+      parent: 2
+  - uid: 173
+    components:
+    - type: Transform
+      pos: 25.570808,7.6870356
+      parent: 2
+- proto: ClothingShoesCult
+  entities:
+  - uid: 174
+    components:
+    - type: Transform
+      pos: 27.247335,6.6999836
+      parent: 2
+  - uid: 176
+    components:
+    - type: Transform
+      pos: 27.4423,6.4601035
+      parent: 2
+- proto: ClothingUniformJumpsuitGladiator
+  entities:
+  - uid: 614
+    components:
+    - type: Transform
+      pos: 18.635735,30.106283
+      parent: 2
+  - uid: 639
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.363964,27.571035
+      parent: 2
+- proto: ConveyorBelt
+  entities:
+  - uid: 6
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,2.5
+      parent: 2
+  - uid: 44
+    components:
+    - type: Transform
+      pos: 8.5,3.5
+      parent: 2
+  - uid: 85
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,2.5
+      parent: 2
+  - uid: 159
+    components:
+    - type: Transform
+      pos: 8.5,2.5
+      parent: 2
+  - uid: 177
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,2.5
+      parent: 2
+  - uid: 367
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,33.5
+      parent: 2
+  - uid: 791
+    components:
+    - type: Transform
+      pos: 46.5,21.5
+      parent: 2
+  - uid: 792
+    components:
+    - type: Transform
+      pos: 46.5,20.5
+      parent: 2
+  - uid: 793
+    components:
+    - type: Transform
+      pos: 46.5,19.5
+      parent: 2
+  - uid: 794
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 46.5,18.5
+      parent: 2
+  - uid: 795
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 47.5,18.5
+      parent: 2
+  - uid: 948
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,33.5
+      parent: 2
+  - uid: 949
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,33.5
+      parent: 2
+  - uid: 950
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,33.5
+      parent: 2
+  - uid: 951
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,33.5
+      parent: 2
+  - uid: 952
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,33.5
+      parent: 2
+  - uid: 953
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,33.5
+      parent: 2
+  - uid: 954
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,33.5
+      parent: 2
+  - uid: 955
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,33.5
+      parent: 2
+- proto: ConveyorBeltAssembly
+  entities:
+  - uid: 956
+    components:
+    - type: Transform
+      pos: 8.552004,33.69986
+      parent: 2
+  - uid: 957
+    components:
+    - type: Transform
+      pos: 11.431062,33.09255
+      parent: 2
+- proto: CrateWoodenGrave
+  entities:
+  - uid: 270
+    components:
+    - type: Transform
+      pos: 29.5,8.5
+      parent: 2
+- proto: CrystalBlue
+  entities:
+  - uid: 521
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,19.5
+      parent: 2
+- proto: CrystalCyan
+  entities:
+  - uid: 488
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,23.5
+      parent: 2
+  - uid: 534
+    components:
+    - type: Transform
+      pos: 31.5,18.5
+      parent: 2
+- proto: CrystalOrange
+  entities:
+  - uid: 249
+    components:
+    - type: Transform
+      pos: 23.5,4.5
+      parent: 2
+  - uid: 253
+    components:
+    - type: Transform
+      pos: 25.5,1.5
+      parent: 2
+  - uid: 254
+    components:
+    - type: Transform
+      pos: 30.5,0.5
+      parent: 2
+  - uid: 269
+    components:
+    - type: Transform
+      pos: 31.5,4.5
+      parent: 2
+  - uid: 919
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,1.5
+      parent: 2
+  - uid: 920
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,3.5
+      parent: 2
+  - uid: 921
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,0.5
+      parent: 2
+  - uid: 922
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 39.5,4.5
+      parent: 2
+  - uid: 923
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,1.5
+      parent: 2
+- proto: CrystalSpawner
+  entities:
+  - uid: 28
+    components:
+    - type: Transform
+      pos: 5.5,0.5
+      parent: 2
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 7.5,2.5
+      parent: 2
+  - uid: 30
+    components:
+    - type: Transform
+      pos: 11.5,4.5
+      parent: 2
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 14.5,2.5
+      parent: 2
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 21.5,9.5
+      parent: 2
+  - uid: 50
+    components:
+    - type: Transform
+      pos: 12.5,7.5
+      parent: 2
+  - uid: 63
+    components:
+    - type: Transform
+      pos: 20.5,6.5
+      parent: 2
+  - uid: 79
+    components:
+    - type: Transform
+      pos: 5.5,10.5
+      parent: 2
+  - uid: 91
+    components:
+    - type: Transform
+      pos: 26.5,9.5
+      parent: 2
+  - uid: 107
+    components:
+    - type: Transform
+      pos: 6.5,7.5
+      parent: 2
+  - uid: 121
+    components:
+    - type: Transform
+      pos: 14.5,27.5
+      parent: 2
+  - uid: 130
+    components:
+    - type: Transform
+      pos: 0.5,15.5
+      parent: 2
+  - uid: 184
+    components:
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 2
+  - uid: 197
+    components:
+    - type: Transform
+      pos: 13.5,10.5
+      parent: 2
+  - uid: 332
+    components:
+    - type: Transform
+      pos: 19.5,13.5
+      parent: 2
+  - uid: 352
+    components:
+    - type: Transform
+      pos: 16.5,12.5
+      parent: 2
+  - uid: 370
+    components:
+    - type: Transform
+      pos: 21.5,32.5
+      parent: 2
+  - uid: 441
+    components:
+    - type: Transform
+      pos: 7.5,19.5
+      parent: 2
+  - uid: 442
+    components:
+    - type: Transform
+      pos: 9.5,21.5
+      parent: 2
+  - uid: 619
+    components:
+    - type: Transform
+      pos: 37.5,19.5
+      parent: 2
+  - uid: 620
+    components:
+    - type: Transform
+      pos: 38.5,24.5
+      parent: 2
+  - uid: 621
+    components:
+    - type: Transform
+      pos: 34.5,19.5
+      parent: 2
+  - uid: 658
+    components:
+    - type: Transform
+      pos: 34.5,28.5
+      parent: 2
+  - uid: 659
+    components:
+    - type: Transform
+      pos: 33.5,26.5
+      parent: 2
+  - uid: 714
+    components:
+    - type: Transform
+      pos: 36.5,7.5
+      parent: 2
+  - uid: 715
+    components:
+    - type: Transform
+      pos: 44.5,10.5
+      parent: 2
+  - uid: 769
+    components:
+    - type: Transform
+      pos: 42.5,15.5
+      parent: 2
+  - uid: 992
+    components:
+    - type: Transform
+      pos: 1.5,34.5
+      parent: 2
+  - uid: 998
+    components:
+    - type: Transform
+      pos: 10.5,34.5
+      parent: 2
+  - uid: 999
+    components:
+    - type: Transform
+      pos: 3.5,32.5
+      parent: 2
+  - uid: 1024
+    components:
+    - type: Transform
+      pos: 25.5,34.5
+      parent: 2
+  - uid: 1045
+    components:
+    - type: Transform
+      pos: 12.5,28.5
+      parent: 2
+  - uid: 1046
+    components:
+    - type: Transform
+      pos: 12.5,26.5
+      parent: 2
+- proto: CyborgEndoskeleton
+  entities:
+  - uid: 803
+    components:
+    - type: Transform
+      pos: 46.596577,23.582308
+      parent: 2
+  - uid: 804
+    components:
+    - type: Transform
+      pos: 46.156357,23.503092
+      parent: 2
+  - uid: 805
+    components:
+    - type: Transform
+      pos: 45.2583,23.626316
+      parent: 2
+- proto: DrinkAleBottleFull
+  entities:
+  - uid: 1105
+    components:
+    - type: Transform
+      pos: 28.588388,32.850025
+      parent: 2
+  - uid: 1106
+    components:
+    - type: Transform
+      pos: 30.140612,34.862766
+      parent: 2
+  - uid: 1107
+    components:
+    - type: Transform
+      pos: 30.343075,34.727837
+      parent: 2
+- proto: DrinkBeerBottleFull
+  entities:
+  - uid: 1037
+    components:
+    - type: Transform
+      pos: 14.698467,21.394209
+      parent: 2
+  - uid: 1038
+    components:
+    - type: Transform
+      pos: 14.407921,21.143362
+      parent: 2
+- proto: DrinkBeerGrowler
+  entities:
+  - uid: 1036
+    components:
+    - type: Transform
+      pos: 15.128302,19.8661
+      parent: 2
+  - uid: 1044
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.560413,19.81329
+      parent: 2
+- proto: DrinkBloodGlass
+  entities:
+  - uid: 38
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 16.35854,32.78117
+      parent: 2
+  - uid: 1059
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 16.649086,32.701954
+      parent: 2
+- proto: DrinkMugOne
+  entities:
+  - uid: 310
+    components:
+    - type: Transform
+      pos: 2.7162292,21.258032
+      parent: 2
+- proto: ExosuitFabricator
+  entities:
+  - uid: 797
+    components:
+    - type: Transform
+      pos: 46.5,21.5
+      parent: 2
+- proto: FenceMetalBroken
+  entities:
+  - uid: 1068
+    components:
+    - type: Transform
+      pos: 32.5,34.5
+      parent: 2
+- proto: FenceMetalEnd
+  entities:
+  - uid: 1104
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,32.5
+      parent: 2
+  - uid: 1108
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,32.5
+      parent: 2
+- proto: FenceMetalStraight
+  entities:
+  - uid: 151
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,29.5
+      parent: 2
+  - uid: 153
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,29.5
+      parent: 2
+  - uid: 161
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,29.5
+      parent: 2
+  - uid: 336
+    components:
+    - type: Transform
+      pos: 17.5,12.5
+      parent: 2
+  - uid: 337
+    components:
+    - type: Transform
+      pos: 17.5,13.5
+      parent: 2
+  - uid: 338
+    components:
+    - type: Transform
+      pos: 17.5,14.5
+      parent: 2
+  - uid: 339
+    components:
+    - type: Transform
+      pos: 17.5,15.5
+      parent: 2
+  - uid: 340
+    components:
+    - type: Transform
+      pos: 17.5,16.5
+      parent: 2
+  - uid: 343
+    components:
+    - type: Transform
+      pos: 21.5,14.5
+      parent: 2
+  - uid: 344
+    components:
+    - type: Transform
+      pos: 21.5,13.5
+      parent: 2
+  - uid: 345
+    components:
+    - type: Transform
+      pos: 21.5,12.5
+      parent: 2
+  - uid: 942
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,27.5
+      parent: 2
+  - uid: 943
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,27.5
+      parent: 2
+  - uid: 1067
+    components:
+    - type: Transform
+      pos: 32.5,33.5
+      parent: 2
+  - uid: 1070
+    components:
+    - type: Transform
+      pos: 36.5,33.5
+      parent: 2
+- proto: FloorChasmEntity
+  entities:
+  - uid: 1
+    components:
+    - type: Transform
+      pos: 6.5,9.5
+      parent: 2
+  - uid: 7
+    components:
+    - type: Transform
+      pos: 5.5,8.5
+      parent: 2
+  - uid: 93
+    components:
+    - type: Transform
+      pos: 4.5,7.5
+      parent: 2
+  - uid: 95
+    components:
+    - type: Transform
+      pos: 3.5,7.5
+      parent: 2
+  - uid: 113
+    components:
+    - type: Transform
+      pos: 13.5,27.5
+      parent: 2
+  - uid: 132
+    components:
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 2
+  - uid: 136
+    components:
+    - type: Transform
+      pos: 6.5,8.5
+      parent: 2
+  - uid: 155
+    components:
+    - type: Transform
+      pos: 7.5,9.5
+      parent: 2
+  - uid: 156
+    components:
+    - type: Transform
+      pos: 5.5,7.5
+      parent: 2
+  - uid: 163
+    components:
+    - type: Transform
+      pos: 5.5,9.5
+      parent: 2
+  - uid: 164
+    components:
+    - type: Transform
+      pos: 4.5,8.5
+      parent: 2
+  - uid: 312
+    components:
+    - type: Transform
+      pos: 3.5,6.5
+      parent: 2
+  - uid: 313
+    components:
+    - type: Transform
+      pos: 2.5,6.5
+      parent: 2
+  - uid: 410
+    components:
+    - type: Transform
+      pos: 9.5,20.5
+      parent: 2
+  - uid: 411
+    components:
+    - type: Transform
+      pos: 9.5,21.5
+      parent: 2
+  - uid: 412
+    components:
+    - type: Transform
+      pos: 8.5,19.5
+      parent: 2
+  - uid: 413
+    components:
+    - type: Transform
+      pos: 8.5,20.5
+      parent: 2
+  - uid: 414
+    components:
+    - type: Transform
+      pos: 8.5,21.5
+      parent: 2
+  - uid: 415
+    components:
+    - type: Transform
+      pos: 7.5,19.5
+      parent: 2
+  - uid: 416
+    components:
+    - type: Transform
+      pos: 7.5,20.5
+      parent: 2
+  - uid: 417
+    components:
+    - type: Transform
+      pos: 7.5,21.5
+      parent: 2
+  - uid: 574
+    components:
+    - type: Transform
+      pos: 14.5,28.5
+      parent: 2
+  - uid: 575
+    components:
+    - type: Transform
+      pos: 13.5,28.5
+      parent: 2
+  - uid: 576
+    components:
+    - type: Transform
+      pos: 12.5,27.5
+      parent: 2
+- proto: FloorLavaEntity
+  entities:
+  - uid: 103
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,3.5
+      parent: 2
+  - uid: 165
+    components:
+    - type: Transform
+      pos: 30.5,29.5
+      parent: 2
+  - uid: 224
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,3.5
+      parent: 2
+  - uid: 225
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,4.5
+      parent: 2
+  - uid: 226
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,4.5
+      parent: 2
+  - uid: 227
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,1.5
+      parent: 2
+  - uid: 228
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,2.5
+      parent: 2
+  - uid: 229
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,1.5
+      parent: 2
+  - uid: 230
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,0.5
+      parent: 2
+  - uid: 231
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,0.5
+      parent: 2
+  - uid: 232
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,0.5
+      parent: 2
+  - uid: 233
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,0.5
+      parent: 2
+  - uid: 234
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,1.5
+      parent: 2
+  - uid: 427
+    components:
+    - type: Transform
+      pos: 29.5,29.5
+      parent: 2
+  - uid: 428
+    components:
+    - type: Transform
+      pos: 29.5,30.5
+      parent: 2
+  - uid: 429
+    components:
+    - type: Transform
+      pos: 30.5,30.5
+      parent: 2
+  - uid: 430
+    components:
+    - type: Transform
+      pos: 28.5,29.5
+      parent: 2
+  - uid: 431
+    components:
+    - type: Transform
+      pos: 28.5,28.5
+      parent: 2
+  - uid: 446
+    components:
+    - type: Transform
+      pos: 29.5,28.5
+      parent: 2
+  - uid: 452
+    components:
+    - type: Transform
+      pos: 28.5,27.5
+      parent: 2
+  - uid: 841
+    components:
+    - type: Transform
+      pos: 42.5,2.5
+      parent: 2
+  - uid: 842
+    components:
+    - type: Transform
+      pos: 43.5,2.5
+      parent: 2
+  - uid: 843
+    components:
+    - type: Transform
+      pos: 44.5,2.5
+      parent: 2
+  - uid: 844
+    components:
+    - type: Transform
+      pos: 45.5,2.5
+      parent: 2
+  - uid: 845
+    components:
+    - type: Transform
+      pos: 43.5,1.5
+      parent: 2
+  - uid: 848
+    components:
+    - type: Transform
+      pos: 41.5,1.5
+      parent: 2
+  - uid: 852
+    components:
+    - type: Transform
+      pos: 42.5,1.5
+      parent: 2
+  - uid: 861
+    components:
+    - type: Transform
+      pos: 43.5,3.5
+      parent: 2
+  - uid: 862
+    components:
+    - type: Transform
+      pos: 42.5,3.5
+      parent: 2
+  - uid: 863
+    components:
+    - type: Transform
+      pos: 43.5,4.5
+      parent: 2
+  - uid: 864
+    components:
+    - type: Transform
+      pos: 42.5,4.5
+      parent: 2
+  - uid: 865
+    components:
+    - type: Transform
+      pos: 41.5,4.5
+      parent: 2
+  - uid: 866
+    components:
+    - type: Transform
+      pos: 41.5,2.5
+      parent: 2
+  - uid: 867
+    components:
+    - type: Transform
+      pos: 41.5,3.5
+      parent: 2
+  - uid: 868
+    components:
+    - type: Transform
+      pos: 40.5,2.5
+      parent: 2
+  - uid: 869
+    components:
+    - type: Transform
+      pos: 40.5,3.5
+      parent: 2
+  - uid: 870
+    components:
+    - type: Transform
+      pos: 39.5,1.5
+      parent: 2
+  - uid: 871
+    components:
+    - type: Transform
+      pos: 39.5,2.5
+      parent: 2
+  - uid: 872
+    components:
+    - type: Transform
+      pos: 38.5,1.5
+      parent: 2
+  - uid: 873
+    components:
+    - type: Transform
+      pos: 40.5,4.5
+      parent: 2
+  - uid: 874
+    components:
+    - type: Transform
+      pos: 39.5,4.5
+      parent: 2
+  - uid: 875
+    components:
+    - type: Transform
+      pos: 44.5,1.5
+      parent: 2
+  - uid: 876
+    components:
+    - type: Transform
+      pos: 44.5,3.5
+      parent: 2
+  - uid: 877
+    components:
+    - type: Transform
+      pos: 45.5,1.5
+      parent: 2
+  - uid: 878
+    components:
+    - type: Transform
+      pos: 46.5,1.5
+      parent: 2
+  - uid: 879
+    components:
+    - type: Transform
+      pos: 48.5,0.5
+      parent: 2
+  - uid: 880
+    components:
+    - type: Transform
+      pos: 47.5,0.5
+      parent: 2
+  - uid: 881
+    components:
+    - type: Transform
+      pos: 46.5,0.5
+      parent: 2
+  - uid: 882
+    components:
+    - type: Transform
+      pos: 45.5,0.5
+      parent: 2
+  - uid: 883
+    components:
+    - type: Transform
+      pos: 47.5,1.5
+      parent: 2
+  - uid: 884
+    components:
+    - type: Transform
+      pos: 46.5,2.5
+      parent: 2
+- proto: FloorWaterEntity
+  entities:
+  - uid: 449
+    components:
+    - type: Transform
+      pos: 29.5,21.5
+      parent: 2
+  - uid: 450
+    components:
+    - type: Transform
+      pos: 29.5,22.5
+      parent: 2
+  - uid: 451
+    components:
+    - type: Transform
+      pos: 30.5,22.5
+      parent: 2
+  - uid: 454
+    components:
+    - type: Transform
+      pos: 28.5,22.5
+      parent: 2
+  - uid: 459
+    components:
+    - type: Transform
+      pos: 30.5,20.5
+      parent: 2
+  - uid: 460
+    components:
+    - type: Transform
+      pos: 30.5,21.5
+      parent: 2
+  - uid: 465
+    components:
+    - type: Transform
+      pos: 27.5,19.5
+      parent: 2
+  - uid: 467
+    components:
+    - type: Transform
+      pos: 28.5,19.5
+      parent: 2
+  - uid: 497
+    components:
+    - type: Transform
+      pos: 28.5,20.5
+      parent: 2
+  - uid: 498
+    components:
+    - type: Transform
+      pos: 27.5,20.5
+      parent: 2
+  - uid: 502
+    components:
+    - type: Transform
+      pos: 28.5,21.5
+      parent: 2
+  - uid: 503
+    components:
+    - type: Transform
+      pos: 29.5,20.5
+      parent: 2
+  - uid: 517
+    components:
+    - type: Transform
+      pos: 29.5,21.5
+      parent: 2
+  - uid: 519
+    components:
+    - type: Transform
+      pos: 28.5,20.5
+      parent: 2
+  - uid: 564
+    components:
+    - type: Transform
+      pos: 25.5,28.5
+      parent: 2
+  - uid: 565
+    components:
+    - type: Transform
+      pos: 24.5,29.5
+      parent: 2
+  - uid: 566
+    components:
+    - type: Transform
+      pos: 25.5,29.5
+      parent: 2
+  - uid: 567
+    components:
+    - type: Transform
+      pos: 26.5,27.5
+      parent: 2
+  - uid: 568
+    components:
+    - type: Transform
+      pos: 26.5,28.5
+      parent: 2
+- proto: FloraRockSolid01
+  entities:
+  - uid: 205
+    components:
+    - type: Transform
+      pos: 14.417985,10.609197
+      parent: 2
+- proto: FloraRockSolid03
+  entities:
+  - uid: 542
+    components:
+    - type: Transform
+      pos: 30.46267,18.973217
+      parent: 2
+- proto: FoodBoxDonkpocketStonk
+  entities:
+  - uid: 405
+    components:
+    - type: Transform
+      pos: 29.534237,13.61823
+      parent: 2
+- proto: FoodMeatBearCooked
+  entities:
+  - uid: 612
+    components:
+    - type: Transform
+      pos: 17.658442,29.564983
+      parent: 2
+  - uid: 634
+    components:
+    - type: Transform
+      pos: 17.526375,29.71021
+      parent: 2
+- proto: FoodMeatRatdoubleKebab
+  entities:
+  - uid: 1051
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.48519707,25.58962
+      parent: 2
+  - uid: 1052
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.68329763,25.391584
+      parent: 2
+- proto: FoodTartGapple
+  entities:
+  - uid: 936
+    components:
+    - type: Transform
+      pos: 37.348515,4.6837792
+      parent: 2
+- proto: FoodTinBeans
+  entities:
+  - uid: 609
+    components:
+    - type: Transform
+      pos: 14.063244,25.815691
+      parent: 2
+- proto: FoodTinBeansTrash
+  entities:
+  - uid: 661
+    components:
+    - type: Transform
+      pos: 13.658937,25.452745
+      parent: 2
+  - uid: 663
+    components:
+    - type: Transform
+      pos: 13.096437,25.68712
+      parent: 2
+- proto: GeneratorRTG
+  entities:
+  - uid: 376
+    components:
+    - type: Transform
+      pos: 25.5,15.5
+      parent: 2
+- proto: GeneratorRTGDamaged
+  entities:
+  - uid: 944
+    components:
+    - type: Transform
+      pos: 36.5,26.5
+      parent: 2
+- proto: GoldOre
+  entities:
+  - uid: 937
+    components:
+    - type: Transform
+      pos: 37.69189,4.4285326
+      parent: 2
+- proto: GoldOre1
+  entities:
+  - uid: 959
+    components:
+    - type: Transform
+      pos: 4.569704,33.341743
+      parent: 2
+  - uid: 960
+    components:
+    - type: Transform
+      pos: 6.801633,33.75102
+      parent: 2
+  - uid: 961
+    components:
+    - type: Transform
+      pos: 10.459887,33.236122
+      parent: 2
+- proto: Grille
+  entities:
+  - uid: 288
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,19.5
+      parent: 2
+  - uid: 289
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,21.5
+      parent: 2
+  - uid: 290
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,21.5
+      parent: 2
+  - uid: 359
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 27.5,16.5
+      parent: 2
+  - uid: 374
+    components:
+    - type: Transform
+      pos: 40.5,15.5
+      parent: 2
+  - uid: 375
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,18.5
+      parent: 2
+  - uid: 462
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,20.5
+      parent: 2
+  - uid: 472
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,24.5
+      parent: 2
+  - uid: 599
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 22.5,18.5
+      parent: 2
+  - uid: 732
+    components:
+    - type: Transform
+      pos: 46.5,15.5
+      parent: 2
+  - uid: 733
+    components:
+    - type: Transform
+      pos: 40.5,13.5
+      parent: 2
+  - uid: 737
+    components:
+    - type: Transform
+      pos: 46.5,13.5
+      parent: 2
+  - uid: 740
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,22.5
+      parent: 2
+  - uid: 745
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,20.5
+      parent: 2
+  - uid: 748
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 42.5,16.5
+      parent: 2
+  - uid: 749
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 44.5,16.5
+      parent: 2
+  - uid: 750
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 44.5,12.5
+      parent: 2
+  - uid: 751
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 42.5,12.5
+      parent: 2
+  - uid: 1026
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 28.5,16.5
+      parent: 2
+  - uid: 1028
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,15.5
+      parent: 2
+- proto: GrilleBroken
+  entities:
+  - uid: 275
+    components:
+    - type: Transform
+      pos: 4.5,20.5
+      parent: 2
+  - uid: 287
+    components:
+    - type: Transform
+      pos: 4.5,19.5
+      parent: 2
+  - uid: 291
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,19.5
+      parent: 2
+  - uid: 306
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,20.5
+      parent: 2
+  - uid: 307
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,20.5
+      parent: 2
+  - uid: 320
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,12.5
+      parent: 2
+  - uid: 321
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 28.5,12.5
+      parent: 2
+  - uid: 399
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,14.5
+      parent: 2
+  - uid: 408
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,16.5
+      parent: 2
+  - uid: 600
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,12.5
+      parent: 2
+  - uid: 625
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,24.5
+      parent: 2
+  - uid: 626
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 34.5,21.5
+      parent: 2
+  - uid: 628
+    components:
+    - type: Transform
+      pos: 38.5,21.5
+      parent: 2
+  - uid: 629
+    components:
+    - type: Transform
+      pos: 37.5,21.5
+      parent: 2
+  - uid: 699
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,6.5
+      parent: 2
+  - uid: 746
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,16.5
+      parent: 2
+  - uid: 747
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 43.5,16.5
+      parent: 2
+  - uid: 1029
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,13.5
+      parent: 2
+  - uid: 1030
+    components:
+    - type: Transform
+      pos: 30.5,13.5
+      parent: 2
+- proto: GrilleDiagonal
+  entities:
+  - uid: 627
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 37.5,20.5
+      parent: 2
+- proto: HandHeldMassScanner
+  entities:
+  - uid: 729
+    components:
+    - type: Transform
+      pos: 43.573917,7.488577
+      parent: 2
+- proto: LeftLegBorgEngineer
+  entities:
+  - uid: 808
+    components:
+    - type: Transform
+      pos: 46.631798,24.462471
+      parent: 2
+- proto: LegionnaireBonfire
+  entities:
+  - uid: 39
+    components:
+    - type: Transform
+      pos: 20.5,29.5
+      parent: 2
+  - uid: 604
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,28.5
+      parent: 2
+- proto: LightHeadBorg
+  entities:
+  - uid: 806
+    components:
+    - type: Transform
+      pos: 43.312515,23.740736
+      parent: 2
+- proto: LockerSalvageSpecialist
+  entities:
+  - uid: 175
+    components:
+    - type: Transform
+      pos: 0.5,29.5
+      parent: 2
+  - uid: 311
+    components:
+    - type: Transform
+      pos: 2.5,25.5
+      parent: 2
+- proto: LockerSalvageSpecialistFilled
+  entities:
+  - uid: 108
+    components:
+    - type: Transform
+      pos: 0.5,28.5
+      parent: 2
+  - uid: 558
+    components:
+    - type: Transform
+      pos: 2.5,26.5
+      parent: 2
+- proto: MachineAnomalySynchronizer
+  entities:
+  - uid: 591
+    components:
+    - type: Transform
+      pos: 36.5,22.5
+      parent: 2
+- proto: MachineArtifactCrusher
+  entities:
+  - uid: 680
+    components:
+    - type: Transform
+      pos: 33.5,15.5
+      parent: 2
+- proto: MachineFrameDestroyed
+  entities:
+  - uid: 796
+    components:
+    - type: Transform
+      pos: 47.5,18.5
+      parent: 2
+- proto: MaintenanceFluffSpawner
+  entities:
+  - uid: 721
+    components:
+    - type: Transform
+      pos: 38.5,7.5
+      parent: 2
+- proto: MaintenancePlantSpawner
+  entities:
+  - uid: 188
+    components:
+    - type: Transform
+      pos: 21.5,21.5
+      parent: 2
+  - uid: 323
+    components:
+    - type: Transform
+      pos: 21.5,22.5
+      parent: 2
+  - uid: 535
+    components:
+    - type: Transform
+      pos: 31.5,23.5
+      parent: 2
+  - uid: 536
+    components:
+    - type: Transform
+      pos: 27.5,22.5
+      parent: 2
+  - uid: 537
+    components:
+    - type: Transform
+      pos: 27.5,23.5
+      parent: 2
+  - uid: 538
+    components:
+    - type: Transform
+      pos: 30.5,24.5
+      parent: 2
+  - uid: 539
+    components:
+    - type: Transform
+      pos: 26.5,19.5
+      parent: 2
+  - uid: 540
+    components:
+    - type: Transform
+      pos: 27.5,18.5
+      parent: 2
+  - uid: 541
+    components:
+    - type: Transform
+      pos: 32.5,20.5
+      parent: 2
+  - uid: 543
+    components:
+    - type: Transform
+      pos: 31.5,21.5
+      parent: 2
+  - uid: 551
+    components:
+    - type: Transform
+      pos: 22.5,22.5
+      parent: 2
+  - uid: 552
+    components:
+    - type: Transform
+      pos: 20.5,23.5
+      parent: 2
+  - uid: 553
+    components:
+    - type: Transform
+      pos: 15.5,18.5
+      parent: 2
+  - uid: 554
+    components:
+    - type: Transform
+      pos: 12.5,21.5
+      parent: 2
+- proto: MaintenanceToolSpawner
+  entities:
+  - uid: 722
+    components:
+    - type: Transform
+      pos: 42.5,7.5
+      parent: 2
+  - uid: 723
+    components:
+    - type: Transform
+      pos: 40.5,7.5
+      parent: 2
+- proto: MaterialBananium1
+  entities:
+  - uid: 966
+    components:
+    - type: Transform
+      pos: 5.4913206,33.44939
+      parent: 2
+  - uid: 967
+    components:
+    - type: Transform
+      pos: 10.87965,33.647427
+      parent: 2
+- proto: MaterialDiamond1
+  entities:
+  - uid: 135
+    components:
+    - type: Transform
+      pos: 15.696499,19.294453
+      parent: 2
+  - uid: 1035
+    components:
+    - type: Transform
+      pos: 13.508261,21.99531
+      parent: 2
+- proto: MedkitAdvancedFilled
+  entities:
+  - uid: 455
+    components:
+    - type: Transform
+      pos: 19.449413,19.468704
+      parent: 2
+- proto: MedkitFilled
+  entities:
+  - uid: 457
+    components:
+    - type: Transform
+      pos: 19.613476,20.617142
+      parent: 2
+  - uid: 765
+    components:
+    - type: Transform
+      pos: 44.36778,13.667694
+      parent: 2
+  - uid: 766
+    components:
+    - type: Transform
+      pos: 44.618706,13.456455
+      parent: 2
+- proto: MiningDrill
+  entities:
+  - uid: 404
+    components:
+    - type: Transform
+      pos: 27.48866,15.5502
+      parent: 2
+- proto: MiningWindow
+  entities:
+  - uid: 102
+    components:
+    - type: Transform
+      pos: 39.5,8.5
+      parent: 2
+  - uid: 284
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,19.5
+      parent: 2
+  - uid: 286
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,21.5
+      parent: 2
+  - uid: 317
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 28.5,16.5
+      parent: 2
+  - uid: 319
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 27.5,16.5
+      parent: 2
+  - uid: 407
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,24.5
+      parent: 2
+  - uid: 468
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,20.5
+      parent: 2
+  - uid: 469
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 22.5,18.5
+      parent: 2
+  - uid: 473
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,20.5
+      parent: 2
+  - uid: 474
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,22.5
+      parent: 2
+  - uid: 477
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,18.5
+      parent: 2
+  - uid: 556
+    components:
+    - type: Transform
+      pos: 40.5,15.5
+      parent: 2
+  - uid: 560
+    components:
+    - type: Transform
+      pos: 40.5,13.5
+      parent: 2
+  - uid: 578
+    components:
+    - type: Transform
+      pos: 46.5,15.5
+      parent: 2
+  - uid: 579
+    components:
+    - type: Transform
+      pos: 46.5,13.5
+      parent: 2
+  - uid: 689
+    components:
+    - type: Transform
+      pos: 40.5,8.5
+      parent: 2
+  - uid: 690
+    components:
+    - type: Transform
+      pos: 41.5,8.5
+      parent: 2
+  - uid: 742
+    components:
+    - type: Transform
+      pos: 44.5,12.5
+      parent: 2
+  - uid: 743
+    components:
+    - type: Transform
+      pos: 42.5,12.5
+      parent: 2
+  - uid: 744
+    components:
+    - type: Transform
+      pos: 42.5,16.5
+      parent: 2
+  - uid: 1027
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,15.5
+      parent: 2
+- proto: OreProcessor
+  entities:
+  - uid: 43
+    components:
+    - type: Transform
+      pos: 8.5,3.5
+      parent: 2
+  - uid: 958
+    components:
+    - type: Transform
+      pos: 2.5,33.5
+      parent: 2
+- proto: Pickaxe
+  entities:
+  - uid: 55
+    components:
+    - type: Transform
+      pos: 4.296715,9.233585
+      parent: 2
+  - uid: 77
+    components:
+    - type: Transform
+      pos: 2.4692135,13.591463
+      parent: 2
+  - uid: 183
+    components:
+    - type: Transform
+      pos: 11.493782,2.5302112
+      parent: 2
+  - uid: 447
+    components:
+    - type: Transform
+      pos: 12.498873,19.789907
+      parent: 2
+  - uid: 448
+    components:
+    - type: Transform
+      pos: 23.588451,20.247799
+      parent: 2
+  - uid: 458
+    components:
+    - type: Transform
+      pos: 23.433788,20.45308
+      parent: 2
+  - uid: 572
+    components:
+    - type: Transform
+      pos: 29.876812,28.272526
+      parent: 2
+- proto: PlushieSlime
+  entities:
+  - uid: 1025
+    components:
+    - type: Transform
+      pos: 6.3847184,15.547257
+      parent: 2
+- proto: PortableGeneratorJrPacman
+  entities:
+  - uid: 292
+    components:
+    - type: Transform
+      pos: 1.5,21.5
+      parent: 2
+  - uid: 824
+    components:
+    - type: Transform
+      pos: 48.5,23.5
+      parent: 2
+  - uid: 989
+    components:
+    - type: Transform
+      pos: 5.5,32.5
+      parent: 2
+  - uid: 1079
+    components:
+    - type: Transform
+      pos: 31.5,32.5
+      parent: 2
+- proto: PosterLegitScience
+  entities:
+  - uid: 590
+    components:
+    - type: Transform
+      pos: 34.5,22.5
+      parent: 2
+- proto: PoweredLightPostSmall
+  entities:
+  - uid: 822
+    components:
+    - type: Transform
+      pos: 45.5,19.5
+      parent: 2
+  - uid: 971
+    components:
+    - type: Transform
+      pos: 9.5,34.5
+      parent: 2
+  - uid: 972
+    components:
+    - type: Transform
+      pos: 2.5,32.5
+      parent: 2
+- proto: PoweredSmallLight
+  entities:
+  - uid: 303
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,19.5
+      parent: 2
+  - uid: 305
+    components:
+    - type: Transform
+      pos: 3.5,21.5
+      parent: 2
+  - uid: 377
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,13.5
+      parent: 2
+  - uid: 378
+    components:
+    - type: Transform
+      pos: 29.5,15.5
+      parent: 2
+  - uid: 379
+    components:
+    - type: Transform
+      pos: 25.5,15.5
+      parent: 2
+  - uid: 380
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,13.5
+      parent: 2
+- proto: Protolathe
+  entities:
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 6.5,2.5
+      parent: 2
+- proto: Rack
+  entities:
+  - uid: 70
+    components:
+    - type: Transform
+      pos: 18.5,7.5
+      parent: 2
+  - uid: 84
+    components:
+    - type: Transform
+      pos: 27.5,6.5
+      parent: 2
+  - uid: 87
+    components:
+    - type: Transform
+      pos: 25.5,7.5
+      parent: 2
+  - uid: 99
+    components:
+    - type: Transform
+      pos: 30.5,4.5
+      parent: 2
+  - uid: 157
+    components:
+    - type: Transform
+      pos: 19.5,7.5
+      parent: 2
+  - uid: 264
+    components:
+    - type: Transform
+      pos: 20.5,0.5
+      parent: 2
+  - uid: 267
+    components:
+    - type: Transform
+      pos: 32.5,4.5
+      parent: 2
+  - uid: 368
+    components:
+    - type: Transform
+      pos: 27.5,13.5
+      parent: 2
+  - uid: 369
+    components:
+    - type: Transform
+      pos: 27.5,15.5
+      parent: 2
+  - uid: 398
+    components:
+    - type: Transform
+      pos: 29.5,13.5
+      parent: 2
+  - uid: 485
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,20.5
+      parent: 2
+  - uid: 486
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,19.5
+      parent: 2
+  - uid: 489
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,20.5
+      parent: 2
+  - uid: 490
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,19.5
+      parent: 2
+  - uid: 593
+    components:
+    - type: Transform
+      pos: 39.5,20.5
+      parent: 2
+  - uid: 622
+    components:
+    - type: Transform
+      pos: 40.5,20.5
+      parent: 2
+  - uid: 683
+    components:
+    - type: Transform
+      pos: 33.5,12.5
+      parent: 2
+  - uid: 763
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 45.5,13.5
+      parent: 2
+  - uid: 764
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 44.5,13.5
+      parent: 2
+  - uid: 789
+    components:
+    - type: Transform
+      pos: 43.5,20.5
+      parent: 2
+  - uid: 790
+    components:
+    - type: Transform
+      pos: 43.5,21.5
+      parent: 2
+  - uid: 924
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,4.5
+      parent: 2
+  - uid: 925
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,0.5
+      parent: 2
+  - uid: 926
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,0.5
+      parent: 2
+  - uid: 927
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 49.5,0.5
+      parent: 2
+  - uid: 931
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,4.5
+      parent: 2
+  - uid: 932
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,4.5
+      parent: 2
+  - uid: 1040
+    components:
+    - type: Transform
+      pos: 15.5,22.5
+      parent: 2
+  - uid: 1041
+    components:
+    - type: Transform
+      pos: 13.5,18.5
+      parent: 2
+  - uid: 1042
+    components:
+    - type: Transform
+      pos: 12.5,19.5
+      parent: 2
+  - uid: 1048
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,24.5
+      parent: 2
+  - uid: 1049
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,30.5
+      parent: 2
+  - uid: 1092
+    components:
+    - type: Transform
+      pos: 39.5,34.5
+      parent: 2
+  - uid: 1093
+    components:
+    - type: Transform
+      pos: 40.5,34.5
+      parent: 2
+- proto: Railing
+  entities:
+  - uid: 544
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,21.5
+      parent: 2
+  - uid: 798
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,21.5
+      parent: 2
+  - uid: 904
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,1.5
+      parent: 2
+  - uid: 905
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 45.5,1.5
+      parent: 2
+  - uid: 906
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 46.5,1.5
+      parent: 2
+  - uid: 907
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,1.5
+      parent: 2
+  - uid: 908
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,1.5
+      parent: 2
+  - uid: 909
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 47.5,1.5
+      parent: 2
+  - uid: 910
+    components:
+    - type: Transform
+      pos: 43.5,3.5
+      parent: 2
+  - uid: 911
+    components:
+    - type: Transform
+      pos: 42.5,3.5
+      parent: 2
+  - uid: 912
+    components:
+    - type: Transform
+      pos: 41.5,3.5
+      parent: 2
+  - uid: 913
+    components:
+    - type: Transform
+      pos: 40.5,3.5
+      parent: 2
+  - uid: 914
+    components:
+    - type: Transform
+      pos: 39.5,3.5
+      parent: 2
+  - uid: 918
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 39.5,1.5
+      parent: 2
+- proto: RailingCornerSmall
+  entities:
+  - uid: 545
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,22.5
+      parent: 2
+  - uid: 546
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,22.5
+      parent: 2
+  - uid: 547
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,21.5
+      parent: 2
+  - uid: 799
+    components:
+    - type: Transform
+      pos: 47.5,20.5
+      parent: 2
+  - uid: 915
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 38.5,3.5
+      parent: 2
+  - uid: 916
+    components:
+    - type: Transform
+      pos: 48.5,1.5
+      parent: 2
+  - uid: 917
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 48.5,3.5
+      parent: 2
+- proto: RandomArtifactSpawner
+  entities:
+  - uid: 611
+    components:
+    - type: Transform
+      pos: 34.5,14.5
+      parent: 2
+- proto: RandomBoard
+  entities:
+  - uid: 934
+    components:
+    - type: Transform
+      pos: 50.5,4.5
+      parent: 2
+  - uid: 935
+    components:
+    - type: Transform
+      pos: 49.5,0.5
+      parent: 2
+- proto: RandomBrownStalagmite
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 33.5,28.5
+      parent: 2
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 10.5,4.5
+      parent: 2
+  - uid: 13
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 2
+  - uid: 35
+    components:
+    - type: Transform
+      pos: 9.5,13.5
+      parent: 2
+  - uid: 36
+    components:
+    - type: Transform
+      pos: 9.5,9.5
+      parent: 2
+  - uid: 37
+    components:
+    - type: Transform
+      pos: 12.5,1.5
+      parent: 2
+  - uid: 51
+    components:
+    - type: Transform
+      pos: 34.5,30.5
+      parent: 2
+  - uid: 62
+    components:
+    - type: Transform
+      pos: 32.5,26.5
+      parent: 2
+  - uid: 71
+    components:
+    - type: Transform
+      pos: 20.5,27.5
+      parent: 2
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 32.5,28.5
+      parent: 2
+  - uid: 74
+    components:
+    - type: Transform
+      pos: 22.5,30.5
+      parent: 2
+  - uid: 80
+    components:
+    - type: Transform
+      pos: 20.5,30.5
+      parent: 2
+  - uid: 90
+    components:
+    - type: Transform
+      pos: 34.5,27.5
+      parent: 2
+  - uid: 169
+    components:
+    - type: Transform
+      pos: 38.5,26.5
+      parent: 2
+  - uid: 322
+    components:
+    - type: Transform
+      pos: 38.5,29.5
+      parent: 2
+  - uid: 358
+    components:
+    - type: Transform
+      pos: 14.5,15.5
+      parent: 2
+  - uid: 443
+    components:
+    - type: Transform
+      pos: 14.5,16.5
+      parent: 2
+  - uid: 635
+    components:
+    - type: Transform
+      pos: 35.5,18.5
+      parent: 2
+  - uid: 636
+    components:
+    - type: Transform
+      pos: 40.5,24.5
+      parent: 2
+  - uid: 637
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 2
+  - uid: 638
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 2
+  - uid: 649
+    components:
+    - type: Transform
+      pos: 33.5,29.5
+      parent: 2
+  - uid: 674
+    components:
+    - type: Transform
+      pos: 37.5,15.5
+      parent: 2
+  - uid: 675
+    components:
+    - type: Transform
+      pos: 32.5,13.5
+      parent: 2
+  - uid: 676
+    components:
+    - type: Transform
+      pos: 19.5,3.5
+      parent: 2
+  - uid: 677
+    components:
+    - type: Transform
+      pos: 32.5,0.5
+      parent: 2
+  - uid: 678
+    components:
+    - type: Transform
+      pos: 33.5,3.5
+      parent: 2
+  - uid: 679
+    components:
+    - type: Transform
+      pos: 14.5,0.5
+      parent: 2
+  - uid: 709
+    components:
+    - type: Transform
+      pos: 36.5,10.5
+      parent: 2
+  - uid: 711
+    components:
+    - type: Transform
+      pos: 41.5,9.5
+      parent: 2
+  - uid: 712
+    components:
+    - type: Transform
+      pos: 42.5,9.5
+      parent: 2
+  - uid: 713
+    components:
+    - type: Transform
+      pos: 39.5,9.5
+      parent: 2
+  - uid: 768
+    components:
+    - type: Transform
+      pos: 42.5,14.5
+      parent: 2
+  - uid: 836
+    components:
+    - type: Transform
+      pos: 44.5,18.5
+      parent: 2
+  - uid: 837
+    components:
+    - type: Transform
+      pos: 44.5,22.5
+      parent: 2
+  - uid: 838
+    components:
+    - type: Transform
+      pos: 48.5,22.5
+      parent: 2
+  - uid: 946
+    components:
+    - type: Transform
+      pos: 36.5,30.5
+      parent: 2
+  - uid: 1016
+    components:
+    - type: Transform
+      pos: 21.5,34.5
+      parent: 2
+  - uid: 1096
+    components:
+    - type: Transform
+      pos: 33.5,33.5
+      parent: 2
+  - uid: 1097
+    components:
+    - type: Transform
+      pos: 35.5,34.5
+      parent: 2
+  - uid: 1098
+    components:
+    - type: Transform
+      pos: 29.5,34.5
+      parent: 2
+  - uid: 1099
+    components:
+    - type: Transform
+      pos: 37.5,33.5
+      parent: 2
+- proto: RandomFoodBakedSingle
+  entities:
+  - uid: 548
+    components:
+    - type: Transform
+      pos: 21.5,20.5
+      parent: 2
+- proto: RandomFoodBakedWhole
+  entities:
+  - uid: 549
+    components:
+    - type: Transform
+      pos: 21.5,19.5
+      parent: 2
+- proto: RandomGreyStalagmite
+  entities:
+  - uid: 655
+    components:
+    - type: Transform
+      pos: 33.5,27.5
+      parent: 2
+  - uid: 656
+    components:
+    - type: Transform
+      pos: 32.5,30.5
+      parent: 2
+  - uid: 770
+    components:
+    - type: Transform
+      pos: 41.5,13.5
+      parent: 2
+- proto: RandomRockAnomalySpawner
+  entities:
+  - uid: 585
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 36.5,22.5
+      parent: 2
+- proto: RandomWoodenSupport
+  entities:
+  - uid: 939
+    components:
+    - type: Transform
+      pos: 10.5,16.5
+      parent: 2
+  - uid: 940
+    components:
+    - type: Transform
+      pos: 3.5,12.5
+      parent: 2
+  - uid: 945
+    components:
+    - type: Transform
+      pos: 5.5,14.5
+      parent: 2
+  - uid: 1005
+    components:
+    - type: Transform
+      pos: 3.5,16.5
+      parent: 2
+  - uid: 1014
+    components:
+    - type: Transform
+      pos: 1.5,14.5
+      parent: 2
+- proto: RandomWoodenWall
+  entities:
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 21.5,18.5
+      parent: 2
+  - uid: 406
+    components:
+    - type: Transform
+      pos: 5.5,6.5
+      parent: 2
+  - uid: 1002
+    components:
+    - type: Transform
+      pos: 15.5,7.5
+      parent: 2
+  - uid: 1003
+    components:
+    - type: Transform
+      pos: 17.5,8.5
+      parent: 2
+  - uid: 1004
+    components:
+    - type: Transform
+      pos: 17.5,9.5
+      parent: 2
+  - uid: 1008
+    components:
+    - type: Transform
+      pos: 23.5,21.5
+      parent: 2
+  - uid: 1010
+    components:
+    - type: Transform
+      pos: 21.5,24.5
+      parent: 2
+- proto: RitualDagger
+  entities:
+  - uid: 58
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.584774,6.677495
+      parent: 2
+- proto: SalvageCanisterSpawner
+  entities:
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 14.5,8.5
+      parent: 2
+  - uid: 185
+    components:
+    - type: Transform
+      pos: 6.5,12.5
+      parent: 2
+  - uid: 192
+    components:
+    - type: Transform
+      pos: 9.5,6.5
+      parent: 2
+  - uid: 195
+    components:
+    - type: Transform
+      pos: 19.5,10.5
+      parent: 2
+  - uid: 444
+    components:
+    - type: Transform
+      pos: 13.5,19.5
+      parent: 2
+  - uid: 724
+    components:
+    - type: Transform
+      pos: 41.5,7.5
+      parent: 2
+- proto: SalvageHumanCorpseSpawner
+  entities:
+  - uid: 1011
+    components:
+    - type: Transform
+      pos: 15.5,32.5
+      parent: 2
+  - uid: 1012
+    components:
+    - type: Transform
+      pos: 17.5,34.5
+      parent: 2
+  - uid: 1013
+    components:
+    - type: Transform
+      pos: 19.5,32.5
+      parent: 2
+- proto: SalvageLootSpawner
+  entities:
+  - uid: 207
+    components:
+    - type: Transform
+      pos: 18.5,7.5
+      parent: 2
+- proto: SalvageMaterialCrateSpawner
+  entities:
+  - uid: 308
+    components:
+    - type: Transform
+      pos: 1.5,19.5
+      parent: 2
+  - uid: 767
+    components:
+    - type: Transform
+      pos: 45.5,15.5
+      parent: 2
+  - uid: 965
+    components:
+    - type: Transform
+      pos: 1.5,33.5
+      parent: 2
+- proto: SeismicCharge
+  entities:
+  - uid: 271
+    components:
+    - type: Transform
+      pos: 20.302504,0.69014454
+      parent: 2
+  - uid: 272
+    components:
+    - type: Transform
+      pos: 20.607191,0.479207
+      parent: 2
+  - uid: 403
+    components:
+    - type: Transform
+      pos: 27.344437,13.639372
+      parent: 2
+  - uid: 569
+    components:
+    - type: Transform
+      pos: 25.394873,28.386763
+      parent: 2
+  - uid: 570
+    components:
+    - type: Transform
+      pos: 9.34093,26.582075
+      parent: 2
+  - uid: 571
+    components:
+    - type: Transform
+      pos: 9.5987425,26.886763
+      parent: 2
+  - uid: 650
+    components:
+    - type: Transform
+      pos: 2.4223385,15.630526
+      parent: 2
+  - uid: 651
+    components:
+    - type: Transform
+      pos: 2.6098385,15.560213
+      parent: 2
+- proto: SheetGlass
+  entities:
+  - uid: 1095
+    components:
+    - type: Transform
+      pos: 40.66182,34.563454
+      parent: 2
+- proto: SheetPlastic
+  entities:
+  - uid: 139
+    components:
+    - type: Transform
+      pos: 9.581186,28.36499
+      parent: 2
+- proto: SheetSteel
+  entities:
+  - uid: 1094
+    components:
+    - type: Transform
+      pos: 39.413292,34.563454
+      parent: 2
+- proto: SignDangerMed
+  entities:
+  - uid: 128
+    components:
+    - type: Transform
+      pos: 0.5,10.5
+      parent: 2
+  - uid: 216
+    components:
+    - type: Transform
+      pos: 10.5,6.5
+      parent: 2
+  - uid: 409
+    components:
+    - type: Transform
+      pos: 6.5,18.5
+      parent: 2
+  - uid: 422
+    components:
+    - type: Transform
+      pos: 10.5,22.5
+      parent: 2
+- proto: SignNosmoking
+  entities:
+  - uid: 573
+    components:
+    - type: Transform
+      pos: 20.5,24.5
+      parent: 2
+- proto: SignRadiationMed
+  entities:
+  - uid: 654
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,27.5
+      parent: 2
+- proto: SilverOre1
+  entities:
+  - uid: 962
+    components:
+    - type: Transform
+      pos: 3.6584427,33.53978
+      parent: 2
+  - uid: 963
+    components:
+    - type: Transform
+      pos: 7.5544147,33.381348
+      parent: 2
+  - uid: 964
+    components:
+    - type: Transform
+      pos: 9.759932,33.75102
+      parent: 2
+- proto: SpearBone
+  entities:
+  - uid: 643
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.78427,29.934273
+      parent: 2
+  - uid: 644
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.654732,27.307365
+      parent: 2
+- proto: StatueVenusBlue
+  entities:
+  - uid: 487
+    components:
+    - type: Transform
+      pos: 29.5,21.5
+      parent: 2
+- proto: StatueVenusRed
+  entities:
+  - uid: 1043
+    components:
+    - type: Transform
+      pos: 14.5,20.5
+      parent: 2
+- proto: SubstationBasic
+  entities:
+  - uid: 383
+    components:
+    - type: Transform
+      pos: 25.5,13.5
+      parent: 2
+- proto: TableCounterMetal
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      pos: 4.5,13.5
+      parent: 2
+  - uid: 111
+    components:
+    - type: Transform
+      pos: 2.5,15.5
+      parent: 2
+    - type: ContainerContainer
+      containers:
+        stickers_container: !type:Container
+          showEnts: True
+          ents: []
+  - uid: 127
+    components:
+    - type: Transform
+      pos: 9.5,28.5
+      parent: 2
+  - uid: 133
+    components:
+    - type: Transform
+      pos: 9.5,27.5
+      parent: 2
+  - uid: 134
+    components:
+    - type: Transform
+      pos: 9.5,26.5
+      parent: 2
+  - uid: 355
+    components:
+    - type: Transform
+      pos: 38.5,6.5
+      parent: 2
+  - uid: 528
+    components:
+    - type: Transform
+      pos: 21.5,20.5
+      parent: 2
+  - uid: 531
+    components:
+    - type: Transform
+      pos: 21.5,19.5
+      parent: 2
+  - uid: 640
+    components:
+    - type: Transform
+      pos: 4.5,15.5
+      parent: 2
+  - uid: 647
+    components:
+    - type: Transform
+      pos: 2.5,13.5
+      parent: 2
+  - uid: 716
+    components:
+    - type: Transform
+      pos: 38.5,7.5
+      parent: 2
+  - uid: 717
+    components:
+    - type: Transform
+      pos: 39.5,7.5
+      parent: 2
+  - uid: 718
+    components:
+    - type: Transform
+      pos: 40.5,7.5
+      parent: 2
+  - uid: 719
+    components:
+    - type: Transform
+      pos: 42.5,7.5
+      parent: 2
+  - uid: 720
+    components:
+    - type: Transform
+      pos: 43.5,7.5
+      parent: 2
+  - uid: 823
+    components:
+    - type: Transform
+      pos: 48.5,19.5
+      parent: 2
+  - uid: 938
+    components:
+    - type: Transform
+      pos: 6.5,15.5
+      parent: 2
+  - uid: 1102
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,32.5
+      parent: 2
+- proto: TableFancyPurple
+  entities:
+  - uid: 618
+    components:
+    - type: Transform
+      pos: 35.5,23.5
+      parent: 2
+- proto: TableFancyRed
+  entities:
+  - uid: 78
+    components:
+    - type: Transform
+      pos: 33.5,9.5
+      parent: 2
+  - uid: 122
+    components:
+    - type: Transform
+      pos: 32.5,9.5
+      parent: 2
+  - uid: 182
+    components:
+    - type: Transform
+      pos: 31.5,9.5
+      parent: 2
+- proto: TableStone
+  entities:
+  - uid: 605
+    components:
+    - type: Transform
+      pos: 17.5,29.5
+      parent: 2
+  - uid: 613
+    components:
+    - type: Transform
+      pos: 17.5,27.5
+      parent: 2
+- proto: ToolboxArtisticFilled
+  entities:
+  - uid: 623
+    components:
+    - type: Transform
+      pos: 39.425648,20.705383
+      parent: 2
+- proto: ToolboxElectricalFilled
+  entities:
+  - uid: 684
+    components:
+    - type: Transform
+      pos: 33.405064,12.760937
+      parent: 2
+- proto: TorsoBorg
+  entities:
+  - uid: 807
+    components:
+    - type: Transform
+      pos: 42.660984,19.533558
+      parent: 2
+- proto: TorsoBorgJanitor
+  entities:
+  - uid: 835
+    components:
+    - type: Transform
+      pos: 47.640297,19.235235
+      parent: 2
+- proto: VendingMachineChapel
+  entities:
+  - uid: 146
+    components:
+    - type: Transform
+      pos: 33.5,6.5
+      parent: 2
+- proto: VendingMachineMedical
+  entities:
+  - uid: 762
+    components:
+    - type: Transform
+      pos: 41.5,15.5
+      parent: 2
+- proto: VendingMachineSovietSoda
+  entities:
+  - uid: 304
+    components:
+    - type: Transform
+      pos: 3.5,21.5
+      parent: 2
+- proto: WallCobblebrick
+  entities:
+  - uid: 94
+    components:
+    - type: Transform
+      pos: 0.5,10.5
+      parent: 2
+  - uid: 96
+    components:
+    - type: Transform
+      pos: 10.5,10.5
+      parent: 2
+  - uid: 100
+    components:
+    - type: Transform
+      pos: 0.5,6.5
+      parent: 2
+  - uid: 101
+    components:
+    - type: Transform
+      pos: 10.5,6.5
+      parent: 2
+  - uid: 118
+    components:
+    - type: Transform
+      pos: 9.5,25.5
+      parent: 2
+  - uid: 124
+    components:
+    - type: Transform
+      pos: 9.5,29.5
+      parent: 2
+  - uid: 418
+    components:
+    - type: Transform
+      pos: 6.5,18.5
+      parent: 2
+  - uid: 419
+    components:
+    - type: Transform
+      pos: 6.5,22.5
+      parent: 2
+  - uid: 420
+    components:
+    - type: Transform
+      pos: 10.5,22.5
+      parent: 2
+  - uid: 421
+    components:
+    - type: Transform
+      pos: 10.5,18.5
+      parent: 2
+- proto: WallMining
+  entities:
+  - uid: 281
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,18.5
+      parent: 2
+  - uid: 282
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,22.5
+      parent: 2
+  - uid: 283
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,22.5
+      parent: 2
+  - uid: 295
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,18.5
+      parent: 2
+  - uid: 349
+    components:
+    - type: Transform
+      pos: 26.5,16.5
+      parent: 2
+  - uid: 356
+    components:
+    - type: Transform
+      pos: 29.5,16.5
+      parent: 2
+  - uid: 357
+    components:
+    - type: Transform
+      pos: 29.5,12.5
+      parent: 2
+  - uid: 360
+    components:
+    - type: Transform
+      pos: 26.5,12.5
+      parent: 2
+  - uid: 373
+    components:
+    - type: Transform
+      pos: 25.5,12.5
+      parent: 2
+  - uid: 393
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 26.5,15.5
+      parent: 2
+  - uid: 394
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 26.5,13.5
+      parent: 2
+  - uid: 461
+    components:
+    - type: Transform
+      pos: 24.5,19.5
+      parent: 2
+  - uid: 470
+    components:
+    - type: Transform
+      pos: 19.5,24.5
+      parent: 2
+  - uid: 471
+    components:
+    - type: Transform
+      pos: 18.5,23.5
+      parent: 2
+  - uid: 475
+    components:
+    - type: Transform
+      pos: 18.5,19.5
+      parent: 2
+  - uid: 476
+    components:
+    - type: Transform
+      pos: 19.5,18.5
+      parent: 2
+  - uid: 480
+    components:
+    - type: Transform
+      pos: 23.5,18.5
+      parent: 2
+  - uid: 595
+    components:
+    - type: Transform
+      pos: 34.5,23.5
+      parent: 2
+  - uid: 597
+    components:
+    - type: Transform
+      pos: 34.5,22.5
+      parent: 2
+  - uid: 616
+    components:
+    - type: Transform
+      pos: 35.5,24.5
+      parent: 2
+  - uid: 624
+    components:
+    - type: Transform
+      pos: 36.5,24.5
+      parent: 2
+  - uid: 657
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,27.5
+      parent: 2
+  - uid: 691
+    components:
+    - type: Transform
+      pos: 38.5,8.5
+      parent: 2
+  - uid: 692
+    components:
+    - type: Transform
+      pos: 42.5,8.5
+      parent: 2
+  - uid: 693
+    components:
+    - type: Transform
+      pos: 43.5,8.5
+      parent: 2
+  - uid: 698
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,7.5
+      parent: 2
+  - uid: 730
+    components:
+    - type: Transform
+      pos: 41.5,12.5
+      parent: 2
+  - uid: 735
+    components:
+    - type: Transform
+      pos: 41.5,16.5
+      parent: 2
+  - uid: 736
+    components:
+    - type: Transform
+      pos: 45.5,16.5
+      parent: 2
+  - uid: 741
+    components:
+    - type: Transform
+      pos: 45.5,12.5
+      parent: 2
+  - uid: 1072
+    components:
+    - type: Transform
+      pos: 32.5,32.5
+      parent: 2
+  - uid: 1073
+    components:
+    - type: Transform
+      pos: 36.5,34.5
+      parent: 2
+- proto: WallMiningDiagonal
+  entities:
+  - uid: 276
+    components:
+    - type: Transform
+      pos: 0.5,22.5
+      parent: 2
+  - uid: 277
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,22.5
+      parent: 2
+  - uid: 278
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,18.5
+      parent: 2
+  - uid: 279
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,18.5
+      parent: 2
+  - uid: 362
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,16.5
+      parent: 2
+  - uid: 363
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,12.5
+      parent: 2
+  - uid: 481
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 24.5,18.5
+      parent: 2
+  - uid: 483
+    components:
+    - type: Transform
+      pos: 18.5,24.5
+      parent: 2
+  - uid: 484
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,18.5
+      parent: 2
+  - uid: 555
+    components:
+    - type: Transform
+      pos: 40.5,16.5
+      parent: 2
+  - uid: 561
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,16.5
+      parent: 2
+  - uid: 562
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 46.5,12.5
+      parent: 2
+  - uid: 583
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,30.5
+      parent: 2
+  - uid: 584
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,30.5
+      parent: 2
+  - uid: 598
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,12.5
+      parent: 2
+  - uid: 694
+    components:
+    - type: Transform
+      pos: 37.5,8.5
+      parent: 2
+  - uid: 697
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,8.5
+      parent: 2
+- proto: WallRock
+  entities:
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 5.5,16.5
+      parent: 2
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 5.5,12.5
+      parent: 2
+  - uid: 10
+    components:
+    - type: Transform
+      pos: 1.5,12.5
+      parent: 2
+  - uid: 14
+    components:
+    - type: Transform
+      pos: 5.5,15.5
+      parent: 2
+  - uid: 15
+    components:
+    - type: Transform
+      pos: 5.5,13.5
+      parent: 2
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 1.5,16.5
+      parent: 2
+  - uid: 17
+    components:
+    - type: Transform
+      pos: 1.5,13.5
+      parent: 2
+  - uid: 18
+    components:
+    - type: Transform
+      pos: 12.5,10.5
+      parent: 2
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 21.5,10.5
+      parent: 2
+  - uid: 21
+    components:
+    - type: Transform
+      pos: 12.5,6.5
+      parent: 2
+  - uid: 22
+    components:
+    - type: Transform
+      pos: 22.5,10.5
+      parent: 2
+  - uid: 23
+    components:
+    - type: Transform
+      pos: 22.5,9.5
+      parent: 2
+  - uid: 24
+    components:
+    - type: Transform
+      pos: 22.5,6.5
+      parent: 2
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 15.5,8.5
+      parent: 2
+  - uid: 45
+    components:
+    - type: Transform
+      pos: 15.5,9.5
+      parent: 2
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 9.5,12.5
+      parent: 2
+  - uid: 60
+    components:
+    - type: Transform
+      pos: 4.5,16.5
+      parent: 2
+  - uid: 61
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 2
+  - uid: 65
+    components:
+    - type: Transform
+      pos: 2.5,16.5
+      parent: 2
+  - uid: 66
+    components:
+    - type: Transform
+      pos: 17.5,7.5
+      parent: 2
+  - uid: 68
+    components:
+    - type: Transform
+      pos: 18.5,6.5
+      parent: 2
+  - uid: 69
+    components:
+    - type: Transform
+      pos: 15.5,3.5
+      parent: 2
+  - uid: 75
+    components:
+    - type: Transform
+      pos: 13.5,16.5
+      parent: 2
+  - uid: 81
+    components:
+    - type: Transform
+      pos: 16.5,4.5
+      parent: 2
+  - uid: 82
+    components:
+    - type: Transform
+      pos: 14.5,4.5
+      parent: 2
+  - uid: 97
+    components:
+    - type: Transform
+      pos: 18.5,4.5
+      parent: 2
+  - uid: 104
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 2
+  - uid: 105
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 2
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 5.5,4.5
+      parent: 2
+  - uid: 112
+    components:
+    - type: Transform
+      pos: 19.5,6.5
+      parent: 2
+  - uid: 114
+    components:
+    - type: Transform
+      pos: 14.5,6.5
+      parent: 2
+  - uid: 116
+    components:
+    - type: Transform
+      pos: 10.5,0.5
+      parent: 2
+  - uid: 120
+    components:
+    - type: Transform
+      pos: 16.5,0.5
+      parent: 2
+  - uid: 123
+    components:
+    - type: Transform
+      pos: 9.5,1.5
+      parent: 2
+  - uid: 125
+    components:
+    - type: Transform
+      pos: 9.5,2.5
+      parent: 2
+  - uid: 126
+    components:
+    - type: Transform
+      pos: 12.5,0.5
+      parent: 2
+  - uid: 137
+    components:
+    - type: Transform
+      pos: 12.5,15.5
+      parent: 2
+  - uid: 141
+    components:
+    - type: Transform
+      pos: 15.5,0.5
+      parent: 2
+  - uid: 145
+    components:
+    - type: Transform
+      pos: 10.5,1.5
+      parent: 2
+  - uid: 147
+    components:
+    - type: Transform
+      pos: 11.5,1.5
+      parent: 2
+  - uid: 148
+    components:
+    - type: Transform
+      pos: 33.5,10.5
+      parent: 2
+  - uid: 149
+    components:
+    - type: Transform
+      pos: 11.5,0.5
+      parent: 2
+  - uid: 150
+    components:
+    - type: Transform
+      pos: 6.5,3.5
+      parent: 2
+  - uid: 152
+    components:
+    - type: Transform
+      pos: 5.5,2.5
+      parent: 2
+  - uid: 158
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 2
+  - uid: 160
+    components:
+    - type: Transform
+      pos: 34.5,10.5
+      parent: 2
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 28.5,8.5
+      parent: 2
+  - uid: 178
+    components:
+    - type: Transform
+      pos: 15.5,4.5
+      parent: 2
+  - uid: 180
+    components:
+    - type: Transform
+      pos: 24.5,7.5
+      parent: 2
+  - uid: 181
+    components:
+    - type: Transform
+      pos: 24.5,6.5
+      parent: 2
+  - uid: 186
+    components:
+    - type: Transform
+      pos: 26.5,6.5
+      parent: 2
+  - uid: 187
+    components:
+    - type: Transform
+      pos: 29.5,9.5
+      parent: 2
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 32.5,10.5
+      parent: 2
+  - uid: 190
+    components:
+    - type: Transform
+      pos: 24.5,10.5
+      parent: 2
+  - uid: 191
+    components:
+    - type: Transform
+      pos: 25.5,6.5
+      parent: 2
+  - uid: 193
+    components:
+    - type: Transform
+      pos: 15.5,10.5
+      parent: 2
+  - uid: 196
+    components:
+    - type: Transform
+      pos: 5.5,3.5
+      parent: 2
+  - uid: 198
+    components:
+    - type: Transform
+      pos: 28.5,9.5
+      parent: 2
+  - uid: 199
+    components:
+    - type: Transform
+      pos: 34.5,6.5
+      parent: 2
+  - uid: 202
+    components:
+    - type: Transform
+      pos: 14.5,9.5
+      parent: 2
+  - uid: 210
+    components:
+    - type: Transform
+      pos: 6.5,25.5
+      parent: 2
+  - uid: 211
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 2
+  - uid: 215
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 2
+  - uid: 217
+    components:
+    - type: Transform
+      pos: 27.5,9.5
+      parent: 2
+  - uid: 219
+    components:
+    - type: Transform
+      pos: 34.5,9.5
+      parent: 2
+  - uid: 221
+    components:
+    - type: Transform
+      pos: 1.5,15.5
+      parent: 2
+  - uid: 235
+    components:
+    - type: Transform
+      pos: 19.5,0.5
+      parent: 2
+  - uid: 236
+    components:
+    - type: Transform
+      pos: 18.5,0.5
+      parent: 2
+  - uid: 237
+    components:
+    - type: Transform
+      pos: 19.5,4.5
+      parent: 2
+  - uid: 238
+    components:
+    - type: Transform
+      pos: 18.5,3.5
+      parent: 2
+  - uid: 239
+    components:
+    - type: Transform
+      pos: 21.5,0.5
+      parent: 2
+  - uid: 240
+    components:
+    - type: Transform
+      pos: 33.5,0.5
+      parent: 2
+  - uid: 241
+    components:
+    - type: Transform
+      pos: 34.5,0.5
+      parent: 2
+  - uid: 242
+    components:
+    - type: Transform
+      pos: 34.5,4.5
+      parent: 2
+  - uid: 243
+    components:
+    - type: Transform
+      pos: 34.5,3.5
+      parent: 2
+  - uid: 244
+    components:
+    - type: Transform
+      pos: 33.5,4.5
+      parent: 2
+  - uid: 245
+    components:
+    - type: Transform
+      pos: 27.5,1.5
+      parent: 2
+  - uid: 247
+    components:
+    - type: Transform
+      pos: 28.5,1.5
+      parent: 2
+  - uid: 248
+    components:
+    - type: Transform
+      pos: 25.5,2.5
+      parent: 2
+  - uid: 251
+    components:
+    - type: Transform
+      pos: 24.5,2.5
+      parent: 2
+  - uid: 252
+    components:
+    - type: Transform
+      pos: 24.5,1.5
+      parent: 2
+  - uid: 309
+    components:
+    - type: Transform
+      pos: 8.5,12.5
+      parent: 2
+  - uid: 314
+    components:
+    - type: Transform
+      pos: 13.5,12.5
+      parent: 2
+  - uid: 315
+    components:
+    - type: Transform
+      pos: 14.5,12.5
+      parent: 2
+  - uid: 316
+    components:
+    - type: Transform
+      pos: 5.5,26.5
+      parent: 2
+  - uid: 324
+    components:
+    - type: Transform
+      pos: 13.5,13.5
+      parent: 2
+  - uid: 325
+    components:
+    - type: Transform
+      pos: 22.5,12.5
+      parent: 2
+  - uid: 331
+    components:
+    - type: Transform
+      pos: 21.5,16.5
+      parent: 2
+  - uid: 341
+    components:
+    - type: Transform
+      pos: 21.5,15.5
+      parent: 2
+  - uid: 346
+    components:
+    - type: Transform
+      pos: 20.5,15.5
+      parent: 2
+  - uid: 347
+    components:
+    - type: Transform
+      pos: 20.5,16.5
+      parent: 2
+  - uid: 348
+    components:
+    - type: Transform
+      pos: 19.5,16.5
+      parent: 2
+  - uid: 351
+    components:
+    - type: Transform
+      pos: 22.5,15.5
+      parent: 2
+  - uid: 353
+    components:
+    - type: Transform
+      pos: 22.5,16.5
+      parent: 2
+  - uid: 388
+    components:
+    - type: Transform
+      pos: 8.5,16.5
+      parent: 2
+  - uid: 464
+    components:
+    - type: Transform
+      pos: 22.5,23.5
+      parent: 2
+  - uid: 466
+    components:
+    - type: Transform
+      pos: 24.5,22.5
+      parent: 2
+  - uid: 479
+    components:
+    - type: Transform
+      pos: 13.5,15.5
+      parent: 2
+  - uid: 482
+    components:
+    - type: Transform
+      pos: 23.5,22.5
+      parent: 2
+  - uid: 493
+    components:
+    - type: Transform
+      pos: 23.5,23.5
+      parent: 2
+  - uid: 494
+    components:
+    - type: Transform
+      pos: 24.5,23.5
+      parent: 2
+  - uid: 515
+    components:
+    - type: Transform
+      pos: 24.5,24.5
+      parent: 2
+  - uid: 516
+    components:
+    - type: Transform
+      pos: 23.5,24.5
+      parent: 2
+  - uid: 518
+    components:
+    - type: Transform
+      pos: 22.5,24.5
+      parent: 2
+  - uid: 520
+    components:
+    - type: Transform
+      pos: 26.5,23.5
+      parent: 2
+  - uid: 522
+    components:
+    - type: Transform
+      pos: 26.5,24.5
+      parent: 2
+  - uid: 523
+    components:
+    - type: Transform
+      pos: 27.5,24.5
+      parent: 2
+  - uid: 524
+    components:
+    - type: Transform
+      pos: 32.5,18.5
+      parent: 2
+  - uid: 525
+    components:
+    - type: Transform
+      pos: 32.5,24.5
+      parent: 2
+  - uid: 526
+    components:
+    - type: Transform
+      pos: 26.5,18.5
+      parent: 2
+  - uid: 527
+    components:
+    - type: Transform
+      pos: 31.5,20.5
+      parent: 2
+  - uid: 529
+    components:
+    - type: Transform
+      pos: 31.5,19.5
+      parent: 2
+  - uid: 530
+    components:
+    - type: Transform
+      pos: 32.5,19.5
+      parent: 2
+  - uid: 532
+    components:
+    - type: Transform
+      pos: 29.5,19.5
+      parent: 2
+  - uid: 533
+    components:
+    - type: Transform
+      pos: 27.5,21.5
+      parent: 2
+  - uid: 557
+    components:
+    - type: Transform
+      pos: 30.5,27.5
+      parent: 2
+  - uid: 559
+    components:
+    - type: Transform
+      pos: 24.5,27.5
+      parent: 2
+  - uid: 563
+    components:
+    - type: Transform
+      pos: 26.5,26.5
+      parent: 2
+  - uid: 577
+    components:
+    - type: Transform
+      pos: 24.5,30.5
+      parent: 2
+  - uid: 580
+    components:
+    - type: Transform
+      pos: 34.5,24.5
+      parent: 2
+  - uid: 581
+    components:
+    - type: Transform
+      pos: 40.5,18.5
+      parent: 2
+  - uid: 582
+    components:
+    - type: Transform
+      pos: 39.5,18.5
+      parent: 2
+  - uid: 586
+    components:
+    - type: Transform
+      pos: 40.5,19.5
+      parent: 2
+  - uid: 587
+    components:
+    - type: Transform
+      pos: 39.5,19.5
+      parent: 2
+  - uid: 588
+    components:
+    - type: Transform
+      pos: 38.5,20.5
+      parent: 2
+  - uid: 589
+    components:
+    - type: Transform
+      pos: 38.5,19.5
+      parent: 2
+  - uid: 631
+    components:
+    - type: Transform
+      pos: 16.5,26.5
+      parent: 2
+  - uid: 632
+    components:
+    - type: Transform
+      pos: 34.5,18.5
+      parent: 2
+  - uid: 641
+    components:
+    - type: Transform
+      pos: 16.5,30.5
+      parent: 2
+  - uid: 646
+    components:
+    - type: Transform
+      pos: 22.5,27.5
+      parent: 2
+  - uid: 648
+    components:
+    - type: Transform
+      pos: 20.5,26.5
+      parent: 2
+  - uid: 652
+    components:
+    - type: Transform
+      pos: 2.5,12.5
+      parent: 2
+  - uid: 653
+    components:
+    - type: Transform
+      pos: 4.5,12.5
+      parent: 2
+  - uid: 660
+    components:
+    - type: Transform
+      pos: 34.5,26.5
+      parent: 2
+  - uid: 662
+    components:
+    - type: Transform
+      pos: 32.5,29.5
+      parent: 2
+  - uid: 666
+    components:
+    - type: Transform
+      pos: 38.5,16.5
+      parent: 2
+  - uid: 667
+    components:
+    - type: Transform
+      pos: 37.5,16.5
+      parent: 2
+  - uid: 668
+    components:
+    - type: Transform
+      pos: 38.5,15.5
+      parent: 2
+  - uid: 669
+    components:
+    - type: Transform
+      pos: 38.5,12.5
+      parent: 2
+  - uid: 670
+    components:
+    - type: Transform
+      pos: 33.5,16.5
+      parent: 2
+  - uid: 671
+    components:
+    - type: Transform
+      pos: 32.5,16.5
+      parent: 2
+  - uid: 672
+    components:
+    - type: Transform
+      pos: 32.5,15.5
+      parent: 2
+  - uid: 673
+    components:
+    - type: Transform
+      pos: 32.5,12.5
+      parent: 2
+  - uid: 681
+    components:
+    - type: Transform
+      pos: 34.5,13.5
+      parent: 2
+  - uid: 682
+    components:
+    - type: Transform
+      pos: 34.5,12.5
+      parent: 2
+  - uid: 688
+    components:
+    - type: Transform
+      pos: 18.5,34.5
+      parent: 2
+  - uid: 695
+    components:
+    - type: Transform
+      pos: 37.5,7.5
+      parent: 2
+  - uid: 696
+    components:
+    - type: Transform
+      pos: 37.5,6.5
+      parent: 2
+  - uid: 705
+    components:
+    - type: Transform
+      pos: 36.5,6.5
+      parent: 2
+  - uid: 706
+    components:
+    - type: Transform
+      pos: 45.5,10.5
+      parent: 2
+  - uid: 707
+    components:
+    - type: Transform
+      pos: 46.5,9.5
+      parent: 2
+  - uid: 708
+    components:
+    - type: Transform
+      pos: 46.5,6.5
+      parent: 2
+  - uid: 710
+    components:
+    - type: Transform
+      pos: 46.5,10.5
+      parent: 2
+  - uid: 771
+    components:
+    - type: Transform
+      pos: 42.5,18.5
+      parent: 2
+  - uid: 772
+    components:
+    - type: Transform
+      pos: 43.5,18.5
+      parent: 2
+  - uid: 773
+    components:
+    - type: Transform
+      pos: 43.5,19.5
+      parent: 2
+  - uid: 774
+    components:
+    - type: Transform
+      pos: 47.5,23.5
+      parent: 2
+  - uid: 775
+    components:
+    - type: Transform
+      pos: 48.5,24.5
+      parent: 2
+  - uid: 776
+    components:
+    - type: Transform
+      pos: 47.5,24.5
+      parent: 2
+  - uid: 777
+    components:
+    - type: Transform
+      pos: 47.5,22.5
+      parent: 2
+  - uid: 778
+    components:
+    - type: Transform
+      pos: 46.5,22.5
+      parent: 2
+  - uid: 779
+    components:
+    - type: Transform
+      pos: 44.5,20.5
+      parent: 2
+  - uid: 780
+    components:
+    - type: Transform
+      pos: 45.5,20.5
+      parent: 2
+  - uid: 781
+    components:
+    - type: Transform
+      pos: 44.5,19.5
+      parent: 2
+  - uid: 782
+    components:
+    - type: Transform
+      pos: 45.5,21.5
+      parent: 2
+  - uid: 783
+    components:
+    - type: Transform
+      pos: 44.5,21.5
+      parent: 2
+  - uid: 784
+    components:
+    - type: Transform
+      pos: 45.5,22.5
+      parent: 2
+  - uid: 785
+    components:
+    - type: Transform
+      pos: 42.5,24.5
+      parent: 2
+  - uid: 786
+    components:
+    - type: Transform
+      pos: 42.5,23.5
+      parent: 2
+  - uid: 787
+    components:
+    - type: Transform
+      pos: 43.5,24.5
+      parent: 2
+  - uid: 788
+    components:
+    - type: Transform
+      pos: 48.5,18.5
+      parent: 2
+  - uid: 839
+    components:
+    - type: Transform
+      pos: 45.5,4.5
+      parent: 2
+  - uid: 840
+    components:
+    - type: Transform
+      pos: 45.5,3.5
+      parent: 2
+  - uid: 846
+    components:
+    - type: Transform
+      pos: 40.5,1.5
+      parent: 2
+  - uid: 847
+    components:
+    - type: Transform
+      pos: 41.5,0.5
+      parent: 2
+  - uid: 849
+    components:
+    - type: Transform
+      pos: 40.5,0.5
+      parent: 2
+  - uid: 850
+    components:
+    - type: Transform
+      pos: 46.5,3.5
+      parent: 2
+  - uid: 851
+    components:
+    - type: Transform
+      pos: 47.5,3.5
+      parent: 2
+  - uid: 853
+    components:
+    - type: Transform
+      pos: 52.5,0.5
+      parent: 2
+  - uid: 854
+    components:
+    - type: Transform
+      pos: 52.5,1.5
+      parent: 2
+  - uid: 855
+    components:
+    - type: Transform
+      pos: 51.5,0.5
+      parent: 2
+  - uid: 856
+    components:
+    - type: Transform
+      pos: 51.5,4.5
+      parent: 2
+  - uid: 857
+    components:
+    - type: Transform
+      pos: 36.5,4.5
+      parent: 2
+  - uid: 858
+    components:
+    - type: Transform
+      pos: 36.5,0.5
+      parent: 2
+  - uid: 859
+    components:
+    - type: Transform
+      pos: 39.5,0.5
+      parent: 2
+  - uid: 860
+    components:
+    - type: Transform
+      pos: 38.5,0.5
+      parent: 2
+  - uid: 930
+    components:
+    - type: Transform
+      pos: 50.5,3.5
+      parent: 2
+  - uid: 941
+    components:
+    - type: Transform
+      pos: 38.5,30.5
+      parent: 2
+  - uid: 968
+    components:
+    - type: Transform
+      pos: 4.5,32.5
+      parent: 2
+  - uid: 969
+    components:
+    - type: Transform
+      pos: 0.5,34.5
+      parent: 2
+  - uid: 970
+    components:
+    - type: Transform
+      pos: 12.5,34.5
+      parent: 2
+  - uid: 1001
+    components:
+    - type: Transform
+      pos: 14.5,32.5
+      parent: 2
+  - uid: 1018
+    components:
+    - type: Transform
+      pos: 6.5,16.5
+      parent: 2
+  - uid: 1019
+    components:
+    - type: Transform
+      pos: 0.5,16.5
+      parent: 2
+  - uid: 1021
+    components:
+    - type: Transform
+      pos: 22.5,32.5
+      parent: 2
+  - uid: 1031
+    components:
+    - type: Transform
+      pos: 12.5,18.5
+      parent: 2
+  - uid: 1032
+    components:
+    - type: Transform
+      pos: 16.5,22.5
+      parent: 2
+  - uid: 1033
+    components:
+    - type: Transform
+      pos: 16.5,18.5
+      parent: 2
+  - uid: 1034
+    components:
+    - type: Transform
+      pos: 12.5,22.5
+      parent: 2
+  - uid: 1066
+    components:
+    - type: Transform
+      pos: 40.5,32.5
+      parent: 2
+  - uid: 1069
+    components:
+    - type: Transform
+      pos: 37.5,34.5
+      parent: 2
+  - uid: 1071
+    components:
+    - type: Transform
+      pos: 28.5,34.5
+      parent: 2
+  - uid: 1074
+    components:
+    - type: Transform
+      pos: 36.5,32.5
+      parent: 2
+  - uid: 1075
+    components:
+    - type: Transform
+      pos: 37.5,32.5
+      parent: 2
+  - uid: 1076
+    components:
+    - type: Transform
+      pos: 38.5,32.5
+      parent: 2
+- proto: WaterTankFull
+  entities:
+  - uid: 1091
+    components:
+    - type: Transform
+      pos: 38.5,34.5
+      parent: 2
+- proto: WeaponPistolCHIMP
+  entities:
+  - uid: 617
+    components:
+    - type: Transform
+      pos: 35.42519,23.6449
+      parent: 2
+- proto: WeaponProtoKineticAccelerator
+  entities:
+  - uid: 76
+    components:
+    - type: Transform
+      pos: 4.461401,13.497713
+      parent: 2
+- proto: WeldingFuelTankFull
+  entities:
+  - uid: 833
+    components:
+    - type: Transform
+      pos: 48.5,20.5
+      parent: 2
+  - uid: 990
+    components:
+    - type: Transform
+      pos: 11.5,34.5
+      parent: 2
+- proto: WeldingFuelTankHighCapacity
+  entities:
+  - uid: 1090
+    components:
+    - type: Transform
+      pos: 39.5,32.5
+      parent: 2
+- proto: WindowFrostedDirectional
+  entities:
+  - uid: 142
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,26.5
+      parent: 2
+  - uid: 179
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,29.5
+      parent: 2
+  - uid: 222
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,25.5
+      parent: 2
+  - uid: 354
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,27.5
+      parent: 2
+  - uid: 594
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,28.5
+      parent: 2
+  - uid: 1047
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,24.5
+      parent: 2
+- proto: WoodenSign
+  entities:
+  - uid: 223
+    components:
+    - type: Transform
+      pos: 7.4139023,8.307723
+      parent: 2
+  - uid: 500
+    components:
+    - type: Transform
+      pos: 10.363173,19.50409
+      parent: 2
+- proto: WoodenSignRight
+  entities:
+  - uid: 41
+    components:
+    - type: Transform
+      pos: 3.4060895,8.378036
+      parent: 2
+  - uid: 212
+    components:
+    - type: Transform
+      pos: 5.481395,27.427502
+      parent: 2
+  - uid: 246
+    components:
+    - type: Transform
+      pos: 20.401012,2.5267615
+      parent: 2
+  - uid: 445
+    components:
+    - type: Transform
+      pos: 9.592986,14.552987
+      parent: 2
+  - uid: 499
+    components:
+    - type: Transform
+      pos: 7.494245,21.359413
+      parent: 2
+  - uid: 501
+    components:
+    - type: Transform
+      pos: 20.46358,14.338741
+      parent: 2
+  - uid: 991
+    components:
+    - type: Transform
+      pos: 10.697649,32.293045
+      parent: 2
+- proto: WoodenSupport
+  entities:
+  - uid: 42
+    components:
+    - type: Transform
+      pos: 12.5,9.5
+      parent: 2
+  - uid: 56
+    components:
+    - type: Transform
+      pos: 21.5,6.5
+      parent: 2
+  - uid: 89
+    components:
+    - type: Transform
+      pos: 31.5,10.5
+      parent: 2
+  - uid: 154
+    components:
+    - type: Transform
+      pos: 20.5,10.5
+      parent: 2
+  - uid: 167
+    components:
+    - type: Transform
+      pos: 25.5,10.5
+      parent: 2
+  - uid: 170
+    components:
+    - type: Transform
+      pos: 32.5,6.5
+      parent: 2
+  - uid: 250
+    components:
+    - type: Transform
+      pos: 14.5,3.5
+      parent: 2
+- proto: WoodenSupportBeam
+  entities:
+  - uid: 53
+    components:
+    - type: Transform
+      pos: 17.5,10.5
+      parent: 2
+  - uid: 83
+    components:
+    - type: Transform
+      pos: 13.5,0.5
+      parent: 2
+  - uid: 119
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 2
+  - uid: 140
+    components:
+    - type: Transform
+      pos: 13.5,4.5
+      parent: 2
+  - uid: 725
+    components:
+    - type: Transform
+      pos: 38.5,9.5
+      parent: 2
+  - uid: 726
+    components:
+    - type: Transform
+      pos: 38.5,10.5
+      parent: 2
+  - uid: 727
+    components:
+    - type: Transform
+      pos: 43.5,9.5
+      parent: 2
+  - uid: 728
+    components:
+    - type: Transform
+      pos: 43.5,10.5
+      parent: 2
+  - uid: 993
+    components:
+    - type: Transform
+      pos: 4.5,34.5
+      parent: 2
+  - uid: 994
+    components:
+    - type: Transform
+      pos: 4.5,33.5
+      parent: 2
+  - uid: 995
+    components:
+    - type: Transform
+      pos: 8.5,34.5
+      parent: 2
+  - uid: 996
+    components:
+    - type: Transform
+      pos: 8.5,33.5
+      parent: 2
+  - uid: 997
+    components:
+    - type: Transform
+      pos: 8.5,32.5
+      parent: 2
+  - uid: 1015
+    components:
+    - type: Transform
+      pos: 20.5,32.5
+      parent: 2
+  - uid: 1017
+    components:
+    - type: Transform
+      pos: 20.5,34.5
+      parent: 2
+  - uid: 1020
+    components:
+    - type: Transform
+      pos: 23.5,34.5
+      parent: 2
+  - uid: 1022
+    components:
+    - type: Transform
+      pos: 26.5,33.5
+      parent: 2
+  - uid: 1023
+    components:
+    - type: Transform
+      pos: 26.5,34.5
+      parent: 2
+- proto: WoodenSupportWall
+  entities:
+  - uid: 928
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,3.5
+      parent: 2
+  - uid: 929
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 49.5,3.5
+      parent: 2
+...
diff --git a/Resources/Maps/Dungeon/snowy_labs.yml b/Resources/Maps/Dungeon/snowy_labs.yml
new file mode 100644
index 0000000000..1211d7a664
--- /dev/null
+++ b/Resources/Maps/Dungeon/snowy_labs.yml
@@ -0,0 +1,15185 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  12: FloorAstroGrass
+  13: FloorAstroIce
+  17: FloorBlueCircuit
+  29: FloorDark
+  32: FloorDarkHerringbone
+  36: FloorDarkPavement
+  37: FloorDarkPavementVertical
+  38: FloorDarkPlastic
+  44: FloorFreezer
+  49: FloorGrassJungle
+  58: FloorHydro
+  61: FloorLaundry
+  62: FloorLino
+  74: FloorPlanetGrass
+  75: FloorPlastic
+  77: FloorReinforced
+  78: FloorReinforcedHardened
+  80: FloorShowroom
+  84: FloorShuttleOrange
+  89: FloorSnow
+  90: FloorSnowDug
+  91: FloorSteel
+  96: FloorSteelDiagonal
+  101: FloorSteelMini
+  102: FloorSteelMono
+  105: FloorSteelPavementVertical
+  106: FloorTechMaint
+  107: FloorTechMaint2
+  108: FloorTechMaint3
+  110: FloorWhite
+  115: FloorWhiteMono
+  119: FloorWhitePlastic
+  120: FloorWood
+  121: FloorWoodLarge
+  124: Plating
+  128: PlatingSnow
+entities:
+- proto: ""
+  entities:
+  - uid: 1653
+    components:
+    - type: MetaData
+    - type: Transform
+    - type: Map
+    - type: PhysicsMap
+    - type: Broadphase
+    - type: OccluderTree
+    - type: MapGrid
+      chunks:
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAA
+          version: 6
+        0,0:
+          ind: 0,0
+          tiles: WQAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWQAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAASwAAAAAAdwAAAAABSwAAAAAASwAAAAABdwAAAAABSwAAAAAAWwAAAAAAWwAAAAADWwAAAAAAWwAAAAADWwAAAAABVAAAAAAAIAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAASwAAAAADdwAAAAABSwAAAAAASwAAAAACdwAAAAAASwAAAAACWwAAAAADWwAAAAAAWwAAAAABWwAAAAAAWwAAAAADVAAAAAAAJQAAAAAAOgAAAAAAaQAAAAAAOgAAAAAAWwAAAAAAeAAAAAABeAAAAAAAeAAAAAABeAAAAAAAeAAAAAADeAAAAAACeAAAAAABeAAAAAAAeAAAAAABeAAAAAADVAAAAAAAJQAAAAAAOgAAAAAAaQAAAAAAOgAAAAAASwAAAAACeAAAAAABeAAAAAABeAAAAAAAeAAAAAACeAAAAAABeAAAAAABeAAAAAAAeAAAAAACeAAAAAAAeAAAAAACVAAAAAAAJQAAAAAAOgAAAAAAaQAAAAAAOgAAAAAASwAAAAABSwAAAAACSwAAAAAASwAAAAACSwAAAAABSwAAAAABSwAAAAABSwAAAAAASwAAAAACSwAAAAABSwAAAAABVAAAAAAAIAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAVAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAVAAAAAAAHQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAVAAAAAAAHQAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAHQAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAVAAAAAAAHQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAVAAAAAAA
+          version: 6
+        0,1:
+          ind: 0,1
+          tiles: WwAAAAAAWwAAAAAAWQAAAAAAWQAAAAAAWwAAAAAAWwAAAAAAWQAAAAAAVAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAAVAAAAAAAWwAAAAABbgAAAAACbgAAAAACbgAAAAADWwAAAAABVAAAAAAAWgAAAAAAbgAAAAADbgAAAAADbgAAAAAALAAAAAAALAAAAAAALAAAAAAAfAAAAAAAfAAAAAAAVAAAAAAAbgAAAAABbgAAAAADWgAAAAAAbgAAAAADbgAAAAADVAAAAAAAbgAAAAACbgAAAAADbgAAAAADbgAAAAACLAAAAAAALAAAAAAAdwAAAAADdwAAAAADdwAAAAADVAAAAAAAbgAAAAADWgAAAAAAWgAAAAAAWgAAAAAAbgAAAAABVAAAAAAAbgAAAAABbgAAAAADbgAAAAAAbgAAAAADLAAAAAAAfAAAAAAAdwAAAAADbgAAAAACbgAAAAACVAAAAAAAbgAAAAABbgAAAAACWgAAAAAAbgAAAAABbgAAAAAAVAAAAAAAbgAAAAACbgAAAAAAbgAAAAADbgAAAAABLAAAAAAAfAAAAAAAdwAAAAADbgAAAAAAbgAAAAADVAAAAAAAWwAAAAAAbgAAAAADbgAAAAAAbgAAAAABWwAAAAABVAAAAAAAbgAAAAABbgAAAAADbgAAAAABbgAAAAACVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAATQAAAAAATQAAAAAATQAAAAAAVAAAAAAAWwAAAAAAWwAAAAABWwAAAAADVAAAAAAAUAAAAAAAUAAAAAAALAAAAAAAVAAAAAAAZQAAAAACZQAAAAACZgAAAAAAVAAAAAAATQAAAAAAEQAAAAAATQAAAAAAVAAAAAAAagAAAAAAWwAAAAAAWwAAAAADVAAAAAAALAAAAAAAUAAAAAAALAAAAAAAVAAAAAAAZQAAAAACZQAAAAACZgAAAAACVAAAAAAATQAAAAAAEQAAAAAATQAAAAAAVAAAAAAAWwAAAAADWwAAAAACWwAAAAADVAAAAAAALAAAAAAALAAAAAAALAAAAAAAVAAAAAAAWQAAAAAAZQAAAAACZgAAAAACVAAAAAAATQAAAAAAEQAAAAAATQAAAAAAVAAAAAAAWwAAAAADWwAAAAABWwAAAAABVAAAAAAALAAAAAAAUAAAAAAALAAAAAAAVAAAAAAAWQAAAAAAWQAAAAAAZgAAAAABVAAAAAAATQAAAAAATQAAAAAATQAAAAAAVAAAAAAAWwAAAAABWwAAAAAAWwAAAAACVAAAAAAALAAAAAAALAAAAAAAUAAAAAAAVAAAAAAAZQAAAAADZQAAAAAAZgAAAAABVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAbgAAAAAAbgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAbgAAAAACbgAAAAAC
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAA
+          version: 6
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAA
+          version: 6
+        -1,1:
+          ind: -1,1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAA
+          version: 6
+        1,-1:
+          ind: 1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAA
+          version: 6
+        1,0:
+          ind: 1,0
+          tiles: WQAAAAAAVAAAAAAAWwAAAAAATQAAAAAATQAAAAAATQAAAAAAWwAAAAAATQAAAAAATQAAAAAATQAAAAAAWwAAAAAATQAAAAAATQAAAAAATQAAAAAAWwAAAAAATQAAAAAAWwAAAAAAVAAAAAAAWwAAAAAATQAAAAAATQAAAAAATQAAAAAAWwAAAAAATQAAAAAATQAAAAAATQAAAAAAWwAAAAAATQAAAAAATQAAAAAATQAAAAAAWwAAAAAATQAAAAAAWwAAAAAAVAAAAAAAWwAAAAAAWwAAAAAATQAAAAAAWwAAAAAAWwAAAAAAWwAAAAAATQAAAAAAWwAAAAAAWwAAAAAAWwAAAAAATQAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAWwAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAWQAAAAAAVAAAAAAAWwAAAAAAfAAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAIAAAAAAAVAAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAWwAAAAAAaQAAAAAAWwAAAAAAOgAAAAAAaQAAAAAAOgAAAAAAJQAAAAAAVAAAAAAAagAAAAAAWwAAAAAAHQAAAAAAHQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAWwAAAAAAaQAAAAAAWwAAAAAAOgAAAAAAaQAAAAAAOgAAAAAAJQAAAAAAVAAAAAAAagAAAAAAWwAAAAAAHQAAAAAAHQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAWwAAAAAAaQAAAAAAWwAAAAAAOgAAAAAAaQAAAAAAOgAAAAAAJQAAAAAAVAAAAAAAagAAAAAAWwAAAAAAHQAAAAAAHQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAIAAAAAAAVAAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWwAAAAABWwAAAAADWwAAAAAAWwAAAAABWwAAAAACWwAAAAABWwAAAAADVAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAVAAAAAAAWwAAAAACSgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAWwAAAAABVAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATgAAAAAAbgAAAAAAbgAAAAAAVAAAAAAAWwAAAAABSgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAWwAAAAADVAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATgAAAAAATgAAAAAAbgAAAAAAbgAAAAAAVAAAAAAAWwAAAAABSgAAAAAASgAAAAAASgAAAAAASgAAAAAASgAAAAAAWwAAAAAAVAAAAAAAbgAAAAAAWQAAAAAATgAAAAAATgAAAAAATgAAAAAAbgAAAAAAbgAAAAAAVAAAAAAA
+          version: 6
+        1,1:
+          ind: 1,1
+          tiles: WwAAAAAAWwAAAAADWwAAAAADWwAAAAADWwAAAAACWwAAAAADWwAAAAACVAAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAbgAAAAADVAAAAAAAMQAAAAAAWwAAAAABWwAAAAABWwAAAAABMQAAAAAAVAAAAAAAWwAAAAAAWwAAAAADWwAAAAADWwAAAAAAWwAAAAADVAAAAAAAWwAAAAAAWwAAAAAAbgAAAAAAVAAAAAAAWwAAAAAAWgAAAAAAWwAAAAAAWwAAAAADWwAAAAADVAAAAAAAWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADVAAAAAAAWwAAAAAAWwAAAAAAbgAAAAABVAAAAAAAWwAAAAABWwAAAAACWwAAAAABWwAAAAACWwAAAAABVAAAAAAAWwAAAAADfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACVAAAAAAAWwAAAAAAWwAAAAAAbgAAAAABVAAAAAAAWwAAAAADWwAAAAABWwAAAAADWwAAAAABWwAAAAADVAAAAAAAWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACVAAAAAAAWwAAAAAAWwAAAAAAbgAAAAADVAAAAAAAMQAAAAAAWwAAAAACWwAAAAAAWwAAAAABMQAAAAAAVAAAAAAAWwAAAAABWwAAAAABWwAAAAABWwAAAAADfAAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAHQAAAAADHQAAAAACWQAAAAAAVAAAAAAAYAAAAAAAYAAAAAADYAAAAAABVAAAAAAAOgAAAAAAHQAAAAAAOgAAAAAAVAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAVAAAAAAAHQAAAAADHQAAAAAAWQAAAAAAVAAAAAAAYAAAAAAAYAAAAAAAawAAAAAAVAAAAAAAOgAAAAAAHQAAAAAAOgAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAHQAAAAABHQAAAAAAHQAAAAADVAAAAAAAYAAAAAADYAAAAAACawAAAAAAVAAAAAAAOgAAAAAAHQAAAAAAOgAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAHQAAAAAAHQAAAAAAHQAAAAACVAAAAAAAWQAAAAAAYAAAAAABawAAAAAAVAAAAAAAOgAAAAAAHQAAAAAAOgAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAHQAAAAAAHQAAAAAAHQAAAAACVAAAAAAAWQAAAAAAYAAAAAABYAAAAAADVAAAAAAAOgAAAAAAHQAAAAAAOgAAAAAAVAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAbgAAAAADfAAAAAAAWwAAAAABWwAAAAACWwAAAAACWwAAAAABWwAAAAADWwAAAAACWwAAAAAAWwAAAAABWwAAAAABVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAbgAAAAADagAAAAAAWwAAAAADWwAAAAABWwAAAAAAWwAAAAACWwAAAAAAWwAAAAAAWwAAAAADWwAAAAADWwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAA
+          version: 6
+        -1,2:
+          ind: -1,2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAA
+          version: 6
+        -1,3:
+          ind: -1,3
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,2:
+          ind: 0,2
+          tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAbgAAAAADbgAAAAACVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWwAAAAACWwAAAAACWwAAAAAAWwAAAAADcwAAAAAAcwAAAAAAcwAAAAADWwAAAAADWwAAAAACWwAAAAACWwAAAAABVAAAAAAAWwAAAAADWwAAAAABgAAAAAAAWQAAAAAAWwAAAAACWwAAAAADWwAAAAACWwAAAAAAZgAAAAADZgAAAAAAZgAAAAABWwAAAAACWwAAAAABWwAAAAAAWwAAAAABVAAAAAAAWwAAAAACcwAAAAABcwAAAAABWQAAAAAAWwAAAAAAWwAAAAAAWwAAAAACWwAAAAABcwAAAAABcwAAAAAAcwAAAAACWwAAAAABWwAAAAAAWwAAAAACWwAAAAABVAAAAAAAWwAAAAADWwAAAAADWwAAAAACWQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWwAAAAACWwAAAAABWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAADWwAAAAADVAAAAAAAWwAAAAACWwAAAAADWwAAAAABWwAAAAADWwAAAAADWwAAAAAAWwAAAAAAVAAAAAAAWwAAAAAAWwAAAAABWwAAAAABWwAAAAADWwAAAAADWwAAAAAAWwAAAAABVAAAAAAAWwAAAAADWwAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWwAAAAABWwAAAAADVAAAAAAAWwAAAAAAWwAAAAACWwAAAAADWwAAAAABWwAAAAABWwAAAAABWwAAAAAAVAAAAAAAWwAAAAAAWwAAAAABWwAAAAAAWwAAAAACWwAAAAAAWwAAAAACWwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAfAAAAAAAHQAAAAABHQAAAAACHQAAAAADHQAAAAACHQAAAAABHQAAAAABVAAAAAAAWwAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAWwAAAAAAVAAAAAAAfAAAAAAAfAAAAAAAHQAAAAABHQAAAAAAHQAAAAACfAAAAAAAfAAAAAAAVAAAAAAAWwAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAWwAAAAAAVAAAAAAAWwAAAAACawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAWwAAAAAAVAAAAAAAWwAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAWwAAAAAAVAAAAAAAWwAAAAADawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAWwAAAAABVAAAAAAAWwAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAWwAAAAAAVAAAAAAAWwAAAAACawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAWwAAAAABVAAAAAAAWwAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAWwAAAAAAVAAAAAAAWwAAAAADbAAAAAACawAAAAAAbAAAAAAAawAAAAAAbAAAAAAAWwAAAAABVAAAAAAA
+          version: 6
+        0,3:
+          ind: 0,3
+          tiles: WwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAWwAAAAABWwAAAAACWwAAAAAAWwAAAAABWwAAAAAAWwAAAAAAWwAAAAACVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,2:
+          ind: 1,2
+          tiles: bgAAAAABfAAAAAAAWwAAAAACWwAAAAABWwAAAAABWwAAAAABWwAAAAADWwAAAAACWwAAAAACWwAAAAABWwAAAAACVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWwAAAAABWwAAAAADWwAAAAADWwAAAAACVAAAAAAAWgAAAAAAWwAAAAADWwAAAAACWwAAAAABWwAAAAADWwAAAAABWwAAAAAAWwAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAcwAAAAAAgAAAAAAAWwAAAAADVAAAAAAAbgAAAAAAWwAAAAADWwAAAAADWwAAAAACWwAAAAABWwAAAAADWwAAAAACWwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWwAAAAADWwAAAAAAWwAAAAACVAAAAAAAWgAAAAAAWwAAAAACWwAAAAACWwAAAAACWwAAAAADWwAAAAACWwAAAAAAWwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWwAAAAABWwAAAAACWwAAAAADWwAAAAADWwAAAAAAWwAAAAABWwAAAAABVAAAAAAAWwAAAAABWwAAAAADfAAAAAAAWwAAAAAAfAAAAAAAWwAAAAACWwAAAAADVAAAAAAAWwAAAAACWwAAAAAAWwAAAAADWwAAAAAAWwAAAAAAWwAAAAADWwAAAAAAVAAAAAAAWwAAAAACWwAAAAAAWwAAAAADWwAAAAAAWwAAAAADWwAAAAACWwAAAAADVAAAAAAAWwAAAAACWwAAAAAAWwAAAAABWwAAAAAAWwAAAAAAWwAAAAABWwAAAAACVAAAAAAAWwAAAAACWwAAAAADfAAAAAAAWwAAAAADfAAAAAAAWwAAAAACWwAAAAACVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAbgAAAAAAfAAAAAAAbgAAAAAAbgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAADAAAAAAAfAAAAAAAbgAAAAAAbgAAAAAAfAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAADAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAADAAAAAAAbgAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAAADAAAAAAAfAAAAAAADAAAAAAAfAAAAAAADAAAAAAADAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAbgAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAADAAAAAAADAAAAAAAbgAAAAAAfAAAAAAAbgAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,3:
+          ind: 1,3
+          tiles: bgAAAAAAbgAAAAAAbgAAAAAADAAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,0:
+          ind: 2,0
+          tiles: TQAAAAAATQAAAAAAWwAAAAAAVAAAAAAAWwAAAAADWwAAAAACWwAAAAACfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAfAAAAAAATQAAAAAATQAAAAAAWwAAAAAAVAAAAAAAWwAAAAACWwAAAAACWwAAAAABfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAfAAAAAAATQAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAWwAAAAADWwAAAAADWwAAAAACWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWQAAAAAAbgAAAAAAbgAAAAAAWwAAAAAAVAAAAAAAWwAAAAAAWwAAAAABWwAAAAABfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAfAAAAAAAbgAAAAAAfAAAAAAAWwAAAAAAVAAAAAAAWwAAAAAAWwAAAAABWwAAAAACfAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAfAAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAfAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAagAAAAAAagAAAAAAagAAAAAAVAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAVAAAAAAAHQAAAAAAWwAAAAAAagAAAAAAVAAAAAAAHQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAHQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAHQAAAAAAVAAAAAAAHQAAAAAAWwAAAAAAagAAAAAAVAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAVAAAAAAAHQAAAAAAWwAAAAAAagAAAAAAVAAAAAAAHQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAHQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAHQAAAAAAVAAAAAAAagAAAAAAagAAAAAAagAAAAAAVAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAfAAAAAAAJgAAAAAAJgAAAAAAVAAAAAAAWwAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAWwAAAAAAVAAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAWwAAAAAAWwAAAAADWwAAAAAAfAAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAVAAAAAAAWwAAAAAAfAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAfAAAAAAAWwAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADVAAAAAAA
+          version: 6
+        3,0:
+          ind: 3,0
+          tiles: eAAAAAAAeAAAAAAAeAAAAAAAfAAAAAAAWwAAAAABWwAAAAACWwAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAWwAAAAABWwAAAAADWwAAAAADVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAACWwAAAAAAWwAAAAADVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAWwAAAAACWwAAAAAAWwAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAfAAAAAAAWwAAAAABWwAAAAADWwAAAAADVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAJgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAJgAAAAAAJgAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAJgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAJgAAAAAAJgAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAJgAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAJgAAAAAAJgAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,-1:
+          ind: 2,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAA
+          version: 6
+        3,-1:
+          ind: 3,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        3,1:
+          ind: 3,1
+          tiles: JgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        3,2:
+          ind: 3,2
+          tiles: VAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAADQAAAAAADQAAAAAADQAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAAAAADQAAAAAADQAAAAAAWwAAAAAADQAAAAAADQAAAAAADQAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,2:
+          ind: 2,2
+          tiles: VAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWwAAAAACWwAAAAACWgAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWwAAAAACWwAAAAADbgAAAAACVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAWgAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWwAAAAAAWwAAAAACWwAAAAAAWwAAAAACWQAAAAAAWwAAAAADfAAAAAAAVAAAAAAAWwAAAAADWwAAAAABWwAAAAABWwAAAAABWwAAAAAAWwAAAAADWwAAAAACVAAAAAAAWwAAAAAAWwAAAAACWQAAAAAAfAAAAAAAWwAAAAACWwAAAAAAWwAAAAACVAAAAAAAWwAAAAADWwAAAAADWwAAAAABWwAAAAADWwAAAAADWwAAAAABWwAAAAAAVAAAAAAAWwAAAAAAWQAAAAAAWQAAAAAAWwAAAAACWwAAAAAAfAAAAAAAfAAAAAAAVAAAAAAAWwAAAAACWwAAAAACWwAAAAABWwAAAAADWwAAAAACWwAAAAABWwAAAAABVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,1:
+          ind: 2,1
+          tiles: WwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAWwAAAAADWwAAAAACfAAAAAAAWwAAAAABfAAAAAAAWwAAAAABWwAAAAACVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAbgAAAAAAbgAAAAAAbgAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAA
+          version: 6
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            angle: -1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            231: 40,39
+            326: 10,35
+            483: 17,25
+            484: 17,26
+            485: 17,27
+        - node:
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            941: 41,14
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            232: 46,39
+            327: 0,35
+        - node:
+            color: '#FFFFFFFF'
+            id: Bot
+          decals:
+            480: 16,25
+            481: 16,26
+            482: 16,27
+            508: 5,6
+            509: 5,7
+            510: 0,6
+            511: 0,7
+            512: 7,10
+            513: 8,10
+            514: 9,10
+            1009: 3,14
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: BotLeft
+          decals:
+            471: 14,42
+        - node:
+            color: '#8BDA8EB4'
+            id: Box
+          decals:
+            1339: 45,12
+        - node:
+            color: '#8BDA8EFF'
+            id: Box
+          decals:
+            1633: 51,14
+        - node:
+            color: '#8BDABA6F'
+            id: BrickCornerOverlayNE
+          decals:
+            1202: 22,10
+        - node:
+            color: '#8BDABA6F'
+            id: BrickCornerOverlayNW
+          decals:
+            1201: 12,10
+        - node:
+            color: '#8BDABA6F'
+            id: BrickCornerOverlaySE
+          decals:
+            1196: 22,6
+        - node:
+            color: '#8BDABA6F'
+            id: BrickCornerOverlaySW
+          decals:
+            1197: 12,6
+        - node:
+            color: '#8BDABA6F'
+            id: BrickLineOverlayE
+          decals:
+            1212: 22,9
+            1213: 22,8
+            1214: 22,7
+        - node:
+            color: '#8BDB9B85'
+            id: BrickLineOverlayE
+          decals:
+            1386: 18,4
+            1387: 18,2
+            1388: 18,1
+            1389: 18,0
+        - node:
+            color: '#8BDABA6F'
+            id: BrickLineOverlayN
+          decals:
+            1203: 13,10
+            1204: 14,10
+            1205: 15,10
+            1206: 16,10
+            1207: 17,10
+            1208: 18,10
+            1209: 19,10
+            1210: 20,10
+            1211: 21,10
+        - node:
+            color: '#8BDABA6F'
+            id: BrickLineOverlayS
+          decals:
+            1187: 13,6
+            1188: 14,6
+            1189: 15,6
+            1190: 16,6
+            1191: 17,6
+            1192: 18,6
+            1193: 19,6
+            1194: 20,6
+            1195: 21,6
+        - node:
+            color: '#8BDABA6F'
+            id: BrickLineOverlayW
+          decals:
+            1198: 12,7
+            1199: 12,8
+            1200: 12,9
+        - node:
+            color: '#8BDB9B85'
+            id: BrickLineOverlayW
+          decals:
+            1382: 34,2
+            1383: 34,1
+            1384: 34,0
+            1385: 34,4
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileSteelCornerNe
+          decals:
+            1611: 30,24
+            1634: 54,16
+            1746: 38,16
+        - node:
+            color: '#D381C996'
+            id: BrickTileSteelCornerNe
+          decals:
+            618: 14,16
+            805: 22,10
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileSteelCornerNe
+          decals:
+            1631: 34,27
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileSteelCornerNw
+          decals:
+            1613: 28,24
+            1637: 48,16
+            1745: 32,16
+        - node:
+            color: '#D381C996'
+            id: BrickTileSteelCornerNw
+          decals:
+            619: 8,16
+            806: 12,10
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileSteelCornerNw
+          decals:
+            1629: 32,27
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileSteelCornerSe
+          decals:
+            1616: 30,28
+            1635: 54,12
+            1747: 38,12
+        - node:
+            color: '#D381C996'
+            id: BrickTileSteelCornerSe
+          decals:
+            804: 22,6
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileSteelCornerSe
+          decals:
+            1627: 34,25
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileSteelCornerSw
+          decals:
+            1614: 28,28
+            1636: 48,12
+            1744: 32,12
+        - node:
+            color: '#D381C996'
+            id: BrickTileSteelCornerSw
+          decals:
+            803: 12,6
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileSteelCornerSw
+          decals:
+            1626: 32,25
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileSteelEndN
+          decals:
+            537: 1,7
+            538: 4,7
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileSteelLineE
+          decals:
+            1646: 54,15
+            1647: 54,14
+            1648: 54,13
+            1748: 38,13
+            1749: 38,14
+            1750: 38,15
+        - node:
+            color: '#D381C996'
+            id: BrickTileSteelLineE
+          decals:
+            797: 22,7
+            798: 22,8
+            799: 22,9
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileSteelLineE
+          decals:
+            539: 4,6
+            540: 1,6
+            1561: 36,9
+            1563: 41,9
+            1567: 41,7
+            1568: 36,7
+            1601: 25,24
+            1602: 25,25
+            1603: 25,26
+            1604: 25,27
+            1605: 25,28
+            1632: 34,26
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileSteelLineN
+          decals:
+            1612: 29,24
+            1641: 49,16
+            1642: 50,16
+            1643: 51,16
+            1644: 52,16
+            1645: 53,16
+            1751: 37,16
+            1752: 36,16
+            1753: 35,16
+            1754: 34,16
+            1755: 33,16
+        - node:
+            color: '#D381C996'
+            id: BrickTileSteelLineN
+          decals:
+            613: 11,16
+            614: 10,16
+            615: 9,16
+            616: 12,16
+            617: 13,16
+            788: 21,10
+            789: 20,10
+            790: 18,10
+            791: 19,10
+            792: 17,10
+            793: 16,10
+            794: 15,10
+            795: 13,10
+            796: 14,10
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileSteelLineN
+          decals:
+            807: 21,6
+            808: 20,6
+            809: 19,6
+            810: 17,6
+            811: 18,6
+            812: 16,6
+            813: 15,6
+            814: 14,6
+            815: 13,6
+            1585: 37,8
+            1586: 38,8
+            1587: 39,8
+            1588: 40,8
+            1589: 42,8
+            1590: 43,8
+            1591: 44,8
+            1592: 45,8
+            1593: 45,6
+            1594: 44,6
+            1595: 43,6
+            1596: 42,6
+            1597: 40,6
+            1598: 39,6
+            1599: 38,6
+            1600: 37,6
+            1630: 33,27
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileSteelLineS
+          decals:
+            1615: 29,28
+            1649: 53,12
+            1650: 52,12
+            1651: 51,12
+            1652: 50,12
+            1653: 49,12
+            1756: 33,12
+            1757: 34,12
+            1758: 35,12
+            1759: 36,12
+            1760: 37,12
+        - node:
+            color: '#D381C996'
+            id: BrickTileSteelLineS
+          decals:
+            779: 21,6
+            780: 20,6
+            781: 18,6
+            782: 19,6
+            783: 17,6
+            784: 16,6
+            785: 15,6
+            786: 14,6
+            787: 13,6
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileSteelLineS
+          decals:
+            816: 21,10
+            817: 20,10
+            818: 19,10
+            819: 18,10
+            820: 17,10
+            821: 16,10
+            822: 15,10
+            823: 14,10
+            824: 13,10
+            1569: 37,8
+            1570: 38,8
+            1571: 39,8
+            1572: 40,8
+            1573: 42,8
+            1574: 43,8
+            1575: 44,8
+            1576: 45,8
+            1577: 45,10
+            1578: 44,10
+            1579: 43,10
+            1580: 42,10
+            1581: 40,10
+            1582: 39,10
+            1583: 38,10
+            1584: 37,10
+            1625: 33,25
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileSteelLineW
+          decals:
+            1638: 48,13
+            1639: 48,14
+            1640: 48,15
+            1739: 32,15
+            1740: 32,14
+            1741: 32,14
+            1742: 32,12
+            1743: 32,13
+        - node:
+            color: '#D381C996'
+            id: BrickTileSteelLineW
+          decals:
+            610: 8,13
+            611: 8,14
+            612: 8,15
+            800: 12,7
+            801: 12,8
+            802: 12,9
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileSteelLineW
+          decals:
+            541: 4,6
+            542: 1,6
+            1562: 41,9
+            1564: 46,9
+            1565: 46,7
+            1566: 41,7
+            1606: 25,24
+            1607: 25,25
+            1608: 25,26
+            1609: 25,27
+            1610: 25,28
+            1628: 32,26
+        - node:
+            color: '#8BDA8EB4'
+            id: BrickTileWhiteBox
+          decals:
+            1320: 32,20
+        - node:
+            color: '#8BDA8EB4'
+            id: BrickTileWhiteCornerNe
+          decals:
+            1313: 34,22
+            1324: 33,21
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileWhiteCornerNe
+          decals:
+            1025: 14,16
+            1543: 46,10
+            1617: 30,27
+            1672: 15,4
+            1673: 16,3
+            1836: 6,48
+        - node:
+            color: '#EFB34196'
+            id: BrickTileWhiteCornerNe
+          decals:
+            1008: 6,28
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileWhiteCornerNe
+          decals:
+            58: 6,40
+            75: 14,40
+            109: 22,40
+            154: 30,40
+            155: 46,40
+            299: 10,36
+            339: 22,36
+            375: 33,36
+            420: 26,32
+            648: 38,4
+            651: 54,4
+        - node:
+            color: '#8BDA8EB4'
+            id: BrickTileWhiteCornerNw
+          decals:
+            1307: 30,22
+            1323: 31,21
+            1332: 0,16
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileWhiteCornerNw
+          decals:
+            1031: 8,16
+            1533: 36,10
+            1618: 28,27
+            1656: 1,4
+            1657: 0,3
+            1835: 0,48
+        - node:
+            color: '#EFB34196'
+            id: BrickTileWhiteCornerNw
+          decals:
+            570: 24,22
+            999: 4,28
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileWhiteCornerNw
+          decals:
+            61: 0,40
+            76: 8,40
+            108: 16,40
+            151: 40,40
+            152: 32,40
+            153: 24,40
+            301: 0,36
+            338: 12,36
+            374: 25,36
+            419: 18,32
+            646: 52,4
+            647: 36,4
+        - node:
+            color: '#8BDA8EB4'
+            id: BrickTileWhiteCornerSe
+          decals:
+            1312: 34,18
+            1326: 33,19
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileWhiteCornerSe
+          decals:
+            1021: 14,12
+            1547: 46,6
+            1620: 30,25
+            1674: 16,1
+            1675: 15,0
+            1838: 6,42
+        - node:
+            color: '#EFB34196'
+            id: BrickTileWhiteCornerSe
+          decals:
+            1004: 6,24
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileWhiteCornerSe
+          decals:
+            59: 6,38
+            74: 14,38
+            107: 22,38
+            149: 30,38
+            150: 46,38
+            298: 10,34
+            344: 22,34
+            373: 33,34
+            421: 26,30
+            644: 38,0
+            645: 54,0
+            696: 46,0
+        - node:
+            color: '#8BDA8EB4'
+            id: BrickTileWhiteCornerSw
+          decals:
+            1311: 30,18
+            1322: 31,19
+            1336: 0,12
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileWhiteCornerSw
+          decals:
+            1035: 8,12
+            1557: 36,6
+            1621: 28,25
+            1677: 1,0
+            1678: 0,1
+            1837: 0,42
+        - node:
+            color: '#EFB34196'
+            id: BrickTileWhiteCornerSw
+          decals:
+            574: 24,18
+            1003: 4,24
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileWhiteCornerSw
+          decals:
+            60: 0,38
+            77: 8,38
+            110: 16,38
+            156: 40,38
+            157: 32,38
+            158: 24,38
+            300: 0,34
+            345: 12,34
+            376: 25,34
+            422: 18,30
+            649: 36,0
+            650: 52,0
+            697: 44,0
+        - node:
+            color: '#8BDABAFF'
+            id: BrickTileWhiteEndE
+          decals:
+            1072: 9,39
+            1092: 26,39
+        - node:
+            color: '#D381C996'
+            id: BrickTileWhiteEndE
+          decals:
+            102: 9,39
+        - node:
+            color: '#8BDABAFF'
+            id: BrickTileWhiteEndW
+          decals:
+            1073: 13,39
+            1093: 28,39
+        - node:
+            color: '#D381C996'
+            id: BrickTileWhiteEndW
+          decals:
+            101: 13,39
+            185: 28,39
+        - node:
+            color: '#8BDA8E88'
+            id: BrickTileWhiteInnerNe
+          decals:
+            1884: 0,42
+        - node:
+            color: '#8BDA8EB4'
+            id: BrickTileWhiteInnerNe
+          decals:
+            1290: 21,21
+            1300: 9,21
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileWhiteInnerNe
+          decals:
+            1681: 15,3
+        - node:
+            color: '#8BDABAFF'
+            id: BrickTileWhiteInnerNe
+          decals:
+            1068: 9,38
+            1097: 25,39
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteInnerNe
+          decals:
+            1015: 1,12
+        - node:
+            color: '#D381C996'
+            id: BrickTileWhiteInnerNe
+          decals:
+            106: 9,38
+            188: 25,39
+            193: 25,38
+            562: 21,21
+        - node:
+            color: '#D4D4D4FF'
+            id: BrickTileWhiteInnerNe
+          decals:
+            1734: 32,14
+            1735: 32,12
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileWhiteInnerNe
+          decals:
+            695: 38,2
+        - node:
+            color: '#8BDA8E88'
+            id: BrickTileWhiteInnerNw
+          decals:
+            1883: 6,42
+        - node:
+            color: '#8BDA8EB4'
+            id: BrickTileWhiteInnerNw
+          decals:
+            1291: 19,21
+            1301: 7,21
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileWhiteInnerNw
+          decals:
+            1658: 1,3
+        - node:
+            color: '#8BDABAFF'
+            id: BrickTileWhiteInnerNw
+          decals:
+            1067: 13,38
+            1096: 29,39
+        - node:
+            color: '#D381C996'
+            id: BrickTileWhiteInnerNw
+          decals:
+            105: 13,38
+            189: 29,39
+            192: 29,38
+            561: 19,21
+        - node:
+            color: '#D4D4D4FF'
+            id: BrickTileWhiteInnerNw
+          decals:
+            1732: 38,12
+            1733: 38,14
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileWhiteInnerNw
+          decals:
+            694: 52,2
+        - node:
+            color: '#8BDA8E88'
+            id: BrickTileWhiteInnerSe
+          decals:
+            1882: 0,48
+        - node:
+            color: '#8BDA8EB4'
+            id: BrickTileWhiteInnerSe
+          decals:
+            1289: 21,19
+            1303: 9,19
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileWhiteInnerSe
+          decals:
+            1680: 15,1
+        - node:
+            color: '#8BDABAFF'
+            id: BrickTileWhiteInnerSe
+          decals:
+            1071: 9,40
+            1095: 25,39
+        - node:
+            color: '#D381C996'
+            id: BrickTileWhiteInnerSe
+          decals:
+            104: 9,40
+            187: 25,39
+            191: 25,40
+            563: 21,19
+        - node:
+            color: '#D4D4D4FF'
+            id: BrickTileWhiteInnerSe
+          decals:
+            1728: 32,16
+            1729: 32,14
+        - node:
+            color: '#8BDA8E88'
+            id: BrickTileWhiteInnerSw
+          decals:
+            1881: 6,48
+        - node:
+            color: '#8BDA8EB4'
+            id: BrickTileWhiteInnerSw
+          decals:
+            1302: 7,19
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileWhiteInnerSw
+          decals:
+            1679: 1,1
+        - node:
+            color: '#8BDABAFF'
+            id: BrickTileWhiteInnerSw
+          decals:
+            1066: 13,40
+            1094: 29,39
+        - node:
+            color: '#D381C996'
+            id: BrickTileWhiteInnerSw
+          decals:
+            103: 13,40
+            186: 29,39
+            190: 29,40
+        - node:
+            color: '#D4D4D4FF'
+            id: BrickTileWhiteInnerSw
+          decals:
+            1730: 38,16
+            1731: 38,14
+        - node:
+            color: '#8BDA8E88'
+            id: BrickTileWhiteLineE
+          decals:
+            1860: 0,47
+            1861: 0,46
+            1862: 0,45
+            1863: 0,44
+            1864: 0,43
+        - node:
+            color: '#8BDA8EB4'
+            id: BrickTileWhiteLineE
+          decals:
+            1283: 21,22
+            1284: 21,18
+            1297: 9,18
+            1299: 9,22
+            1314: 34,21
+            1315: 34,20
+            1316: 34,19
+            1327: 33,20
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileWhiteLineE
+          decals:
+            1022: 14,13
+            1023: 14,14
+            1024: 14,15
+            1544: 46,9
+            1545: 46,8
+            1546: 46,7
+            1619: 30,26
+            1682: 16,2
+            1855: 6,47
+            1856: 6,46
+            1857: 6,45
+            1858: 6,44
+            1859: 6,43
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteLineE
+          decals:
+            1010: 1,13
+            1011: 1,14
+            1012: 1,15
+        - node:
+            color: '#D381C996'
+            id: BrickTileWhiteLineE
+          decals:
+            555: 21,22
+            556: 21,18
+            865: 18,0
+            866: 18,1
+            867: 18,2
+            868: 18,4
+        - node:
+            color: '#D4D4D4FF'
+            id: BrickTileWhiteLineE
+          decals:
+            1712: 32,13
+            1714: 32,15
+        - node:
+            color: '#EFB34196'
+            id: BrickTileWhiteLineE
+          decals:
+            564: 28,19
+            565: 28,20
+            566: 28,21
+            1005: 6,25
+            1006: 6,26
+            1007: 6,27
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileWhiteLineE
+          decals:
+            72: 6,39
+            87: 14,39
+            116: 22,39
+            178: 30,39
+            179: 38,39
+            180: 46,39
+            302: 10,35
+            347: 22,35
+            377: 33,35
+            430: 26,31
+            655: 38,1
+            656: 38,3
+            657: 54,1
+            658: 54,2
+            659: 54,3
+            699: 46,1
+            1771: 7,19
+            1772: 7,21
+            1774: 6,20
+        - node:
+            color: '#8BDA8E88'
+            id: BrickTileWhiteLineN
+          decals:
+            1865: 1,42
+            1866: 2,42
+            1867: 3,42
+            1868: 4,42
+            1869: 5,42
+        - node:
+            color: '#8BDA8EB4'
+            id: BrickTileWhiteLineN
+          decals:
+            1285: 18,21
+            1286: 22,21
+            1292: 6,21
+            1298: 10,21
+            1304: 31,22
+            1305: 32,22
+            1306: 33,22
+            1325: 32,21
+            1333: 1,16
+            1334: 4,16
+            1335: 5,16
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileWhiteLineN
+          decals:
+            1026: 13,16
+            1027: 12,16
+            1028: 11,16
+            1029: 10,16
+            1030: 9,16
+            1534: 37,10
+            1535: 38,10
+            1536: 39,10
+            1537: 40,10
+            1538: 41,10
+            1539: 42,10
+            1540: 43,10
+            1541: 44,10
+            1542: 45,10
+            1659: 2,4
+            1660: 3,4
+            1661: 4,4
+            1662: 5,4
+            1663: 6,4
+            1664: 7,4
+            1665: 8,4
+            1666: 9,4
+            1667: 10,4
+            1668: 11,4
+            1669: 12,4
+            1670: 13,4
+            1671: 14,4
+            1850: 1,48
+            1851: 2,48
+            1852: 3,48
+            1853: 4,48
+            1854: 5,48
+        - node:
+            color: '#8BDABAFF'
+            id: BrickTileWhiteLineN
+          decals:
+            1061: 11,38
+            1062: 12,38
+            1069: 10,38
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteLineN
+          decals:
+            841: 21,6
+            842: 19,6
+            843: 13,6
+            844: 15,6
+            1014: 2,12
+        - node:
+            color: '#D381C996'
+            id: BrickTileWhiteLineN
+          decals:
+            96: 12,38
+            97: 11,38
+            348: 21,34
+            349: 20,34
+            350: 19,34
+            351: 13,34
+            553: 18,21
+            554: 22,21
+        - node:
+            color: '#D4D4D4FF'
+            id: BrickTileWhiteLineN
+          decals:
+            1702: 34,12
+            1703: 35,12
+            1704: 36,12
+            1708: 33,12
+            1709: 37,12
+            1716: 37,14
+            1717: 36,14
+            1718: 36,14
+            1719: 34,14
+            1720: 35,14
+            1721: 33,14
+        - node:
+            color: '#EFB34196'
+            id: BrickTileWhiteLineN
+          decals:
+            567: 27,22
+            568: 26,22
+            569: 25,22
+            890: 31,9
+            891: 32,9
+            896: 27,9
+            897: 26,9
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileWhiteLineN
+          decals:
+            62: 1,40
+            63: 2,40
+            64: 5,40
+            65: 4,40
+            66: 3,40
+            78: 9,40
+            79: 10,40
+            80: 11,40
+            81: 12,40
+            82: 13,40
+            118: 17,40
+            119: 19,40
+            120: 18,40
+            121: 20,40
+            122: 21,40
+            159: 29,40
+            160: 35,40
+            161: 36,40
+            162: 41,40
+            163: 42,40
+            164: 43,40
+            165: 44,40
+            166: 45,40
+            184: 25,40
+            286: 9,36
+            287: 8,36
+            288: 7,36
+            289: 3,36
+            290: 1,36
+            291: 2,36
+            334: 14,36
+            335: 13,36
+            336: 20,36
+            337: 21,36
+            386: 26,36
+            387: 27,36
+            388: 28,36
+            389: 29,36
+            390: 30,36
+            391: 31,36
+            392: 32,36
+            412: 25,32
+            413: 24,32
+            414: 23,32
+            415: 22,32
+            416: 21,32
+            417: 20,32
+            418: 19,32
+            652: 53,4
+            653: 37,4
+            684: 51,2
+            685: 50,2
+            686: 48,2
+            687: 47,2
+            688: 46,2
+            689: 44,2
+            690: 42,2
+            691: 43,2
+            692: 40,2
+            693: 39,2
+            1102: 29,40
+            1103: 25,40
+            1770: 8,18
+            1775: 7,19
+            1776: 9,19
+        - node:
+            color: '#8BDA8E88'
+            id: BrickTileWhiteLineS
+          decals:
+            1875: 5,48
+            1876: 4,48
+            1877: 3,48
+            1878: 2,48
+            1880: 1,48
+        - node:
+            color: '#8BDA8EB4'
+            id: BrickTileWhiteLineS
+          decals:
+            1287: 22,19
+            1288: 18,19
+            1295: 6,19
+            1296: 10,19
+            1317: 33,18
+            1318: 32,18
+            1319: 31,18
+            1321: 32,19
+            1337: 1,12
+            1338: 2,12
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileWhiteLineS
+          decals:
+            1016: 10,12
+            1017: 11,12
+            1018: 12,12
+            1019: 13,12
+            1020: 9,12
+            1548: 45,6
+            1549: 44,6
+            1550: 43,6
+            1551: 42,6
+            1552: 41,6
+            1553: 40,6
+            1554: 39,6
+            1555: 38,6
+            1556: 37,6
+            1683: 14,0
+            1684: 13,0
+            1685: 12,0
+            1686: 11,0
+            1687: 10,0
+            1688: 9,0
+            1689: 7,0
+            1690: 7,0
+            1691: 8,0
+            1692: 6,0
+            1693: 5,0
+            1694: 4,0
+            1695: 3,0
+            1696: 2,0
+            1839: 1,42
+            1840: 2,42
+            1841: 4,42
+            1842: 4,42
+            1843: 3,42
+            1844: 5,42
+        - node:
+            color: '#8BDABAFF'
+            id: BrickTileWhiteLineS
+          decals:
+            1063: 10,40
+            1064: 11,40
+            1065: 12,40
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteLineS
+          decals:
+            837: 21,10
+            838: 19,10
+            839: 15,10
+            840: 13,10
+            1013: 4,16
+        - node:
+            color: '#D381C996'
+            id: BrickTileWhiteLineS
+          decals:
+            98: 12,40
+            99: 11,40
+            100: 10,40
+            352: 21,36
+            353: 20,36
+            354: 14,36
+            355: 13,36
+            557: 22,19
+            558: 18,19
+        - node:
+            color: '#D4D4D4FF'
+            id: BrickTileWhiteLineS
+          decals:
+            1705: 34,14
+            1706: 35,14
+            1707: 36,14
+            1710: 37,14
+            1711: 33,14
+            1722: 33,16
+            1723: 34,16
+            1724: 34,16
+            1725: 35,16
+            1726: 36,16
+            1727: 37,16
+        - node:
+            color: '#EFB34196'
+            id: BrickTileWhiteLineS
+          decals:
+            575: 25,18
+            576: 26,18
+            577: 27,18
+            892: 32,7
+            893: 31,7
+            894: 27,7
+            895: 26,7
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileWhiteLineS
+          decals:
+            67: 5,38
+            68: 4,38
+            69: 3,38
+            70: 2,38
+            71: 1,38
+            83: 13,38
+            84: 12,38
+            85: 11,38
+            86: 9,38
+            111: 21,38
+            112: 20,38
+            113: 19,38
+            114: 18,38
+            115: 17,38
+            167: 45,38
+            168: 44,38
+            169: 43,38
+            170: 42,38
+            171: 41,38
+            172: 37,38
+            173: 34,38
+            174: 35,38
+            175: 33,38
+            176: 29,38
+            177: 25,38
+            292: 9,34
+            293: 7,34
+            294: 8,34
+            295: 3,34
+            296: 2,34
+            297: 1,34
+            340: 21,34
+            341: 20,34
+            342: 19,34
+            343: 13,34
+            379: 26,34
+            380: 27,34
+            381: 28,34
+            382: 29,34
+            383: 30,34
+            384: 31,34
+            385: 32,34
+            423: 19,30
+            424: 20,30
+            425: 21,30
+            426: 22,30
+            427: 23,30
+            428: 24,30
+            429: 25,30
+            654: 37,0
+            660: 53,0
+            698: 45,0
+            1070: 10,38
+            1104: 25,38
+            1105: 29,38
+            1773: 7,21
+            1779: 9,21
+            1780: 8,22
+        - node:
+            color: '#8BDA8E88'
+            id: BrickTileWhiteLineW
+          decals:
+            1870: 6,43
+            1871: 6,44
+            1872: 6,45
+            1873: 6,46
+            1874: 6,47
+        - node:
+            color: '#8BDA8EB4'
+            id: BrickTileWhiteLineW
+          decals:
+            1281: 19,18
+            1282: 19,22
+            1293: 7,22
+            1294: 7,18
+            1308: 30,21
+            1309: 30,20
+            1310: 30,19
+            1328: 31,20
+            1329: 0,13
+            1330: 0,14
+            1331: 0,15
+        - node:
+            color: '#8BDA8EFF'
+            id: BrickTileWhiteLineW
+          decals:
+            1032: 8,14
+            1033: 8,15
+            1034: 8,13
+            1558: 36,7
+            1559: 36,8
+            1560: 36,9
+            1622: 28,26
+            1697: 0,2
+            1736: 32,14
+            1737: 32,13
+            1738: 32,15
+            1845: 0,43
+            1846: 0,44
+            1847: 0,45
+            1848: 0,46
+            1849: 0,47
+        - node:
+            color: '#D381C996'
+            id: BrickTileWhiteLineW
+          decals:
+            559: 19,18
+            560: 19,22
+            869: 34,0
+            870: 34,1
+            871: 34,2
+            872: 34,4
+        - node:
+            color: '#D4D4D4FF'
+            id: BrickTileWhiteLineW
+          decals:
+            1713: 38,13
+            1715: 38,15
+        - node:
+            color: '#EFB34196'
+            id: BrickTileWhiteLineW
+          decals:
+            571: 24,21
+            572: 24,20
+            573: 24,19
+            1000: 4,27
+            1001: 4,26
+            1002: 4,25
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileWhiteLineW
+          decals:
+            73: 0,39
+            88: 8,39
+            117: 16,39
+            181: 40,39
+            182: 32,39
+            183: 24,39
+            303: 0,35
+            346: 12,35
+            378: 25,35
+            431: 18,31
+            661: 52,1
+            662: 52,3
+            663: 36,1
+            664: 36,2
+            665: 36,3
+            700: 44,1
+            1777: 9,19
+            1778: 10,20
+            1781: 9,21
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: Caution
+          decals:
+            470: 11,42
+        - node:
+            color: '#8BDABAFF'
+            id: CheckerNESW
+          decals:
+            1074: 17,39
+            1075: 18,39
+            1076: 19,39
+            1077: 20,39
+            1078: 21,39
+            1250: 20,20
+            1251: 21,20
+            1252: 20,21
+            1253: 20,19
+            1254: 19,20
+        - node:
+            color: '#D381C996'
+            id: CheckerNESW
+          decals:
+            123: 17,39
+            124: 18,39
+            125: 19,39
+            126: 20,39
+            127: 21,39
+            393: 31,35
+            394: 30,35
+            395: 29,35
+            396: 28,35
+            397: 27,35
+            547: 19,20
+            548: 20,21
+            549: 20,20
+            550: 21,20
+            551: 20,19
+        - node:
+            color: '#EFB34196'
+            id: CheckerNESW
+          decals:
+            237: 8,48
+        - node:
+            color: '#8BDABAFF'
+            id: CheckerNWSE
+          decals:
+            1046: 3,39
+            1047: 2,39
+            1048: 1,39
+            1049: 4,39
+            1050: 5,39
+            1115: 45,39
+            1116: 44,39
+            1117: 43,39
+            1118: 42,39
+            1119: 41,39
+        - node:
+            color: '#D381C996'
+            id: CheckerNWSE
+          decals:
+            216: 45,39
+            217: 44,39
+            218: 43,39
+            219: 42,39
+            220: 41,39
+            304: 1,35
+            305: 2,35
+            306: 3,35
+            307: 7,35
+            308: 8,35
+            309: 9,35
+            451: 16,30
+            452: 16,31
+            453: 16,32
+            454: 15,32
+            455: 15,31
+            456: 15,30
+            457: 14,30
+            458: 14,31
+            459: 14,32
+            666: 37,1
+            667: 37,2
+            668: 37,3
+            669: 53,1
+            670: 53,2
+            671: 53,3
+        - node:
+            color: '#EFB34196'
+            id: CheckerNWSE
+          decals:
+            238: 14,48
+            993: 5,27
+            994: 5,26
+            995: 5,25
+        - node:
+            color: '#FFFFFFFF'
+            id: Delivery
+          decals:
+            266: 13,47
+            267: 11,47
+            268: 9,47
+            269: 12,43
+            270: 11,43
+            271: 10,43
+            486: 4,22
+            487: 3,22
+            601: 11,13
+            859: 24,2
+            860: 20,2
+            886: 33,7
+            887: 33,9
+            888: 25,7
+            889: 25,9
+            938: 40,16
+            939: 41,15
+            940: 43,16
+        - node:
+            color: '#8BDB9BFF'
+            id: DeliveryGreyscale
+          decals:
+            1531: 34,35
+            1532: 24,35
+        - node:
+            color: '#79DA8EA1'
+            id: DiagonalCheckerBOverlay
+          decals:
+            964: 20,24
+            965: 20,25
+            966: 20,26
+            967: 20,27
+            968: 20,28
+            969: 21,28
+            970: 22,28
+            971: 21,27
+            972: 21,26
+            973: 21,25
+            974: 21,24
+            975: 22,24
+        - node:
+            color: '#FFFFFFFF'
+            id: Dirt
+          decals:
+            1159: 16,48
+            1160: 16,48
+            1161: 17,48
+            1162: 16,47
+            1163: 16,46
+            1164: 16,45
+            1165: 17,44
+            1166: 17,42
+            1167: 19,42
+            1168: 21,42
+            1169: 21,47
+            1170: 21,47
+            1171: 21,47
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: Dirt
+          decals:
+            211: 38,38
+            212: 38,40
+            213: 37,40
+            214: 34,40
+            215: 36,38
+            368: 15,34
+            369: 19,35
+            370: 17,35
+            371: 16,34
+            372: 18,36
+            934: 44,12
+            935: 44,15
+            936: 42,16
+            937: 46,14
+        - node:
+            color: '#FFFFFFFF'
+            id: DirtLight
+          decals:
+            1172: 20,47
+            1173: 20,47
+            1174: 16,48
+            1175: 16,46
+            1176: 16,45
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtLight
+          decals:
+            138: 17,38
+            139: 17,39
+            140: 18,39
+            141: 21,38
+            143: 16,40
+            144: 20,39
+            145: 13,38
+            146: 8,40
+            147: 6,39
+            148: 22,40
+            203: 29,39
+            204: 29,40
+            205: 24,39
+            206: 30,38
+            207: 33,39
+            208: 37,39
+            209: 37,38
+            210: 38,39
+            273: 10,44
+            274: 9,45
+            275: 8,46
+            276: 8,47
+            277: 13,48
+            278: 14,44
+            279: 13,42
+            281: 10,42
+            283: 8,44
+            284: 13,45
+            356: 22,35
+            357: 22,34
+            358: 21,34
+            359: 12,36
+            360: 13,36
+            361: 12,35
+            362: 13,34
+            364: 12,34
+            365: 19,34
+            366: 15,34
+            367: 19,35
+            448: 8,31
+            449: 10,32
+            450: 11,32
+            460: 15,31
+            461: 16,30
+            462: 14,31
+            463: 15,32
+            464: 19,31
+            465: 20,30
+            466: 21,30
+            467: 24,30
+            468: 26,31
+            469: 8,28
+            584: 21,18
+            585: 22,19
+            586: 21,19
+            587: 19,18
+            588: 18,21
+            589: 25,18
+            590: 24,19
+            591: 28,20
+            592: 26,22
+            593: 14,22
+            594: 15,18
+            595: 16,20
+            596: 4,20
+            597: 2,22
+            598: 2,18
+            599: 0,21
+            600: 0,19
+            903: 30,15
+            905: 28,15
+            906: 27,14
+            928: 33,12
+        - node:
+            color: '#FFFFFFFF'
+            id: DirtMedium
+          decals:
+            1177: 16,42
+            1178: 16,42
+            1179: 18,42
+            1180: 20,43
+            1181: 22,44
+            1182: 18,48
+            1183: 22,47
+            1184: 16,45
+            1185: 19,42
+            1186: 20,43
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtMedium
+          decals:
+            142: 17,39
+            280: 11,42
+            282: 8,45
+            363: 12,35
+        - node:
+            color: '#8BDABA82'
+            id: FullTileOverlayGreyscale
+          decals:
+            1089: 27,38
+            1090: 27,39
+            1091: 27,40
+        - node:
+            color: '#8BDABAFF'
+            id: FullTileOverlayGreyscale
+          decals:
+            1106: 33,39
+            1107: 36,39
+            1108: 37,39
+        - node:
+            color: '#9FED5896'
+            id: FullTileOverlayGreyscale
+          decals:
+            825: 21,7
+            826: 21,8
+            827: 21,9
+            828: 19,7
+            829: 19,8
+            830: 19,9
+            831: 15,7
+            832: 15,8
+            833: 15,9
+            834: 13,7
+            835: 13,8
+            836: 13,9
+        - node:
+            color: '#D381C996'
+            id: FullTileOverlayGreyscale
+          decals:
+            194: 36,39
+            195: 33,39
+            196: 37,39
+        - node:
+            color: '#52B4E996'
+            id: HalfTileOverlayGreyscale
+          decals:
+            900: 28,16
+            901: 29,16
+            1219: 27,16
+            1220: 26,16
+            1221: 25,16
+        - node:
+            color: '#8BDA8E9B'
+            id: HalfTileOverlayGreyscale
+          decals:
+            1367: 30,2
+            1368: 29,2
+            1369: 31,2
+            1370: 27,2
+            1371: 26,2
+            1372: 22,2
+            1373: 33,2
+        - node:
+            color: '#8BDA8EB4'
+            id: HalfTileOverlayGreyscale
+          decals:
+            1272: 13,22
+            1273: 15,22
+            1274: 14,22
+        - node:
+            color: '#8BDA8EFF'
+            id: HalfTileOverlayGreyscale
+          decals:
+            1356: 24,4
+            1357: 23,4
+            1358: 22,4
+            1359: 21,4
+            1360: 20,4
+            1361: 27,4
+            1362: 28,4
+            1363: 29,4
+            1364: 30,4
+            1365: 31,4
+            1366: 32,4
+        - node:
+            color: '#8BDABAFF'
+            id: HalfTileOverlayGreyscale
+          decals:
+            1109: 33,38
+            1110: 34,38
+            1111: 35,38
+            1114: 37,38
+        - node:
+            color: '#8BDB8E99'
+            id: HalfTileOverlayGreyscale
+          decals:
+            1374: 25,4
+            1375: 25,4
+        - node:
+            color: '#D381C996'
+            id: HalfTileOverlayGreyscale
+          decals:
+            199: 37,38
+            200: 35,38
+            201: 34,38
+            202: 33,38
+            496: 13,22
+            497: 14,22
+            498: 15,22
+            875: 27,4
+            876: 28,4
+            877: 24,4
+            878: 29,4
+            879: 30,4
+            880: 31,4
+            881: 32,4
+            882: 23,4
+            883: 22,4
+            884: 21,4
+            885: 20,4
+        - node:
+            color: '#52B4E996'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            1217: 29,12
+            1218: 28,12
+        - node:
+            color: '#8BDA8EB4'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            1275: 15,18
+            1276: 14,18
+            1277: 13,18
+        - node:
+            color: '#8BDA8EFF'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            1341: 19,3
+            1342: 20,3
+            1343: 21,3
+            1344: 22,3
+            1345: 24,3
+            1346: 23,3
+            1347: 25,3
+            1348: 26,3
+            1349: 27,3
+            1350: 28,3
+            1351: 29,3
+            1352: 30,3
+            1353: 31,3
+            1354: 32,3
+            1355: 33,3
+        - node:
+            color: '#8BDABAFF'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            1112: 35,40
+            1113: 36,40
+        - node:
+            color: '#D381C996'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            197: 36,40
+            198: 35,40
+            493: 13,18
+            494: 14,18
+            495: 15,18
+            845: 19,3
+            846: 20,3
+            847: 21,3
+            848: 22,3
+            849: 23,3
+            850: 24,3
+            851: 26,3
+            852: 25,3
+            853: 28,3
+            854: 29,3
+            855: 30,3
+            856: 31,3
+            857: 32,3
+            858: 33,3
+            1340: 27,3
+        - node:
+            color: '#4B709CFF'
+            id: HalfTileOverlayGreyscale270
+          decals:
+            1261: 15,20
+        - node:
+            color: '#52B4E996'
+            id: HalfTileOverlayGreyscale270
+          decals:
+            1222: 24,15
+        - node:
+            color: '#8BDA8EB4'
+            id: HalfTileOverlayGreyscale270
+          decals:
+            1269: 12,19
+            1270: 12,20
+            1271: 12,21
+        - node:
+            color: '#D381C996'
+            id: HalfTileOverlayGreyscale270
+          decals:
+            502: 12,19
+            503: 12,20
+            504: 12,21
+        - node:
+            color: '#4B709CFF'
+            id: HalfTileOverlayGreyscale90
+          decals:
+            1256: 13,20
+        - node:
+            color: '#52B4E996'
+            id: HalfTileOverlayGreyscale90
+          decals:
+            902: 30,15
+            1215: 30,14
+            1216: 30,13
+        - node:
+            color: '#8BDA8EB4'
+            id: HalfTileOverlayGreyscale90
+          decals:
+            1266: 16,19
+            1267: 16,20
+            1268: 16,21
+        - node:
+            color: '#D381C996'
+            id: HalfTileOverlayGreyscale90
+          decals:
+            499: 16,19
+            500: 16,20
+            501: 16,21
+        - node:
+            color: '#8BDA8EFF'
+            id: MiniTileWhiteCornerNe
+          decals:
+            954: 13,28
+        - node:
+            color: '#D381C996'
+            id: MiniTileWhiteCornerNe
+          decals:
+            474: 13,28
+        - node:
+            color: '#8BDA8EFF'
+            id: MiniTileWhiteCornerNw
+          decals:
+            955: 12,28
+        - node:
+            color: '#D381C996'
+            id: MiniTileWhiteCornerNw
+          decals:
+            475: 12,28
+        - node:
+            color: '#8BDA8EFF'
+            id: MiniTileWhiteCornerSe
+          decals:
+            950: 13,24
+        - node:
+            color: '#D381C996'
+            id: MiniTileWhiteCornerSe
+          decals:
+            479: 13,24
+        - node:
+            color: '#8BDA8EFF'
+            id: MiniTileWhiteCornerSw
+          decals:
+            958: 12,24
+        - node:
+            color: '#D381C996'
+            id: MiniTileWhiteCornerSw
+          decals:
+            478: 12,24
+        - node:
+            color: '#8BDA8EFF'
+            id: MiniTileWhiteLineE
+          decals:
+            949: 13,24
+            951: 13,25
+            952: 13,25
+            953: 13,26
+        - node:
+            color: '#8BDABAFF'
+            id: MiniTileWhiteLineE
+          decals:
+            1098: 25,38
+            1100: 25,40
+        - node:
+            color: '#D381C996'
+            id: MiniTileWhiteLineE
+          decals:
+            472: 13,25
+            473: 13,26
+        - node:
+            color: '#8BDA8EFF'
+            id: MiniTileWhiteLineW
+          decals:
+            956: 12,27
+            957: 12,25
+        - node:
+            color: '#8BDABAFF'
+            id: MiniTileWhiteLineW
+          decals:
+            1099: 29,38
+            1101: 29,40
+        - node:
+            color: '#D381C996'
+            id: MiniTileWhiteLineW
+          decals:
+            476: 12,27
+            477: 12,25
+        - node:
+            color: '#79DA8E6F'
+            id: MonoOverlay
+          decals:
+            959: 14,24
+            960: 14,25
+            961: 14,26
+            962: 14,27
+            963: 14,28
+        - node:
+            color: '#8BDB9BFF'
+            id: MonoOverlay
+          decals:
+            1474: 4,34
+            1475: 4,36
+            1476: 6,36
+            1477: 6,34
+        - node:
+            color: '#D381C996'
+            id: MonoOverlay
+          decals:
+            322: 4,34
+            323: 6,34
+            324: 4,36
+            325: 6,36
+        - node:
+            color: '#4B709CFF'
+            id: QuarterTileOverlayGreyscale
+          decals:
+            1260: 15,19
+            1262: 14,20
+        - node:
+            color: '#8BDABAFF'
+            id: QuarterTileOverlayGreyscale
+          decals:
+            1056: 1,38
+            1057: 2,38
+            1058: 3,38
+            1059: 4,38
+            1060: 5,38
+            1120: 41,38
+            1121: 42,38
+            1122: 42,38
+            1123: 43,38
+            1124: 44,38
+            1125: 45,38
+            1131: 8,44
+            1132: 8,45
+            1133: 8,46
+            1134: 8,47
+            1135: 8,48
+            1136: 9,48
+            1137: 10,48
+            1226: 16,16
+            1227: 17,16
+            1228: 18,16
+            1229: 19,16
+            1230: 20,16
+            1231: 21,16
+            1232: 22,16
+            1233: 16,15
+            1234: 16,14
+            1235: 16,13
+            1236: 16,12
+        - node:
+            color: '#8BDB9BFF'
+            id: QuarterTileOverlayGreyscale
+          decals:
+            1422: 53,1
+            1423: 53,2
+            1424: 53,3
+            1425: 54,3
+            1426: 54,2
+            1427: 54,1
+            1428: 38,2
+            1429: 38,1
+            1430: 38,3
+            1431: 37,3
+            1432: 37,2
+            1433: 37,1
+            1465: 16,32
+            1466: 16,31
+            1467: 16,30
+            1468: 15,30
+            1469: 15,31
+            1470: 15,32
+            1471: 14,32
+            1472: 14,31
+            1473: 14,30
+            1478: 1,35
+            1479: 2,35
+            1480: 3,35
+            1481: 3,34
+            1482: 2,34
+            1483: 1,34
+            1484: 7,34
+            1485: 7,35
+            1486: 8,35
+            1487: 8,34
+            1488: 9,34
+            1489: 9,35
+        - node:
+            color: '#9EDA8E28'
+            id: QuarterTileOverlayGreyscale
+          decals:
+            1813: 4,45
+            1816: 4,44
+            1817: 4,46
+            1820: 3,45
+            1826: 2,46
+        - node:
+            color: '#D381C996'
+            id: QuarterTileOverlayGreyscale
+          decals:
+            53: 5,38
+            54: 4,38
+            55: 3,38
+            56: 2,38
+            57: 1,38
+            221: 45,38
+            222: 44,38
+            223: 43,38
+            224: 42,38
+            225: 41,38
+            247: 8,44
+            248: 8,45
+            249: 8,46
+            250: 8,47
+            251: 8,48
+            252: 9,48
+            253: 10,48
+            316: 9,34
+            317: 8,34
+            318: 7,34
+            319: 3,34
+            320: 2,34
+            321: 1,34
+            627: 22,16
+            628: 21,16
+            629: 20,16
+            630: 19,16
+            631: 18,16
+            632: 17,16
+            633: 16,16
+            634: 16,15
+            635: 16,14
+            636: 16,13
+            637: 16,12
+            672: 38,1
+            673: 38,3
+            679: 54,1
+            680: 54,2
+            681: 54,3
+            682: 38,2
+        - node:
+            color: '#EFB34196'
+            id: QuarterTileOverlayGreyscale
+          decals:
+            245: 13,48
+            246: 12,48
+        - node:
+            color: '#4B709CFF'
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            1258: 13,21
+            1263: 14,20
+        - node:
+            color: '#8BDA8E5D'
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            1833: 4,44
+            1834: 2,44
+        - node:
+            color: '#8BDABAFF'
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            1051: 5,40
+            1052: 4,40
+            1053: 3,40
+            1054: 2,40
+            1055: 1,40
+            1126: 45,40
+            1127: 44,40
+            1128: 43,40
+            1129: 42,40
+            1130: 41,40
+            1237: 16,12
+            1238: 17,12
+            1239: 18,12
+            1240: 19,12
+            1241: 20,12
+            1242: 21,12
+            1243: 22,12
+            1244: 22,13
+            1245: 22,14
+            1246: 22,15
+            1247: 22,16
+        - node:
+            color: '#8BDB9BFF'
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            1416: 52,2
+            1417: 52,1
+            1418: 52,3
+            1419: 53,3
+            1420: 53,2
+            1421: 53,1
+            1434: 37,3
+            1435: 36,3
+            1436: 36,2
+            1437: 37,2
+            1438: 37,1
+            1439: 36,1
+            1440: 18,32
+            1441: 19,32
+            1442: 20,32
+            1443: 21,32
+            1444: 22,32
+            1445: 24,32
+            1446: 23,32
+            1447: 25,32
+            1456: 14,30
+            1457: 14,31
+            1458: 14,32
+            1459: 15,32
+            1460: 15,31
+            1461: 15,30
+            1462: 16,30
+            1463: 16,31
+            1464: 16,32
+            1490: 7,35
+            1491: 8,35
+            1492: 9,35
+            1493: 9,36
+            1494: 8,36
+            1495: 7,36
+            1496: 3,36
+            1497: 2,36
+            1498: 1,36
+            1499: 1,35
+            1500: 2,35
+            1501: 3,35
+        - node:
+            color: '#9EDA8E28'
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            1821: 3,45
+            1824: 2,45
+            1825: 2,46
+        - node:
+            color: '#D381C996'
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            48: 5,40
+            49: 4,40
+            50: 3,40
+            51: 2,40
+            52: 1,40
+            226: 41,40
+            227: 42,40
+            228: 43,40
+            229: 44,40
+            230: 45,40
+            310: 9,36
+            311: 8,36
+            312: 7,36
+            313: 3,36
+            314: 2,36
+            315: 1,36
+            432: 25,32
+            433: 24,32
+            434: 23,32
+            435: 22,32
+            436: 21,32
+            437: 20,32
+            438: 19,32
+            439: 18,32
+            622: 22,12
+            623: 22,13
+            624: 22,14
+            625: 22,15
+            626: 22,16
+            638: 16,12
+            639: 17,12
+            640: 18,12
+            641: 19,12
+            642: 20,12
+            643: 21,12
+            674: 36,1
+            675: 36,2
+            676: 36,3
+            677: 52,1
+            678: 52,3
+            683: 52,2
+        - node:
+            color: '#EFB34196'
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            239: 14,44
+            240: 14,45
+            241: 14,46
+            242: 14,47
+        - node:
+            color: '#4B709CFF'
+            id: QuarterTileOverlayGreyscale270
+          decals:
+            1259: 15,21
+            1264: 16,21
+        - node:
+            color: '#8BDA8E5D'
+            id: QuarterTileOverlayGreyscale270
+          decals:
+            1830: 2,46
+            1831: 4,44
+            1832: 3,45
+        - node:
+            color: '#8BDABAFF'
+            id: QuarterTileOverlayGreyscale270
+          decals:
+            1084: 21,40
+            1085: 20,40
+            1086: 18,40
+            1087: 19,40
+            1088: 17,40
+            1248: 20,19
+            1249: 19,20
+            1255: 21,21
+        - node:
+            color: '#8BDB9BFF'
+            id: QuarterTileOverlayGreyscale270
+          decals:
+            1509: 32,35
+            1510: 31,35
+            1511: 30,35
+            1512: 29,35
+            1513: 28,35
+            1514: 27,35
+            1515: 26,36
+            1516: 26,36
+            1517: 27,36
+            1518: 28,36
+            1519: 29,36
+            1520: 30,36
+            1521: 31,36
+            1528: 32,36
+            1529: 26,35
+        - node:
+            color: '#9EDA8E28'
+            id: QuarterTileOverlayGreyscale270
+          decals:
+            1814: 4,45
+            1818: 4,46
+            1828: 3,46
+        - node:
+            color: '#D381C996'
+            id: QuarterTileOverlayGreyscale270
+          decals:
+            128: 17,40
+            129: 18,40
+            130: 19,40
+            131: 20,40
+            132: 21,40
+            398: 32,35
+            405: 27,36
+            406: 28,36
+            407: 29,36
+            408: 30,36
+            409: 31,36
+            411: 26,36
+            552: 21,21
+        - node:
+            color: '#EFB34196'
+            id: QuarterTileOverlayGreyscale270
+          decals:
+            233: 8,44
+            234: 8,45
+            235: 8,46
+            236: 8,47
+        - node:
+            color: '#4B709CFF'
+            id: QuarterTileOverlayGreyscale90
+          decals:
+            1257: 13,19
+            1265: 12,19
+        - node:
+            color: '#79DA8EA1'
+            id: QuarterTileOverlayGreyscale90
+          decals:
+            976: 18,24
+            977: 18,25
+            978: 18,26
+            979: 18,27
+            980: 18,28
+        - node:
+            color: '#8BDA8E5D'
+            id: QuarterTileOverlayGreyscale90
+          decals:
+            1829: 3,44
+        - node:
+            color: '#8BDABAFF'
+            id: QuarterTileOverlayGreyscale90
+          decals:
+            1079: 17,38
+            1080: 18,38
+            1081: 19,38
+            1082: 20,38
+            1083: 21,38
+            1138: 12,48
+            1139: 13,48
+            1140: 14,48
+            1141: 14,47
+            1142: 14,46
+            1143: 14,45
+            1144: 14,44
+        - node:
+            color: '#8BDB9BFF'
+            id: QuarterTileOverlayGreyscale90
+          decals:
+            1448: 18,30
+            1449: 19,30
+            1450: 20,30
+            1451: 22,30
+            1452: 21,30
+            1453: 23,30
+            1454: 24,30
+            1455: 25,30
+            1502: 26,35
+            1503: 27,35
+            1504: 28,35
+            1505: 30,35
+            1506: 29,35
+            1507: 31,35
+            1508: 32,35
+            1522: 32,34
+            1523: 31,34
+            1524: 30,34
+            1525: 29,34
+            1526: 28,34
+            1527: 27,34
+            1530: 26,34
+        - node:
+            color: '#9EDA8E28'
+            id: QuarterTileOverlayGreyscale90
+          decals:
+            1815: 4,44
+            1819: 3,45
+            1822: 2,45
+            1823: 2,44
+            1827: 2,46
+        - node:
+            color: '#D381C996'
+            id: QuarterTileOverlayGreyscale90
+          decals:
+            133: 21,38
+            134: 20,38
+            135: 19,38
+            136: 18,38
+            137: 17,38
+            254: 14,44
+            255: 14,45
+            256: 14,46
+            257: 14,47
+            258: 14,48
+            259: 13,48
+            260: 12,48
+            399: 26,35
+            400: 31,34
+            401: 30,34
+            402: 29,34
+            403: 28,34
+            404: 27,34
+            410: 32,34
+            440: 18,30
+            441: 19,30
+            442: 20,30
+            443: 21,30
+            444: 22,30
+            445: 23,30
+            446: 24,30
+            447: 25,30
+        - node:
+            color: '#EFB34196'
+            id: QuarterTileOverlayGreyscale90
+          decals:
+            243: 9,48
+            244: 10,48
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock01
+          decals:
+            543: 22,18
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock03
+          decals:
+            544: 18,18
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock04
+          decals:
+            546: 18,22
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock05
+          decals:
+            545: 22,22
+        - node:
+            color: '#FFFFFFFF'
+            id: StandClear
+          decals:
+            272: 11,44
+        - node:
+            color: '#52B4E996'
+            id: ThreeQuarterTileOverlayGreyscale
+          decals:
+            1223: 24,16
+        - node:
+            color: '#8BDA8EB4'
+            id: ThreeQuarterTileOverlayGreyscale
+          decals:
+            1279: 12,22
+        - node:
+            color: '#D381C996'
+            id: ThreeQuarterTileOverlayGreyscale
+          decals:
+            507: 12,22
+        - node:
+            color: '#52B4E996'
+            id: ThreeQuarterTileOverlayGreyscale180
+          decals:
+            1224: 30,12
+        - node:
+            color: '#8BDA8EB4'
+            id: ThreeQuarterTileOverlayGreyscale180
+          decals:
+            1280: 16,18
+        - node:
+            color: '#D381C996'
+            id: ThreeQuarterTileOverlayGreyscale180
+          decals:
+            505: 16,18
+        - node:
+            color: '#52B4E996'
+            id: ThreeQuarterTileOverlayGreyscale90
+          decals:
+            899: 30,16
+        - node:
+            color: '#8BDA8EB4'
+            id: ThreeQuarterTileOverlayGreyscale90
+          decals:
+            1278: 16,22
+        - node:
+            color: '#D381C996'
+            id: ThreeQuarterTileOverlayGreyscale90
+          decals:
+            506: 16,22
+        - node:
+            color: '#79DA8EFF'
+            id: WarnCornerGreyscaleNE
+          decals:
+            984: 2,28
+        - node:
+            color: '#79DA8EFF'
+            id: WarnCornerGreyscaleNW
+          decals:
+            986: 0,28
+        - node:
+            color: '#79DA8EFF'
+            id: WarnCornerGreyscaleSE
+          decals:
+            987: 2,24
+        - node:
+            color: '#79DA8EFF'
+            id: WarnCornerGreyscaleSW
+          decals:
+            989: 0,24
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerNE
+          decals:
+            861: 21,2
+            862: 25,2
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerNW
+          decals:
+            863: 23,2
+            864: 19,2
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSW
+          decals:
+            490: 2,20
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallNE
+          decals:
+            1037: 8,12
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallNW
+          decals:
+            1036: 14,12
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallSE
+          decals:
+            621: 8,16
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallSW
+          decals:
+            620: 14,16
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineE
+          decals:
+            331: 6,34
+            332: 6,35
+            333: 6,36
+            607: 8,13
+            608: 8,14
+            609: 8,15
+        - node:
+            color: '#79DA8EFF'
+            id: WarnLineGreyscaleE
+          decals:
+            981: 2,25
+            982: 2,26
+            983: 2,27
+        - node:
+            color: '#8BDB8E99'
+            id: WarnLineGreyscaleE
+          decals:
+            1378: 18,3
+            1379: 18,3
+        - node:
+            color: '#8BDB8EFF'
+            id: WarnLineGreyscaleE
+          decals:
+            1380: 18,3
+        - node:
+            color: '#D381C996'
+            id: WarnLineGreyscaleE
+          decals:
+            874: 18,3
+        - node:
+            color: '#52B4E996'
+            id: WarnLineGreyscaleN
+          decals:
+            1225: 27,15
+        - node:
+            color: '#79DA8EFF'
+            id: WarnLineGreyscaleN
+          decals:
+            985: 1,28
+        - node:
+            color: '#8BDA8EFF'
+            id: WarnLineGreyscaleN
+          decals:
+            1624: 29,27
+        - node:
+            color: '#8BDB8E99'
+            id: WarnLineGreyscaleN
+          decals:
+            1376: 26,4
+            1377: 26,4
+        - node:
+            color: '#DABC8BFF'
+            id: WarnLineGreyscaleN
+          decals:
+            996: 5,28
+        - node:
+            color: '#79DA8EFF'
+            id: WarnLineGreyscaleS
+          decals:
+            988: 1,24
+        - node:
+            color: '#8BDA8EFF'
+            id: WarnLineGreyscaleS
+          decals:
+            1623: 29,25
+        - node:
+            color: '#DABC8BFF'
+            id: WarnLineGreyscaleS
+          decals:
+            997: 5,24
+            998: 5,24
+        - node:
+            color: '#79DA8EFF'
+            id: WarnLineGreyscaleW
+          decals:
+            990: 0,25
+            991: 0,26
+            992: 0,27
+        - node:
+            color: '#8BDB8EFF'
+            id: WarnLineGreyscaleW
+          decals:
+            1381: 34,3
+        - node:
+            color: '#D381C996'
+            id: WarnLineGreyscaleW
+          decals:
+            873: 34,3
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineN
+          decals:
+            264: 12,47
+            265: 10,47
+            488: 4,20
+            489: 3,20
+            581: 27,22
+            582: 26,22
+            583: 25,22
+            602: 13,16
+            603: 11,16
+            604: 12,16
+            605: 10,16
+            606: 9,16
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineS
+          decals:
+            328: 4,34
+            329: 4,36
+            330: 4,35
+            491: 2,21
+            492: 2,22
+            1043: 14,13
+            1044: 14,14
+            1045: 14,15
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineW
+          decals:
+            261: 12,44
+            262: 11,44
+            263: 10,44
+            578: 27,18
+            579: 26,18
+            580: 25,18
+            942: 45,13
+            943: 46,13
+            944: 44,13
+            945: 43,13
+            946: 42,13
+            947: 41,13
+            948: 40,13
+            1038: 9,12
+            1039: 10,12
+            1040: 11,12
+            1041: 12,12
+            1042: 13,12
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerNe
+          decals:
+            518: 10,9
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerNw
+          decals:
+            517: 1,9
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerSe
+          decals:
+            515: 10,8
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerSw
+          decals:
+            516: 1,8
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineN
+          decals:
+            519: 9,9
+            520: 8,9
+            521: 7,9
+            522: 6,9
+            523: 5,9
+            524: 4,9
+            525: 3,9
+            526: 2,9
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineS
+          decals:
+            527: 10,8
+            528: 9,8
+            529: 8,8
+            530: 7,8
+            531: 6,8
+            532: 5,8
+            533: 4,8
+            534: 3,8
+            535: 2,8
+            536: 1,8
+        - node:
+            color: '#FFFFFFFF'
+            id: bushsnowa1
+          decals:
+            1768: 34.098167,13.033111
+        - node:
+            color: '#FFFFFFFF'
+            id: bushsnowb1
+          decals:
+            1769: 35.707542,12.970611
+        - node:
+            color: '#FFFFFFFF'
+            id: chevron
+          decals:
+            285: 11,48
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnow
+          decals:
+            1885: 10.225454,38.990788
+            1886: 11.037954,39.022038
+            1887: 11.834829,39.022038
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnow02
+          decals:
+            1762: 34.973167,13.060861
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnow10
+          decals:
+            1761: 34.004417,13.045236
+            1763: 35.316917,13.060861
+            1764: 36.035667,13.029611
+            1765: 34.535667,12.998361
+            1766: 36.129417,13.076486
+            1767: 34.238792,13.076486
+            1888: 10.491079,38.975163
+            1889: 11.600454,38.959538
+            1890: 11.006704,39.178288
+    - type: RadiationGridResistance
+    - type: LoadedMap
+    - type: SpreaderGrid
+    - type: GridTree
+    - type: MovedGrids
+    - type: GridPathfinding
+- proto: Airlock
+  entities:
+  - uid: 1221
+    components:
+    - type: Transform
+      pos: 41.5,3.5
+      parent: 1653
+  - uid: 1222
+    components:
+    - type: Transform
+      pos: 41.5,1.5
+      parent: 1653
+  - uid: 1223
+    components:
+    - type: Transform
+      pos: 49.5,1.5
+      parent: 1653
+  - uid: 1224
+    components:
+    - type: Transform
+      pos: 49.5,3.5
+      parent: 1653
+- proto: AirlockFreezer
+  entities:
+  - uid: 888
+    components:
+    - type: Transform
+      pos: 3.5,18.5
+      parent: 1653
+- proto: AirlockHydroGlassLocked
+  entities:
+  - uid: 10
+    components:
+    - type: Transform
+      pos: 17.5,31.5
+      parent: 1653
+- proto: AloeSeeds
+  entities:
+  - uid: 1078
+    components:
+    - type: Transform
+      pos: 1.5044713,15.591048
+      parent: 1653
+  - uid: 1379
+    components:
+    - type: Transform
+      pos: 16.516748,9.567207
+      parent: 1653
+- proto: AmbrosiaVulgarisSeeds
+  entities:
+  - uid: 1380
+    components:
+    - type: Transform
+      pos: 16.688623,9.410957
+      parent: 1653
+- proto: AnomalyFloraBulb
+  entities:
+  - uid: 105
+    components:
+    - type: Transform
+      pos: 21.5,44.5
+      parent: 1653
+  - uid: 110
+    components:
+    - type: Transform
+      pos: 17.5,44.5
+      parent: 1653
+  - uid: 624
+    components:
+    - type: Transform
+      pos: 18.5,47.5
+      parent: 1653
+- proto: AnomalyIce
+  entities:
+  - uid: 1840
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 45.497818,12.844993
+      parent: 1653
+  - uid: 2141
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.43184,14.455296
+      parent: 1653
+- proto: AnomalyScanner
+  entities:
+  - uid: 2182
+    components:
+    - type: Transform
+      pos: 53.56535,13.579968
+      parent: 1653
+- proto: APCBasic
+  entities:
+  - uid: 353
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,9.5
+      parent: 1653
+  - uid: 569
+    components:
+    - type: Transform
+      pos: 13.5,43.5
+      parent: 1653
+  - uid: 1023
+    components:
+    - type: Transform
+      pos: 28.5,22.5
+      parent: 1653
+- proto: Barricade
+  entities:
+  - uid: 665
+    components:
+    - type: Transform
+      pos: 22.5,36.5
+      parent: 1653
+- proto: BaseComputer
+  entities:
+  - uid: 121
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 29.5,14.5
+      parent: 1653
+  - uid: 126
+    components:
+    - type: Transform
+      pos: 21.5,48.5
+      parent: 1653
+  - uid: 296
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,14.5
+      parent: 1653
+  - uid: 495
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,19.5
+      parent: 1653
+  - uid: 730
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,14.5
+      parent: 1653
+  - uid: 880
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,21.5
+      parent: 1653
+  - uid: 1067
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,14.5
+      parent: 1653
+  - uid: 2131
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 49.5,14.5
+      parent: 1653
+  - uid: 2134
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 53.5,14.5
+      parent: 1653
+- proto: Beaker
+  entities:
+  - uid: 1470
+    components:
+    - type: Transform
+      pos: 21.687025,4.54119
+      parent: 1653
+- proto: Bed
+  entities:
+  - uid: 1233
+    components:
+    - type: Transform
+      pos: 42.5,4.5
+      parent: 1653
+  - uid: 1234
+    components:
+    - type: Transform
+      pos: 42.5,0.5
+      parent: 1653
+  - uid: 1235
+    components:
+    - type: Transform
+      pos: 50.5,0.5
+      parent: 1653
+  - uid: 1236
+    components:
+    - type: Transform
+      pos: 50.5,4.5
+      parent: 1653
+- proto: BedsheetSpawner
+  entities:
+  - uid: 1237
+    components:
+    - type: Transform
+      pos: 42.5,4.5
+      parent: 1653
+  - uid: 1238
+    components:
+    - type: Transform
+      pos: 50.5,4.5
+      parent: 1653
+  - uid: 1239
+    components:
+    - type: Transform
+      pos: 50.5,0.5
+      parent: 1653
+  - uid: 1240
+    components:
+    - type: Transform
+      pos: 42.5,0.5
+      parent: 1653
+- proto: BloodTomatoSeeds
+  entities:
+  - uid: 792
+    components:
+    - type: Transform
+      pos: 1.4725559,25.735012
+      parent: 1653
+- proto: BluespaceBeaker
+  entities:
+  - uid: 1476
+    components:
+    - type: Transform
+      pos: 21.201073,4.650565
+      parent: 1653
+- proto: BookLeafLoversSecret
+  entities:
+  - uid: 1419
+    components:
+    - type: Transform
+      pos: 6.468939,30.545952
+      parent: 1653
+- proto: Bookshelf
+  entities:
+  - uid: 1241
+    components:
+    - type: Transform
+      pos: 40.5,4.5
+      parent: 1653
+- proto: BookshelfFilled
+  entities:
+  - uid: 626
+    components:
+    - type: Transform
+      pos: 8.5,32.5
+      parent: 1653
+  - uid: 863
+    components:
+    - type: Transform
+      pos: 11.5,32.5
+      parent: 1653
+  - uid: 864
+    components:
+    - type: Transform
+      pos: 8.5,30.5
+      parent: 1653
+  - uid: 865
+    components:
+    - type: Transform
+      pos: 11.5,31.5
+      parent: 1653
+  - uid: 866
+    components:
+    - type: Transform
+      pos: 4.5,32.5
+      parent: 1653
+  - uid: 1057
+    components:
+    - type: Transform
+      pos: 1.5,30.5
+      parent: 1653
+  - uid: 1070
+    components:
+    - type: Transform
+      pos: 1.5,32.5
+      parent: 1653
+  - uid: 1414
+    components:
+    - type: Transform
+      pos: 7.5,32.5
+      parent: 1653
+  - uid: 1426
+    components:
+    - type: Transform
+      pos: 5.5,32.5
+      parent: 1653
+  - uid: 1480
+    components:
+    - type: Transform
+      pos: 2.5,32.5
+      parent: 1653
+- proto: BoxBeaker
+  entities:
+  - uid: 1484
+    components:
+    - type: Transform
+      pos: 22.482006,0.7443154
+      parent: 1653
+- proto: BoxFolderBlue
+  entities:
+  - uid: 776
+    components:
+    - type: Transform
+      pos: 22.48359,30.550323
+      parent: 1653
+- proto: BoxFolderGreen
+  entities:
+  - uid: 1201
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.6928706,46.564724
+      parent: 1653
+- proto: BoxFolderWhite
+  entities:
+  - uid: 1003
+    components:
+    - type: Transform
+      pos: 21.488142,22.553272
+      parent: 1653
+  - uid: 1755
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.416601,13.653091
+      parent: 1653
+  - uid: 1756
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.322851,13.512466
+      parent: 1653
+- proto: BoxFolderYellow
+  entities:
+  - uid: 1714
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.6459956,46.39285
+      parent: 1653
+- proto: BoxMouthSwab
+  entities:
+  - uid: 796
+    components:
+    - type: Transform
+      pos: 14.493081,24.60434
+      parent: 1653
+- proto: BriefcaseBrown
+  entities:
+  - uid: 1699
+    components:
+    - type: Transform
+      pos: 18.487843,32.40922
+      parent: 1653
+- proto: BungoSeeds
+  entities:
+  - uid: 1424
+    components:
+    - type: Transform
+      pos: 8.531214,35.590054
+      parent: 1653
+- proto: CabbageSeeds
+  entities:
+  - uid: 1381
+    components:
+    - type: Transform
+      pos: 16.501123,8.739082
+      parent: 1653
+- proto: CableApcExtension
+  entities:
+  - uid: 1
+    components:
+    - type: Transform
+      pos: 0.5,39.5
+      parent: 1653
+  - uid: 2
+    components:
+    - type: Transform
+      pos: 1.5,39.5
+      parent: 1653
+  - uid: 3
+    components:
+    - type: Transform
+      pos: 2.5,39.5
+      parent: 1653
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 3.5,39.5
+      parent: 1653
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 4.5,39.5
+      parent: 1653
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 5.5,39.5
+      parent: 1653
+  - uid: 7
+    components:
+    - type: Transform
+      pos: 6.5,39.5
+      parent: 1653
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 8.5,39.5
+      parent: 1653
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 9.5,39.5
+      parent: 1653
+  - uid: 13
+    components:
+    - type: Transform
+      pos: 13.5,39.5
+      parent: 1653
+  - uid: 14
+    components:
+    - type: Transform
+      pos: 14.5,39.5
+      parent: 1653
+  - uid: 15
+    components:
+    - type: Transform
+      pos: 16.5,39.5
+      parent: 1653
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 17.5,39.5
+      parent: 1653
+  - uid: 17
+    components:
+    - type: Transform
+      pos: 18.5,39.5
+      parent: 1653
+  - uid: 18
+    components:
+    - type: Transform
+      pos: 19.5,39.5
+      parent: 1653
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 20.5,39.5
+      parent: 1653
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 21.5,39.5
+      parent: 1653
+  - uid: 21
+    components:
+    - type: Transform
+      pos: 22.5,39.5
+      parent: 1653
+  - uid: 22
+    components:
+    - type: Transform
+      pos: 24.5,39.5
+      parent: 1653
+  - uid: 23
+    components:
+    - type: Transform
+      pos: 25.5,39.5
+      parent: 1653
+  - uid: 24
+    components:
+    - type: Transform
+      pos: 26.5,39.5
+      parent: 1653
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 27.5,39.5
+      parent: 1653
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 28.5,39.5
+      parent: 1653
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 29.5,39.5
+      parent: 1653
+  - uid: 28
+    components:
+    - type: Transform
+      pos: 30.5,39.5
+      parent: 1653
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 32.5,39.5
+      parent: 1653
+  - uid: 30
+    components:
+    - type: Transform
+      pos: 33.5,39.5
+      parent: 1653
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 34.5,39.5
+      parent: 1653
+  - uid: 32
+    components:
+    - type: Transform
+      pos: 35.5,39.5
+      parent: 1653
+  - uid: 33
+    components:
+    - type: Transform
+      pos: 36.5,39.5
+      parent: 1653
+  - uid: 34
+    components:
+    - type: Transform
+      pos: 37.5,39.5
+      parent: 1653
+  - uid: 35
+    components:
+    - type: Transform
+      pos: 38.5,39.5
+      parent: 1653
+  - uid: 36
+    components:
+    - type: Transform
+      pos: 40.5,39.5
+      parent: 1653
+  - uid: 37
+    components:
+    - type: Transform
+      pos: 41.5,39.5
+      parent: 1653
+  - uid: 38
+    components:
+    - type: Transform
+      pos: 42.5,39.5
+      parent: 1653
+  - uid: 39
+    components:
+    - type: Transform
+      pos: 43.5,39.5
+      parent: 1653
+  - uid: 40
+    components:
+    - type: Transform
+      pos: 44.5,39.5
+      parent: 1653
+  - uid: 41
+    components:
+    - type: Transform
+      pos: 45.5,39.5
+      parent: 1653
+  - uid: 42
+    components:
+    - type: Transform
+      pos: 46.5,39.5
+      parent: 1653
+  - uid: 43
+    components:
+    - type: Transform
+      pos: 34.5,35.5
+      parent: 1653
+  - uid: 44
+    components:
+    - type: Transform
+      pos: 33.5,35.5
+      parent: 1653
+  - uid: 45
+    components:
+    - type: Transform
+      pos: 32.5,35.5
+      parent: 1653
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 31.5,35.5
+      parent: 1653
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 30.5,35.5
+      parent: 1653
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 29.5,35.5
+      parent: 1653
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 28.5,35.5
+      parent: 1653
+  - uid: 50
+    components:
+    - type: Transform
+      pos: 27.5,35.5
+      parent: 1653
+  - uid: 51
+    components:
+    - type: Transform
+      pos: 26.5,35.5
+      parent: 1653
+  - uid: 52
+    components:
+    - type: Transform
+      pos: 25.5,35.5
+      parent: 1653
+  - uid: 53
+    components:
+    - type: Transform
+      pos: 24.5,35.5
+      parent: 1653
+  - uid: 54
+    components:
+    - type: Transform
+      pos: 22.5,35.5
+      parent: 1653
+  - uid: 55
+    components:
+    - type: Transform
+      pos: 21.5,35.5
+      parent: 1653
+  - uid: 56
+    components:
+    - type: Transform
+      pos: 20.5,35.5
+      parent: 1653
+  - uid: 57
+    components:
+    - type: Transform
+      pos: 19.5,35.5
+      parent: 1653
+  - uid: 58
+    components:
+    - type: Transform
+      pos: 18.5,35.5
+      parent: 1653
+  - uid: 59
+    components:
+    - type: Transform
+      pos: 17.5,35.5
+      parent: 1653
+  - uid: 60
+    components:
+    - type: Transform
+      pos: 16.5,35.5
+      parent: 1653
+  - uid: 61
+    components:
+    - type: Transform
+      pos: 15.5,35.5
+      parent: 1653
+  - uid: 62
+    components:
+    - type: Transform
+      pos: 14.5,35.5
+      parent: 1653
+  - uid: 63
+    components:
+    - type: Transform
+      pos: 13.5,35.5
+      parent: 1653
+  - uid: 64
+    components:
+    - type: Transform
+      pos: 12.5,35.5
+      parent: 1653
+  - uid: 65
+    components:
+    - type: Transform
+      pos: 10.5,35.5
+      parent: 1653
+  - uid: 66
+    components:
+    - type: Transform
+      pos: 9.5,35.5
+      parent: 1653
+  - uid: 67
+    components:
+    - type: Transform
+      pos: 8.5,35.5
+      parent: 1653
+  - uid: 68
+    components:
+    - type: Transform
+      pos: 7.5,35.5
+      parent: 1653
+  - uid: 69
+    components:
+    - type: Transform
+      pos: 6.5,35.5
+      parent: 1653
+  - uid: 70
+    components:
+    - type: Transform
+      pos: 5.5,35.5
+      parent: 1653
+  - uid: 71
+    components:
+    - type: Transform
+      pos: 4.5,35.5
+      parent: 1653
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 3.5,35.5
+      parent: 1653
+  - uid: 73
+    components:
+    - type: Transform
+      pos: 2.5,35.5
+      parent: 1653
+  - uid: 74
+    components:
+    - type: Transform
+      pos: 1.5,35.5
+      parent: 1653
+  - uid: 75
+    components:
+    - type: Transform
+      pos: 0.5,35.5
+      parent: 1653
+  - uid: 83
+    components:
+    - type: Transform
+      pos: 34.5,14.5
+      parent: 1653
+  - uid: 84
+    components:
+    - type: Transform
+      pos: 33.5,14.5
+      parent: 1653
+  - uid: 88
+    components:
+    - type: Transform
+      pos: 37.5,14.5
+      parent: 1653
+  - uid: 89
+    components:
+    - type: Transform
+      pos: 8.5,45.5
+      parent: 1653
+  - uid: 90
+    components:
+    - type: Transform
+      pos: 9.5,45.5
+      parent: 1653
+  - uid: 91
+    components:
+    - type: Transform
+      pos: 10.5,45.5
+      parent: 1653
+  - uid: 92
+    components:
+    - type: Transform
+      pos: 11.5,45.5
+      parent: 1653
+  - uid: 93
+    components:
+    - type: Transform
+      pos: 12.5,45.5
+      parent: 1653
+  - uid: 94
+    components:
+    - type: Transform
+      pos: 13.5,45.5
+      parent: 1653
+  - uid: 95
+    components:
+    - type: Transform
+      pos: 14.5,45.5
+      parent: 1653
+  - uid: 96
+    components:
+    - type: Transform
+      pos: 11.5,42.5
+      parent: 1653
+  - uid: 97
+    components:
+    - type: Transform
+      pos: 11.5,43.5
+      parent: 1653
+  - uid: 98
+    components:
+    - type: Transform
+      pos: 11.5,44.5
+      parent: 1653
+  - uid: 99
+    components:
+    - type: Transform
+      pos: 11.5,46.5
+      parent: 1653
+  - uid: 100
+    components:
+    - type: Transform
+      pos: 11.5,47.5
+      parent: 1653
+  - uid: 101
+    components:
+    - type: Transform
+      pos: 11.5,48.5
+      parent: 1653
+  - uid: 102
+    components:
+    - type: Transform
+      pos: 16.5,45.5
+      parent: 1653
+  - uid: 108
+    components:
+    - type: Transform
+      pos: 22.5,45.5
+      parent: 1653
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 19.5,42.5
+      parent: 1653
+  - uid: 114
+    components:
+    - type: Transform
+      pos: 19.5,48.5
+      parent: 1653
+  - uid: 122
+    components:
+    - type: Transform
+      pos: 9.5,40.5
+      parent: 1653
+  - uid: 124
+    components:
+    - type: Transform
+      pos: 13.5,40.5
+      parent: 1653
+  - uid: 128
+    components:
+    - type: Transform
+      pos: 26.5,31.5
+      parent: 1653
+  - uid: 129
+    components:
+    - type: Transform
+      pos: 25.5,31.5
+      parent: 1653
+  - uid: 130
+    components:
+    - type: Transform
+      pos: 24.5,31.5
+      parent: 1653
+  - uid: 131
+    components:
+    - type: Transform
+      pos: 23.5,31.5
+      parent: 1653
+  - uid: 132
+    components:
+    - type: Transform
+      pos: 22.5,31.5
+      parent: 1653
+  - uid: 133
+    components:
+    - type: Transform
+      pos: 21.5,31.5
+      parent: 1653
+  - uid: 134
+    components:
+    - type: Transform
+      pos: 20.5,31.5
+      parent: 1653
+  - uid: 135
+    components:
+    - type: Transform
+      pos: 19.5,31.5
+      parent: 1653
+  - uid: 136
+    components:
+    - type: Transform
+      pos: 18.5,31.5
+      parent: 1653
+  - uid: 137
+    components:
+    - type: Transform
+      pos: 17.5,31.5
+      parent: 1653
+  - uid: 138
+    components:
+    - type: Transform
+      pos: 16.5,31.5
+      parent: 1653
+  - uid: 139
+    components:
+    - type: Transform
+      pos: 15.5,31.5
+      parent: 1653
+  - uid: 140
+    components:
+    - type: Transform
+      pos: 14.5,31.5
+      parent: 1653
+  - uid: 142
+    components:
+    - type: Transform
+      pos: 0.5,16.5
+      parent: 1653
+  - uid: 153
+    components:
+    - type: Transform
+      pos: 12.5,31.5
+      parent: 1653
+  - uid: 154
+    components:
+    - type: Transform
+      pos: 1.5,24.5
+      parent: 1653
+  - uid: 155
+    components:
+    - type: Transform
+      pos: 1.5,25.5
+      parent: 1653
+  - uid: 156
+    components:
+    - type: Transform
+      pos: 1.5,26.5
+      parent: 1653
+  - uid: 157
+    components:
+    - type: Transform
+      pos: 1.5,27.5
+      parent: 1653
+  - uid: 158
+    components:
+    - type: Transform
+      pos: 1.5,28.5
+      parent: 1653
+  - uid: 165
+    components:
+    - type: Transform
+      pos: 6.5,26.5
+      parent: 1653
+  - uid: 166
+    components:
+    - type: Transform
+      pos: 2.5,26.5
+      parent: 1653
+  - uid: 167
+    components:
+    - type: Transform
+      pos: 0.5,26.5
+      parent: 1653
+  - uid: 175
+    components:
+    - type: Transform
+      pos: 3.5,38.5
+      parent: 1653
+  - uid: 176
+    components:
+    - type: Transform
+      pos: 3.5,40.5
+      parent: 1653
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 11.5,38.5
+      parent: 1653
+  - uid: 178
+    components:
+    - type: Transform
+      pos: 11.5,40.5
+      parent: 1653
+  - uid: 179
+    components:
+    - type: Transform
+      pos: 19.5,38.5
+      parent: 1653
+  - uid: 180
+    components:
+    - type: Transform
+      pos: 19.5,40.5
+      parent: 1653
+  - uid: 181
+    components:
+    - type: Transform
+      pos: 27.5,38.5
+      parent: 1653
+  - uid: 182
+    components:
+    - type: Transform
+      pos: 27.5,40.5
+      parent: 1653
+  - uid: 183
+    components:
+    - type: Transform
+      pos: 35.5,38.5
+      parent: 1653
+  - uid: 184
+    components:
+    - type: Transform
+      pos: 35.5,40.5
+      parent: 1653
+  - uid: 185
+    components:
+    - type: Transform
+      pos: 43.5,38.5
+      parent: 1653
+  - uid: 186
+    components:
+    - type: Transform
+      pos: 43.5,40.5
+      parent: 1653
+  - uid: 187
+    components:
+    - type: Transform
+      pos: 29.5,36.5
+      parent: 1653
+  - uid: 188
+    components:
+    - type: Transform
+      pos: 29.5,34.5
+      parent: 1653
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 17.5,34.5
+      parent: 1653
+  - uid: 190
+    components:
+    - type: Transform
+      pos: 17.5,36.5
+      parent: 1653
+  - uid: 191
+    components:
+    - type: Transform
+      pos: 5.5,34.5
+      parent: 1653
+  - uid: 192
+    components:
+    - type: Transform
+      pos: 5.5,36.5
+      parent: 1653
+  - uid: 195
+    components:
+    - type: Transform
+      pos: 20.5,32.5
+      parent: 1653
+  - uid: 196
+    components:
+    - type: Transform
+      pos: 20.5,30.5
+      parent: 1653
+  - uid: 199
+    components:
+    - type: Transform
+      pos: 13.5,24.5
+      parent: 1653
+  - uid: 200
+    components:
+    - type: Transform
+      pos: 13.5,25.5
+      parent: 1653
+  - uid: 201
+    components:
+    - type: Transform
+      pos: 13.5,26.5
+      parent: 1653
+  - uid: 203
+    components:
+    - type: Transform
+      pos: 13.5,28.5
+      parent: 1653
+  - uid: 205
+    components:
+    - type: Transform
+      pos: 14.5,26.5
+      parent: 1653
+  - uid: 206
+    components:
+    - type: Transform
+      pos: 17.5,24.5
+      parent: 1653
+  - uid: 207
+    components:
+    - type: Transform
+      pos: 17.5,25.5
+      parent: 1653
+  - uid: 208
+    components:
+    - type: Transform
+      pos: 17.5,26.5
+      parent: 1653
+  - uid: 209
+    components:
+    - type: Transform
+      pos: 17.5,27.5
+      parent: 1653
+  - uid: 210
+    components:
+    - type: Transform
+      pos: 17.5,28.5
+      parent: 1653
+  - uid: 211
+    components:
+    - type: Transform
+      pos: 16.5,26.5
+      parent: 1653
+  - uid: 212
+    components:
+    - type: Transform
+      pos: 18.5,26.5
+      parent: 1653
+  - uid: 213
+    components:
+    - type: Transform
+      pos: 21.5,24.5
+      parent: 1653
+  - uid: 214
+    components:
+    - type: Transform
+      pos: 21.5,25.5
+      parent: 1653
+  - uid: 215
+    components:
+    - type: Transform
+      pos: 21.5,26.5
+      parent: 1653
+  - uid: 216
+    components:
+    - type: Transform
+      pos: 21.5,27.5
+      parent: 1653
+  - uid: 217
+    components:
+    - type: Transform
+      pos: 21.5,28.5
+      parent: 1653
+  - uid: 218
+    components:
+    - type: Transform
+      pos: 20.5,26.5
+      parent: 1653
+  - uid: 219
+    components:
+    - type: Transform
+      pos: 22.5,26.5
+      parent: 1653
+  - uid: 220
+    components:
+    - type: Transform
+      pos: 2.5,18.5
+      parent: 1653
+  - uid: 221
+    components:
+    - type: Transform
+      pos: 2.5,19.5
+      parent: 1653
+  - uid: 222
+    components:
+    - type: Transform
+      pos: 2.5,20.5
+      parent: 1653
+  - uid: 223
+    components:
+    - type: Transform
+      pos: 2.5,21.5
+      parent: 1653
+  - uid: 224
+    components:
+    - type: Transform
+      pos: 2.5,22.5
+      parent: 1653
+  - uid: 225
+    components:
+    - type: Transform
+      pos: 3.5,20.5
+      parent: 1653
+  - uid: 226
+    components:
+    - type: Transform
+      pos: 4.5,20.5
+      parent: 1653
+  - uid: 227
+    components:
+    - type: Transform
+      pos: 1.5,20.5
+      parent: 1653
+  - uid: 228
+    components:
+    - type: Transform
+      pos: 0.5,20.5
+      parent: 1653
+  - uid: 229
+    components:
+    - type: Transform
+      pos: 8.5,18.5
+      parent: 1653
+  - uid: 230
+    components:
+    - type: Transform
+      pos: 7.5,19.5
+      parent: 1653
+  - uid: 231
+    components:
+    - type: Transform
+      pos: 7.5,21.5
+      parent: 1653
+  - uid: 232
+    components:
+    - type: Transform
+      pos: 7.5,18.5
+      parent: 1653
+  - uid: 233
+    components:
+    - type: Transform
+      pos: 8.5,22.5
+      parent: 1653
+  - uid: 234
+    components:
+    - type: Transform
+      pos: 6.5,19.5
+      parent: 1653
+  - uid: 235
+    components:
+    - type: Transform
+      pos: 6.5,20.5
+      parent: 1653
+  - uid: 236
+    components:
+    - type: Transform
+      pos: 6.5,21.5
+      parent: 1653
+  - uid: 237
+    components:
+    - type: Transform
+      pos: 10.5,20.5
+      parent: 1653
+  - uid: 238
+    components:
+    - type: Transform
+      pos: 14.5,18.5
+      parent: 1653
+  - uid: 239
+    components:
+    - type: Transform
+      pos: 14.5,19.5
+      parent: 1653
+  - uid: 240
+    components:
+    - type: Transform
+      pos: 14.5,20.5
+      parent: 1653
+  - uid: 241
+    components:
+    - type: Transform
+      pos: 14.5,21.5
+      parent: 1653
+  - uid: 242
+    components:
+    - type: Transform
+      pos: 14.5,22.5
+      parent: 1653
+  - uid: 243
+    components:
+    - type: Transform
+      pos: 13.5,20.5
+      parent: 1653
+  - uid: 244
+    components:
+    - type: Transform
+      pos: 12.5,20.5
+      parent: 1653
+  - uid: 245
+    components:
+    - type: Transform
+      pos: 15.5,20.5
+      parent: 1653
+  - uid: 246
+    components:
+    - type: Transform
+      pos: 16.5,20.5
+      parent: 1653
+  - uid: 247
+    components:
+    - type: Transform
+      pos: 20.5,18.5
+      parent: 1653
+  - uid: 248
+    components:
+    - type: Transform
+      pos: 20.5,19.5
+      parent: 1653
+  - uid: 249
+    components:
+    - type: Transform
+      pos: 20.5,20.5
+      parent: 1653
+  - uid: 250
+    components:
+    - type: Transform
+      pos: 20.5,21.5
+      parent: 1653
+  - uid: 251
+    components:
+    - type: Transform
+      pos: 20.5,22.5
+      parent: 1653
+  - uid: 252
+    components:
+    - type: Transform
+      pos: 19.5,20.5
+      parent: 1653
+  - uid: 253
+    components:
+    - type: Transform
+      pos: 18.5,20.5
+      parent: 1653
+  - uid: 254
+    components:
+    - type: Transform
+      pos: 21.5,20.5
+      parent: 1653
+  - uid: 255
+    components:
+    - type: Transform
+      pos: 22.5,20.5
+      parent: 1653
+  - uid: 256
+    components:
+    - type: Transform
+      pos: 26.5,18.5
+      parent: 1653
+  - uid: 257
+    components:
+    - type: Transform
+      pos: 26.5,19.5
+      parent: 1653
+  - uid: 258
+    components:
+    - type: Transform
+      pos: 26.5,20.5
+      parent: 1653
+  - uid: 259
+    components:
+    - type: Transform
+      pos: 26.5,21.5
+      parent: 1653
+  - uid: 260
+    components:
+    - type: Transform
+      pos: 26.5,22.5
+      parent: 1653
+  - uid: 263
+    components:
+    - type: Transform
+      pos: 27.5,20.5
+      parent: 1653
+  - uid: 264
+    components:
+    - type: Transform
+      pos: 28.5,20.5
+      parent: 1653
+  - uid: 274
+    components:
+    - type: Transform
+      pos: 19.5,12.5
+      parent: 1653
+  - uid: 275
+    components:
+    - type: Transform
+      pos: 16.5,12.5
+      parent: 1653
+  - uid: 276
+    components:
+    - type: Transform
+      pos: 16.5,15.5
+      parent: 1653
+  - uid: 277
+    components:
+    - type: Transform
+      pos: 17.5,12.5
+      parent: 1653
+  - uid: 278
+    components:
+    - type: Transform
+      pos: 19.5,16.5
+      parent: 1653
+  - uid: 279
+    components:
+    - type: Transform
+      pos: 16.5,16.5
+      parent: 1653
+  - uid: 280
+    components:
+    - type: Transform
+      pos: 17.5,16.5
+      parent: 1653
+  - uid: 281
+    components:
+    - type: Transform
+      pos: 16.5,14.5
+      parent: 1653
+  - uid: 282
+    components:
+    - type: Transform
+      pos: 16.5,13.5
+      parent: 1653
+  - uid: 283
+    components:
+    - type: Transform
+      pos: 18.5,12.5
+      parent: 1653
+  - uid: 284
+    components:
+    - type: Transform
+      pos: 22.5,14.5
+      parent: 1653
+  - uid: 292
+    components:
+    - type: Transform
+      pos: 8.5,14.5
+      parent: 1653
+  - uid: 297
+    components:
+    - type: Transform
+      pos: 10.5,12.5
+      parent: 1653
+  - uid: 298
+    components:
+    - type: Transform
+      pos: 10.5,14.5
+      parent: 1653
+  - uid: 299
+    components:
+    - type: Transform
+      pos: 11.5,14.5
+      parent: 1653
+  - uid: 300
+    components:
+    - type: Transform
+      pos: 12.5,14.5
+      parent: 1653
+  - uid: 302
+    components:
+    - type: Transform
+      pos: 14.5,14.5
+      parent: 1653
+  - uid: 304
+    components:
+    - type: Transform
+      pos: 11.5,16.5
+      parent: 1653
+  - uid: 305
+    components:
+    - type: Transform
+      pos: 11.5,13.5
+      parent: 1653
+  - uid: 306
+    components:
+    - type: Transform
+      pos: 11.5,12.5
+      parent: 1653
+  - uid: 318
+    components:
+    - type: Transform
+      pos: 32.5,14.5
+      parent: 1653
+  - uid: 319
+    components:
+    - type: Transform
+      pos: 36.5,14.5
+      parent: 1653
+  - uid: 329
+    components:
+    - type: Transform
+      pos: 40.5,14.5
+      parent: 1653
+  - uid: 330
+    components:
+    - type: Transform
+      pos: 41.5,14.5
+      parent: 1653
+  - uid: 331
+    components:
+    - type: Transform
+      pos: 42.5,14.5
+      parent: 1653
+  - uid: 332
+    components:
+    - type: Transform
+      pos: 43.5,14.5
+      parent: 1653
+  - uid: 333
+    components:
+    - type: Transform
+      pos: 44.5,14.5
+      parent: 1653
+  - uid: 334
+    components:
+    - type: Transform
+      pos: 45.5,14.5
+      parent: 1653
+  - uid: 335
+    components:
+    - type: Transform
+      pos: 46.5,14.5
+      parent: 1653
+  - uid: 336
+    components:
+    - type: Transform
+      pos: 43.5,13.5
+      parent: 1653
+  - uid: 337
+    components:
+    - type: Transform
+      pos: 43.5,12.5
+      parent: 1653
+  - uid: 338
+    components:
+    - type: Transform
+      pos: 43.5,15.5
+      parent: 1653
+  - uid: 339
+    components:
+    - type: Transform
+      pos: 43.5,16.5
+      parent: 1653
+  - uid: 340
+    components:
+    - type: Transform
+      pos: 34.5,8.5
+      parent: 1653
+  - uid: 341
+    components:
+    - type: Transform
+      pos: 33.5,8.5
+      parent: 1653
+  - uid: 342
+    components:
+    - type: Transform
+      pos: 32.5,8.5
+      parent: 1653
+  - uid: 343
+    components:
+    - type: Transform
+      pos: 31.5,8.5
+      parent: 1653
+  - uid: 344
+    components:
+    - type: Transform
+      pos: 30.5,8.5
+      parent: 1653
+  - uid: 345
+    components:
+    - type: Transform
+      pos: 29.5,8.5
+      parent: 1653
+  - uid: 346
+    components:
+    - type: Transform
+      pos: 28.5,8.5
+      parent: 1653
+  - uid: 347
+    components:
+    - type: Transform
+      pos: 27.5,8.5
+      parent: 1653
+  - uid: 348
+    components:
+    - type: Transform
+      pos: 26.5,8.5
+      parent: 1653
+  - uid: 349
+    components:
+    - type: Transform
+      pos: 25.5,8.5
+      parent: 1653
+  - uid: 350
+    components:
+    - type: Transform
+      pos: 24.5,8.5
+      parent: 1653
+  - uid: 351
+    components:
+    - type: Transform
+      pos: 29.5,9.5
+      parent: 1653
+  - uid: 352
+    components:
+    - type: Transform
+      pos: 29.5,10.5
+      parent: 1653
+  - uid: 355
+    components:
+    - type: Transform
+      pos: 22.5,8.5
+      parent: 1653
+  - uid: 356
+    components:
+    - type: Transform
+      pos: 21.5,8.5
+      parent: 1653
+  - uid: 357
+    components:
+    - type: Transform
+      pos: 20.5,8.5
+      parent: 1653
+  - uid: 358
+    components:
+    - type: Transform
+      pos: 19.5,8.5
+      parent: 1653
+  - uid: 359
+    components:
+    - type: Transform
+      pos: 18.5,8.5
+      parent: 1653
+  - uid: 360
+    components:
+    - type: Transform
+      pos: 17.5,8.5
+      parent: 1653
+  - uid: 361
+    components:
+    - type: Transform
+      pos: 16.5,8.5
+      parent: 1653
+  - uid: 362
+    components:
+    - type: Transform
+      pos: 15.5,8.5
+      parent: 1653
+  - uid: 363
+    components:
+    - type: Transform
+      pos: 14.5,8.5
+      parent: 1653
+  - uid: 364
+    components:
+    - type: Transform
+      pos: 13.5,8.5
+      parent: 1653
+  - uid: 365
+    components:
+    - type: Transform
+      pos: 12.5,8.5
+      parent: 1653
+  - uid: 366
+    components:
+    - type: Transform
+      pos: 17.5,9.5
+      parent: 1653
+  - uid: 367
+    components:
+    - type: Transform
+      pos: 17.5,10.5
+      parent: 1653
+  - uid: 368
+    components:
+    - type: Transform
+      pos: 17.5,7.5
+      parent: 1653
+  - uid: 369
+    components:
+    - type: Transform
+      pos: 17.5,6.5
+      parent: 1653
+  - uid: 370
+    components:
+    - type: Transform
+      pos: 10.5,8.5
+      parent: 1653
+  - uid: 371
+    components:
+    - type: Transform
+      pos: 9.5,8.5
+      parent: 1653
+  - uid: 372
+    components:
+    - type: Transform
+      pos: 8.5,8.5
+      parent: 1653
+  - uid: 373
+    components:
+    - type: Transform
+      pos: 7.5,8.5
+      parent: 1653
+  - uid: 374
+    components:
+    - type: Transform
+      pos: 6.5,8.5
+      parent: 1653
+  - uid: 375
+    components:
+    - type: Transform
+      pos: 5.5,8.5
+      parent: 1653
+  - uid: 376
+    components:
+    - type: Transform
+      pos: 4.5,8.5
+      parent: 1653
+  - uid: 377
+    components:
+    - type: Transform
+      pos: 3.5,8.5
+      parent: 1653
+  - uid: 378
+    components:
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 1653
+  - uid: 379
+    components:
+    - type: Transform
+      pos: 1.5,8.5
+      parent: 1653
+  - uid: 380
+    components:
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 1653
+  - uid: 381
+    components:
+    - type: Transform
+      pos: 5.5,9.5
+      parent: 1653
+  - uid: 382
+    components:
+    - type: Transform
+      pos: 5.5,10.5
+      parent: 1653
+  - uid: 383
+    components:
+    - type: Transform
+      pos: 5.5,7.5
+      parent: 1653
+  - uid: 384
+    components:
+    - type: Transform
+      pos: 5.5,6.5
+      parent: 1653
+  - uid: 406
+    components:
+    - type: Transform
+      pos: 18.5,2.5
+      parent: 1653
+  - uid: 407
+    components:
+    - type: Transform
+      pos: 19.5,2.5
+      parent: 1653
+  - uid: 408
+    components:
+    - type: Transform
+      pos: 20.5,2.5
+      parent: 1653
+  - uid: 409
+    components:
+    - type: Transform
+      pos: 21.5,2.5
+      parent: 1653
+  - uid: 410
+    components:
+    - type: Transform
+      pos: 22.5,2.5
+      parent: 1653
+  - uid: 411
+    components:
+    - type: Transform
+      pos: 23.5,2.5
+      parent: 1653
+  - uid: 412
+    components:
+    - type: Transform
+      pos: 24.5,2.5
+      parent: 1653
+  - uid: 413
+    components:
+    - type: Transform
+      pos: 25.5,2.5
+      parent: 1653
+  - uid: 414
+    components:
+    - type: Transform
+      pos: 26.5,2.5
+      parent: 1653
+  - uid: 421
+    components:
+    - type: Transform
+      pos: 33.5,2.5
+      parent: 1653
+  - uid: 422
+    components:
+    - type: Transform
+      pos: 34.5,2.5
+      parent: 1653
+  - uid: 423
+    components:
+    - type: Transform
+      pos: 36.5,2.5
+      parent: 1653
+  - uid: 424
+    components:
+    - type: Transform
+      pos: 26.5,3.5
+      parent: 1653
+  - uid: 425
+    components:
+    - type: Transform
+      pos: 26.5,4.5
+      parent: 1653
+  - uid: 426
+    components:
+    - type: Transform
+      pos: 26.5,1.5
+      parent: 1653
+  - uid: 427
+    components:
+    - type: Transform
+      pos: 26.5,0.5
+      parent: 1653
+  - uid: 428
+    components:
+    - type: Transform
+      pos: 37.5,2.5
+      parent: 1653
+  - uid: 429
+    components:
+    - type: Transform
+      pos: 38.5,2.5
+      parent: 1653
+  - uid: 430
+    components:
+    - type: Transform
+      pos: 39.5,2.5
+      parent: 1653
+  - uid: 431
+    components:
+    - type: Transform
+      pos: 40.5,2.5
+      parent: 1653
+  - uid: 432
+    components:
+    - type: Transform
+      pos: 41.5,2.5
+      parent: 1653
+  - uid: 433
+    components:
+    - type: Transform
+      pos: 42.5,2.5
+      parent: 1653
+  - uid: 434
+    components:
+    - type: Transform
+      pos: 43.5,2.5
+      parent: 1653
+  - uid: 435
+    components:
+    - type: Transform
+      pos: 44.5,2.5
+      parent: 1653
+  - uid: 436
+    components:
+    - type: Transform
+      pos: 45.5,2.5
+      parent: 1653
+  - uid: 437
+    components:
+    - type: Transform
+      pos: 46.5,2.5
+      parent: 1653
+  - uid: 438
+    components:
+    - type: Transform
+      pos: 47.5,2.5
+      parent: 1653
+  - uid: 439
+    components:
+    - type: Transform
+      pos: 48.5,2.5
+      parent: 1653
+  - uid: 440
+    components:
+    - type: Transform
+      pos: 49.5,2.5
+      parent: 1653
+  - uid: 441
+    components:
+    - type: Transform
+      pos: 50.5,2.5
+      parent: 1653
+  - uid: 442
+    components:
+    - type: Transform
+      pos: 51.5,2.5
+      parent: 1653
+  - uid: 443
+    components:
+    - type: Transform
+      pos: 52.5,2.5
+      parent: 1653
+  - uid: 444
+    components:
+    - type: Transform
+      pos: 53.5,2.5
+      parent: 1653
+  - uid: 445
+    components:
+    - type: Transform
+      pos: 54.5,2.5
+      parent: 1653
+  - uid: 447
+    components:
+    - type: Transform
+      pos: 45.5,3.5
+      parent: 1653
+  - uid: 448
+    components:
+    - type: Transform
+      pos: 45.5,4.5
+      parent: 1653
+  - uid: 449
+    components:
+    - type: Transform
+      pos: 45.5,0.5
+      parent: 1653
+  - uid: 450
+    components:
+    - type: Transform
+      pos: 45.5,1.5
+      parent: 1653
+  - uid: 480
+    components:
+    - type: Transform
+      pos: 5.5,2.5
+      parent: 1653
+  - uid: 493
+    components:
+    - type: Transform
+      pos: 10.5,2.5
+      parent: 1653
+  - uid: 494
+    components:
+    - type: Transform
+      pos: 6.5,2.5
+      parent: 1653
+  - uid: 514
+    components:
+    - type: Transform
+      pos: 7.5,2.5
+      parent: 1653
+  - uid: 515
+    components:
+    - type: Transform
+      pos: 11.5,2.5
+      parent: 1653
+  - uid: 566
+    components:
+    - type: Transform
+      pos: 9.5,2.5
+      parent: 1653
+  - uid: 567
+    components:
+    - type: Transform
+      pos: 38.5,14.5
+      parent: 1653
+  - uid: 568
+    components:
+    - type: Transform
+      pos: 12.5,43.5
+      parent: 1653
+  - uid: 572
+    components:
+    - type: Transform
+      pos: 13.5,43.5
+      parent: 1653
+  - uid: 602
+    components:
+    - type: Transform
+      pos: 29.5,2.5
+      parent: 1653
+  - uid: 603
+    components:
+    - type: Transform
+      pos: 28.5,2.5
+      parent: 1653
+  - uid: 604
+    components:
+    - type: Transform
+      pos: 12.5,38.5
+      parent: 1653
+  - uid: 672
+    components:
+    - type: Transform
+      pos: 0.5,15.5
+      parent: 1653
+  - uid: 688
+    components:
+    - type: Transform
+      pos: 27.5,2.5
+      parent: 1653
+  - uid: 736
+    components:
+    - type: Transform
+      pos: 0.5,13.5
+      parent: 1653
+  - uid: 741
+    components:
+    - type: Transform
+      pos: 0.5,14.5
+      parent: 1653
+  - uid: 748
+    components:
+    - type: Transform
+      pos: 30.5,20.5
+      parent: 1653
+  - uid: 749
+    components:
+    - type: Transform
+      pos: 31.5,20.5
+      parent: 1653
+  - uid: 750
+    components:
+    - type: Transform
+      pos: 32.5,20.5
+      parent: 1653
+  - uid: 751
+    components:
+    - type: Transform
+      pos: 34.5,20.5
+      parent: 1653
+  - uid: 752
+    components:
+    - type: Transform
+      pos: 32.5,22.5
+      parent: 1653
+  - uid: 753
+    components:
+    - type: Transform
+      pos: 33.5,20.5
+      parent: 1653
+  - uid: 754
+    components:
+    - type: Transform
+      pos: 32.5,19.5
+      parent: 1653
+  - uid: 755
+    components:
+    - type: Transform
+      pos: 32.5,21.5
+      parent: 1653
+  - uid: 761
+    components:
+    - type: Transform
+      pos: 17.5,45.5
+      parent: 1653
+  - uid: 762
+    components:
+    - type: Transform
+      pos: 32.5,18.5
+      parent: 1653
+  - uid: 767
+    components:
+    - type: Transform
+      pos: 31.5,2.5
+      parent: 1653
+  - uid: 906
+    components:
+    - type: Transform
+      pos: 9.5,18.5
+      parent: 1653
+  - uid: 907
+    components:
+    - type: Transform
+      pos: 10.5,21.5
+      parent: 1653
+  - uid: 910
+    components:
+    - type: Transform
+      pos: 9.5,22.5
+      parent: 1653
+  - uid: 911
+    components:
+    - type: Transform
+      pos: 7.5,22.5
+      parent: 1653
+  - uid: 912
+    components:
+    - type: Transform
+      pos: 9.5,19.5
+      parent: 1653
+  - uid: 913
+    components:
+    - type: Transform
+      pos: 10.5,19.5
+      parent: 1653
+  - uid: 914
+    components:
+    - type: Transform
+      pos: 9.5,21.5
+      parent: 1653
+  - uid: 976
+    components:
+    - type: Transform
+      pos: 32.5,2.5
+      parent: 1653
+  - uid: 977
+    components:
+    - type: Transform
+      pos: 30.5,2.5
+      parent: 1653
+  - uid: 978
+    components:
+    - type: Transform
+      pos: 20.5,45.5
+      parent: 1653
+  - uid: 984
+    components:
+    - type: Transform
+      pos: 3.5,43.5
+      parent: 1653
+  - uid: 1029
+    components:
+    - type: Transform
+      pos: 28.5,21.5
+      parent: 1653
+  - uid: 1030
+    components:
+    - type: Transform
+      pos: 28.5,22.5
+      parent: 1653
+  - uid: 1031
+    components:
+    - type: Transform
+      pos: 25.5,18.5
+      parent: 1653
+  - uid: 1032
+    components:
+    - type: Transform
+      pos: 24.5,18.5
+      parent: 1653
+  - uid: 1033
+    components:
+    - type: Transform
+      pos: 25.5,22.5
+      parent: 1653
+  - uid: 1034
+    components:
+    - type: Transform
+      pos: 24.5,22.5
+      parent: 1653
+  - uid: 1035
+    components:
+    - type: Transform
+      pos: 24.5,21.5
+      parent: 1653
+  - uid: 1036
+    components:
+    - type: Transform
+      pos: 24.5,20.5
+      parent: 1653
+  - uid: 1037
+    components:
+    - type: Transform
+      pos: 24.5,19.5
+      parent: 1653
+  - uid: 1053
+    components:
+    - type: Transform
+      pos: 1.5,12.5
+      parent: 1653
+  - uid: 1126
+    components:
+    - type: Transform
+      pos: 8.5,12.5
+      parent: 1653
+  - uid: 1128
+    components:
+    - type: Transform
+      pos: 3.5,47.5
+      parent: 1653
+  - uid: 1129
+    components:
+    - type: Transform
+      pos: 3.5,45.5
+      parent: 1653
+  - uid: 1130
+    components:
+    - type: Transform
+      pos: 9.5,12.5
+      parent: 1653
+  - uid: 1132
+    components:
+    - type: Transform
+      pos: 1.5,45.5
+      parent: 1653
+  - uid: 1134
+    components:
+    - type: Transform
+      pos: 3.5,48.5
+      parent: 1653
+  - uid: 1135
+    components:
+    - type: Transform
+      pos: 8.5,13.5
+      parent: 1653
+  - uid: 1136
+    components:
+    - type: Transform
+      pos: 8.5,15.5
+      parent: 1653
+  - uid: 1137
+    components:
+    - type: Transform
+      pos: 8.5,16.5
+      parent: 1653
+  - uid: 1138
+    components:
+    - type: Transform
+      pos: 9.5,16.5
+      parent: 1653
+  - uid: 1139
+    components:
+    - type: Transform
+      pos: 10.5,16.5
+      parent: 1653
+  - uid: 1140
+    components:
+    - type: Transform
+      pos: 12.5,16.5
+      parent: 1653
+  - uid: 1141
+    components:
+    - type: Transform
+      pos: 13.5,16.5
+      parent: 1653
+  - uid: 1142
+    components:
+    - type: Transform
+      pos: 14.5,16.5
+      parent: 1653
+  - uid: 1143
+    components:
+    - type: Transform
+      pos: 14.5,15.5
+      parent: 1653
+  - uid: 1144
+    components:
+    - type: Transform
+      pos: 14.5,13.5
+      parent: 1653
+  - uid: 1145
+    components:
+    - type: Transform
+      pos: 14.5,12.5
+      parent: 1653
+  - uid: 1146
+    components:
+    - type: Transform
+      pos: 13.5,12.5
+      parent: 1653
+  - uid: 1147
+    components:
+    - type: Transform
+      pos: 12.5,12.5
+      parent: 1653
+  - uid: 1159
+    components:
+    - type: Transform
+      pos: 18.5,16.5
+      parent: 1653
+  - uid: 1160
+    components:
+    - type: Transform
+      pos: 20.5,16.5
+      parent: 1653
+  - uid: 1161
+    components:
+    - type: Transform
+      pos: 21.5,16.5
+      parent: 1653
+  - uid: 1162
+    components:
+    - type: Transform
+      pos: 22.5,16.5
+      parent: 1653
+  - uid: 1163
+    components:
+    - type: Transform
+      pos: 22.5,15.5
+      parent: 1653
+  - uid: 1164
+    components:
+    - type: Transform
+      pos: 22.5,13.5
+      parent: 1653
+  - uid: 1165
+    components:
+    - type: Transform
+      pos: 22.5,12.5
+      parent: 1653
+  - uid: 1166
+    components:
+    - type: Transform
+      pos: 21.5,12.5
+      parent: 1653
+  - uid: 1167
+    components:
+    - type: Transform
+      pos: 20.5,12.5
+      parent: 1653
+  - uid: 1202
+    components:
+    - type: Transform
+      pos: 0.5,45.5
+      parent: 1653
+  - uid: 1203
+    components:
+    - type: Transform
+      pos: 2.5,45.5
+      parent: 1653
+  - uid: 1206
+    components:
+    - type: Transform
+      pos: 3.5,42.5
+      parent: 1653
+  - uid: 1207
+    components:
+    - type: Transform
+      pos: 3.5,44.5
+      parent: 1653
+  - uid: 1225
+    components:
+    - type: Transform
+      pos: 41.5,1.5
+      parent: 1653
+  - uid: 1226
+    components:
+    - type: Transform
+      pos: 41.5,0.5
+      parent: 1653
+  - uid: 1227
+    components:
+    - type: Transform
+      pos: 41.5,3.5
+      parent: 1653
+  - uid: 1228
+    components:
+    - type: Transform
+      pos: 41.5,4.5
+      parent: 1653
+  - uid: 1229
+    components:
+    - type: Transform
+      pos: 49.5,3.5
+      parent: 1653
+  - uid: 1230
+    components:
+    - type: Transform
+      pos: 49.5,4.5
+      parent: 1653
+  - uid: 1231
+    components:
+    - type: Transform
+      pos: 49.5,1.5
+      parent: 1653
+  - uid: 1232
+    components:
+    - type: Transform
+      pos: 49.5,0.5
+      parent: 1653
+  - uid: 1299
+    components:
+    - type: Transform
+      pos: 35.5,13.5
+      parent: 1653
+  - uid: 1300
+    components:
+    - type: Transform
+      pos: 35.5,14.5
+      parent: 1653
+  - uid: 1303
+    components:
+    - type: Transform
+      pos: 35.5,16.5
+      parent: 1653
+  - uid: 1306
+    components:
+    - type: Transform
+      pos: 35.5,15.5
+      parent: 1653
+  - uid: 1310
+    components:
+    - type: Transform
+      pos: 35.5,12.5
+      parent: 1653
+  - uid: 1393
+    components:
+    - type: Transform
+      pos: 0.5,12.5
+      parent: 1653
+  - uid: 1397
+    components:
+    - type: Transform
+      pos: 19.5,45.5
+      parent: 1653
+  - uid: 1410
+    components:
+    - type: Transform
+      pos: 19.5,42.5
+      parent: 1653
+  - uid: 1411
+    components:
+    - type: Transform
+      pos: 16.5,45.5
+      parent: 1653
+  - uid: 1412
+    components:
+    - type: Transform
+      pos: 21.5,45.5
+      parent: 1653
+  - uid: 1439
+    components:
+    - type: Transform
+      pos: 19.5,43.5
+      parent: 1653
+  - uid: 1440
+    components:
+    - type: Transform
+      pos: 19.5,44.5
+      parent: 1653
+  - uid: 1441
+    components:
+    - type: Transform
+      pos: 19.5,46.5
+      parent: 1653
+  - uid: 1446
+    components:
+    - type: Transform
+      pos: 19.5,47.5
+      parent: 1653
+  - uid: 1447
+    components:
+    - type: Transform
+      pos: 22.5,45.5
+      parent: 1653
+  - uid: 1457
+    components:
+    - type: Transform
+      pos: 18.5,45.5
+      parent: 1653
+  - uid: 1461
+    components:
+    - type: Transform
+      pos: 19.5,48.5
+      parent: 1653
+  - uid: 1462
+    components:
+    - type: Transform
+      pos: 1.5,16.5
+      parent: 1653
+  - uid: 1510
+    components:
+    - type: Transform
+      pos: 30.5,9.5
+      parent: 1653
+  - uid: 1511
+    components:
+    - type: Transform
+      pos: 31.5,7.5
+      parent: 1653
+  - uid: 1512
+    components:
+    - type: Transform
+      pos: 31.5,6.5
+      parent: 1653
+  - uid: 1513
+    components:
+    - type: Transform
+      pos: 30.5,6.5
+      parent: 1653
+  - uid: 1514
+    components:
+    - type: Transform
+      pos: 29.5,6.5
+      parent: 1653
+  - uid: 1515
+    components:
+    - type: Transform
+      pos: 28.5,6.5
+      parent: 1653
+  - uid: 1516
+    components:
+    - type: Transform
+      pos: 27.5,6.5
+      parent: 1653
+  - uid: 1517
+    components:
+    - type: Transform
+      pos: 27.5,7.5
+      parent: 1653
+  - uid: 1569
+    components:
+    - type: Transform
+      pos: 10.5,38.5
+      parent: 1653
+  - uid: 1570
+    components:
+    - type: Transform
+      pos: 10.5,40.5
+      parent: 1653
+  - uid: 1571
+    components:
+    - type: Transform
+      pos: 12.5,40.5
+      parent: 1653
+  - uid: 1572
+    components:
+    - type: Transform
+      pos: 9.5,38.5
+      parent: 1653
+  - uid: 1573
+    components:
+    - type: Transform
+      pos: 13.5,38.5
+      parent: 1653
+  - uid: 1702
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 1653
+  - uid: 1708
+    components:
+    - type: Transform
+      pos: 8.5,2.5
+      parent: 1653
+  - uid: 1709
+    components:
+    - type: Transform
+      pos: 12.5,2.5
+      parent: 1653
+  - uid: 1715
+    components:
+    - type: Transform
+      pos: 3.5,46.5
+      parent: 1653
+  - uid: 1717
+    components:
+    - type: Transform
+      pos: 4.5,45.5
+      parent: 1653
+  - uid: 1718
+    components:
+    - type: Transform
+      pos: 5.5,45.5
+      parent: 1653
+  - uid: 1719
+    components:
+    - type: Transform
+      pos: 6.5,45.5
+      parent: 1653
+  - uid: 1726
+    components:
+    - type: Transform
+      pos: 2.5,12.5
+      parent: 1653
+  - uid: 1735
+    components:
+    - type: Transform
+      pos: 24.5,14.5
+      parent: 1653
+  - uid: 1736
+    components:
+    - type: Transform
+      pos: 25.5,14.5
+      parent: 1653
+  - uid: 1737
+    components:
+    - type: Transform
+      pos: 30.5,14.5
+      parent: 1653
+  - uid: 1738
+    components:
+    - type: Transform
+      pos: 29.5,14.5
+      parent: 1653
+  - uid: 1739
+    components:
+    - type: Transform
+      pos: 29.5,15.5
+      parent: 1653
+  - uid: 1740
+    components:
+    - type: Transform
+      pos: 29.5,16.5
+      parent: 1653
+  - uid: 1741
+    components:
+    - type: Transform
+      pos: 28.5,16.5
+      parent: 1653
+  - uid: 1742
+    components:
+    - type: Transform
+      pos: 27.5,16.5
+      parent: 1653
+  - uid: 1743
+    components:
+    - type: Transform
+      pos: 26.5,16.5
+      parent: 1653
+  - uid: 1744
+    components:
+    - type: Transform
+      pos: 25.5,16.5
+      parent: 1653
+  - uid: 1745
+    components:
+    - type: Transform
+      pos: 25.5,15.5
+      parent: 1653
+  - uid: 1746
+    components:
+    - type: Transform
+      pos: 25.5,13.5
+      parent: 1653
+  - uid: 1747
+    components:
+    - type: Transform
+      pos: 25.5,12.5
+      parent: 1653
+  - uid: 1748
+    components:
+    - type: Transform
+      pos: 26.5,12.5
+      parent: 1653
+  - uid: 1749
+    components:
+    - type: Transform
+      pos: 27.5,12.5
+      parent: 1653
+  - uid: 1750
+    components:
+    - type: Transform
+      pos: 28.5,12.5
+      parent: 1653
+  - uid: 1751
+    components:
+    - type: Transform
+      pos: 29.5,12.5
+      parent: 1653
+  - uid: 1752
+    components:
+    - type: Transform
+      pos: 29.5,13.5
+      parent: 1653
+  - uid: 1875
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 1653
+  - uid: 1876
+    components:
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 1653
+  - uid: 1877
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 1653
+  - uid: 1878
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1653
+  - uid: 1879
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1653
+  - uid: 1880
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1653
+  - uid: 1881
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 1653
+  - uid: 1882
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 1653
+  - uid: 1888
+    components:
+    - type: Transform
+      pos: 13.5,2.5
+      parent: 1653
+  - uid: 1889
+    components:
+    - type: Transform
+      pos: 14.5,2.5
+      parent: 1653
+  - uid: 1890
+    components:
+    - type: Transform
+      pos: 15.5,2.5
+      parent: 1653
+  - uid: 1891
+    components:
+    - type: Transform
+      pos: 16.5,2.5
+      parent: 1653
+  - uid: 1892
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 1653
+  - uid: 1893
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 1653
+  - uid: 1894
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 1653
+  - uid: 1895
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 1653
+  - uid: 1961
+    components:
+    - type: Transform
+      pos: 25.5,28.5
+      parent: 1653
+  - uid: 1962
+    components:
+    - type: Transform
+      pos: 25.5,27.5
+      parent: 1653
+  - uid: 1963
+    components:
+    - type: Transform
+      pos: 25.5,26.5
+      parent: 1653
+  - uid: 1964
+    components:
+    - type: Transform
+      pos: 25.5,25.5
+      parent: 1653
+  - uid: 1965
+    components:
+    - type: Transform
+      pos: 25.5,24.5
+      parent: 1653
+  - uid: 1966
+    components:
+    - type: Transform
+      pos: 24.5,26.5
+      parent: 1653
+  - uid: 1967
+    components:
+    - type: Transform
+      pos: 26.5,26.5
+      parent: 1653
+  - uid: 1968
+    components:
+    - type: Transform
+      pos: 48.5,39.5
+      parent: 1653
+  - uid: 1969
+    components:
+    - type: Transform
+      pos: 49.5,39.5
+      parent: 1653
+  - uid: 1970
+    components:
+    - type: Transform
+      pos: 50.5,39.5
+      parent: 1653
+  - uid: 1971
+    components:
+    - type: Transform
+      pos: 51.5,39.5
+      parent: 1653
+  - uid: 1972
+    components:
+    - type: Transform
+      pos: 52.5,39.5
+      parent: 1653
+  - uid: 1973
+    components:
+    - type: Transform
+      pos: 53.5,39.5
+      parent: 1653
+  - uid: 1974
+    components:
+    - type: Transform
+      pos: 54.5,39.5
+      parent: 1653
+  - uid: 1975
+    components:
+    - type: Transform
+      pos: 51.5,40.5
+      parent: 1653
+  - uid: 1976
+    components:
+    - type: Transform
+      pos: 51.5,38.5
+      parent: 1653
+  - uid: 2031
+    components:
+    - type: Transform
+      pos: 29.5,24.5
+      parent: 1653
+  - uid: 2032
+    components:
+    - type: Transform
+      pos: 29.5,25.5
+      parent: 1653
+  - uid: 2033
+    components:
+    - type: Transform
+      pos: 29.5,26.5
+      parent: 1653
+  - uid: 2034
+    components:
+    - type: Transform
+      pos: 29.5,27.5
+      parent: 1653
+  - uid: 2035
+    components:
+    - type: Transform
+      pos: 29.5,28.5
+      parent: 1653
+  - uid: 2036
+    components:
+    - type: Transform
+      pos: 28.5,26.5
+      parent: 1653
+  - uid: 2037
+    components:
+    - type: Transform
+      pos: 30.5,26.5
+      parent: 1653
+  - uid: 2038
+    components:
+    - type: Transform
+      pos: 33.5,24.5
+      parent: 1653
+  - uid: 2039
+    components:
+    - type: Transform
+      pos: 33.5,25.5
+      parent: 1653
+  - uid: 2040
+    components:
+    - type: Transform
+      pos: 33.5,26.5
+      parent: 1653
+  - uid: 2041
+    components:
+    - type: Transform
+      pos: 33.5,27.5
+      parent: 1653
+  - uid: 2042
+    components:
+    - type: Transform
+      pos: 33.5,28.5
+      parent: 1653
+  - uid: 2043
+    components:
+    - type: Transform
+      pos: 32.5,26.5
+      parent: 1653
+  - uid: 2044
+    components:
+    - type: Transform
+      pos: 34.5,26.5
+      parent: 1653
+  - uid: 2045
+    components:
+    - type: Transform
+      pos: 36.5,8.5
+      parent: 1653
+  - uid: 2046
+    components:
+    - type: Transform
+      pos: 37.5,8.5
+      parent: 1653
+  - uid: 2047
+    components:
+    - type: Transform
+      pos: 38.5,8.5
+      parent: 1653
+  - uid: 2048
+    components:
+    - type: Transform
+      pos: 39.5,8.5
+      parent: 1653
+  - uid: 2049
+    components:
+    - type: Transform
+      pos: 40.5,8.5
+      parent: 1653
+  - uid: 2050
+    components:
+    - type: Transform
+      pos: 41.5,8.5
+      parent: 1653
+  - uid: 2051
+    components:
+    - type: Transform
+      pos: 42.5,8.5
+      parent: 1653
+  - uid: 2052
+    components:
+    - type: Transform
+      pos: 43.5,8.5
+      parent: 1653
+  - uid: 2053
+    components:
+    - type: Transform
+      pos: 44.5,8.5
+      parent: 1653
+  - uid: 2054
+    components:
+    - type: Transform
+      pos: 45.5,8.5
+      parent: 1653
+  - uid: 2055
+    components:
+    - type: Transform
+      pos: 46.5,8.5
+      parent: 1653
+  - uid: 2056
+    components:
+    - type: Transform
+      pos: 41.5,9.5
+      parent: 1653
+  - uid: 2057
+    components:
+    - type: Transform
+      pos: 41.5,10.5
+      parent: 1653
+  - uid: 2058
+    components:
+    - type: Transform
+      pos: 41.5,7.5
+      parent: 1653
+  - uid: 2059
+    components:
+    - type: Transform
+      pos: 41.5,6.5
+      parent: 1653
+  - uid: 2188
+    components:
+    - type: Transform
+      pos: 14.5,0.5
+      parent: 1653
+  - uid: 2189
+    components:
+    - type: Transform
+      pos: 14.5,1.5
+      parent: 1653
+  - uid: 2190
+    components:
+    - type: Transform
+      pos: 14.5,3.5
+      parent: 1653
+  - uid: 2191
+    components:
+    - type: Transform
+      pos: 14.5,4.5
+      parent: 1653
+  - uid: 2192
+    components:
+    - type: Transform
+      pos: 8.5,3.5
+      parent: 1653
+  - uid: 2193
+    components:
+    - type: Transform
+      pos: 8.5,4.5
+      parent: 1653
+  - uid: 2194
+    components:
+    - type: Transform
+      pos: 8.5,1.5
+      parent: 1653
+  - uid: 2195
+    components:
+    - type: Transform
+      pos: 8.5,0.5
+      parent: 1653
+- proto: CableApcStack
+  entities:
+  - uid: 824
+    components:
+    - type: Transform
+      pos: 6.439933,35.56771
+      parent: 1653
+  - uid: 1541
+    components:
+    - type: Transform
+      pos: 27.694578,8.767019
+      parent: 1653
+- proto: CableApcStack10
+  entities:
+  - uid: 171
+    components:
+    - type: Transform
+      pos: 4.338315,25.664474
+      parent: 1653
+  - uid: 733
+    components:
+    - type: Transform
+      pos: 4.557065,25.539474
+      parent: 1653
+  - uid: 814
+    components:
+    - type: Transform
+      pos: 6.47894,27.64885
+      parent: 1653
+  - uid: 817
+    components:
+    - type: Transform
+      pos: 6.619565,27.508224
+      parent: 1653
+- proto: CableHV
+  entities:
+  - uid: 544
+    components:
+    - type: Transform
+      pos: 11.5,46.5
+      parent: 1653
+  - uid: 545
+    components:
+    - type: Transform
+      pos: 10.5,46.5
+      parent: 1653
+  - uid: 546
+    components:
+    - type: Transform
+      pos: 9.5,46.5
+      parent: 1653
+  - uid: 547
+    components:
+    - type: Transform
+      pos: 12.5,46.5
+      parent: 1653
+  - uid: 548
+    components:
+    - type: Transform
+      pos: 13.5,46.5
+      parent: 1653
+  - uid: 549
+    components:
+    - type: Transform
+      pos: 13.5,47.5
+      parent: 1653
+  - uid: 550
+    components:
+    - type: Transform
+      pos: 11.5,47.5
+      parent: 1653
+  - uid: 551
+    components:
+    - type: Transform
+      pos: 9.5,47.5
+      parent: 1653
+  - uid: 552
+    components:
+    - type: Transform
+      pos: 11.5,45.5
+      parent: 1653
+  - uid: 553
+    components:
+    - type: Transform
+      pos: 11.5,44.5
+      parent: 1653
+  - uid: 554
+    components:
+    - type: Transform
+      pos: 11.5,43.5
+      parent: 1653
+  - uid: 555
+    components:
+    - type: Transform
+      pos: 11.5,42.5
+      parent: 1653
+  - uid: 556
+    components:
+    - type: Transform
+      pos: 10.5,42.5
+      parent: 1653
+  - uid: 557
+    components:
+    - type: Transform
+      pos: 9.5,42.5
+      parent: 1653
+  - uid: 558
+    components:
+    - type: Transform
+      pos: 8.5,42.5
+      parent: 1653
+  - uid: 1014
+    components:
+    - type: Transform
+      pos: 25.5,19.5
+      parent: 1653
+  - uid: 1015
+    components:
+    - type: Transform
+      pos: 25.5,20.5
+      parent: 1653
+  - uid: 1016
+    components:
+    - type: Transform
+      pos: 25.5,21.5
+      parent: 1653
+  - uid: 1017
+    components:
+    - type: Transform
+      pos: 26.5,20.5
+      parent: 1653
+  - uid: 1018
+    components:
+    - type: Transform
+      pos: 27.5,20.5
+      parent: 1653
+  - uid: 1019
+    components:
+    - type: Transform
+      pos: 28.5,20.5
+      parent: 1653
+  - uid: 1020
+    components:
+    - type: Transform
+      pos: 28.5,19.5
+      parent: 1653
+  - uid: 1021
+    components:
+    - type: Transform
+      pos: 28.5,18.5
+      parent: 1653
+  - uid: 1153
+    components:
+    - type: Transform
+      pos: 27.5,19.5
+      parent: 1653
+  - uid: 1200
+    components:
+    - type: Transform
+      pos: 27.5,21.5
+      parent: 1653
+  - uid: 1488
+    components:
+    - type: Transform
+      pos: 28.5,8.5
+      parent: 1653
+  - uid: 1489
+    components:
+    - type: Transform
+      pos: 29.5,8.5
+      parent: 1653
+  - uid: 1490
+    components:
+    - type: Transform
+      pos: 30.5,8.5
+      parent: 1653
+  - uid: 1491
+    components:
+    - type: Transform
+      pos: 28.5,7.5
+      parent: 1653
+  - uid: 1492
+    components:
+    - type: Transform
+      pos: 29.5,7.5
+      parent: 1653
+  - uid: 1493
+    components:
+    - type: Transform
+      pos: 30.5,7.5
+      parent: 1653
+  - uid: 1494
+    components:
+    - type: Transform
+      pos: 27.5,7.5
+      parent: 1653
+  - uid: 1495
+    components:
+    - type: Transform
+      pos: 26.5,7.5
+      parent: 1653
+  - uid: 1496
+    components:
+    - type: Transform
+      pos: 31.5,7.5
+      parent: 1653
+  - uid: 1497
+    components:
+    - type: Transform
+      pos: 32.5,7.5
+      parent: 1653
+  - uid: 1498
+    components:
+    - type: Transform
+      pos: 33.5,7.5
+      parent: 1653
+  - uid: 1499
+    components:
+    - type: Transform
+      pos: 33.5,8.5
+      parent: 1653
+  - uid: 1500
+    components:
+    - type: Transform
+      pos: 33.5,9.5
+      parent: 1653
+  - uid: 1502
+    components:
+    - type: Transform
+      pos: 29.5,9.5
+      parent: 1653
+  - uid: 1503
+    components:
+    - type: Transform
+      pos: 25.5,7.5
+      parent: 1653
+  - uid: 1504
+    components:
+    - type: Transform
+      pos: 25.5,8.5
+      parent: 1653
+  - uid: 1505
+    components:
+    - type: Transform
+      pos: 25.5,9.5
+      parent: 1653
+- proto: CableHVStack
+  entities:
+  - uid: 1543
+    components:
+    - type: Transform
+      pos: 27.850828,8.329519
+      parent: 1653
+- proto: CableMV
+  entities:
+  - uid: 573
+    components:
+    - type: Transform
+      pos: 8.5,42.5
+      parent: 1653
+  - uid: 574
+    components:
+    - type: Transform
+      pos: 9.5,42.5
+      parent: 1653
+  - uid: 575
+    components:
+    - type: Transform
+      pos: 10.5,42.5
+      parent: 1653
+  - uid: 576
+    components:
+    - type: Transform
+      pos: 11.5,42.5
+      parent: 1653
+  - uid: 577
+    components:
+    - type: Transform
+      pos: 12.5,42.5
+      parent: 1653
+  - uid: 578
+    components:
+    - type: Transform
+      pos: 13.5,42.5
+      parent: 1653
+  - uid: 579
+    components:
+    - type: Transform
+      pos: 13.5,43.5
+      parent: 1653
+  - uid: 1024
+    components:
+    - type: Transform
+      pos: 28.5,18.5
+      parent: 1653
+  - uid: 1025
+    components:
+    - type: Transform
+      pos: 28.5,19.5
+      parent: 1653
+  - uid: 1026
+    components:
+    - type: Transform
+      pos: 28.5,20.5
+      parent: 1653
+  - uid: 1027
+    components:
+    - type: Transform
+      pos: 28.5,21.5
+      parent: 1653
+  - uid: 1028
+    components:
+    - type: Transform
+      pos: 28.5,22.5
+      parent: 1653
+  - uid: 1508
+    components:
+    - type: Transform
+      pos: 29.5,9.5
+      parent: 1653
+  - uid: 1509
+    components:
+    - type: Transform
+      pos: 30.5,9.5
+      parent: 1653
+- proto: CableMVStack
+  entities:
+  - uid: 1542
+    components:
+    - type: Transform
+      pos: 27.819578,8.595144
+      parent: 1653
+- proto: CableTerminal
+  entities:
+  - uid: 543
+    components:
+    - type: Transform
+      pos: 11.5,46.5
+      parent: 1653
+  - uid: 1038
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,20.5
+      parent: 1653
+  - uid: 1518
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,7.5
+      parent: 1653
+  - uid: 1519
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,7.5
+      parent: 1653
+  - uid: 1520
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,7.5
+      parent: 1653
+- proto: CannabisSeeds
+  entities:
+  - uid: 905
+    components:
+    - type: Transform
+      pos: 4.5,18.5
+      parent: 1653
+- proto: CarbonDioxideCanister
+  entities:
+  - uid: 806
+    components:
+    - type: Transform
+      pos: 16.5,25.5
+      parent: 1653
+- proto: CarpetGreen
+  entities:
+  - uid: 271
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,30.5
+      parent: 1653
+  - uid: 272
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,30.5
+      parent: 1653
+  - uid: 273
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,30.5
+      parent: 1653
+  - uid: 307
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,31.5
+      parent: 1653
+  - uid: 308
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,30.5
+      parent: 1653
+  - uid: 309
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,32.5
+      parent: 1653
+  - uid: 310
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,30.5
+      parent: 1653
+  - uid: 311
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,30.5
+      parent: 1653
+  - uid: 312
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,30.5
+      parent: 1653
+  - uid: 314
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,31.5
+      parent: 1653
+  - uid: 614
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,6.5
+      parent: 1653
+  - uid: 617
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,7.5
+      parent: 1653
+  - uid: 618
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,6.5
+      parent: 1653
+  - uid: 620
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,7.5
+      parent: 1653
+  - uid: 621
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,7.5
+      parent: 1653
+  - uid: 622
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,7.5
+      parent: 1653
+  - uid: 623
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,6.5
+      parent: 1653
+  - uid: 628
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,30.5
+      parent: 1653
+  - uid: 643
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,32.5
+      parent: 1653
+  - uid: 674
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,6.5
+      parent: 1653
+  - uid: 1244
+    components:
+    - type: Transform
+      pos: 49.5,4.5
+      parent: 1653
+  - uid: 1827
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,6.5
+      parent: 1653
+  - uid: 1831
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,7.5
+      parent: 1653
+- proto: CarrotSeeds
+  entities:
+  - uid: 1382
+    components:
+    - type: Transform
+      pos: 16.641748,8.598457
+      parent: 1653
+- proto: Catwalk
+  entities:
+  - uid: 560
+    components:
+    - type: Transform
+      pos: 10.5,45.5
+      parent: 1653
+  - uid: 561
+    components:
+    - type: Transform
+      pos: 10.5,46.5
+      parent: 1653
+  - uid: 562
+    components:
+    - type: Transform
+      pos: 11.5,46.5
+      parent: 1653
+  - uid: 563
+    components:
+    - type: Transform
+      pos: 12.5,46.5
+      parent: 1653
+  - uid: 564
+    components:
+    - type: Transform
+      pos: 12.5,45.5
+      parent: 1653
+  - uid: 565
+    components:
+    - type: Transform
+      pos: 11.5,45.5
+      parent: 1653
+  - uid: 1039
+    components:
+    - type: Transform
+      pos: 25.5,19.5
+      parent: 1653
+  - uid: 1040
+    components:
+    - type: Transform
+      pos: 26.5,19.5
+      parent: 1653
+  - uid: 1041
+    components:
+    - type: Transform
+      pos: 27.5,19.5
+      parent: 1653
+  - uid: 1042
+    components:
+    - type: Transform
+      pos: 27.5,20.5
+      parent: 1653
+  - uid: 1043
+    components:
+    - type: Transform
+      pos: 27.5,21.5
+      parent: 1653
+  - uid: 1044
+    components:
+    - type: Transform
+      pos: 26.5,21.5
+      parent: 1653
+  - uid: 1045
+    components:
+    - type: Transform
+      pos: 25.5,21.5
+      parent: 1653
+  - uid: 1046
+    components:
+    - type: Transform
+      pos: 25.5,20.5
+      parent: 1653
+  - uid: 1062
+    components:
+    - type: Transform
+      pos: 27.5,14.5
+      parent: 1653
+  - uid: 1521
+    components:
+    - type: Transform
+      pos: 28.5,7.5
+      parent: 1653
+  - uid: 1522
+    components:
+    - type: Transform
+      pos: 29.5,7.5
+      parent: 1653
+  - uid: 1523
+    components:
+    - type: Transform
+      pos: 30.5,7.5
+      parent: 1653
+  - uid: 1927
+    components:
+    - type: Transform
+      pos: 52.5,39.5
+      parent: 1653
+  - uid: 1928
+    components:
+    - type: Transform
+      pos: 54.5,39.5
+      parent: 1653
+  - uid: 1929
+    components:
+    - type: Transform
+      pos: 50.5,38.5
+      parent: 1653
+  - uid: 1930
+    components:
+    - type: Transform
+      pos: 53.5,39.5
+      parent: 1653
+  - uid: 1931
+    components:
+    - type: Transform
+      pos: 49.5,39.5
+      parent: 1653
+  - uid: 1932
+    components:
+    - type: Transform
+      pos: 50.5,39.5
+      parent: 1653
+  - uid: 1933
+    components:
+    - type: Transform
+      pos: 52.5,38.5
+      parent: 1653
+  - uid: 1934
+    components:
+    - type: Transform
+      pos: 51.5,38.5
+      parent: 1653
+  - uid: 1935
+    components:
+    - type: Transform
+      pos: 48.5,39.5
+      parent: 1653
+- proto: Chair
+  entities:
+  - uid: 388
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,1.5
+      parent: 1653
+  - uid: 389
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,0.5
+      parent: 1653
+  - uid: 390
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,2.5
+      parent: 1653
+  - uid: 392
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,2.5
+      parent: 1653
+  - uid: 393
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 1653
+  - uid: 394
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,2.5
+      parent: 1653
+  - uid: 397
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,3.5
+      parent: 1653
+  - uid: 398
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,3.5
+      parent: 1653
+  - uid: 401
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,2.5
+      parent: 1653
+  - uid: 402
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,2.5
+      parent: 1653
+  - uid: 404
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,0.5
+      parent: 1653
+  - uid: 458
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,0.5
+      parent: 1653
+  - uid: 460
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,2.5
+      parent: 1653
+  - uid: 462
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,4.5
+      parent: 1653
+  - uid: 464
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,0.5
+      parent: 1653
+  - uid: 496
+    components:
+    - type: Transform
+      pos: 2.5,40.5
+      parent: 1653
+  - uid: 497
+    components:
+    - type: Transform
+      pos: 4.5,40.5
+      parent: 1653
+  - uid: 502
+    components:
+    - type: Transform
+      pos: 17.5,40.5
+      parent: 1653
+  - uid: 504
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,39.5
+      parent: 1653
+  - uid: 505
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,39.5
+      parent: 1653
+  - uid: 511
+    components:
+    - type: Transform
+      pos: 18.5,40.5
+      parent: 1653
+  - uid: 518
+    components:
+    - type: Transform
+      pos: 25.5,40.5
+      parent: 1653
+  - uid: 519
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,38.5
+      parent: 1653
+  - uid: 538
+    components:
+    - type: Transform
+      pos: 44.5,40.5
+      parent: 1653
+  - uid: 630
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,35.5
+      parent: 1653
+  - uid: 638
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,35.5
+      parent: 1653
+  - uid: 682
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 26.5,34.5
+      parent: 1653
+  - uid: 683
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,34.5
+      parent: 1653
+  - uid: 684
+    components:
+    - type: Transform
+      pos: 32.5,36.5
+      parent: 1653
+  - uid: 779
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,32.5
+      parent: 1653
+  - uid: 780
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,30.5
+      parent: 1653
+  - uid: 783
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,32.5
+      parent: 1653
+  - uid: 784
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,30.5
+      parent: 1653
+  - uid: 1004
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,21.5
+      parent: 1653
+  - uid: 1005
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,19.5
+      parent: 1653
+  - uid: 1008
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,19.5
+      parent: 1653
+  - uid: 1009
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,21.5
+      parent: 1653
+  - uid: 1264
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,0.5
+      parent: 1653
+  - uid: 1265
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,0.5
+      parent: 1653
+  - uid: 1266
+    components:
+    - type: Transform
+      pos: 37.5,1.5
+      parent: 1653
+  - uid: 1267
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 52.5,4.5
+      parent: 1653
+  - uid: 1268
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,4.5
+      parent: 1653
+  - uid: 1295
+    components:
+    - type: Transform
+      pos: 15.5,4.5
+      parent: 1653
+  - uid: 1298
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,1.5
+      parent: 1653
+  - uid: 1945
+    components:
+    - type: Transform
+      pos: 49.5,40.5
+      parent: 1653
+  - uid: 1946
+    components:
+    - type: Transform
+      pos: 48.5,40.5
+      parent: 1653
+- proto: ChairFolding
+  entities:
+  - uid: 929
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,22.5
+      parent: 1653
+  - uid: 931
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,21.5
+      parent: 1653
+- proto: ChairOfficeDark
+  entities:
+  - uid: 146
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,47.5
+      parent: 1653
+  - uid: 482
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 36.5,14.5
+      parent: 1653
+  - uid: 1071
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,32.5
+      parent: 1653
+  - uid: 1311
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,46.5
+      parent: 1653
+  - uid: 1315
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 34.5,14.5
+      parent: 1653
+  - uid: 1713
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,44.5
+      parent: 1653
+- proto: ChairOfficeLight
+  entities:
+  - uid: 317
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,19.5
+      parent: 1653
+  - uid: 981
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 30.5,21.5
+      parent: 1653
+  - uid: 1455
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,3.5
+      parent: 1653
+  - uid: 1467
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,3.5
+      parent: 1653
+  - uid: 1479
+    components:
+    - type: Transform
+      pos: 22.5,1.5
+      parent: 1653
+  - uid: 1623
+    components:
+    - type: Transform
+      pos: 41.5,13.5
+      parent: 1653
+- proto: ChairWood
+  entities:
+  - uid: 1271
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,1.5
+      parent: 1653
+  - uid: 1272
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 44.5,1.5
+      parent: 1653
+- proto: chem_master
+  entities:
+  - uid: 1454
+    components:
+    - type: Transform
+      pos: 29.5,4.5
+      parent: 1653
+- proto: ChessBoard
+  entities:
+  - uid: 1273
+    components:
+    - type: Transform
+      pos: 45.521095,1.5328176
+      parent: 1653
+- proto: CloningPod
+  entities:
+  - uid: 651
+    components:
+    - type: Transform
+      pos: 27.5,14.5
+      parent: 1653
+- proto: ClosetEmergencyFilledRandom
+  entities:
+  - uid: 899
+    components:
+    - type: Transform
+      pos: 4.5,22.5
+      parent: 1653
+- proto: ClosetFireFilled
+  entities:
+  - uid: 747
+    components:
+    - type: Transform
+      pos: 1.5,40.5
+      parent: 1653
+  - uid: 900
+    components:
+    - type: Transform
+      pos: 3.5,22.5
+      parent: 1653
+- proto: ClosetL3ScienceFilled
+  entities:
+  - uid: 1285
+    components:
+    - type: Transform
+      pos: 53.5,0.5
+      parent: 1653
+  - uid: 1286
+    components:
+    - type: Transform
+      pos: 54.5,0.5
+      parent: 1653
+- proto: ClosetMaintenanceFilledRandom
+  entities:
+  - uid: 745
+    components:
+    - type: Transform
+      pos: 14.5,32.5
+      parent: 1653
+  - uid: 948
+    components:
+    - type: Transform
+      pos: 5.5,7.5
+      parent: 1653
+  - uid: 954
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 1653
+  - uid: 955
+    components:
+    - type: Transform
+      pos: 0.5,6.5
+      parent: 1653
+  - uid: 1284
+    components:
+    - type: Transform
+      pos: 52.5,0.5
+      parent: 1653
+- proto: ClosetSteelBase
+  entities:
+  - uid: 2010
+    components:
+    - type: Transform
+      pos: 30.5,25.5
+      parent: 1653
+  - uid: 2011
+    components:
+    - type: Transform
+      pos: 28.5,26.5
+      parent: 1653
+  - uid: 2012
+    components:
+    - type: Transform
+      pos: 28.5,27.5
+      parent: 1653
+- proto: ClosetToolFilled
+  entities:
+  - uid: 584
+    components:
+    - type: Transform
+      pos: 14.5,42.5
+      parent: 1653
+- proto: ClothingBackpackDuffelHydroponics
+  entities:
+  - uid: 2023
+    components:
+    - type: Transform
+      pos: 32.47305,27.527536
+      parent: 1653
+- proto: ClothingEyesGlassesMeson
+  entities:
+  - uid: 591
+    components:
+    - type: Transform
+      pos: 10.480986,45.607067
+      parent: 1653
+- proto: ClothingEyesGlassesThermal
+  entities:
+  - uid: 800
+    components:
+    - type: Transform
+      pos: 6.5116234,25.568321
+      parent: 1653
+- proto: ClothingHandsGlovesLeather
+  entities:
+  - uid: 719
+    components:
+    - type: Transform
+      pos: 12.432887,24.48849
+      parent: 1653
+- proto: ClothingHeadHatHoodBioVirology
+  entities:
+  - uid: 2062
+    components:
+    - type: Transform
+      pos: 34.71194,26.670929
+      parent: 1653
+  - uid: 2063
+    components:
+    - type: Transform
+      pos: 34.321316,26.655304
+      parent: 1653
+- proto: ClothingHeadHatWeldingMaskFlame
+  entities:
+  - uid: 661
+    components:
+    - type: Transform
+      pos: 21.418028,36.658634
+      parent: 1653
+- proto: ClothingHeadHatWeldingMaskFlameBlue
+  entities:
+  - uid: 662
+    components:
+    - type: Transform
+      pos: 21.605528,36.471134
+      parent: 1653
+- proto: ClothingMaskBandBotany
+  entities:
+  - uid: 732
+    components:
+    - type: Transform
+      pos: 12.423744,24.51739
+      parent: 1653
+- proto: ClothingOuterApronBotanist
+  entities:
+  - uid: 656
+    components:
+    - type: Transform
+      pos: 33.50576,36.565666
+      parent: 1653
+- proto: ClothingOuterBioVirology
+  entities:
+  - uid: 2064
+    components:
+    - type: Transform
+      pos: 34.321316,26.514679
+      parent: 1653
+  - uid: 2065
+    components:
+    - type: Transform
+      pos: 34.696316,26.499054
+      parent: 1653
+- proto: ClothingOuterWinterHydro
+  entities:
+  - uid: 1077
+    components:
+    - type: Transform
+      pos: 7.484151,6.5991178
+      parent: 1653
+  - uid: 2060
+    components:
+    - type: Transform
+      pos: 32.374146,26.80749
+      parent: 1653
+- proto: ClothingShoeSlippersDuck
+  entities:
+  - uid: 2030
+    components:
+    - type: Transform
+      pos: 13.532652,9.379251
+      parent: 1653
+- proto: ClothingUniformJumpsuitHydroponics
+  entities:
+  - uid: 2061
+    components:
+    - type: Transform
+      pos: 32.54602,26.604364
+      parent: 1653
+- proto: CocoaSeeds
+  entities:
+  - uid: 829
+    components:
+    - type: Transform
+      pos: 1.5350559,26.594387
+      parent: 1653
+- proto: ComfyChair
+  entities:
+  - uid: 268
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,30.5
+      parent: 1653
+  - uid: 269
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,30.5
+      parent: 1653
+  - uid: 313
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,30.5
+      parent: 1653
+  - uid: 619
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,6.5
+      parent: 1653
+  - uid: 675
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,8.5
+      parent: 1653
+  - uid: 935
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,18.5
+      parent: 1653
+  - uid: 937
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,21.5
+      parent: 1653
+  - uid: 938
+    components:
+    - type: Transform
+      pos: 13.5,22.5
+      parent: 1653
+  - uid: 939
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,19.5
+      parent: 1653
+  - uid: 982
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,30.5
+      parent: 1653
+  - uid: 987
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,7.5
+      parent: 1653
+  - uid: 988
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,6.5
+      parent: 1653
+  - uid: 989
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,6.5
+      parent: 1653
+  - uid: 1247
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 48.5,0.5
+      parent: 1653
+  - uid: 1568
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,8.5
+      parent: 1653
+  - uid: 1698
+    components:
+    - type: Transform
+      pos: 25.5,32.5
+      parent: 1653
+- proto: ComputerBroken
+  entities:
+  - uid: 143
+    components:
+    - type: Transform
+      pos: 22.5,48.5
+      parent: 1653
+  - uid: 801
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,26.5
+      parent: 1653
+  - uid: 1732
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,15.5
+      parent: 1653
+- proto: ComputerCrewMonitoring
+  entities:
+  - uid: 2215
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,22.5
+      parent: 1653
+- proto: ComputerFrame
+  entities:
+  - uid: 825
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 29.5,13.5
+      parent: 1653
+- proto: CrateFilledSpawner
+  entities:
+  - uid: 874
+    components:
+    - type: Transform
+      pos: 22.5,34.5
+      parent: 1653
+- proto: CrateHydroponicsSeeds
+  entities:
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 22.5,27.5
+      parent: 1653
+- proto: CrateHydroponicsTools
+  entities:
+  - uid: 1958
+    components:
+    - type: Transform
+      pos: 24.5,28.5
+      parent: 1653
+- proto: CrateHydroSecure
+  entities:
+  - uid: 599
+    components:
+    - type: Transform
+      pos: 26.5,0.5
+      parent: 1653
+- proto: CrystalBlue
+  entities:
+  - uid: 194
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,30.5
+      parent: 1653
+  - uid: 197
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,32.5
+      parent: 1653
+  - uid: 316
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,31.5
+      parent: 1653
+  - uid: 1668
+    components:
+    - type: Transform
+      pos: 13.5,38.5
+      parent: 1653
+- proto: CrystalCyan
+  entities:
+  - uid: 120
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,36.5
+      parent: 1653
+  - uid: 193
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,31.5
+      parent: 1653
+  - uid: 198
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 26.5,31.5
+      parent: 1653
+  - uid: 818
+    components:
+    - type: Transform
+      pos: 20.5,25.5
+      parent: 1653
+  - uid: 879
+    components:
+    - type: Transform
+      pos: 16.5,28.5
+      parent: 1653
+  - uid: 1108
+    components:
+    - type: Transform
+      pos: 2.5,24.5
+      parent: 1653
+  - uid: 1109
+    components:
+    - type: Transform
+      pos: 0.5,27.5
+      parent: 1653
+  - uid: 1189
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,34.5
+      parent: 1653
+  - uid: 1666
+    components:
+    - type: Transform
+      pos: 4.5,38.5
+      parent: 1653
+  - uid: 1669
+    components:
+    - type: Transform
+      pos: 10.5,40.5
+      parent: 1653
+  - uid: 1670
+    components:
+    - type: Transform
+      pos: 16.5,40.5
+      parent: 1653
+  - uid: 1917
+    components:
+    - type: Transform
+      pos: 32.5,35.5
+      parent: 1653
+  - uid: 1918
+    components:
+    - type: Transform
+      pos: 26.5,36.5
+      parent: 1653
+  - uid: 2083
+    components:
+    - type: Transform
+      pos: 34.5,25.5
+      parent: 1653
+  - uid: 2084
+    components:
+    - type: Transform
+      pos: 28.5,19.5
+      parent: 1653
+  - uid: 2085
+    components:
+    - type: Transform
+      pos: 33.5,22.5
+      parent: 1653
+  - uid: 2086
+    components:
+    - type: Transform
+      pos: 43.5,12.5
+      parent: 1653
+  - uid: 2087
+    components:
+    - type: Transform
+      pos: 40.5,15.5
+      parent: 1653
+  - uid: 2088
+    components:
+    - type: Transform
+      pos: 28.5,15.5
+      parent: 1653
+- proto: CrystalGreen
+  entities:
+  - uid: 836
+    components:
+    - type: Transform
+      pos: 12.5,25.5
+      parent: 1653
+  - uid: 878
+    components:
+    - type: Transform
+      pos: 10.5,27.5
+      parent: 1653
+  - uid: 1667
+    components:
+    - type: Transform
+      pos: 1.5,39.5
+      parent: 1653
+- proto: CyberPen
+  entities:
+  - uid: 1124
+    components:
+    - type: Transform
+      pos: 3.5640259,43.59188
+      parent: 1653
+- proto: DisposalTrunk
+  entities:
+  - uid: 1436
+    components:
+    - type: Transform
+      pos: 21.5,2.5
+      parent: 1653
+  - uid: 1437
+    components:
+    - type: Transform
+      pos: 25.5,2.5
+      parent: 1653
+  - uid: 1442
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,1.5
+      parent: 1653
+  - uid: 1443
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 21.5,1.5
+      parent: 1653
+- proto: DisposalUnit
+  entities:
+  - uid: 1432
+    components:
+    - type: Transform
+      pos: 21.5,2.5
+      parent: 1653
+  - uid: 1433
+    components:
+    - type: Transform
+      pos: 25.5,2.5
+      parent: 1653
+- proto: DonkpocketBoxSpawner
+  entities:
+  - uid: 962
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 1653
+- proto: DrinkGoldenCup
+  entities:
+  - uid: 1192
+    components:
+    - type: Transform
+      pos: 10.500535,32.48345
+      parent: 1653
+- proto: DrinkMug
+  entities:
+  - uid: 963
+    components:
+    - type: Transform
+      pos: 1.4545751,10.669063
+      parent: 1653
+- proto: DrinkMugDog
+  entities:
+  - uid: 452
+    components:
+    - type: Transform
+      pos: 10.44451,4.54002
+      parent: 1653
+  - uid: 965
+    components:
+    - type: Transform
+      pos: 1.4858251,10.465938
+      parent: 1653
+- proto: DrinkMugMetal
+  entities:
+  - uid: 964
+    components:
+    - type: Transform
+      pos: 1.6889501,10.590938
+      parent: 1653
+- proto: DrinkMugMoebius
+  entities:
+  - uid: 466
+    components:
+    - type: Transform
+      pos: 10.60076,4.711895
+      parent: 1653
+  - uid: 966
+    components:
+    - type: Transform
+      pos: 2.173325,10.684688
+      parent: 1653
+- proto: DrinkWaterCup
+  entities:
+  - uid: 508
+    components:
+    - type: Transform
+      pos: 20.373915,40.64657
+      parent: 1653
+  - uid: 509
+    components:
+    - type: Transform
+      pos: 20.54579,40.724693
+      parent: 1653
+  - uid: 510
+    components:
+    - type: Transform
+      pos: 20.592665,40.537193
+      parent: 1653
+- proto: Dropper
+  entities:
+  - uid: 1471
+    components:
+    - type: Transform
+      pos: 22.57765,4.50994
+      parent: 1653
+- proto: EggplantSeeds
+  entities:
+  - uid: 1384
+    components:
+    - type: Transform
+      pos: 16.626123,7.6609573
+      parent: 1653
+- proto: EggySeeds
+  entities:
+  - uid: 1383
+    components:
+    - type: Transform
+      pos: 16.422998,7.8484573
+      parent: 1653
+- proto: EmergencyLight
+  entities:
+  - uid: 1605
+    components:
+    - type: Transform
+      pos: 29.5,8.5
+      parent: 1653
+    - type: PointLight
+      enabled: True
+  - uid: 1606
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,16.5
+      parent: 1653
+    - type: PointLight
+      enabled: True
+  - uid: 1607
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,44.5
+      parent: 1653
+    - type: PointLight
+      enabled: True
+- proto: EncryptionKeyService
+  entities:
+  - uid: 1205
+    components:
+    - type: Transform
+      pos: 5.3739185,43.607506
+      parent: 1653
+- proto: ExtinguisherCabinetFilled
+  entities:
+  - uid: 1287
+    components:
+    - type: Transform
+      pos: 51.5,1.5
+      parent: 1653
+  - uid: 1288
+    components:
+    - type: Transform
+      pos: 39.5,1.5
+      parent: 1653
+- proto: filingCabinetDrawerRandom
+  entities:
+  - uid: 1279
+    components:
+    - type: Transform
+      pos: 36.5,4.5
+      parent: 1653
+  - uid: 1481
+    components:
+    - type: Transform
+      pos: 18.5,0.5
+      parent: 1653
+- proto: filingCabinetRandom
+  entities:
+  - uid: 1482
+    components:
+    - type: Transform
+      pos: 34.5,0.5
+      parent: 1653
+- proto: Floodlight
+  entities:
+  - uid: 664
+    components:
+    - type: Transform
+      pos: 19.496153,34.502384
+      parent: 1653
+- proto: FloodlightBroken
+  entities:
+  - uid: 523
+    components:
+    - type: Transform
+      pos: 36.481613,40.499622
+      parent: 1653
+- proto: FloorDrain
+  entities:
+  - uid: 896
+    components:
+    - type: Transform
+      pos: 0.5,22.5
+      parent: 1653
+    - type: Fixtures
+      fixtures: {}
+- proto: FloraTreeSnow01
+  entities:
+  - uid: 1133
+    components:
+    - type: Transform
+      pos: 34.488148,39.383087
+      parent: 1653
+- proto: FloraTreeSnow03
+  entities:
+  - uid: 405
+    components:
+    - type: Transform
+      pos: 0.431108,0.37702036
+      parent: 1653
+  - uid: 479
+    components:
+    - type: Transform
+      pos: 16.778654,4.6426454
+      parent: 1653
+- proto: FloraTreeSnow04
+  entities:
+  - uid: 420
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.352256,20.196136
+      parent: 1653
+- proto: FloraTreeSnow05
+  entities:
+  - uid: 1198
+    components:
+    - type: Transform
+      pos: 11.423113,39.334538
+      parent: 1653
+- proto: FoodBerries
+  entities:
+  - uid: 804
+    components:
+    - type: Transform
+      pos: 12.556688,14.57218
+      parent: 1653
+  - uid: 805
+    components:
+    - type: MetaData
+      name: strange berries
+    - type: Transform
+      pos: 10.525438,14.587805
+      parent: 1653
+- proto: FoodCondimentBottleColdsauce
+  entities:
+  - uid: 1841
+    components:
+    - type: Transform
+      pos: 5.5153017,13.652036
+      parent: 1653
+- proto: FoodGatfruit
+  entities:
+  - uid: 295
+    components:
+    - type: Transform
+      pos: 3.4733143,14.462859
+      parent: 1653
+- proto: FoodPotato
+  entities:
+  - uid: 1396
+    components:
+    - type: Transform
+      pos: 21.463976,15.404201
+      parent: 1653
+- proto: FoodShakerPepper
+  entities:
+  - uid: 1327
+    components:
+    - type: Transform
+      pos: 12.527602,2.6585855
+      parent: 1653
+- proto: FoodShakerSalt
+  entities:
+  - uid: 1220
+    components:
+    - type: Transform
+      pos: 12.340102,2.7523355
+      parent: 1653
+- proto: FoodSoupChiliCold
+  entities:
+  - uid: 1842
+    components:
+    - type: Transform
+      pos: 41.565323,12.755919
+      parent: 1653
+- proto: GasCanisterBrokenBase
+  entities:
+  - uid: 287
+    components:
+    - type: Transform
+      pos: 18.5,28.5
+      parent: 1653
+  - uid: 1648
+    components:
+    - type: Transform
+      pos: 43.5,15.5
+      parent: 1653
+- proto: GasFilter
+  entities:
+  - uid: 1612
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 42.5,16.5
+      parent: 1653
+- proto: GasMixer
+  entities:
+  - uid: 1613
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 41.5,16.5
+      parent: 1653
+- proto: GasPort
+  entities:
+  - uid: 1614
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,16.5
+      parent: 1653
+  - uid: 1615
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 42.5,15.5
+      parent: 1653
+  - uid: 1616
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,15.5
+      parent: 1653
+  - uid: 1617
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,16.5
+      parent: 1653
+  - uid: 1651
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 45.5,15.5
+      parent: 1653
+- proto: GasRecycler
+  entities:
+  - uid: 1649
+    components:
+    - type: Transform
+      pos: 46.5,16.5
+      parent: 1653
+- proto: GasThermoMachineFreezer
+  entities:
+  - uid: 1650
+    components:
+    - type: Transform
+      pos: 45.5,16.5
+      parent: 1653
+- proto: GeneratorRTG
+  entities:
+  - uid: 261
+    components:
+    - type: Transform
+      pos: 25.5,19.5
+      parent: 1653
+  - uid: 540
+    components:
+    - type: Transform
+      pos: 9.5,47.5
+      parent: 1653
+  - uid: 541
+    components:
+    - type: Transform
+      pos: 13.5,47.5
+      parent: 1653
+  - uid: 542
+    components:
+    - type: Transform
+      pos: 11.5,47.5
+      parent: 1653
+  - uid: 1013
+    components:
+    - type: Transform
+      pos: 25.5,21.5
+      parent: 1653
+  - uid: 1524
+    components:
+    - type: Transform
+      pos: 25.5,7.5
+      parent: 1653
+  - uid: 1525
+    components:
+    - type: Transform
+      pos: 25.5,9.5
+      parent: 1653
+  - uid: 1526
+    components:
+    - type: Transform
+      pos: 33.5,7.5
+      parent: 1653
+  - uid: 1527
+    components:
+    - type: Transform
+      pos: 33.5,9.5
+      parent: 1653
+- proto: Girder
+  entities:
+  - uid: 671
+    components:
+    - type: Transform
+      pos: 14.5,34.5
+      parent: 1653
+- proto: Grille
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      pos: 19.5,46.5
+      parent: 1653
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 18.5,44.5
+      parent: 1653
+  - uid: 103
+    components:
+    - type: Transform
+      pos: 20.5,46.5
+      parent: 1653
+  - uid: 115
+    components:
+    - type: Transform
+      pos: 19.5,44.5
+      parent: 1653
+  - uid: 291
+    components:
+    - type: Transform
+      pos: 2.5,13.5
+      parent: 1653
+  - uid: 293
+    components:
+    - type: Transform
+      pos: 3.5,13.5
+      parent: 1653
+  - uid: 294
+    components:
+    - type: Transform
+      pos: 2.5,14.5
+      parent: 1653
+  - uid: 536
+    components:
+    - type: Transform
+      pos: 4.5,13.5
+      parent: 1653
+  - uid: 670
+    components:
+    - type: Transform
+      pos: 4.5,15.5
+      parent: 1653
+  - uid: 710
+    components:
+    - type: Transform
+      pos: 3.5,15.5
+      parent: 1653
+  - uid: 712
+    components:
+    - type: Transform
+      pos: 2.5,15.5
+      parent: 1653
+  - uid: 715
+    components:
+    - type: Transform
+      pos: 4.5,14.5
+      parent: 1653
+  - uid: 742
+    components:
+    - type: Transform
+      pos: 17.5,30.5
+      parent: 1653
+  - uid: 743
+    components:
+    - type: Transform
+      pos: 17.5,32.5
+      parent: 1653
+  - uid: 975
+    components:
+    - type: Transform
+      pos: 20.5,44.5
+      parent: 1653
+  - uid: 1435
+    components:
+    - type: Transform
+      pos: 18.5,45.5
+      parent: 1653
+  - uid: 1438
+    components:
+    - type: Transform
+      pos: 18.5,46.5
+      parent: 1653
+  - uid: 1478
+    components:
+    - type: Transform
+      pos: 20.5,45.5
+      parent: 1653
+- proto: GunpetInstrument
+  entities:
+  - uid: 491
+    components:
+    - type: Transform
+      pos: 32.456673,4.6502504
+      parent: 1653
+- proto: HandLabeler
+  entities:
+  - uid: 797
+    components:
+    - type: Transform
+      pos: 14.461831,28.633146
+      parent: 1653
+- proto: HelicopterInstrument
+  entities:
+  - uid: 415
+    components:
+    - type: Transform
+      pos: 31.582432,20.675161
+      parent: 1653
+- proto: HospitalCurtainsOpen
+  entities:
+  - uid: 270
+    components:
+    - type: Transform
+      pos: 8.5,31.5
+      parent: 1653
+  - uid: 756
+    components:
+    - type: Transform
+      pos: 1.5,31.5
+      parent: 1653
+  - uid: 816
+    components:
+    - type: Transform
+      pos: 8.5,27.5
+      parent: 1653
+  - uid: 826
+    components:
+    - type: Transform
+      pos: 10.5,27.5
+      parent: 1653
+  - uid: 827
+    components:
+    - type: Transform
+      pos: 10.5,25.5
+      parent: 1653
+  - uid: 828
+    components:
+    - type: Transform
+      pos: 8.5,25.5
+      parent: 1653
+  - uid: 897
+    components:
+    - type: Transform
+      pos: 0.5,22.5
+      parent: 1653
+- proto: hydroponicsSoil
+  entities:
+  - uid: 654
+    components:
+    - type: Transform
+      pos: 17.5,14.5
+      parent: 1653
+  - uid: 757
+    components:
+    - type: Transform
+      pos: 17.5,15.5
+      parent: 1653
+  - uid: 1061
+    components:
+    - type: Transform
+      pos: 21.5,13.5
+      parent: 1653
+  - uid: 1196
+    components:
+    - type: Transform
+      pos: 21.5,15.5
+      parent: 1653
+  - uid: 1392
+    components:
+    - type: Transform
+      pos: 17.5,13.5
+      parent: 1653
+  - uid: 1398
+    components:
+    - type: Transform
+      pos: 21.5,14.5
+      parent: 1653
+- proto: HydroponicsToolHatchet
+  entities:
+  - uid: 1959
+    components:
+    - type: Transform
+      pos: 26.521053,26.358747
+      parent: 1653
+- proto: HydroponicsToolMiniHoe
+  entities:
+  - uid: 1378
+    components:
+    - type: Transform
+      pos: 18.469873,9.442207
+      parent: 1653
+- proto: HydroponicsToolScythe
+  entities:
+  - uid: 1948
+    components:
+    - type: Transform
+      pos: 53.545364,38.54707
+      parent: 1653
+- proto: HydroponicsToolSpade
+  entities:
+  - uid: 1998
+    components:
+    - type: Transform
+      pos: 37.663628,7.3749332
+      parent: 1653
+- proto: hydroponicsTray
+  entities:
+  - uid: 159
+    components:
+    - type: Transform
+      pos: 22.5,25.5
+      parent: 1653
+  - uid: 160
+    components:
+    - type: Transform
+      pos: 22.5,26.5
+      parent: 1653
+  - uid: 417
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,19.5
+      parent: 1653
+  - uid: 419
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 33.5,21.5
+      parent: 1653
+  - uid: 598
+    components:
+    - type: Transform
+      pos: 33.5,0.5
+      parent: 1653
+  - uid: 689
+    components:
+    - type: Transform
+      pos: 32.5,0.5
+      parent: 1653
+  - uid: 1324
+    components:
+    - type: Transform
+      pos: 37.5,9.5
+      parent: 1653
+  - uid: 1354
+    components:
+    - type: Transform
+      pos: 13.5,7.5
+      parent: 1653
+  - uid: 1355
+    components:
+    - type: Transform
+      pos: 13.5,8.5
+      parent: 1653
+  - uid: 1356
+    components:
+    - type: Transform
+      pos: 13.5,9.5
+      parent: 1653
+  - uid: 1357
+    components:
+    - type: Transform
+      pos: 15.5,7.5
+      parent: 1653
+  - uid: 1358
+    components:
+    - type: Transform
+      pos: 15.5,8.5
+      parent: 1653
+  - uid: 1359
+    components:
+    - type: Transform
+      pos: 15.5,9.5
+      parent: 1653
+  - uid: 1360
+    components:
+    - type: Transform
+      pos: 19.5,7.5
+      parent: 1653
+  - uid: 1361
+    components:
+    - type: Transform
+      pos: 19.5,8.5
+      parent: 1653
+  - uid: 1362
+    components:
+    - type: Transform
+      pos: 19.5,9.5
+      parent: 1653
+  - uid: 1363
+    components:
+    - type: Transform
+      pos: 21.5,7.5
+      parent: 1653
+  - uid: 1364
+    components:
+    - type: Transform
+      pos: 21.5,8.5
+      parent: 1653
+  - uid: 1365
+    components:
+    - type: Transform
+      pos: 21.5,9.5
+      parent: 1653
+  - uid: 1430
+    components:
+    - type: Transform
+      pos: 29.5,0.5
+      parent: 1653
+  - uid: 1434
+    components:
+    - type: Transform
+      pos: 31.5,0.5
+      parent: 1653
+  - uid: 1555
+    components:
+    - type: Transform
+      pos: 27.5,0.5
+      parent: 1653
+  - uid: 1556
+    components:
+    - type: Transform
+      pos: 28.5,0.5
+      parent: 1653
+  - uid: 1949
+    components:
+    - type: Transform
+      pos: 26.5,28.5
+      parent: 1653
+  - uid: 1950
+    components:
+    - type: Transform
+      pos: 26.5,27.5
+      parent: 1653
+  - uid: 1951
+    components:
+    - type: Transform
+      pos: 26.5,26.5
+      parent: 1653
+  - uid: 1952
+    components:
+    - type: Transform
+      pos: 26.5,25.5
+      parent: 1653
+  - uid: 1953
+    components:
+    - type: Transform
+      pos: 26.5,24.5
+      parent: 1653
+  - uid: 1954
+    components:
+    - type: Transform
+      pos: 24.5,24.5
+      parent: 1653
+  - uid: 1955
+    components:
+    - type: Transform
+      pos: 24.5,25.5
+      parent: 1653
+  - uid: 1956
+    components:
+    - type: Transform
+      pos: 24.5,26.5
+      parent: 1653
+  - uid: 1957
+    components:
+    - type: Transform
+      pos: 24.5,27.5
+      parent: 1653
+  - uid: 1981
+    components:
+    - type: Transform
+      pos: 38.5,9.5
+      parent: 1653
+  - uid: 1982
+    components:
+    - type: Transform
+      pos: 39.5,9.5
+      parent: 1653
+  - uid: 1983
+    components:
+    - type: Transform
+      pos: 40.5,9.5
+      parent: 1653
+  - uid: 1985
+    components:
+    - type: Transform
+      pos: 42.5,9.5
+      parent: 1653
+  - uid: 1986
+    components:
+    - type: Transform
+      pos: 43.5,9.5
+      parent: 1653
+  - uid: 1987
+    components:
+    - type: Transform
+      pos: 44.5,9.5
+      parent: 1653
+  - uid: 1988
+    components:
+    - type: Transform
+      pos: 45.5,9.5
+      parent: 1653
+  - uid: 1989
+    components:
+    - type: Transform
+      pos: 37.5,7.5
+      parent: 1653
+  - uid: 1990
+    components:
+    - type: Transform
+      pos: 38.5,7.5
+      parent: 1653
+  - uid: 1991
+    components:
+    - type: Transform
+      pos: 39.5,7.5
+      parent: 1653
+  - uid: 1992
+    components:
+    - type: Transform
+      pos: 40.5,7.5
+      parent: 1653
+  - uid: 1994
+    components:
+    - type: Transform
+      pos: 42.5,7.5
+      parent: 1653
+  - uid: 1995
+    components:
+    - type: Transform
+      pos: 43.5,7.5
+      parent: 1653
+  - uid: 1996
+    components:
+    - type: Transform
+      pos: 44.5,7.5
+      parent: 1653
+  - uid: 1997
+    components:
+    - type: Transform
+      pos: 45.5,7.5
+      parent: 1653
+  - uid: 2183
+    components:
+    - type: Transform
+      pos: 52.5,13.5
+      parent: 1653
+  - uid: 2184
+    components:
+    - type: Transform
+      pos: 52.5,15.5
+      parent: 1653
+  - uid: 2185
+    components:
+    - type: Transform
+      pos: 50.5,13.5
+      parent: 1653
+  - uid: 2186
+    components:
+    - type: Transform
+      pos: 50.5,15.5
+      parent: 1653
+- proto: HydroponicsTrayMachineCircuitboard
+  entities:
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 4.5441585,28.543722
+      parent: 1653
+  - uid: 170
+    components:
+    - type: Transform
+      pos: 6.5285335,24.574972
+      parent: 1653
+- proto: IceCrust
+  entities:
+  - uid: 147
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,30.5
+      parent: 1653
+  - uid: 148
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,31.5
+      parent: 1653
+  - uid: 149
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,31.5
+      parent: 1653
+  - uid: 150
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,31.5
+      parent: 1653
+  - uid: 151
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,31.5
+      parent: 1653
+  - uid: 152
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,31.5
+      parent: 1653
+  - uid: 265
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,32.5
+      parent: 1653
+  - uid: 266
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,31.5
+      parent: 1653
+  - uid: 267
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,32.5
+      parent: 1653
+  - uid: 315
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,30.5
+      parent: 1653
+  - uid: 468
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 1653
+  - uid: 469
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 1653
+  - uid: 470
+    components:
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 1653
+  - uid: 471
+    components:
+    - type: Transform
+      pos: 22.5,3.5
+      parent: 1653
+  - uid: 472
+    components:
+    - type: Transform
+      pos: 22.5,2.5
+      parent: 1653
+  - uid: 473
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1653
+  - uid: 474
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 1653
+  - uid: 475
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 1653
+  - uid: 476
+    components:
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 1653
+  - uid: 477
+    components:
+    - type: Transform
+      pos: 6.5,8.5
+      parent: 1653
+  - uid: 478
+    components:
+    - type: Transform
+      pos: 5.5,2.5
+      parent: 1653
+  - uid: 481
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 1653
+  - uid: 503
+    components:
+    - type: Transform
+      pos: 14.5,8.5
+      parent: 1653
+  - uid: 520
+    components:
+    - type: Transform
+      pos: 12.5,9.5
+      parent: 1653
+  - uid: 532
+    components:
+    - type: Transform
+      pos: 13.5,7.5
+      parent: 1653
+  - uid: 533
+    components:
+    - type: Transform
+      pos: 14.5,8.5
+      parent: 1653
+  - uid: 534
+    components:
+    - type: Transform
+      pos: 17.5,9.5
+      parent: 1653
+  - uid: 592
+    components:
+    - type: Transform
+      pos: 17.5,9.5
+      parent: 1653
+  - uid: 593
+    components:
+    - type: Transform
+      pos: 14.5,6.5
+      parent: 1653
+  - uid: 594
+    components:
+    - type: Transform
+      pos: 17.5,7.5
+      parent: 1653
+  - uid: 595
+    components:
+    - type: Transform
+      pos: 13.5,9.5
+      parent: 1653
+  - uid: 596
+    components:
+    - type: Transform
+      pos: 13.5,7.5
+      parent: 1653
+  - uid: 597
+    components:
+    - type: Transform
+      pos: 13.5,8.5
+      parent: 1653
+  - uid: 605
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,32.5
+      parent: 1653
+  - uid: 606
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 22.5,32.5
+      parent: 1653
+  - uid: 607
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,31.5
+      parent: 1653
+  - uid: 608
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 26.5,31.5
+      parent: 1653
+  - uid: 609
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 26.5,30.5
+      parent: 1653
+  - uid: 610
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,30.5
+      parent: 1653
+  - uid: 611
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,31.5
+      parent: 1653
+  - uid: 612
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,32.5
+      parent: 1653
+  - uid: 615
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,7.5
+      parent: 1653
+  - uid: 616
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,7.5
+      parent: 1653
+  - uid: 646
+    components:
+    - type: Transform
+      pos: 33.5,19.5
+      parent: 1653
+  - uid: 647
+    components:
+    - type: Transform
+      pos: 27.5,18.5
+      parent: 1653
+  - uid: 648
+    components:
+    - type: Transform
+      pos: 37.5,3.5
+      parent: 1653
+  - uid: 652
+    components:
+    - type: Transform
+      pos: 32.5,20.5
+      parent: 1653
+  - uid: 677
+    components:
+    - type: Transform
+      pos: 21.5,6.5
+      parent: 1653
+  - uid: 678
+    components:
+    - type: Transform
+      pos: 31.5,18.5
+      parent: 1653
+  - uid: 679
+    components:
+    - type: Transform
+      pos: 32.5,18.5
+      parent: 1653
+  - uid: 720
+    components:
+    - type: Transform
+      pos: 14.5,28.5
+      parent: 1653
+  - uid: 728
+    components:
+    - type: Transform
+      pos: 13.5,26.5
+      parent: 1653
+  - uid: 746
+    components:
+    - type: Transform
+      pos: 24.5,22.5
+      parent: 1653
+  - uid: 758
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,35.5
+      parent: 1653
+  - uid: 759
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,34.5
+      parent: 1653
+  - uid: 760
+    components:
+    - type: Transform
+      pos: 26.5,18.5
+      parent: 1653
+  - uid: 763
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,31.5
+      parent: 1653
+  - uid: 764
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,30.5
+      parent: 1653
+  - uid: 765
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,31.5
+      parent: 1653
+  - uid: 766
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,30.5
+      parent: 1653
+  - uid: 774
+    components:
+    - type: Transform
+      pos: 19.5,8.5
+      parent: 1653
+  - uid: 786
+    components:
+    - type: Transform
+      pos: 18.5,8.5
+      parent: 1653
+  - uid: 793
+    components:
+    - type: Transform
+      pos: 13.5,25.5
+      parent: 1653
+  - uid: 798
+    components:
+    - type: Transform
+      pos: 8.5,27.5
+      parent: 1653
+  - uid: 815
+    components:
+    - type: Transform
+      pos: 13.5,28.5
+      parent: 1653
+  - uid: 860
+    components:
+    - type: Transform
+      pos: 38.5,2.5
+      parent: 1653
+  - uid: 867
+    components:
+    - type: Transform
+      pos: 20.5,9.5
+      parent: 1653
+  - uid: 869
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,30.5
+      parent: 1653
+  - uid: 870
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,31.5
+      parent: 1653
+  - uid: 871
+    components:
+    - type: Transform
+      pos: 17.5,8.5
+      parent: 1653
+  - uid: 872
+    components:
+    - type: Transform
+      pos: 17.5,6.5
+      parent: 1653
+  - uid: 875
+    components:
+    - type: Transform
+      pos: 9.5,25.5
+      parent: 1653
+  - uid: 979
+    components:
+    - type: Transform
+      pos: 32.5,19.5
+      parent: 1653
+  - uid: 983
+    components:
+    - type: Transform
+      pos: 36.5,2.5
+      parent: 1653
+  - uid: 986
+    components:
+    - type: Transform
+      pos: 37.5,2.5
+      parent: 1653
+  - uid: 1054
+    components:
+    - type: Transform
+      pos: 25.5,22.5
+      parent: 1653
+  - uid: 1063
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,35.5
+      parent: 1653
+  - uid: 1064
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,35.5
+      parent: 1653
+  - uid: 1065
+    components:
+    - type: Transform
+      pos: 27.5,19.5
+      parent: 1653
+  - uid: 1066
+    components:
+    - type: Transform
+      pos: 28.5,19.5
+      parent: 1653
+  - uid: 1073
+    components:
+    - type: Transform
+      pos: 39.5,2.5
+      parent: 1653
+  - uid: 1075
+    components:
+    - type: Transform
+      pos: 20.5,8.5
+      parent: 1653
+  - uid: 1076
+    components:
+    - type: Transform
+      pos: 20.5,7.5
+      parent: 1653
+  - uid: 1087
+    components:
+    - type: Transform
+      pos: 9.5,26.5
+      parent: 1653
+  - uid: 1092
+    components:
+    - type: Transform
+      pos: 14.5,27.5
+      parent: 1653
+  - uid: 1093
+    components:
+    - type: Transform
+      pos: 17.5,24.5
+      parent: 1653
+  - uid: 1094
+    components:
+    - type: Transform
+      pos: 17.5,25.5
+      parent: 1653
+  - uid: 1095
+    components:
+    - type: Transform
+      pos: 18.5,25.5
+      parent: 1653
+  - uid: 1096
+    components:
+    - type: Transform
+      pos: 18.5,26.5
+      parent: 1653
+  - uid: 1097
+    components:
+    - type: Transform
+      pos: 17.5,28.5
+      parent: 1653
+  - uid: 1098
+    components:
+    - type: Transform
+      pos: 21.5,24.5
+      parent: 1653
+  - uid: 1099
+    components:
+    - type: Transform
+      pos: 21.5,25.5
+      parent: 1653
+  - uid: 1100
+    components:
+    - type: Transform
+      pos: 20.5,25.5
+      parent: 1653
+  - uid: 1101
+    components:
+    - type: Transform
+      pos: 20.5,26.5
+      parent: 1653
+  - uid: 1102
+    components:
+    - type: Transform
+      pos: 22.5,28.5
+      parent: 1653
+  - uid: 1103
+    components:
+    - type: Transform
+      pos: 1.5,24.5
+      parent: 1653
+  - uid: 1104
+    components:
+    - type: Transform
+      pos: 0.5,25.5
+      parent: 1653
+  - uid: 1105
+    components:
+    - type: Transform
+      pos: 0.5,26.5
+      parent: 1653
+  - uid: 1106
+    components:
+    - type: Transform
+      pos: 2.5,28.5
+      parent: 1653
+  - uid: 1107
+    components:
+    - type: Transform
+      pos: 2.5,27.5
+      parent: 1653
+  - uid: 1114
+    components:
+    - type: Transform
+      pos: 5.5,24.5
+      parent: 1653
+  - uid: 1115
+    components:
+    - type: Transform
+      pos: 5.5,24.5
+      parent: 1653
+  - uid: 1116
+    components:
+    - type: Transform
+      pos: 5.5,25.5
+      parent: 1653
+  - uid: 1117
+    components:
+    - type: Transform
+      pos: 5.5,26.5
+      parent: 1653
+  - uid: 1118
+    components:
+    - type: Transform
+      pos: 4.5,26.5
+      parent: 1653
+  - uid: 1119
+    components:
+    - type: Transform
+      pos: 0.5,25.5
+      parent: 1653
+  - uid: 1120
+    components:
+    - type: Transform
+      pos: 0.5,26.5
+      parent: 1653
+  - uid: 1121
+    components:
+    - type: Transform
+      pos: 2.5,27.5
+      parent: 1653
+  - uid: 1122
+    components:
+    - type: Transform
+      pos: 18.5,26.5
+      parent: 1653
+  - uid: 1123
+    components:
+    - type: Transform
+      pos: 18.5,25.5
+      parent: 1653
+  - uid: 1150
+    components:
+    - type: Transform
+      pos: 17.5,26.5
+      parent: 1653
+  - uid: 1151
+    components:
+    - type: Transform
+      pos: 18.5,27.5
+      parent: 1653
+  - uid: 1152
+    components:
+    - type: Transform
+      pos: 20.5,25.5
+      parent: 1653
+  - uid: 1194
+    components:
+    - type: Transform
+      pos: 21.5,7.5
+      parent: 1653
+  - uid: 1211
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 1653
+  - uid: 1212
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 1653
+  - uid: 1213
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 1653
+  - uid: 1214
+    components:
+    - type: Transform
+      pos: 5.5,3.5
+      parent: 1653
+  - uid: 1215
+    components:
+    - type: Transform
+      pos: 5.5,8.5
+      parent: 1653
+  - uid: 1216
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1653
+  - uid: 1217
+    components:
+    - type: Transform
+      pos: 12.5,3.5
+      parent: 1653
+  - uid: 1218
+    components:
+    - type: Transform
+      pos: 12.5,2.5
+      parent: 1653
+  - uid: 1219
+    components:
+    - type: Transform
+      pos: 13.5,4.5
+      parent: 1653
+  - uid: 1255
+    components:
+    - type: Transform
+      pos: 14.5,3.5
+      parent: 1653
+  - uid: 1282
+    components:
+    - type: Transform
+      pos: 12.5,1.5
+      parent: 1653
+  - uid: 1289
+    components:
+    - type: Transform
+      pos: 11.5,3.5
+      parent: 1653
+  - uid: 1290
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 1653
+  - uid: 1304
+    components:
+    - type: Transform
+      pos: 34.5,14.5
+      parent: 1653
+  - uid: 1308
+    components:
+    - type: Transform
+      pos: 32.5,14.5
+      parent: 1653
+  - uid: 1321
+    components:
+    - type: Transform
+      pos: 12.5,4.5
+      parent: 1653
+  - uid: 1322
+    components:
+    - type: Transform
+      pos: 3.5,10.5
+      parent: 1653
+  - uid: 1326
+    components:
+    - type: Transform
+      pos: 33.5,14.5
+      parent: 1653
+  - uid: 1343
+    components:
+    - type: Transform
+      pos: 12.5,2.5
+      parent: 1653
+  - uid: 1344
+    components:
+    - type: Transform
+      pos: 13.5,2.5
+      parent: 1653
+  - uid: 1345
+    components:
+    - type: Transform
+      pos: 13.5,3.5
+      parent: 1653
+  - uid: 1346
+    components:
+    - type: Transform
+      pos: 13.5,3.5
+      parent: 1653
+  - uid: 1347
+    components:
+    - type: Transform
+      pos: 12.5,3.5
+      parent: 1653
+  - uid: 1408
+    components:
+    - type: Transform
+      pos: 19.5,8.5
+      parent: 1653
+  - uid: 1427
+    components:
+    - type: Transform
+      pos: 38.5,2.5
+      parent: 1653
+  - uid: 1472
+    components:
+    - type: Transform
+      pos: 20.5,25.5
+      parent: 1653
+  - uid: 1474
+    components:
+    - type: Transform
+      pos: 21.5,26.5
+      parent: 1653
+  - uid: 1535
+    components:
+    - type: Transform
+      pos: 13.5,26.5
+      parent: 1653
+  - uid: 1536
+    components:
+    - type: Transform
+      pos: 5.5,27.5
+      parent: 1653
+  - uid: 1537
+    components:
+    - type: Transform
+      pos: 6.5,27.5
+      parent: 1653
+  - uid: 1538
+    components:
+    - type: Transform
+      pos: 5.5,27.5
+      parent: 1653
+  - uid: 1539
+    components:
+    - type: Transform
+      pos: 5.5,27.5
+      parent: 1653
+  - uid: 1546
+    components:
+    - type: Transform
+      pos: 32.5,20.5
+      parent: 1653
+  - uid: 1547
+    components:
+    - type: Transform
+      pos: 32.5,19.5
+      parent: 1653
+  - uid: 1548
+    components:
+    - type: Transform
+      pos: 32.5,21.5
+      parent: 1653
+  - uid: 1549
+    components:
+    - type: Transform
+      pos: 31.5,19.5
+      parent: 1653
+  - uid: 1550
+    components:
+    - type: Transform
+      pos: 33.5,22.5
+      parent: 1653
+  - uid: 1557
+    components:
+    - type: Transform
+      pos: 37.5,3.5
+      parent: 1653
+  - uid: 1558
+    components:
+    - type: Transform
+      pos: 37.5,2.5
+      parent: 1653
+  - uid: 1564
+    components:
+    - type: Transform
+      pos: 38.5,3.5
+      parent: 1653
+  - uid: 1565
+    components:
+    - type: Transform
+      pos: 20.5,7.5
+      parent: 1653
+  - uid: 1566
+    components:
+    - type: Transform
+      pos: 21.5,9.5
+      parent: 1653
+  - uid: 1567
+    components:
+    - type: Transform
+      pos: 17.5,8.5
+      parent: 1653
+  - uid: 1574
+    components:
+    - type: Transform
+      pos: 10.5,39.5
+      parent: 1653
+  - uid: 1591
+    components:
+    - type: Transform
+      pos: 11.5,39.5
+      parent: 1653
+  - uid: 1592
+    components:
+    - type: Transform
+      pos: 12.5,39.5
+      parent: 1653
+  - uid: 1593
+    components:
+    - type: Transform
+      pos: 12.5,39.5
+      parent: 1653
+  - uid: 1599
+    components:
+    - type: Transform
+      pos: 5.5,26.5
+      parent: 1653
+  - uid: 1608
+    components:
+    - type: Transform
+      pos: 11.5,39.5
+      parent: 1653
+  - uid: 1609
+    components:
+    - type: Transform
+      pos: 10.5,39.5
+      parent: 1653
+  - uid: 1610
+    components:
+    - type: Transform
+      pos: 10.5,40.5
+      parent: 1653
+  - uid: 1611
+    components:
+    - type: Transform
+      pos: 11.5,40.5
+      parent: 1653
+  - uid: 1625
+    components:
+    - type: Transform
+      pos: 10.5,38.5
+      parent: 1653
+  - uid: 1626
+    components:
+    - type: Transform
+      pos: 11.5,38.5
+      parent: 1653
+  - uid: 1627
+    components:
+    - type: Transform
+      pos: 9.5,40.5
+      parent: 1653
+  - uid: 1637
+    components:
+    - type: Transform
+      pos: 6.5,27.5
+      parent: 1653
+  - uid: 1638
+    components:
+    - type: Transform
+      pos: 5.5,28.5
+      parent: 1653
+  - uid: 1644
+    components:
+    - type: Transform
+      pos: 3.5,39.5
+      parent: 1653
+  - uid: 1645
+    components:
+    - type: Transform
+      pos: 1.5,39.5
+      parent: 1653
+  - uid: 1654
+    components:
+    - type: Transform
+      pos: 1.5,38.5
+      parent: 1653
+  - uid: 1655
+    components:
+    - type: Transform
+      pos: 2.5,39.5
+      parent: 1653
+  - uid: 1656
+    components:
+    - type: Transform
+      pos: 3.5,39.5
+      parent: 1653
+  - uid: 1657
+    components:
+    - type: Transform
+      pos: 1.5,39.5
+      parent: 1653
+  - uid: 1658
+    components:
+    - type: Transform
+      pos: 5.5,39.5
+      parent: 1653
+  - uid: 1659
+    components:
+    - type: Transform
+      pos: 5.5,40.5
+      parent: 1653
+  - uid: 1660
+    components:
+    - type: Transform
+      pos: 4.5,39.5
+      parent: 1653
+  - uid: 1661
+    components:
+    - type: Transform
+      pos: 13.5,38.5
+      parent: 1653
+  - uid: 1662
+    components:
+    - type: Transform
+      pos: 13.5,39.5
+      parent: 1653
+  - uid: 1663
+    components:
+    - type: Transform
+      pos: 13.5,40.5
+      parent: 1653
+  - uid: 1664
+    components:
+    - type: Transform
+      pos: 14.5,39.5
+      parent: 1653
+  - uid: 1665
+    components:
+    - type: Transform
+      pos: 13.5,39.5
+      parent: 1653
+  - uid: 1676
+    components:
+    - type: Transform
+      pos: 19.5,38.5
+      parent: 1653
+  - uid: 1677
+    components:
+    - type: Transform
+      pos: 19.5,38.5
+      parent: 1653
+  - uid: 1678
+    components:
+    - type: Transform
+      pos: 18.5,38.5
+      parent: 1653
+  - uid: 1679
+    components:
+    - type: Transform
+      pos: 18.5,38.5
+      parent: 1653
+  - uid: 1680
+    components:
+    - type: Transform
+      pos: 19.5,38.5
+      parent: 1653
+  - uid: 1681
+    components:
+    - type: Transform
+      pos: 17.5,38.5
+      parent: 1653
+  - uid: 1682
+    components:
+    - type: Transform
+      pos: 17.5,39.5
+      parent: 1653
+  - uid: 1683
+    components:
+    - type: Transform
+      pos: 17.5,40.5
+      parent: 1653
+  - uid: 1684
+    components:
+    - type: Transform
+      pos: 18.5,40.5
+      parent: 1653
+  - uid: 1685
+    components:
+    - type: Transform
+      pos: 16.5,39.5
+      parent: 1653
+  - uid: 1686
+    components:
+    - type: Transform
+      pos: 17.5,39.5
+      parent: 1653
+  - uid: 1687
+    components:
+    - type: Transform
+      pos: 20.5,40.5
+      parent: 1653
+  - uid: 1688
+    components:
+    - type: Transform
+      pos: 21.5,40.5
+      parent: 1653
+  - uid: 1689
+    components:
+    - type: Transform
+      pos: 22.5,40.5
+      parent: 1653
+  - uid: 1690
+    components:
+    - type: Transform
+      pos: 21.5,39.5
+      parent: 1653
+  - uid: 1691
+    components:
+    - type: Transform
+      pos: 21.5,38.5
+      parent: 1653
+  - uid: 1692
+    components:
+    - type: Transform
+      pos: 21.5,39.5
+      parent: 1653
+  - uid: 1693
+    components:
+    - type: Transform
+      pos: 20.5,40.5
+      parent: 1653
+  - uid: 1694
+    components:
+    - type: Transform
+      pos: 21.5,38.5
+      parent: 1653
+  - uid: 1695
+    components:
+    - type: Transform
+      pos: 21.5,40.5
+      parent: 1653
+  - uid: 1696
+    components:
+    - type: Transform
+      pos: 22.5,39.5
+      parent: 1653
+  - uid: 1697
+    components:
+    - type: Transform
+      pos: 12.5,38.5
+      parent: 1653
+  - uid: 1700
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 1653
+  - uid: 1722
+    components:
+    - type: Transform
+      pos: 5.5,1.5
+      parent: 1653
+  - uid: 1723
+    components:
+    - type: Transform
+      pos: 5.5,0.5
+      parent: 1653
+  - uid: 1757
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 1653
+  - uid: 1758
+    components:
+    - type: Transform
+      pos: 5.5,10.5
+      parent: 1653
+  - uid: 1759
+    components:
+    - type: Transform
+      pos: 4.5,9.5
+      parent: 1653
+  - uid: 1773
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,13.5
+      parent: 1653
+  - uid: 1774
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,14.5
+      parent: 1653
+  - uid: 1775
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,15.5
+      parent: 1653
+  - uid: 1776
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,14.5
+      parent: 1653
+  - uid: 1777
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,14.5
+      parent: 1653
+  - uid: 1778
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,13.5
+      parent: 1653
+  - uid: 1779
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,15.5
+      parent: 1653
+  - uid: 1780
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,12.5
+      parent: 1653
+  - uid: 1781
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,13.5
+      parent: 1653
+  - uid: 1782
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,14.5
+      parent: 1653
+  - uid: 1783
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,14.5
+      parent: 1653
+  - uid: 1784
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,13.5
+      parent: 1653
+  - uid: 1785
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,13.5
+      parent: 1653
+  - uid: 1786
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,14.5
+      parent: 1653
+  - uid: 1787
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,14.5
+      parent: 1653
+  - uid: 1788
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,12.5
+      parent: 1653
+  - uid: 1789
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,16.5
+      parent: 1653
+  - uid: 1790
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,16.5
+      parent: 1653
+  - uid: 1791
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 26.5,16.5
+      parent: 1653
+  - uid: 1792
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,16.5
+      parent: 1653
+  - uid: 1793
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,16.5
+      parent: 1653
+  - uid: 1794
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,19.5
+      parent: 1653
+  - uid: 1795
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,20.5
+      parent: 1653
+  - uid: 1796
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.5,20.5
+      parent: 1653
+  - uid: 1797
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.5,19.5
+      parent: 1653
+  - uid: 1798
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,20.5
+      parent: 1653
+  - uid: 1799
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.5,20.5
+      parent: 1653
+  - uid: 1800
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.5,19.5
+      parent: 1653
+  - uid: 1801
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,20.5
+      parent: 1653
+  - uid: 1802
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,21.5
+      parent: 1653
+  - uid: 1803
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.5,21.5
+      parent: 1653
+  - uid: 1804
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.5,20.5
+      parent: 1653
+  - uid: 1805
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,18.5
+      parent: 1653
+  - uid: 1806
+    components:
+    - type: Transform
+      pos: 24.5,21.5
+      parent: 1653
+  - uid: 1807
+    components:
+    - type: Transform
+      pos: 25.5,22.5
+      parent: 1653
+  - uid: 1808
+    components:
+    - type: Transform
+      pos: 1.5,13.5
+      parent: 1653
+  - uid: 1809
+    components:
+    - type: Transform
+      pos: 0.5,14.5
+      parent: 1653
+  - uid: 1810
+    components:
+    - type: Transform
+      pos: 1.5,14.5
+      parent: 1653
+  - uid: 1811
+    components:
+    - type: Transform
+      pos: 0.5,13.5
+      parent: 1653
+  - uid: 1812
+    components:
+    - type: Transform
+      pos: 0.5,12.5
+      parent: 1653
+  - uid: 1813
+    components:
+    - type: Transform
+      pos: 6.5,9.5
+      parent: 1653
+  - uid: 1814
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 1653
+  - uid: 1815
+    components:
+    - type: Transform
+      pos: 3.5,9.5
+      parent: 1653
+  - uid: 1816
+    components:
+    - type: Transform
+      pos: 5.5,9.5
+      parent: 1653
+  - uid: 1817
+    components:
+    - type: Transform
+      pos: 4.5,8.5
+      parent: 1653
+  - uid: 1818
+    components:
+    - type: Transform
+      pos: 4.5,9.5
+      parent: 1653
+  - uid: 1819
+    components:
+    - type: Transform
+      pos: 5.5,9.5
+      parent: 1653
+  - uid: 1820
+    components:
+    - type: Transform
+      pos: 5.5,8.5
+      parent: 1653
+  - uid: 1821
+    components:
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 1653
+  - uid: 1822
+    components:
+    - type: Transform
+      pos: 1.5,8.5
+      parent: 1653
+  - uid: 1823
+    components:
+    - type: Transform
+      pos: 1.5,9.5
+      parent: 1653
+  - uid: 1824
+    components:
+    - type: Transform
+      pos: 3.5,9.5
+      parent: 1653
+  - uid: 1825
+    components:
+    - type: Transform
+      pos: 3.5,8.5
+      parent: 1653
+  - uid: 1826
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 1653
+  - uid: 1828
+    components:
+    - type: Transform
+      pos: 8.5,8.5
+      parent: 1653
+  - uid: 1829
+    components:
+    - type: Transform
+      pos: 7.5,8.5
+      parent: 1653
+  - uid: 1830
+    components:
+    - type: Transform
+      pos: 9.5,8.5
+      parent: 1653
+  - uid: 1832
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,8.5
+      parent: 1653
+  - uid: 1843
+    components:
+    - type: Transform
+      pos: 38.5,1.5
+      parent: 1653
+  - uid: 1844
+    components:
+    - type: Transform
+      pos: 38.5,1.5
+      parent: 1653
+  - uid: 1845
+    components:
+    - type: Transform
+      pos: 38.5,2.5
+      parent: 1653
+  - uid: 1846
+    components:
+    - type: Transform
+      pos: 40.5,2.5
+      parent: 1653
+  - uid: 1847
+    components:
+    - type: Transform
+      pos: 42.5,2.5
+      parent: 1653
+  - uid: 1848
+    components:
+    - type: Transform
+      pos: 43.5,2.5
+      parent: 1653
+  - uid: 1849
+    components:
+    - type: Transform
+      pos: 49.5,2.5
+      parent: 1653
+  - uid: 1850
+    components:
+    - type: Transform
+      pos: 52.5,2.5
+      parent: 1653
+  - uid: 1851
+    components:
+    - type: Transform
+      pos: 53.5,1.5
+      parent: 1653
+  - uid: 1852
+    components:
+    - type: Transform
+      pos: 53.5,0.5
+      parent: 1653
+  - uid: 1853
+    components:
+    - type: Transform
+      pos: 52.5,2.5
+      parent: 1653
+  - uid: 1854
+    components:
+    - type: Transform
+      pos: 53.5,1.5
+      parent: 1653
+  - uid: 1855
+    components:
+    - type: Transform
+      pos: 33.5,3.5
+      parent: 1653
+  - uid: 1856
+    components:
+    - type: Transform
+      pos: 32.5,3.5
+      parent: 1653
+  - uid: 1857
+    components:
+    - type: Transform
+      pos: 31.5,3.5
+      parent: 1653
+  - uid: 1858
+    components:
+    - type: Transform
+      pos: 31.5,2.5
+      parent: 1653
+  - uid: 1859
+    components:
+    - type: Transform
+      pos: 31.5,3.5
+      parent: 1653
+  - uid: 1860
+    components:
+    - type: Transform
+      pos: 32.5,3.5
+      parent: 1653
+  - uid: 1861
+    components:
+    - type: Transform
+      pos: 33.5,0.5
+      parent: 1653
+  - uid: 1862
+    components:
+    - type: Transform
+      pos: 32.5,0.5
+      parent: 1653
+  - uid: 1863
+    components:
+    - type: Transform
+      pos: 32.5,1.5
+      parent: 1653
+  - uid: 1864
+    components:
+    - type: Transform
+      pos: 32.5,0.5
+      parent: 1653
+  - uid: 1865
+    components:
+    - type: Transform
+      pos: 33.5,0.5
+      parent: 1653
+  - uid: 1866
+    components:
+    - type: Transform
+      pos: 28.5,3.5
+      parent: 1653
+  - uid: 1867
+    components:
+    - type: Transform
+      pos: 27.5,3.5
+      parent: 1653
+  - uid: 1868
+    components:
+    - type: Transform
+      pos: 27.5,2.5
+      parent: 1653
+  - uid: 1869
+    components:
+    - type: Transform
+      pos: 27.5,3.5
+      parent: 1653
+  - uid: 1870
+    components:
+    - type: Transform
+      pos: 27.5,3.5
+      parent: 1653
+  - uid: 1871
+    components:
+    - type: Transform
+      pos: 23.5,3.5
+      parent: 1653
+  - uid: 1872
+    components:
+    - type: Transform
+      pos: 21.5,3.5
+      parent: 1653
+  - uid: 1873
+    components:
+    - type: Transform
+      pos: 21.5,3.5
+      parent: 1653
+  - uid: 1874
+    components:
+    - type: Transform
+      pos: 22.5,3.5
+      parent: 1653
+  - uid: 1883
+    components:
+    - type: Transform
+      pos: 4.5,9.5
+      parent: 1653
+  - uid: 1884
+    components:
+    - type: Transform
+      pos: 4.5,10.5
+      parent: 1653
+  - uid: 1885
+    components:
+    - type: Transform
+      pos: 6.5,8.5
+      parent: 1653
+  - uid: 1886
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1653
+  - uid: 1887
+    components:
+    - type: Transform
+      pos: 5.5,2.5
+      parent: 1653
+  - uid: 1900
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,35.5
+      parent: 1653
+  - uid: 1901
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,36.5
+      parent: 1653
+  - uid: 1902
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,35.5
+      parent: 1653
+  - uid: 1903
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,35.5
+      parent: 1653
+  - uid: 1904
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,35.5
+      parent: 1653
+  - uid: 1905
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,35.5
+      parent: 1653
+  - uid: 1906
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,36.5
+      parent: 1653
+  - uid: 1919
+    components:
+    - type: Transform
+      pos: 32.5,35.5
+      parent: 1653
+  - uid: 1920
+    components:
+    - type: Transform
+      pos: 32.5,34.5
+      parent: 1653
+  - uid: 1921
+    components:
+    - type: Transform
+      pos: 32.5,35.5
+      parent: 1653
+  - uid: 1922
+    components:
+    - type: Transform
+      pos: 31.5,35.5
+      parent: 1653
+  - uid: 1923
+    components:
+    - type: Transform
+      pos: 26.5,36.5
+      parent: 1653
+  - uid: 1924
+    components:
+    - type: Transform
+      pos: 27.5,36.5
+      parent: 1653
+  - uid: 1925
+    components:
+    - type: Transform
+      pos: 25.5,36.5
+      parent: 1653
+  - uid: 1926
+    components:
+    - type: Transform
+      pos: 26.5,36.5
+      parent: 1653
+  - uid: 2000
+    components:
+    - type: Transform
+      pos: 42.5,6.5
+      parent: 1653
+  - uid: 2001
+    components:
+    - type: Transform
+      pos: 43.5,6.5
+      parent: 1653
+  - uid: 2002
+    components:
+    - type: Transform
+      pos: 43.5,7.5
+      parent: 1653
+  - uid: 2003
+    components:
+    - type: Transform
+      pos: 40.5,8.5
+      parent: 1653
+  - uid: 2004
+    components:
+    - type: Transform
+      pos: 38.5,8.5
+      parent: 1653
+  - uid: 2005
+    components:
+    - type: Transform
+      pos: 37.5,8.5
+      parent: 1653
+  - uid: 2006
+    components:
+    - type: Transform
+      pos: 36.5,9.5
+      parent: 1653
+  - uid: 2066
+    components:
+    - type: Transform
+      pos: 29.5,24.5
+      parent: 1653
+  - uid: 2067
+    components:
+    - type: Transform
+      pos: 29.5,25.5
+      parent: 1653
+  - uid: 2068
+    components:
+    - type: Transform
+      pos: 28.5,25.5
+      parent: 1653
+  - uid: 2069
+    components:
+    - type: Transform
+      pos: 28.5,26.5
+      parent: 1653
+  - uid: 2070
+    components:
+    - type: Transform
+      pos: 29.5,25.5
+      parent: 1653
+  - uid: 2071
+    components:
+    - type: Transform
+      pos: 29.5,24.5
+      parent: 1653
+  - uid: 2072
+    components:
+    - type: Transform
+      pos: 28.5,26.5
+      parent: 1653
+  - uid: 2073
+    components:
+    - type: Transform
+      pos: 25.5,28.5
+      parent: 1653
+  - uid: 2074
+    components:
+    - type: Transform
+      pos: 25.5,25.5
+      parent: 1653
+  - uid: 2075
+    components:
+    - type: Transform
+      pos: 26.5,25.5
+      parent: 1653
+  - uid: 2076
+    components:
+    - type: Transform
+      pos: 26.5,25.5
+      parent: 1653
+  - uid: 2077
+    components:
+    - type: Transform
+      pos: 25.5,25.5
+      parent: 1653
+  - uid: 2078
+    components:
+    - type: Transform
+      pos: 25.5,27.5
+      parent: 1653
+  - uid: 2079
+    components:
+    - type: Transform
+      pos: 21.5,26.5
+      parent: 1653
+  - uid: 2080
+    components:
+    - type: Transform
+      pos: 17.5,26.5
+      parent: 1653
+  - uid: 2081
+    components:
+    - type: Transform
+      pos: 17.5,24.5
+      parent: 1653
+  - uid: 2089
+    components:
+    - type: Transform
+      pos: 41.5,14.5
+      parent: 1653
+  - uid: 2090
+    components:
+    - type: Transform
+      pos: 41.5,13.5
+      parent: 1653
+  - uid: 2091
+    components:
+    - type: Transform
+      pos: 41.5,12.5
+      parent: 1653
+  - uid: 2092
+    components:
+    - type: Transform
+      pos: 43.5,13.5
+      parent: 1653
+  - uid: 2093
+    components:
+    - type: Transform
+      pos: 41.5,14.5
+      parent: 1653
+  - uid: 2094
+    components:
+    - type: Transform
+      pos: 42.5,15.5
+      parent: 1653
+  - uid: 2095
+    components:
+    - type: Transform
+      pos: 44.5,15.5
+      parent: 1653
+  - uid: 2096
+    components:
+    - type: Transform
+      pos: 44.5,15.5
+      parent: 1653
+  - uid: 2097
+    components:
+    - type: Transform
+      pos: 42.5,14.5
+      parent: 1653
+  - uid: 2098
+    components:
+    - type: Transform
+      pos: 44.5,15.5
+      parent: 1653
+  - uid: 2099
+    components:
+    - type: Transform
+      pos: 45.5,15.5
+      parent: 1653
+  - uid: 2100
+    components:
+    - type: Transform
+      pos: 43.5,14.5
+      parent: 1653
+  - uid: 2101
+    components:
+    - type: Transform
+      pos: 41.5,15.5
+      parent: 1653
+  - uid: 2102
+    components:
+    - type: Transform
+      pos: 41.5,15.5
+      parent: 1653
+  - uid: 2103
+    components:
+    - type: Transform
+      pos: 43.5,13.5
+      parent: 1653
+  - uid: 2104
+    components:
+    - type: Transform
+      pos: 32.5,25.5
+      parent: 1653
+  - uid: 2105
+    components:
+    - type: Transform
+      pos: 32.5,26.5
+      parent: 1653
+  - uid: 2106
+    components:
+    - type: Transform
+      pos: 33.5,25.5
+      parent: 1653
+  - uid: 2107
+    components:
+    - type: Transform
+      pos: 33.5,24.5
+      parent: 1653
+  - uid: 2108
+    components:
+    - type: Transform
+      pos: 33.5,25.5
+      parent: 1653
+  - uid: 2109
+    components:
+    - type: Transform
+      pos: 32.5,25.5
+      parent: 1653
+  - uid: 2110
+    components:
+    - type: Transform
+      pos: 32.5,26.5
+      parent: 1653
+  - uid: 2111
+    components:
+    - type: Transform
+      pos: 32.5,27.5
+      parent: 1653
+  - uid: 2112
+    components:
+    - type: Transform
+      pos: 33.5,26.5
+      parent: 1653
+  - uid: 2142
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,15.5
+      parent: 1653
+  - uid: 2143
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,14.5
+      parent: 1653
+  - uid: 2144
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,13.5
+      parent: 1653
+  - uid: 2145
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,15.5
+      parent: 1653
+  - uid: 2146
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,14.5
+      parent: 1653
+  - uid: 2147
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,13.5
+      parent: 1653
+  - uid: 2148
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,13.5
+      parent: 1653
+  - uid: 2149
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,14.5
+      parent: 1653
+  - uid: 2150
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,14.5
+      parent: 1653
+  - uid: 2151
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,15.5
+      parent: 1653
+  - uid: 2152
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,14.5
+      parent: 1653
+  - uid: 2153
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,13.5
+      parent: 1653
+  - uid: 2154
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,12.5
+      parent: 1653
+  - uid: 2155
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,12.5
+      parent: 1653
+  - uid: 2156
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 49.5,13.5
+      parent: 1653
+  - uid: 2157
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 49.5,13.5
+      parent: 1653
+  - uid: 2158
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,14.5
+      parent: 1653
+  - uid: 2159
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,15.5
+      parent: 1653
+  - uid: 2160
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 49.5,15.5
+      parent: 1653
+  - uid: 2161
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 49.5,16.5
+      parent: 1653
+  - uid: 2162
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,16.5
+      parent: 1653
+  - uid: 2163
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,16.5
+      parent: 1653
+  - uid: 2164
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,16.5
+      parent: 1653
+  - uid: 2165
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,14.5
+      parent: 1653
+  - uid: 2166
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,13.5
+      parent: 1653
+  - uid: 2167
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,14.5
+      parent: 1653
+  - uid: 2168
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,13.5
+      parent: 1653
+  - uid: 2169
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,15.5
+      parent: 1653
+  - uid: 2170
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,14.5
+      parent: 1653
+  - uid: 2171
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,12.5
+      parent: 1653
+  - uid: 2172
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,14.5
+      parent: 1653
+  - uid: 2173
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,14.5
+      parent: 1653
+  - uid: 2174
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,15.5
+      parent: 1653
+  - uid: 2175
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,13.5
+      parent: 1653
+  - uid: 2176
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,14.5
+      parent: 1653
+  - uid: 2177
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,14.5
+      parent: 1653
+  - uid: 2178
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,2.5
+      parent: 1653
+  - uid: 2179
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,1.5
+      parent: 1653
+  - uid: 2180
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,2.5
+      parent: 1653
+  - uid: 2181
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,2.5
+      parent: 1653
+  - uid: 2196
+    components:
+    - type: Transform
+      pos: 34.5,14.5
+      parent: 1653
+  - uid: 2197
+    components:
+    - type: Transform
+      pos: 34.5,15.5
+      parent: 1653
+  - uid: 2198
+    components:
+    - type: Transform
+      pos: 34.5,16.5
+      parent: 1653
+  - uid: 2199
+    components:
+    - type: Transform
+      pos: 33.5,14.5
+      parent: 1653
+  - uid: 2200
+    components:
+    - type: Transform
+      pos: 35.5,15.5
+      parent: 1653
+  - uid: 2201
+    components:
+    - type: Transform
+      pos: 35.5,14.5
+      parent: 1653
+  - uid: 2202
+    components:
+    - type: Transform
+      pos: 36.5,15.5
+      parent: 1653
+  - uid: 2203
+    components:
+    - type: Transform
+      pos: 36.5,14.5
+      parent: 1653
+  - uid: 2204
+    components:
+    - type: Transform
+      pos: 37.5,14.5
+      parent: 1653
+  - uid: 2205
+    components:
+    - type: Transform
+      pos: 36.5,14.5
+      parent: 1653
+  - uid: 2206
+    components:
+    - type: Transform
+      pos: 34.5,14.5
+      parent: 1653
+  - uid: 2207
+    components:
+    - type: Transform
+      pos: 35.5,14.5
+      parent: 1653
+  - uid: 2208
+    components:
+    - type: Transform
+      pos: 35.5,15.5
+      parent: 1653
+  - uid: 2209
+    components:
+    - type: Transform
+      pos: 35.5,16.5
+      parent: 1653
+  - uid: 2210
+    components:
+    - type: Transform
+      pos: 34.5,16.5
+      parent: 1653
+  - uid: 2211
+    components:
+    - type: Transform
+      pos: 34.5,15.5
+      parent: 1653
+- proto: KitchenMicrowave
+  entities:
+  - uid: 961
+    components:
+    - type: Transform
+      pos: 0.5,10.5
+      parent: 1653
+- proto: KudzuFlowerFriendly
+  entities:
+  - uid: 974
+    components:
+    - type: Transform
+      pos: 19.5,45.5
+      parent: 1653
+- proto: Lamp
+  entities:
+  - uid: 769
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.457528,31.735847
+      parent: 1653
+  - uid: 1208
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.4514933,45.40301
+      parent: 1653
+  - uid: 1319
+    components:
+    - type: Transform
+      pos: 35.611282,15.476883
+      parent: 1653
+- proto: LampGold
+  entities:
+  - uid: 775
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,32.5
+      parent: 1653
+- proto: LargeBeaker
+  entities:
+  - uid: 1468
+    components:
+    - type: Transform
+      pos: 21.7339,4.82244
+      parent: 1653
+  - uid: 1469
+    components:
+    - type: Transform
+      pos: 21.9839,4.619315
+      parent: 1653
+- proto: LightTree05
+  entities:
+  - uid: 125
+    components:
+    - type: Transform
+      pos: 19.507784,45.542137
+      parent: 1653
+- proto: LockerBotanistFilled
+  entities:
+  - uid: 794
+    components:
+    - type: Transform
+      pos: 10.5,26.5
+      parent: 1653
+  - uid: 2009
+    components:
+    - type: Transform
+      pos: 30.5,26.5
+      parent: 1653
+- proto: LockerBotanistLoot
+  entities:
+  - uid: 650
+    components:
+    - type: Transform
+      pos: 43.5,40.5
+      parent: 1653
+  - uid: 1088
+    components:
+    - type: Transform
+      pos: 8.5,26.5
+      parent: 1653
+- proto: LockerElectricalSuppliesFilled
+  entities:
+  - uid: 1533
+    components:
+    - type: Transform
+      pos: 27.5,9.5
+      parent: 1653
+- proto: LockerScienceFilled
+  entities:
+  - uid: 833
+    components:
+    - type: Transform
+      pos: 14.5,25.5
+      parent: 1653
+- proto: LockerWeldingSuppliesFilled
+  entities:
+  - uid: 1531
+    components:
+    - type: Transform
+      pos: 31.5,9.5
+      parent: 1653
+- proto: LuxuryPen
+  entities:
+  - uid: 1328
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.487568,15.43374
+      parent: 1653
+- proto: MachineAPE
+  entities:
+  - uid: 2139
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 50.5,14.5
+      parent: 1653
+- proto: MachineFrame
+  entities:
+  - uid: 1110
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,26.5
+      parent: 1653
+  - uid: 2140
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 52.5,14.5
+      parent: 1653
+- proto: MagicalLamp
+  entities:
+  - uid: 1204
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5085075,47.438328
+      parent: 1653
+- proto: MaintenanceFluffSpawner
+  entities:
+  - uid: 1245
+    components:
+    - type: Transform
+      pos: 48.5,4.5
+      parent: 1653
+  - uid: 1283
+    components:
+    - type: Transform
+      pos: 46.5,3.5
+      parent: 1653
+- proto: MaterialBiomass
+  entities:
+  - uid: 1534
+    components:
+    - type: Transform
+      pos: 24.534355,0.41658816
+      parent: 1653
+  - uid: 1753
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.496466,15.684341
+      parent: 1653
+  - uid: 1754
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.590216,15.590591
+      parent: 1653
+- proto: MaterialBones1
+  entities:
+  - uid: 2137
+    components:
+    - type: Transform
+      pos: 49.42443,15.527899
+      parent: 1653
+  - uid: 2138
+    components:
+    - type: Transform
+      pos: 49.54943,15.481024
+      parent: 1653
+- proto: MaterialWoodPlank
+  entities:
+  - uid: 669
+    components:
+    - type: Transform
+      pos: 20.62062,34.599228
+      parent: 1653
+- proto: Mirror
+  entities:
+  - uid: 892
+    components:
+    - type: Transform
+      pos: 1.5,21.5
+      parent: 1653
+  - uid: 893
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,19.5
+      parent: 1653
+- proto: ModularGrenade
+  entities:
+  - uid: 1634
+    components:
+    - type: Transform
+      pos: 40.388412,13.373815
+      parent: 1653
+  - uid: 1635
+    components:
+    - type: Transform
+      pos: 40.482162,13.57694
+      parent: 1653
+  - uid: 1636
+    components:
+    - type: Transform
+      pos: 40.607162,13.405065
+      parent: 1653
+- proto: Multitool
+  entities:
+  - uid: 1049
+    components:
+    - type: Transform
+      pos: 27.480967,22.500828
+      parent: 1653
+- proto: NettleSeeds
+  entities:
+  - uid: 1999
+    components:
+    - type: Transform
+      pos: 42.384377,9.279519
+      parent: 1653
+- proto: OrangeSeeds
+  entities:
+  - uid: 819
+    components:
+    - type: Transform
+      pos: 1.4881809,27.512886
+      parent: 1653
+- proto: Paper
+  entities:
+  - uid: 490
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.4302826,44.545006
+      parent: 1653
+  - uid: 1127
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.4302826,44.545006
+      parent: 1653
+  - uid: 1131
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.4302826,44.545006
+      parent: 1653
+- proto: PaperBin5
+  entities:
+  - uid: 785
+    components:
+    - type: Transform
+      pos: 24.5,31.5
+      parent: 1653
+  - uid: 1006
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,47.5
+      parent: 1653
+  - uid: 1707
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 35.5,14.5
+      parent: 1653
+- proto: PartRodMetal1
+  entities:
+  - uid: 531
+    components:
+    - type: Transform
+      pos: 33.42354,40.437122
+      parent: 1653
+- proto: PenCentcom
+  entities:
+  - uid: 686
+    components:
+    - type: Transform
+      pos: 24.75229,32.018597
+      parent: 1653
+- proto: PercentileDie
+  entities:
+  - uid: 744
+    components:
+    - type: Transform
+      pos: 17.44835,14.326076
+      parent: 1653
+- proto: PineappleSeeds
+  entities:
+  - uid: 455
+    components:
+    - type: Transform
+      pos: 33.566967,20.5998
+      parent: 1653
+- proto: PlasmaTankFilled
+  entities:
+  - uid: 1473
+    components:
+    - type: Transform
+      pos: 30.568752,4.54119
+      parent: 1653
+- proto: PlushieDiona
+  entities:
+  - uid: 653
+    components:
+    - type: Transform
+      pos: 20.508192,0.61549807
+      parent: 1653
+- proto: PlushieSharkGrey
+  entities:
+  - uid: 926
+    components:
+    - type: Transform
+      pos: 6.4745436,18.474607
+      parent: 1653
+- proto: PortableGeneratorJrPacman
+  entities:
+  - uid: 1716
+    components:
+    - type: Transform
+      pos: 27.5,19.5
+      parent: 1653
+- proto: PortableGeneratorPacman
+  entities:
+  - uid: 489
+    components:
+    - type: Transform
+      pos: 27.5,21.5
+      parent: 1653
+  - uid: 1528
+    components:
+    - type: Transform
+      pos: 25.5,8.5
+      parent: 1653
+  - uid: 1529
+    components:
+    - type: Transform
+      pos: 33.5,8.5
+      parent: 1653
+- proto: PottedPlant19
+  entities:
+  - uid: 990
+    components:
+    - type: Transform
+      pos: 4.4883204,10.239479
+      parent: 1653
+- proto: PottedPlantRandom
+  entities:
+  - uid: 498
+    components:
+    - type: Transform
+      pos: 3.5,40.5
+      parent: 1653
+  - uid: 521
+    components:
+    - type: Transform
+      pos: 24.5,40.5
+      parent: 1653
+- proto: PottedPlantRandomPlastic
+  entities:
+  - uid: 641
+    components:
+    - type: Transform
+      pos: 2.5,35.5
+      parent: 1653
+  - uid: 668
+    components:
+    - type: Transform
+      pos: 12.5,36.5
+      parent: 1653
+  - uid: 731
+    components:
+    - type: Transform
+      pos: 12.5,28.5
+      parent: 1653
+- proto: PowerCellHigh
+  entities:
+  - uid: 799
+    components:
+    - type: Transform
+      pos: 16.534313,24.606636
+      parent: 1653
+- proto: PowerCellPotato
+  entities:
+  - uid: 862
+    components:
+    - type: Transform
+      pos: 12.315257,39.398518
+      parent: 1653
+- proto: PowerCellRecharger
+  entities:
+  - uid: 808
+    components:
+    - type: Transform
+      pos: 12.5,45.5
+      parent: 1653
+  - uid: 2187
+    components:
+    - type: Transform
+      pos: 49.5,13.5
+      parent: 1653
+- proto: PowerDrill
+  entities:
+  - uid: 1050
+    components:
+    - type: Transform
+      pos: 28.512217,21.547703
+      parent: 1653
+- proto: Poweredlight
+  entities:
+  - uid: 77
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,15.5
+      parent: 1653
+  - uid: 79
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,13.5
+      parent: 1653
+  - uid: 81
+    components:
+    - type: Transform
+      pos: 6.5,31.5
+      parent: 1653
+  - uid: 123
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,30.5
+      parent: 1653
+  - uid: 301
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,30.5
+      parent: 1653
+  - uid: 325
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,2.5
+      parent: 1653
+  - uid: 326
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,2.5
+      parent: 1653
+  - uid: 327
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,3.5
+      parent: 1653
+  - uid: 328
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,3.5
+      parent: 1653
+  - uid: 485
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,45.5
+      parent: 1653
+  - uid: 487
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 32.5,13.5
+      parent: 1653
+  - uid: 488
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,4.5
+      parent: 1653
+  - uid: 499
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,38.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 506
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,38.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 513
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,38.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 537
+    components:
+    - type: Transform
+      pos: 42.5,40.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 634
+    components:
+    - type: Transform
+      pos: 2.5,36.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 635
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,34.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 657
+    components:
+    - type: Transform
+      pos: 14.5,36.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 676
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,34.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 680
+    components:
+    - type: Transform
+      pos: 27.5,36.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 770
+    components:
+    - type: Transform
+      pos: 15.5,32.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 771
+    components:
+    - type: Transform
+      pos: 24.5,32.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 932
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,19.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 933
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,21.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 944
+    components:
+    - type: Transform
+      pos: 15.5,22.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 945
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,18.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1011
+    components:
+    - type: Transform
+      pos: 18.5,22.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1012
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,18.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1052
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,18.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1280
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 36.5,3.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1281
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 54.5,1.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1291
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 38.5,15.5
+      parent: 1653
+  - uid: 1292
+    components:
+    - type: Transform
+      pos: 35.5,12.5
+      parent: 1653
+  - uid: 1294
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 44.5,0.5
+      parent: 1653
+  - uid: 1301
+    components:
+    - type: Transform
+      pos: 10.5,1.5
+      parent: 1653
+  - uid: 1302
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 1653
+  - uid: 1307
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,48.5
+      parent: 1653
+  - uid: 1320
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 35.5,16.5
+      parent: 1653
+  - uid: 1385
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,8.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1386
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,8.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1590
+    components:
+    - type: Transform
+      pos: 27.5,4.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1720
+    components:
+    - type: Transform
+      pos: 3.5,42.5
+      parent: 1653
+  - uid: 1721
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,45.5
+      parent: 1653
+  - uid: 1733
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 26.5,14.5
+      parent: 1653
+  - uid: 1734
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,14.5
+      parent: 1653
+  - uid: 1977
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 51.5,38.5
+      parent: 1653
+  - uid: 1978
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,26.5
+      parent: 1653
+  - uid: 1979
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,18.5
+      parent: 1653
+  - uid: 1980
+    components:
+    - type: Transform
+      pos: 33.5,22.5
+      parent: 1653
+  - uid: 2115
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 28.5,26.5
+      parent: 1653
+  - uid: 2116
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,26.5
+      parent: 1653
+  - uid: 2117
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 40.5,6.5
+      parent: 1653
+  - uid: 2118
+    components:
+    - type: Transform
+      pos: 42.5,10.5
+      parent: 1653
+  - uid: 2214
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,30.5
+      parent: 1653
+- proto: PoweredlightCyan
+  entities:
+  - uid: 1701
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,39.5
+      parent: 1653
+- proto: PoweredlightEmpty
+  entities:
+  - uid: 738
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,34.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+- proto: PoweredSmallLight
+  entities:
+  - uid: 320
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,0.5
+      parent: 1653
+  - uid: 323
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 32.5,0.5
+      parent: 1653
+  - uid: 586
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,42.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 587
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,44.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 588
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,44.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 714
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,25.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 830
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,25.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 903
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,19.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 904
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,22.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 949
+    components:
+    - type: Transform
+      pos: 6.5,10.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 991
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,6.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 992
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,6.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1156
+    components:
+    - type: Transform
+      pos: 11.5,14.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1157
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,14.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1158
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,14.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1258
+    components:
+    - type: Transform
+      pos: 41.5,4.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1259
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 41.5,0.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1260
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 49.5,0.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1261
+    components:
+    - type: Transform
+      pos: 49.5,4.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1444
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,0.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1445
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 24.5,0.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1724
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 17.5,42.5
+      parent: 1653
+  - uid: 1725
+    components:
+    - type: Transform
+      pos: 21.5,48.5
+      parent: 1653
+  - uid: 1727
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,12.5
+      parent: 1653
+  - uid: 1728
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 17.5,12.5
+      parent: 1653
+  - uid: 1729
+    components:
+    - type: Transform
+      pos: 21.5,16.5
+      parent: 1653
+- proto: PoweredSmallLightEmpty
+  entities:
+  - uid: 737
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,25.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 848
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,26.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 849
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,26.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 1652
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 45.5,12.5
+      parent: 1653
+    - type: ApcPowerReceiver
+      powerLoad: 0
+- proto: Rack
+  entities:
+  - uid: 164
+    components:
+    - type: Transform
+      pos: 4.5,28.5
+      parent: 1653
+  - uid: 169
+    components:
+    - type: Transform
+      pos: 6.5,24.5
+      parent: 1653
+  - uid: 659
+    components:
+    - type: Transform
+      pos: 20.5,36.5
+      parent: 1653
+  - uid: 660
+    components:
+    - type: Transform
+      pos: 21.5,36.5
+      parent: 1653
+  - uid: 718
+    components:
+    - type: Transform
+      pos: 6.5,27.5
+      parent: 1653
+  - uid: 729
+    components:
+    - type: Transform
+      pos: 4.5,25.5
+      parent: 1653
+  - uid: 837
+    components:
+    - type: Transform
+      pos: 16.5,24.5
+      parent: 1653
+  - uid: 840
+    components:
+    - type: Transform
+      pos: 12.5,24.5
+      parent: 1653
+  - uid: 845
+    components:
+    - type: Transform
+      pos: 20.5,24.5
+      parent: 1653
+  - uid: 882
+    components:
+    - type: Transform
+      pos: 22.5,28.5
+      parent: 1653
+  - uid: 894
+    components:
+    - type: Transform
+      pos: 0.5,18.5
+      parent: 1653
+  - uid: 930
+    components:
+    - type: Transform
+      pos: 6.5,18.5
+      parent: 1653
+  - uid: 1047
+    components:
+    - type: Transform
+      pos: 28.5,21.5
+      parent: 1653
+  - uid: 1048
+    components:
+    - type: Transform
+      pos: 27.5,22.5
+      parent: 1653
+  - uid: 1081
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,15.5
+      parent: 1653
+  - uid: 1148
+    components:
+    - type: Transform
+      pos: 12.5,14.5
+      parent: 1653
+  - uid: 1149
+    components:
+    - type: Transform
+      pos: 10.5,14.5
+      parent: 1653
+  - uid: 1256
+    components:
+    - type: Transform
+      pos: 46.5,3.5
+      parent: 1653
+  - uid: 1947
+    components:
+    - type: Transform
+      pos: 53.5,38.5
+      parent: 1653
+  - uid: 2027
+    components:
+    - type: Transform
+      pos: 34.5,26.5
+      parent: 1653
+- proto: Railing
+  entities:
+  - uid: 527
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,38.5
+      parent: 1653
+  - uid: 936
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,18.5
+      parent: 1653
+  - uid: 940
+    components:
+    - type: Transform
+      pos: 12.5,19.5
+      parent: 1653
+- proto: RailingCornerSmall
+  entities:
+  - uid: 528
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 34.5,39.5
+      parent: 1653
+  - uid: 529
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,39.5
+      parent: 1653
+  - uid: 530
+    components:
+    - type: Transform
+      pos: 35.5,38.5
+      parent: 1653
+  - uid: 943
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,19.5
+      parent: 1653
+- proto: RandomFoodMeal
+  entities:
+  - uid: 456
+    components:
+    - type: Transform
+      pos: 10.5,0.5
+      parent: 1653
+  - uid: 993
+    components:
+    - type: Transform
+      pos: 12.5,22.5
+      parent: 1653
+  - uid: 1314
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 1653
+- proto: RandomFoodSingle
+  entities:
+  - uid: 403
+    components:
+    - type: Transform
+      pos: 5.5,4.5
+      parent: 1653
+- proto: RandomInstruments
+  entities:
+  - uid: 1248
+    components:
+    - type: Transform
+      pos: 48.5,0.5
+      parent: 1653
+- proto: RandomPosterContraband
+  entities:
+  - uid: 1274
+    components:
+    - type: Transform
+      pos: 43.5,4.5
+      parent: 1653
+  - uid: 1275
+    components:
+    - type: Transform
+      pos: 47.5,0.5
+      parent: 1653
+  - uid: 1276
+    components:
+    - type: Transform
+      pos: 39.5,0.5
+      parent: 1653
+- proto: RandomSnacks
+  entities:
+  - uid: 994
+    components:
+    - type: Transform
+      pos: 16.5,18.5
+      parent: 1653
+- proto: RandomSoap
+  entities:
+  - uid: 898
+    components:
+    - type: Transform
+      pos: 0.5,22.5
+      parent: 1653
+- proto: RandomSpawner
+  entities:
+  - uid: 721
+    components:
+    - type: Transform
+      pos: 9.5,34.5
+      parent: 1653
+  - uid: 722
+    components:
+    - type: Transform
+      pos: 5.5,38.5
+      parent: 1653
+  - uid: 723
+    components:
+    - type: Transform
+      pos: 29.5,40.5
+      parent: 1653
+  - uid: 724
+    components:
+    - type: Transform
+      pos: 18.5,38.5
+      parent: 1653
+  - uid: 725
+    components:
+    - type: Transform
+      pos: 37.5,38.5
+      parent: 1653
+  - uid: 726
+    components:
+    - type: Transform
+      pos: 41.5,40.5
+      parent: 1653
+- proto: RandomSpawner100
+  entities:
+  - uid: 1413
+    components:
+    - type: Transform
+      pos: 21.5,43.5
+      parent: 1653
+  - uid: 1456
+    components:
+    - type: Transform
+      pos: 17.5,47.5
+      parent: 1653
+- proto: RandomVending
+  entities:
+  - uid: 861
+    components:
+    - type: Transform
+      pos: 10.5,22.5
+      parent: 1653
+  - uid: 934
+    components:
+    - type: Transform
+      pos: 16.5,22.5
+      parent: 1653
+- proto: ReinforcedUraniumWindow
+  entities:
+  - uid: 289
+    components:
+    - type: Transform
+      pos: 3.5,15.5
+      parent: 1653
+  - uid: 290
+    components:
+    - type: Transform
+      pos: 4.5,13.5
+      parent: 1653
+  - uid: 658
+    components:
+    - type: Transform
+      pos: 2.5,15.5
+      parent: 1653
+  - uid: 811
+    components:
+    - type: Transform
+      pos: 4.5,14.5
+      parent: 1653
+  - uid: 812
+    components:
+    - type: Transform
+      pos: 2.5,14.5
+      parent: 1653
+  - uid: 813
+    components:
+    - type: Transform
+      pos: 2.5,13.5
+      parent: 1653
+  - uid: 820
+    components:
+    - type: Transform
+      pos: 4.5,15.5
+      parent: 1653
+  - uid: 821
+    components:
+    - type: Transform
+      pos: 3.5,13.5
+      parent: 1653
+- proto: ReinforcedWindow
+  entities:
+  - uid: 104
+    components:
+    - type: Transform
+      pos: 19.5,44.5
+      parent: 1653
+  - uid: 106
+    components:
+    - type: Transform
+      pos: 20.5,44.5
+      parent: 1653
+  - uid: 107
+    components:
+    - type: Transform
+      pos: 20.5,45.5
+      parent: 1653
+  - uid: 111
+    components:
+    - type: Transform
+      pos: 18.5,46.5
+      parent: 1653
+  - uid: 112
+    components:
+    - type: Transform
+      pos: 19.5,46.5
+      parent: 1653
+  - uid: 113
+    components:
+    - type: Transform
+      pos: 18.5,45.5
+      parent: 1653
+  - uid: 116
+    components:
+    - type: Transform
+      pos: 18.5,44.5
+      parent: 1653
+  - uid: 625
+    components:
+    - type: Transform
+      pos: 20.5,46.5
+      parent: 1653
+  - uid: 739
+    components:
+    - type: Transform
+      pos: 17.5,30.5
+      parent: 1653
+  - uid: 740
+    components:
+    - type: Transform
+      pos: 17.5,32.5
+      parent: 1653
+- proto: RemoteSignaller
+  entities:
+  - uid: 1628
+    components:
+    - type: Transform
+      pos: 42.357162,12.70194
+      parent: 1653
+  - uid: 1629
+    components:
+    - type: Transform
+      pos: 42.482162,12.85819
+      parent: 1653
+  - uid: 1630
+    components:
+    - type: Transform
+      pos: 42.607162,12.70194
+      parent: 1653
+- proto: SalvageCanisterSpawner
+  entities:
+  - uid: 802
+    components:
+    - type: Transform
+      pos: 16.5,26.5
+      parent: 1653
+- proto: SalvageMaterialCrateSpawner
+  entities:
+  - uid: 2024
+    components:
+    - type: Transform
+      pos: 34.5,27.5
+      parent: 1653
+- proto: Screwdriver
+  entities:
+  - uid: 727
+    components:
+    - type: Transform
+      pos: 4.60394,27.528143
+      parent: 1653
+- proto: SeedExtractor
+  entities:
+  - uid: 810
+    components:
+    - type: Transform
+      pos: 5.5,15.5
+      parent: 1653
+  - uid: 1373
+    components:
+    - type: Transform
+      pos: 18.5,8.5
+      parent: 1653
+  - uid: 1984
+    components:
+    - type: Transform
+      pos: 41.5,9.5
+      parent: 1653
+- proto: SeedExtractorMachineCircuitboard
+  entities:
+  - uid: 162
+    components:
+    - type: Transform
+      pos: 22.515446,28.541763
+      parent: 1653
+- proto: ShardCrystalCyan
+  entities:
+  - uid: 119
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.534214,35.622967
+      parent: 1653
+  - uid: 1915
+    components:
+    - type: Transform
+      pos: 32.723732,35.237103
+      parent: 1653
+  - uid: 1916
+    components:
+    - type: Transform
+      pos: 25.848734,36.330853
+      parent: 1653
+  - uid: 1960
+    components:
+    - type: Transform
+      pos: 24.499039,26.422136
+      parent: 1653
+  - uid: 2082
+    components:
+    - type: Transform
+      pos: 32.498764,25.506607
+      parent: 1653
+- proto: ShardGlass
+  entities:
+  - uid: 535
+    components:
+    - type: Transform
+      pos: 37.501663,39.608997
+      parent: 1653
+  - uid: 613
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.581089,35.48234
+      parent: 1653
+  - uid: 1195
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.508757,46.601135
+      parent: 1653
+- proto: SheetGlass
+  entities:
+  - uid: 717
+    components:
+    - type: Transform
+      pos: 6.41644,28.543768
+      parent: 1653
+  - uid: 832
+    components:
+    - type: Transform
+      pos: 4.557065,24.528143
+      parent: 1653
+  - uid: 844
+    components:
+    - type: Transform
+      pos: 53.377705,4.600436
+      parent: 1653
+- proto: SheetPlasteel1
+  entities:
+  - uid: 288
+    components:
+    - type: Transform
+      pos: 1.4974408,26.422686
+      parent: 1653
+- proto: SheetPlastic
+  entities:
+  - uid: 838
+    components:
+    - type: Transform
+      pos: 10.278141,7.4876976
+      parent: 1653
+  - uid: 846
+    components:
+    - type: Transform
+      pos: 6.3194933,22.541233
+      parent: 1653
+- proto: SheetRGlass
+  entities:
+  - uid: 1112
+    components:
+    - type: Transform
+      pos: 20.352413,24.551647
+      parent: 1653
+- proto: SheetSteel1
+  entities:
+  - uid: 839
+    components:
+    - type: Transform
+      pos: 14.465876,24.425442
+      parent: 1653
+- proto: ShuttersWindow
+  entities:
+  - uid: 580
+    components:
+    - type: Transform
+      pos: 10.5,43.5
+      parent: 1653
+    - type: DeviceLinkSink
+      links:
+      - 583
+  - uid: 581
+    components:
+    - type: Transform
+      pos: 11.5,43.5
+      parent: 1653
+    - type: DeviceLinkSink
+      links:
+      - 583
+  - uid: 582
+    components:
+    - type: Transform
+      pos: 12.5,43.5
+      parent: 1653
+    - type: DeviceLinkSink
+      links:
+      - 583
+- proto: SignalButton
+  entities:
+  - uid: 583
+    components:
+    - type: Transform
+      pos: 9.5,43.5
+      parent: 1653
+    - type: DeviceLinkSource
+      linkedPorts:
+        580:
+        - Pressed: Toggle
+        581:
+        - Pressed: Toggle
+        582:
+        - Pressed: Toggle
+- proto: SignElectricalMed
+  entities:
+  - uid: 585
+    components:
+    - type: Transform
+      pos: 8.5,43.5
+      parent: 1653
+  - uid: 1540
+    components:
+    - type: Transform
+      pos: 28.5,9.5
+      parent: 1653
+- proto: SignHydro2
+  entities:
+  - uid: 1059
+    components:
+    - type: Transform
+      pos: 19.5,4.5
+      parent: 1653
+- proto: SignHydro3
+  entities:
+  - uid: 1060
+    components:
+    - type: Transform
+      pos: 33.5,4.5
+      parent: 1653
+- proto: SignRedFour
+  entities:
+  - uid: 1252
+    components:
+    - type: Transform
+      pos: 48.5,1.5
+      parent: 1653
+- proto: SignRedOne
+  entities:
+  - uid: 1249
+    components:
+    - type: Transform
+      pos: 40.5,3.5
+      parent: 1653
+- proto: SignRedThree
+  entities:
+  - uid: 1251
+    components:
+    - type: Transform
+      pos: 48.5,3.5
+      parent: 1653
+- proto: SignRedTwo
+  entities:
+  - uid: 1250
+    components:
+    - type: Transform
+      pos: 40.5,1.5
+      parent: 1653
+- proto: SignSecureMed
+  entities:
+  - uid: 1154
+    components:
+    - type: Transform
+      pos: 10.5,13.5
+      parent: 1653
+- proto: SignShock
+  entities:
+  - uid: 1155
+    components:
+    - type: Transform
+      pos: 12.5,13.5
+      parent: 1653
+- proto: SilverDoor
+  entities:
+  - uid: 985
+    components:
+    - type: Transform
+      pos: 11.5,13.5
+      parent: 1653
+- proto: SinkWide
+  entities:
+  - uid: 890
+    components:
+    - type: Transform
+      pos: 1.5,20.5
+      parent: 1653
+  - uid: 891
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,19.5
+      parent: 1653
+  - uid: 960
+    components:
+    - type: Transform
+      pos: 3.5,10.5
+      parent: 1653
+- proto: SmartFridge
+  entities:
+  - uid: 1458
+    components:
+    - type: Transform
+      pos: 23.5,4.5
+      parent: 1653
+- proto: SMESBasic
+  entities:
+  - uid: 262
+    components:
+    - type: Transform
+      pos: 26.5,20.5
+      parent: 1653
+  - uid: 539
+    components:
+    - type: Transform
+      pos: 11.5,45.5
+      parent: 1653
+  - uid: 1485
+    components:
+    - type: Transform
+      pos: 28.5,8.5
+      parent: 1653
+  - uid: 1486
+    components:
+    - type: Transform
+      pos: 29.5,8.5
+      parent: 1653
+  - uid: 1487
+    components:
+    - type: Transform
+      pos: 30.5,8.5
+      parent: 1653
+- proto: SteelBench
+  entities:
+  - uid: 2113
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,24.5
+      parent: 1653
+  - uid: 2114
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 32.5,25.5
+      parent: 1653
+- proto: Stool
+  entities:
+  - uid: 172
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,24.5
+      parent: 1653
+  - uid: 173
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,24.5
+      parent: 1653
+  - uid: 202
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,28.5
+      parent: 1653
+  - uid: 204
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,28.5
+      parent: 1653
+  - uid: 644
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,35.5
+      parent: 1653
+  - uid: 787
+    components:
+    - type: Transform
+      pos: 15.5,32.5
+      parent: 1653
+  - uid: 788
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 16.5,30.5
+      parent: 1653
+  - uid: 789
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,30.5
+      parent: 1653
+  - uid: 790
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,30.5
+      parent: 1653
+  - uid: 901
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,21.5
+      parent: 1653
+  - uid: 902
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,21.5
+      parent: 1653
+  - uid: 950
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,7.5
+      parent: 1653
+  - uid: 951
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,6.5
+      parent: 1653
+  - uid: 952
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,6.5
+      parent: 1653
+  - uid: 953
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,7.5
+      parent: 1653
+  - uid: 1269
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 44.5,3.5
+      parent: 1653
+  - uid: 2019
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,24.5
+      parent: 1653
+  - uid: 2020
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 28.5,24.5
+      parent: 1653
+  - uid: 2021
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 28.5,28.5
+      parent: 1653
+  - uid: 2022
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,28.5
+      parent: 1653
+- proto: StorageCanister
+  entities:
+  - uid: 803
+    components:
+    - type: Transform
+      pos: 16.5,27.5
+      parent: 1653
+  - uid: 1647
+    components:
+    - type: Transform
+      pos: 40.5,16.5
+      parent: 1653
+- proto: SubstationBasic
+  entities:
+  - uid: 559
+    components:
+    - type: Transform
+      pos: 8.5,42.5
+      parent: 1653
+  - uid: 1010
+    components:
+    - type: Transform
+      pos: 28.5,18.5
+      parent: 1653
+- proto: SubstationWallBasic
+  entities:
+  - uid: 354
+    components:
+    - type: Transform
+      pos: 29.5,9.5
+      parent: 1653
+- proto: SurveillanceWirelessCameraAnchoredCircuitboard
+  entities:
+  - uid: 1197
+    components:
+    - type: Transform
+      pos: 2.4925566,47.576256
+      parent: 1653
+- proto: Table
+  entities:
+  - uid: 145
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,46.5
+      parent: 1653
+  - uid: 322
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 35.5,15.5
+      parent: 1653
+  - uid: 416
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,20.5
+      parent: 1653
+  - uid: 418
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 33.5,20.5
+      parent: 1653
+  - uid: 453
+    components:
+    - type: Transform
+      pos: 6.5,0.5
+      parent: 1653
+  - uid: 454
+    components:
+    - type: Transform
+      pos: 10.5,0.5
+      parent: 1653
+  - uid: 461
+    components:
+    - type: Transform
+      pos: 5.5,4.5
+      parent: 1653
+  - uid: 465
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,4.5
+      parent: 1653
+  - uid: 507
+    components:
+    - type: Transform
+      pos: 20.5,40.5
+      parent: 1653
+  - uid: 524
+    components:
+    - type: Transform
+      pos: 37.5,39.5
+      parent: 1653
+  - uid: 525
+    components:
+    - type: Transform
+      pos: 37.5,40.5
+      parent: 1653
+  - uid: 526
+    components:
+    - type: Transform
+      pos: 35.5,38.5
+      parent: 1653
+  - uid: 589
+    components:
+    - type: Transform
+      pos: 10.5,45.5
+      parent: 1653
+  - uid: 590
+    components:
+    - type: Transform
+      pos: 12.5,45.5
+      parent: 1653
+  - uid: 631
+    components:
+    - type: Transform
+      pos: 8.5,35.5
+      parent: 1653
+  - uid: 681
+    components:
+    - type: Transform
+      pos: 33.5,36.5
+      parent: 1653
+  - uid: 777
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 22.5,32.5
+      parent: 1653
+  - uid: 778
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 22.5,30.5
+      parent: 1653
+  - uid: 781
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,32.5
+      parent: 1653
+  - uid: 782
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,30.5
+      parent: 1653
+  - uid: 795
+    components:
+    - type: Transform
+      pos: 14.5,28.5
+      parent: 1653
+  - uid: 956
+    components:
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 1653
+  - uid: 957
+    components:
+    - type: Transform
+      pos: 0.5,10.5
+      parent: 1653
+  - uid: 958
+    components:
+    - type: Transform
+      pos: 1.5,10.5
+      parent: 1653
+  - uid: 959
+    components:
+    - type: Transform
+      pos: 2.5,10.5
+      parent: 1653
+  - uid: 1007
+    components:
+    - type: Transform
+      pos: 21.5,22.5
+      parent: 1653
+  - uid: 1056
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.5,48.5
+      parent: 1653
+  - uid: 1111
+    components:
+    - type: Transform
+      pos: 6.5,28.5
+      parent: 1653
+  - uid: 1113
+    components:
+    - type: Transform
+      pos: 4.5,24.5
+      parent: 1653
+  - uid: 1262
+    components:
+    - type: Transform
+      pos: 37.5,0.5
+      parent: 1653
+  - uid: 1263
+    components:
+    - type: Transform
+      pos: 53.5,4.5
+      parent: 1653
+  - uid: 1293
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,14.5
+      parent: 1653
+  - uid: 1309
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 34.5,15.5
+      parent: 1653
+  - uid: 1316
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 36.5,15.5
+      parent: 1653
+  - uid: 1428
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,2.5
+      parent: 1653
+  - uid: 1429
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 23.5,2.5
+      parent: 1653
+  - uid: 1618
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,13.5
+      parent: 1653
+  - uid: 1619
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 40.5,12.5
+      parent: 1653
+  - uid: 1620
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 42.5,12.5
+      parent: 1653
+  - uid: 1621
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 41.5,12.5
+      parent: 1653
+  - uid: 1622
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 42.5,13.5
+      parent: 1653
+  - uid: 1730
+    components:
+    - type: Transform
+      pos: 29.5,15.5
+      parent: 1653
+  - uid: 1731
+    components:
+    - type: Transform
+      pos: 25.5,13.5
+      parent: 1653
+  - uid: 2025
+    components:
+    - type: Transform
+      pos: 32.5,26.5
+      parent: 1653
+  - uid: 2026
+    components:
+    - type: Transform
+      pos: 32.5,27.5
+      parent: 1653
+- proto: TableCarpet
+  entities:
+  - uid: 86
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,46.5
+      parent: 1653
+  - uid: 570
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,44.5
+      parent: 1653
+  - uid: 822
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,47.5
+      parent: 1653
+  - uid: 831
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,43.5
+      parent: 1653
+  - uid: 868
+    components:
+    - type: Transform
+      pos: 6.5,30.5
+      parent: 1653
+  - uid: 969
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,30.5
+      parent: 1653
+  - uid: 1072
+    components:
+    - type: Transform
+      pos: 10.5,31.5
+      parent: 1653
+  - uid: 1243
+    components:
+    - type: Transform
+      pos: 48.5,4.5
+      parent: 1653
+  - uid: 1425
+    components:
+    - type: Transform
+      pos: 10.5,32.5
+      parent: 1653
+- proto: TableFancyCyan
+  entities:
+  - uid: 1323
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,7.5
+      parent: 1653
+  - uid: 1325
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,6.5
+      parent: 1653
+- proto: TableFrame
+  entities:
+  - uid: 716
+    components:
+    - type: Transform
+      pos: 14.5,24.5
+      parent: 1653
+  - uid: 873
+    components:
+    - type: Transform
+      pos: 1.5,26.5
+      parent: 1653
+  - uid: 1079
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,13.5
+      parent: 1653
+  - uid: 1191
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,35.5
+      parent: 1653
+- proto: TableGlass
+  entities:
+  - uid: 457
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,2.5
+      parent: 1653
+  - uid: 459
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,2.5
+      parent: 1653
+  - uid: 467
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,2.5
+      parent: 1653
+  - uid: 627
+    components:
+    - type: Transform
+      pos: 4.5,35.5
+      parent: 1653
+  - uid: 629
+    components:
+    - type: Transform
+      pos: 6.5,35.5
+      parent: 1653
+  - uid: 925
+    components:
+    - type: Transform
+      pos: 6.5,22.5
+      parent: 1653
+  - uid: 941
+    components:
+    - type: Transform
+      pos: 12.5,22.5
+      parent: 1653
+  - uid: 942
+    components:
+    - type: Transform
+      pos: 16.5,18.5
+      parent: 1653
+  - uid: 1374
+    components:
+    - type: Transform
+      pos: 18.5,9.5
+      parent: 1653
+  - uid: 1375
+    components:
+    - type: Transform
+      pos: 16.5,7.5
+      parent: 1653
+  - uid: 1376
+    components:
+    - type: Transform
+      pos: 16.5,8.5
+      parent: 1653
+  - uid: 1377
+    components:
+    - type: Transform
+      pos: 16.5,9.5
+      parent: 1653
+  - uid: 1448
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,4.5
+      parent: 1653
+  - uid: 1449
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 21.5,4.5
+      parent: 1653
+  - uid: 1450
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,4.5
+      parent: 1653
+  - uid: 1451
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 32.5,4.5
+      parent: 1653
+  - uid: 1452
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,4.5
+      parent: 1653
+  - uid: 1453
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,4.5
+      parent: 1653
+  - uid: 1477
+    components:
+    - type: Transform
+      pos: 22.5,0.5
+      parent: 1653
+- proto: TableReinforced
+  entities:
+  - uid: 163
+    components:
+    - type: Transform
+      pos: 6.5,25.5
+      parent: 1653
+  - uid: 709
+    components:
+    - type: Transform
+      pos: 1.5,25.5
+      parent: 1653
+  - uid: 711
+    components:
+    - type: Transform
+      pos: 1.5,27.5
+      parent: 1653
+  - uid: 713
+    components:
+    - type: Transform
+      pos: 3.5,14.5
+      parent: 1653
+  - uid: 823
+    components:
+    - type: Transform
+      pos: 4.5,27.5
+      parent: 1653
+  - uid: 841
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,13.5
+      parent: 1653
+  - uid: 1530
+    components:
+    - type: Transform
+      pos: 27.5,8.5
+      parent: 1653
+  - uid: 1532
+    components:
+    - type: Transform
+      pos: 31.5,8.5
+      parent: 1653
+  - uid: 2132
+    components:
+    - type: Transform
+      pos: 49.5,15.5
+      parent: 1653
+  - uid: 2133
+    components:
+    - type: Transform
+      pos: 49.5,13.5
+      parent: 1653
+  - uid: 2135
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 53.5,13.5
+      parent: 1653
+  - uid: 2136
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 53.5,15.5
+      parent: 1653
+- proto: TableWood
+  entities:
+  - uid: 82
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,45.5
+      parent: 1653
+  - uid: 87
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,47.5
+      parent: 1653
+  - uid: 571
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,43.5
+      parent: 1653
+  - uid: 666
+    components:
+    - type: Transform
+      pos: 20.5,34.5
+      parent: 1653
+  - uid: 667
+    components:
+    - type: Transform
+      pos: 21.5,34.5
+      parent: 1653
+  - uid: 673
+    components:
+    - type: Transform
+      pos: 25.5,31.5
+      parent: 1653
+  - uid: 772
+    components:
+    - type: Transform
+      pos: 24.5,32.5
+      parent: 1653
+  - uid: 773
+    components:
+    - type: Transform
+      pos: 24.5,31.5
+      parent: 1653
+  - uid: 884
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,43.5
+      parent: 1653
+  - uid: 886
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,45.5
+      parent: 1653
+  - uid: 887
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,47.5
+      parent: 1653
+  - uid: 1242
+    components:
+    - type: Transform
+      pos: 40.5,0.5
+      parent: 1653
+  - uid: 1270
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 45.5,1.5
+      parent: 1653
+- proto: TimerTrigger
+  entities:
+  - uid: 1631
+    components:
+    - type: Transform
+      pos: 40.404037,12.592565
+      parent: 1653
+  - uid: 1632
+    components:
+    - type: Transform
+      pos: 40.575912,12.73319
+      parent: 1653
+  - uid: 1633
+    components:
+    - type: Transform
+      pos: 40.654037,12.48319
+      parent: 1653
+- proto: ToiletEmpty
+  entities:
+  - uid: 889
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,18.5
+      parent: 1653
+- proto: ToyRubberDuck
+  entities:
+  - uid: 895
+    components:
+    - type: Transform
+      pos: 0.5,18.5
+      parent: 1653
+  - uid: 1084
+    components:
+    - type: Transform
+      pos: 8.512666,27.639019
+      parent: 1653
+  - uid: 2028
+    components:
+    - type: Transform
+      pos: 24.518465,24.41762
+      parent: 1653
+  - uid: 2029
+    components:
+    - type: Transform
+      pos: 44.51329,7.4417505
+      parent: 1653
+- proto: ToySpawner
+  entities:
+  - uid: 1246
+    components:
+    - type: Transform
+      pos: 40.5,0.5
+      parent: 1653
+- proto: UraniumReinforcedWindowDirectional
+  entities:
+  - uid: 852
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 24.5,34.5
+      parent: 1653
+  - uid: 853
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,34.5
+      parent: 1653
+  - uid: 854
+    components:
+    - type: Transform
+      pos: 24.5,36.5
+      parent: 1653
+  - uid: 855
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,36.5
+      parent: 1653
+  - uid: 856
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,36.5
+      parent: 1653
+  - uid: 857
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,34.5
+      parent: 1653
+  - uid: 858
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 34.5,34.5
+      parent: 1653
+  - uid: 859
+    components:
+    - type: Transform
+      pos: 34.5,36.5
+      parent: 1653
+- proto: UraniumWindowDirectional
+  entities:
+  - uid: 1833
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,12.5
+      parent: 1653
+  - uid: 1834
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 44.5,13.5
+      parent: 1653
+  - uid: 1835
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 46.5,12.5
+      parent: 1653
+  - uid: 1836
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 46.5,13.5
+      parent: 1653
+  - uid: 1837
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 46.5,13.5
+      parent: 1653
+  - uid: 1838
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 44.5,13.5
+      parent: 1653
+- proto: VendingMachineCigs
+  entities:
+  - uid: 928
+    components:
+    - type: Transform
+      pos: 10.5,18.5
+      parent: 1653
+  - uid: 1278
+    components:
+    - type: Transform
+      pos: 37.5,4.5
+      parent: 1653
+- proto: VendingMachineCoffee
+  entities:
+  - uid: 522
+    components:
+    - type: Transform
+      pos: 29.5,38.5
+      parent: 1653
+  - uid: 642
+    components:
+    - type: Transform
+      pos: 7.5,35.5
+      parent: 1653
+  - uid: 968
+    components:
+    - type: Transform
+      pos: 8.5,10.5
+      parent: 1653
+- proto: VendingMachineCola
+  entities:
+  - uid: 1277
+    components:
+    - type: Transform
+      pos: 38.5,4.5
+      parent: 1653
+- proto: VendingMachineHydrobe
+  entities:
+  - uid: 1409
+    components:
+    - type: Transform
+      pos: 9.5,10.5
+      parent: 1653
+- proto: VendingMachineWinter
+  entities:
+  - uid: 1329
+    components:
+    - type: Transform
+      pos: 46.5,4.5
+      parent: 1653
+- proto: WallRockSnow
+  entities:
+  - uid: 117
+    components:
+    - type: Transform
+      pos: 5.5,34.5
+      parent: 1653
+  - uid: 118
+    components:
+    - type: Transform
+      pos: 7.5,36.5
+      parent: 1653
+  - uid: 645
+    components:
+    - type: Transform
+      pos: 16.5,35.5
+      parent: 1653
+  - uid: 693
+    components:
+    - type: Transform
+      pos: 3.5,36.5
+      parent: 1653
+  - uid: 694
+    components:
+    - type: Transform
+      pos: 17.5,34.5
+      parent: 1653
+  - uid: 696
+    components:
+    - type: Transform
+      pos: 19.5,36.5
+      parent: 1653
+  - uid: 697
+    components:
+    - type: Transform
+      pos: 18.5,34.5
+      parent: 1653
+  - uid: 698
+    components:
+    - type: Transform
+      pos: 16.5,34.5
+      parent: 1653
+  - uid: 699
+    components:
+    - type: Transform
+      pos: 15.5,34.5
+      parent: 1653
+  - uid: 700
+    components:
+    - type: Transform
+      pos: 17.5,35.5
+      parent: 1653
+  - uid: 701
+    components:
+    - type: Transform
+      pos: 16.5,36.5
+      parent: 1653
+  - uid: 702
+    components:
+    - type: Transform
+      pos: 15.5,35.5
+      parent: 1653
+  - uid: 703
+    components:
+    - type: Transform
+      pos: 19.5,35.5
+      parent: 1653
+  - uid: 704
+    components:
+    - type: Transform
+      pos: 18.5,36.5
+      parent: 1653
+  - uid: 705
+    components:
+    - type: Transform
+      pos: 17.5,36.5
+      parent: 1653
+  - uid: 706
+    components:
+    - type: Transform
+      pos: 18.5,35.5
+      parent: 1653
+  - uid: 707
+    components:
+    - type: Transform
+      pos: 35.5,39.5
+      parent: 1653
+  - uid: 708
+    components:
+    - type: Transform
+      pos: 36.5,39.5
+      parent: 1653
+  - uid: 734
+    components:
+    - type: Transform
+      pos: 35.5,40.5
+      parent: 1653
+  - uid: 847
+    components:
+    - type: Transform
+      pos: 6.5,14.5
+      parent: 1653
+  - uid: 883
+    components:
+    - type: Transform
+      pos: 2.5,16.5
+      parent: 1653
+  - uid: 1080
+    components:
+    - type: Transform
+      pos: 6.5,13.5
+      parent: 1653
+  - uid: 1082
+    components:
+    - type: Transform
+      pos: 6.5,15.5
+      parent: 1653
+  - uid: 1169
+    components:
+    - type: Transform
+      pos: 4.5,34.5
+      parent: 1653
+  - uid: 1186
+    components:
+    - type: Transform
+      pos: 2.5,34.5
+      parent: 1653
+  - uid: 1187
+    components:
+    - type: Transform
+      pos: 8.5,36.5
+      parent: 1653
+  - uid: 1188
+    components:
+    - type: Transform
+      pos: 3.5,34.5
+      parent: 1653
+  - uid: 1190
+    components:
+    - type: Transform
+      pos: 9.5,36.5
+      parent: 1653
+  - uid: 1340
+    components:
+    - type: Transform
+      pos: 24.5,13.5
+      parent: 1653
+  - uid: 1341
+    components:
+    - type: Transform
+      pos: 24.5,12.5
+      parent: 1653
+  - uid: 1342
+    components:
+    - type: Transform
+      pos: 24.5,14.5
+      parent: 1653
+  - uid: 1639
+    components:
+    - type: Transform
+      pos: 20.5,28.5
+      parent: 1653
+  - uid: 1640
+    components:
+    - type: Transform
+      pos: 20.5,27.5
+      parent: 1653
+  - uid: 1641
+    components:
+    - type: Transform
+      pos: 12.5,27.5
+      parent: 1653
+  - uid: 1642
+    components:
+    - type: Transform
+      pos: 18.5,24.5
+      parent: 1653
+  - uid: 1643
+    components:
+    - type: Transform
+      pos: 18.5,25.5
+      parent: 1653
+  - uid: 1671
+    components:
+    - type: Transform
+      pos: 19.5,40.5
+      parent: 1653
+  - uid: 1672
+    components:
+    - type: Transform
+      pos: 19.5,39.5
+      parent: 1653
+  - uid: 1673
+    components:
+    - type: Transform
+      pos: 20.5,39.5
+      parent: 1653
+  - uid: 1674
+    components:
+    - type: Transform
+      pos: 20.5,38.5
+      parent: 1653
+  - uid: 1675
+    components:
+    - type: Transform
+      pos: 18.5,39.5
+      parent: 1653
+  - uid: 1760
+    components:
+    - type: Transform
+      pos: 25.5,12.5
+      parent: 1653
+  - uid: 1761
+    components:
+    - type: Transform
+      pos: 27.5,13.5
+      parent: 1653
+  - uid: 1762
+    components:
+    - type: Transform
+      pos: 27.5,12.5
+      parent: 1653
+  - uid: 1763
+    components:
+    - type: Transform
+      pos: 26.5,12.5
+      parent: 1653
+  - uid: 1764
+    components:
+    - type: Transform
+      pos: 26.5,13.5
+      parent: 1653
+  - uid: 1765
+    components:
+    - type: Transform
+      pos: 26.5,14.5
+      parent: 1653
+  - uid: 1766
+    components:
+    - type: Transform
+      pos: 10.5,12.5
+      parent: 1653
+  - uid: 1767
+    components:
+    - type: Transform
+      pos: 9.5,12.5
+      parent: 1653
+  - uid: 1768
+    components:
+    - type: Transform
+      pos: 11.5,12.5
+      parent: 1653
+  - uid: 1769
+    components:
+    - type: Transform
+      pos: 14.5,16.5
+      parent: 1653
+  - uid: 1770
+    components:
+    - type: Transform
+      pos: 13.5,16.5
+      parent: 1653
+  - uid: 1771
+    components:
+    - type: Transform
+      pos: 12.5,16.5
+      parent: 1653
+  - uid: 1772
+    components:
+    - type: Transform
+      pos: 14.5,15.5
+      parent: 1653
+  - uid: 1896
+    components:
+    - type: Transform
+      pos: 47.5,2.5
+      parent: 1653
+  - uid: 1897
+    components:
+    - type: Transform
+      pos: 48.5,2.5
+      parent: 1653
+  - uid: 1898
+    components:
+    - type: Transform
+      pos: 12.5,7.5
+      parent: 1653
+  - uid: 1899
+    components:
+    - type: Transform
+      pos: 12.5,8.5
+      parent: 1653
+  - uid: 1907
+    components:
+    - type: Transform
+      pos: 28.5,36.5
+      parent: 1653
+  - uid: 1908
+    components:
+    - type: Transform
+      pos: 28.5,35.5
+      parent: 1653
+  - uid: 1909
+    components:
+    - type: Transform
+      pos: 29.5,36.5
+      parent: 1653
+  - uid: 1910
+    components:
+    - type: Transform
+      pos: 29.5,35.5
+      parent: 1653
+  - uid: 1911
+    components:
+    - type: Transform
+      pos: 30.5,35.5
+      parent: 1653
+  - uid: 1912
+    components:
+    - type: Transform
+      pos: 30.5,34.5
+      parent: 1653
+  - uid: 1913
+    components:
+    - type: Transform
+      pos: 27.5,35.5
+      parent: 1653
+  - uid: 1914
+    components:
+    - type: Transform
+      pos: 26.5,35.5
+      parent: 1653
+  - uid: 1936
+    components:
+    - type: Transform
+      pos: 51.5,39.5
+      parent: 1653
+  - uid: 1937
+    components:
+    - type: Transform
+      pos: 53.5,40.5
+      parent: 1653
+  - uid: 1938
+    components:
+    - type: Transform
+      pos: 51.5,40.5
+      parent: 1653
+  - uid: 1939
+    components:
+    - type: Transform
+      pos: 48.5,38.5
+      parent: 1653
+  - uid: 1940
+    components:
+    - type: Transform
+      pos: 54.5,38.5
+      parent: 1653
+  - uid: 1941
+    components:
+    - type: Transform
+      pos: 50.5,40.5
+      parent: 1653
+  - uid: 1942
+    components:
+    - type: Transform
+      pos: 49.5,38.5
+      parent: 1653
+  - uid: 1943
+    components:
+    - type: Transform
+      pos: 52.5,38.5
+      parent: 1653
+  - uid: 1944
+    components:
+    - type: Transform
+      pos: 52.5,40.5
+      parent: 1653
+  - uid: 2212
+    components:
+    - type: Transform
+      pos: 37.5,14.5
+      parent: 1653
+  - uid: 2213
+    components:
+    - type: Transform
+      pos: 38.5,14.5
+      parent: 1653
+- proto: WallSilver
+  entities:
+  - uid: 321
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,15.5
+      parent: 1653
+  - uid: 324
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,13.5
+      parent: 1653
+  - uid: 385
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,13.5
+      parent: 1653
+  - uid: 386
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 37.5,15.5
+      parent: 1653
+  - uid: 395
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,2.5
+      parent: 1653
+  - uid: 396
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,2.5
+      parent: 1653
+  - uid: 492
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,13.5
+      parent: 1653
+  - uid: 1330
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,14.5
+      parent: 1653
+  - uid: 1331
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,15.5
+      parent: 1653
+  - uid: 1332
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,13.5
+      parent: 1653
+  - uid: 1333
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,15.5
+      parent: 1653
+  - uid: 1334
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,15.5
+      parent: 1653
+  - uid: 1335
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,15.5
+      parent: 1653
+  - uid: 1336
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,15.5
+      parent: 1653
+  - uid: 1337
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,14.5
+      parent: 1653
+  - uid: 1338
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,13.5
+      parent: 1653
+  - uid: 1339
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,13.5
+      parent: 1653
+  - uid: 1348
+    components:
+    - type: Transform
+      pos: 26.5,38.5
+      parent: 1653
+  - uid: 1349
+    components:
+    - type: Transform
+      pos: 26.5,40.5
+      parent: 1653
+  - uid: 1350
+    components:
+    - type: Transform
+      pos: 28.5,40.5
+      parent: 1653
+  - uid: 1351
+    components:
+    - type: Transform
+      pos: 28.5,38.5
+      parent: 1653
+  - uid: 1352
+    components:
+    - type: Transform
+      pos: 8.5,43.5
+      parent: 1653
+  - uid: 1353
+    components:
+    - type: Transform
+      pos: 9.5,43.5
+      parent: 1653
+  - uid: 1483
+    components:
+    - type: Transform
+      pos: 13.5,43.5
+      parent: 1653
+  - uid: 1501
+    components:
+    - type: Transform
+      pos: 14.5,43.5
+      parent: 1653
+  - uid: 1506
+    components:
+    - type: Transform
+      pos: 1.5,21.5
+      parent: 1653
+  - uid: 1507
+    components:
+    - type: Transform
+      pos: 1.5,22.5
+      parent: 1653
+  - uid: 1575
+    components:
+    - type: Transform
+      pos: 3.5,19.5
+      parent: 1653
+  - uid: 1576
+    components:
+    - type: Transform
+      pos: 4.5,19.5
+      parent: 1653
+  - uid: 1577
+    components:
+    - type: Transform
+      pos: 3.5,32.5
+      parent: 1653
+  - uid: 1578
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 40.5,3.5
+      parent: 1653
+  - uid: 1579
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 39.5,3.5
+      parent: 1653
+  - uid: 1580
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 39.5,4.5
+      parent: 1653
+  - uid: 1581
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,3.5
+      parent: 1653
+  - uid: 1582
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,3.5
+      parent: 1653
+  - uid: 1583
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,4.5
+      parent: 1653
+  - uid: 1584
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 39.5,0.5
+      parent: 1653
+  - uid: 1585
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 39.5,1.5
+      parent: 1653
+  - uid: 1586
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 40.5,1.5
+      parent: 1653
+  - uid: 1587
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 42.5,1.5
+      parent: 1653
+  - uid: 1588
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,1.5
+      parent: 1653
+  - uid: 1589
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 43.5,0.5
+      parent: 1653
+  - uid: 1594
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,0.5
+      parent: 1653
+  - uid: 1595
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,1.5
+      parent: 1653
+  - uid: 1596
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,1.5
+      parent: 1653
+  - uid: 1597
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,1.5
+      parent: 1653
+  - uid: 1598
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,1.5
+      parent: 1653
+  - uid: 1600
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,0.5
+      parent: 1653
+  - uid: 1601
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 50.5,3.5
+      parent: 1653
+  - uid: 1602
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,3.5
+      parent: 1653
+  - uid: 1603
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 51.5,4.5
+      parent: 1653
+  - uid: 1604
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 48.5,3.5
+      parent: 1653
+  - uid: 1624
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,3.5
+      parent: 1653
+  - uid: 1646
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 47.5,4.5
+      parent: 1653
+  - uid: 1703
+    components:
+    - type: Transform
+      pos: 6.5,32.5
+      parent: 1653
+  - uid: 1704
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 28.5,9.5
+      parent: 1653
+  - uid: 1705
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,9.5
+      parent: 1653
+  - uid: 1706
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,9.5
+      parent: 1653
+- proto: WallSolid
+  entities:
+  - uid: 1022
+    components:
+    - type: Transform
+      pos: 28.5,22.5
+      parent: 1653
+  - uid: 1459
+    components:
+    - type: Transform
+      pos: 19.5,4.5
+      parent: 1653
+  - uid: 1460
+    components:
+    - type: Transform
+      pos: 33.5,4.5
+      parent: 1653
+- proto: WardrobeBotanistFilled
+  entities:
+  - uid: 649
+    components:
+    - type: Transform
+      pos: 16.5,32.5
+      parent: 1653
+  - uid: 834
+    components:
+    - type: Transform
+      pos: 14.5,26.5
+      parent: 1653
+  - uid: 835
+    components:
+    - type: Transform
+      pos: 14.5,27.5
+      parent: 1653
+  - uid: 1168
+    components:
+    - type: Transform
+      pos: 5.5,6.5
+      parent: 1653
+  - uid: 2007
+    components:
+    - type: Transform
+      pos: 28.5,25.5
+      parent: 1653
+  - uid: 2008
+    components:
+    - type: Transform
+      pos: 30.5,27.5
+      parent: 1653
+- proto: WardrobeMixedFilled
+  entities:
+  - uid: 1257
+    components:
+    - type: Transform
+      pos: 44.5,4.5
+      parent: 1653
+- proto: WaterCooler
+  entities:
+  - uid: 463
+    components:
+    - type: Transform
+      pos: 11.5,4.5
+      parent: 1653
+  - uid: 512
+    components:
+    - type: Transform
+      pos: 21.5,40.5
+      parent: 1653
+  - uid: 967
+    components:
+    - type: Transform
+      pos: 7.5,10.5
+      parent: 1653
+- proto: WaterTankFull
+  entities:
+  - uid: 1372
+    components:
+    - type: Transform
+      pos: 18.5,7.5
+      parent: 1653
+  - uid: 1475
+    components:
+    - type: Transform
+      pos: 24.5,4.5
+      parent: 1653
+  - uid: 1993
+    components:
+    - type: Transform
+      pos: 41.5,7.5
+      parent: 1653
+- proto: WaterTankHighCapacity
+  entities:
+  - uid: 735
+    components:
+    - type: Transform
+      pos: 19.5,15.5
+      parent: 1653
+- proto: Welder
+  entities:
+  - uid: 663
+    components:
+    - type: Transform
+      pos: 20.605528,36.564884
+      parent: 1653
+- proto: WeldingFuelTankFull
+  entities:
+  - uid: 881
+    components:
+    - type: Transform
+      pos: 14.5,44.5
+      parent: 1653
+  - uid: 1387
+    components:
+    - type: Transform
+      pos: 26.5,19.5
+      parent: 1653
+  - uid: 1544
+    components:
+    - type: Transform
+      pos: 31.5,7.5
+      parent: 1653
+  - uid: 1545
+    components:
+    - type: Transform
+      pos: 27.5,7.5
+      parent: 1653
+- proto: Windoor
+  entities:
+  - uid: 127
+    components:
+    - type: Transform
+      pos: 21.5,46.5
+      parent: 1653
+  - uid: 141
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.5,47.5
+      parent: 1653
+  - uid: 636
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,34.5
+      parent: 1653
+  - uid: 637
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,36.5
+      parent: 1653
+  - uid: 639
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,34.5
+      parent: 1653
+  - uid: 640
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,36.5
+      parent: 1653
+  - uid: 1083
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,24.5
+      parent: 1653
+  - uid: 1085
+    components:
+    - type: Transform
+      pos: 9.5,27.5
+      parent: 1653
+  - uid: 1086
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,25.5
+      parent: 1653
+  - uid: 1091
+    components:
+    - type: Transform
+      pos: 9.5,28.5
+      parent: 1653
+  - uid: 2017
+    components:
+    - type: Transform
+      pos: 29.5,25.5
+      parent: 1653
+  - uid: 2018
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,27.5
+      parent: 1653
+- proto: WindoorSecure
+  entities:
+  - uid: 691
+    components:
+    - type: Transform
+      pos: 32.5,2.5
+      parent: 1653
+  - uid: 809
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,42.5
+      parent: 1653
+  - uid: 1175
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,12.5
+      parent: 1653
+  - uid: 1312
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,46.5
+      parent: 1653
+  - uid: 1313
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,44.5
+      parent: 1653
+  - uid: 1420
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,1.5
+      parent: 1653
+  - uid: 1421
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,2.5
+      parent: 1653
+  - uid: 1422
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 24.5,2.5
+      parent: 1653
+  - uid: 1423
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 24.5,1.5
+      parent: 1653
+  - uid: 1465
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,3.5
+      parent: 1653
+  - uid: 1466
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,3.5
+      parent: 1653
+  - uid: 1552
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 32.5,2.5
+      parent: 1653
+  - uid: 1559
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,1.5
+      parent: 1653
+  - uid: 1563
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,2.5
+      parent: 1653
+  - uid: 1839
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 45.5,13.5
+      parent: 1653
+  - uid: 2126
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 51.5,15.5
+      parent: 1653
+  - uid: 2129
+    components:
+    - type: Transform
+      pos: 51.5,13.5
+      parent: 1653
+- proto: WindowDirectional
+  entities:
+  - uid: 632
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,35.5
+      parent: 1653
+  - uid: 633
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,35.5
+      parent: 1653
+  - uid: 1253
+    components:
+    - type: Transform
+      pos: 46.5,3.5
+      parent: 1653
+  - uid: 1254
+    components:
+    - type: Transform
+      pos: 44.5,3.5
+      parent: 1653
+- proto: WindowFrostedDirectional
+  entities:
+  - uid: 500
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,39.5
+      parent: 1653
+  - uid: 501
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,39.5
+      parent: 1653
+  - uid: 946
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,7.5
+      parent: 1653
+  - uid: 947
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,6.5
+      parent: 1653
+  - uid: 970
+    components:
+    - type: Transform
+      pos: 5.5,8.5
+      parent: 1653
+  - uid: 971
+    components:
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 1653
+  - uid: 972
+    components:
+    - type: Transform
+      pos: 3.5,8.5
+      parent: 1653
+  - uid: 973
+    components:
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 1653
+- proto: WindowReinforcedDirectional
+  entities:
+  - uid: 76
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,45.5
+      parent: 1653
+  - uid: 78
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,43.5
+      parent: 1653
+  - uid: 80
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 35.5,13.5
+      parent: 1653
+  - uid: 85
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,47.5
+      parent: 1653
+  - uid: 144
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.5,48.5
+      parent: 1653
+  - uid: 174
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,25.5
+      parent: 1653
+  - uid: 285
+    components:
+    - type: Transform
+      pos: 8.5,27.5
+      parent: 1653
+  - uid: 286
+    components:
+    - type: Transform
+      pos: 10.5,27.5
+      parent: 1653
+  - uid: 303
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,47.5
+      parent: 1653
+  - uid: 387
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 1653
+  - uid: 391
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,0.5
+      parent: 1653
+  - uid: 399
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,0.5
+      parent: 1653
+  - uid: 400
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,4.5
+      parent: 1653
+  - uid: 446
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,0.5
+      parent: 1653
+  - uid: 451
+    components:
+    - type: Transform
+      pos: 16.5,4.5
+      parent: 1653
+  - uid: 483
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 36.5,15.5
+      parent: 1653
+  - uid: 484
+    components:
+    - type: Transform
+      pos: 36.5,13.5
+      parent: 1653
+  - uid: 486
+    components:
+    - type: Transform
+      pos: 34.5,13.5
+      parent: 1653
+  - uid: 516
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 34.5,13.5
+      parent: 1653
+  - uid: 517
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 36.5,13.5
+      parent: 1653
+  - uid: 600
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,1.5
+      parent: 1653
+  - uid: 601
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,0.5
+      parent: 1653
+  - uid: 655
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 26.5,15.5
+      parent: 1653
+  - uid: 685
+    components:
+    - type: Transform
+      pos: 5.5,43.5
+      parent: 1653
+  - uid: 687
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 29.5,0.5
+      parent: 1653
+  - uid: 690
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 29.5,1.5
+      parent: 1653
+  - uid: 692
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,0.5
+      parent: 1653
+  - uid: 695
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,15.5
+      parent: 1653
+  - uid: 768
+    components:
+    - type: Transform
+      pos: 26.5,13.5
+      parent: 1653
+  - uid: 791
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,25.5
+      parent: 1653
+  - uid: 807
+    components:
+    - type: Transform
+      pos: 28.5,13.5
+      parent: 1653
+  - uid: 842
+    components:
+    - type: Transform
+      pos: 22.5,28.5
+      parent: 1653
+  - uid: 843
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,24.5
+      parent: 1653
+  - uid: 850
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,15.5
+      parent: 1653
+  - uid: 851
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,15.5
+      parent: 1653
+  - uid: 876
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,24.5
+      parent: 1653
+  - uid: 877
+    components:
+    - type: Transform
+      pos: 8.5,28.5
+      parent: 1653
+  - uid: 885
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,45.5
+      parent: 1653
+  - uid: 908
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,20.5
+      parent: 1653
+  - uid: 909
+    components:
+    - type: Transform
+      pos: 8.5,19.5
+      parent: 1653
+  - uid: 915
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,21.5
+      parent: 1653
+  - uid: 916
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,20.5
+      parent: 1653
+  - uid: 917
+    components:
+    - type: Transform
+      pos: 9.5,20.5
+      parent: 1653
+  - uid: 918
+    components:
+    - type: Transform
+      pos: 7.5,20.5
+      parent: 1653
+  - uid: 919
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,19.5
+      parent: 1653
+  - uid: 920
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,19.5
+      parent: 1653
+  - uid: 921
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,21.5
+      parent: 1653
+  - uid: 922
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,20.5
+      parent: 1653
+  - uid: 923
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,20.5
+      parent: 1653
+  - uid: 924
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,21.5
+      parent: 1653
+  - uid: 927
+    components:
+    - type: Transform
+      pos: 3.5,43.5
+      parent: 1653
+  - uid: 980
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,47.5
+      parent: 1653
+  - uid: 995
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,18.5
+      parent: 1653
+  - uid: 996
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,18.5
+      parent: 1653
+  - uid: 997
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,18.5
+      parent: 1653
+  - uid: 998
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,18.5
+      parent: 1653
+  - uid: 999
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,22.5
+      parent: 1653
+  - uid: 1000
+    components:
+    - type: Transform
+      pos: 22.5,22.5
+      parent: 1653
+  - uid: 1001
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,22.5
+      parent: 1653
+  - uid: 1002
+    components:
+    - type: Transform
+      pos: 18.5,22.5
+      parent: 1653
+  - uid: 1051
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,14.5
+      parent: 1653
+  - uid: 1055
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,13.5
+      parent: 1653
+  - uid: 1058
+    components:
+    - type: Transform
+      pos: 22.5,46.5
+      parent: 1653
+  - uid: 1068
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,13.5
+      parent: 1653
+  - uid: 1069
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,43.5
+      parent: 1653
+  - uid: 1074
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 33.5,1.5
+      parent: 1653
+  - uid: 1089
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,24.5
+      parent: 1653
+  - uid: 1090
+    components:
+    - type: Transform
+      pos: 10.5,28.5
+      parent: 1653
+  - uid: 1125
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,47.5
+      parent: 1653
+  - uid: 1170
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,13.5
+      parent: 1653
+  - uid: 1171
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,14.5
+      parent: 1653
+  - uid: 1172
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,15.5
+      parent: 1653
+  - uid: 1173
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 21.5,12.5
+      parent: 1653
+  - uid: 1174
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,12.5
+      parent: 1653
+  - uid: 1176
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,12.5
+      parent: 1653
+  - uid: 1177
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 17.5,12.5
+      parent: 1653
+  - uid: 1178
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,13.5
+      parent: 1653
+  - uid: 1179
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,14.5
+      parent: 1653
+  - uid: 1180
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,15.5
+      parent: 1653
+  - uid: 1181
+    components:
+    - type: Transform
+      pos: 17.5,16.5
+      parent: 1653
+  - uid: 1182
+    components:
+    - type: Transform
+      pos: 18.5,16.5
+      parent: 1653
+  - uid: 1183
+    components:
+    - type: Transform
+      pos: 19.5,16.5
+      parent: 1653
+  - uid: 1184
+    components:
+    - type: Transform
+      pos: 20.5,16.5
+      parent: 1653
+  - uid: 1185
+    components:
+    - type: Transform
+      pos: 21.5,16.5
+      parent: 1653
+  - uid: 1193
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,1.5
+      parent: 1653
+  - uid: 1199
+    components:
+    - type: Transform
+      pos: 2.5,43.5
+      parent: 1653
+  - uid: 1209
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,2.5
+      parent: 1653
+  - uid: 1210
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,2.5
+      parent: 1653
+  - uid: 1296
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 16.5,0.5
+      parent: 1653
+  - uid: 1297
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,4.5
+      parent: 1653
+  - uid: 1305
+    components:
+    - type: Transform
+      pos: 35.5,13.5
+      parent: 1653
+  - uid: 1317
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 35.5,15.5
+      parent: 1653
+  - uid: 1318
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 34.5,15.5
+      parent: 1653
+  - uid: 1366
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,7.5
+      parent: 1653
+  - uid: 1367
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,8.5
+      parent: 1653
+  - uid: 1368
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,9.5
+      parent: 1653
+  - uid: 1369
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,7.5
+      parent: 1653
+  - uid: 1370
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,8.5
+      parent: 1653
+  - uid: 1371
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,9.5
+      parent: 1653
+  - uid: 1388
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,0.5
+      parent: 1653
+  - uid: 1389
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,1.5
+      parent: 1653
+  - uid: 1390
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,0.5
+      parent: 1653
+  - uid: 1391
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,1.5
+      parent: 1653
+  - uid: 1394
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,0.5
+      parent: 1653
+  - uid: 1395
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,1.5
+      parent: 1653
+  - uid: 1399
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,14.5
+      parent: 1653
+  - uid: 1400
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,0.5
+      parent: 1653
+  - uid: 1401
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,1.5
+      parent: 1653
+  - uid: 1402
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,0.5
+      parent: 1653
+  - uid: 1403
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,1.5
+      parent: 1653
+  - uid: 1404
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,1.5
+      parent: 1653
+  - uid: 1405
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 21.5,1.5
+      parent: 1653
+  - uid: 1406
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 23.5,1.5
+      parent: 1653
+  - uid: 1407
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,1.5
+      parent: 1653
+  - uid: 1415
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 25.5,2.5
+      parent: 1653
+  - uid: 1416
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,2.5
+      parent: 1653
+  - uid: 1417
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,2.5
+      parent: 1653
+  - uid: 1418
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,2.5
+      parent: 1653
+  - uid: 1431
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 31.5,2.5
+      parent: 1653
+  - uid: 1463
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,2.5
+      parent: 1653
+  - uid: 1464
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 33.5,2.5
+      parent: 1653
+  - uid: 1551
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 29.5,1.5
+      parent: 1653
+  - uid: 1553
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 27.5,2.5
+      parent: 1653
+  - uid: 1554
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 33.5,2.5
+      parent: 1653
+  - uid: 1560
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 29.5,2.5
+      parent: 1653
+  - uid: 1561
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 31.5,1.5
+      parent: 1653
+  - uid: 1562
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 31.5,1.5
+      parent: 1653
+  - uid: 1710
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,47.5
+      parent: 1653
+  - uid: 1711
+    components:
+    - type: Transform
+      pos: 1.5,43.5
+      parent: 1653
+  - uid: 1712
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,47.5
+      parent: 1653
+  - uid: 2013
+    components:
+    - type: Transform
+      pos: 28.5,25.5
+      parent: 1653
+  - uid: 2014
+    components:
+    - type: Transform
+      pos: 30.5,25.5
+      parent: 1653
+  - uid: 2015
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 30.5,27.5
+      parent: 1653
+  - uid: 2016
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 28.5,27.5
+      parent: 1653
+  - uid: 2119
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 49.5,13.5
+      parent: 1653
+  - uid: 2120
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 49.5,14.5
+      parent: 1653
+  - uid: 2121
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 49.5,15.5
+      parent: 1653
+  - uid: 2122
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,15.5
+      parent: 1653
+  - uid: 2123
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,14.5
+      parent: 1653
+  - uid: 2124
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 53.5,13.5
+      parent: 1653
+  - uid: 2125
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 52.5,15.5
+      parent: 1653
+  - uid: 2127
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 50.5,15.5
+      parent: 1653
+  - uid: 2128
+    components:
+    - type: Transform
+      pos: 52.5,13.5
+      parent: 1653
+  - uid: 2130
+    components:
+    - type: Transform
+      pos: 50.5,13.5
+      parent: 1653
+...
diff --git a/Resources/Maps/Nonstations/nukieplanet.yml b/Resources/Maps/Nonstations/nukieplanet.yml
new file mode 100644
index 0000000000..304def19c7
--- /dev/null
+++ b/Resources/Maps/Nonstations/nukieplanet.yml
@@ -0,0 +1,15274 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  14: FloorBar
+  20: FloorCarpetClown
+  29: FloorDark
+  44: FloorFreezer
+  59: FloorIce
+  77: FloorReinforced
+  79: FloorRockVault
+  80: FloorShowroom
+  84: FloorShuttleOrange
+  86: FloorShuttleRed
+  89: FloorSnow
+  91: FloorSteel
+  106: FloorTechMaint
+  110: FloorWhite
+  120: FloorWood
+  123: Lattice
+  124: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 104
+    components:
+    - type: MetaData
+      name: Syndicate Outpost
+    - type: Transform
+      parent: 1295
+    - type: FTLDestination
+      whitelist:
+        tags:
+        - Syndicate
+    - type: MapGrid
+      chunks:
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAKWQAAAAAAfAAAAAAAHQAAAAACbgAAAAADbgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAABbgAAAAADWwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAAAbgAAAAACbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAAAHQAAAAADHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAADWQAAAAAEWQAAAAAAWQAAAAAEfAAAAAAAeAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAeAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAADgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAADgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAADgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAADgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAIfAAAAAAADgAAAAAB
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: bgAAAAAAbgAAAAADfAAAAAAAbgAAAAAAbgAAAAACbgAAAAACbgAAAAADbgAAAAABHQAAAAAAHQAAAAABHQAAAAABHQAAAAABHQAAAAABHQAAAAAAHQAAAAADHQAAAAACWwAAAAAAbgAAAAADbgAAAAADbgAAAAADbgAAAAACbgAAAAAAbgAAAAADbgAAAAADHQAAAAADVgAAAAAAHQAAAAACVgAAAAAAHQAAAAADVgAAAAAAHQAAAAADHQAAAAADbgAAAAAAbgAAAAACfAAAAAAAbgAAAAADbgAAAAACbgAAAAADbgAAAAACbgAAAAACHQAAAAADVgAAAAAAHQAAAAADVgAAAAAAHQAAAAABVgAAAAAAHQAAAAABHQAAAAAAHQAAAAABHQAAAAADHQAAAAAAWwAAAAADWwAAAAACWwAAAAADbgAAAAADbgAAAAACHQAAAAABHQAAAAAAHQAAAAAAHQAAAAABHQAAAAABHQAAAAABHQAAAAAAHQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABWwAAAAABWwAAAAACbgAAAAADbgAAAAACDgAAAAACHQAAAAADHQAAAAAAHQAAAAADHQAAAAADHQAAAAACHQAAAAAAHQAAAAADWQAAAAAAWQAAAAAAbgAAAAAAWwAAAAABWwAAAAAAWwAAAAAAbgAAAAACbgAAAAAAWQAAAAAAHQAAAAADHQAAAAADVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAADgAAAAABDgAAAAADDgAAAAACDgAAAAAADgAAAAADfAAAAAAAHQAAAAABfAAAAAAADgAAAAADDgAAAAACDgAAAAAADgAAAAACDgAAAAAAHQAAAAABHQAAAAADHQAAAAABVgAAAAAAVgAAAAAAeAAAAAACeAAAAAACeAAAAAADHQAAAAAAHQAAAAABHQAAAAABHQAAAAAAHQAAAAADHQAAAAACfAAAAAAAHQAAAAACHQAAAAACHQAAAAADHQAAAAABeAAAAAAAeAAAAAACeAAAAAACeAAAAAADeAAAAAADHQAAAAAAHQAAAAAAHQAAAAACHQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAADHQAAAAABHQAAAAACHQAAAAABeAAAAAAAeAAAAAABeAAAAAAAeAAAAAADeAAAAAADHQAAAAAAHQAAAAAAHQAAAAADHQAAAAAAHQAAAAABHQAAAAADfAAAAAAAHQAAAAACHQAAAAABHQAAAAABHQAAAAACDgAAAAACDgAAAAAADgAAAAACDgAAAAADDgAAAAACDgAAAAABDgAAAAACDgAAAAAADgAAAAAADgAAAAACDgAAAAADDgAAAAAADgAAAAABHQAAAAAAHQAAAAACHQAAAAACDgAAAAAADgAAAAABDgAAAAACDgAAAAAADgAAAAABDgAAAAABDgAAAAADDgAAAAAADgAAAAAALAAAAAAALAAAAAAALAAAAAAADgAAAAACeAAAAAAAeAAAAAADeAAAAAABDgAAAAACDgAAAAACDgAAAAAADgAAAAAADgAAAAADDgAAAAAADgAAAAAAVgAAAAAADgAAAAACLAAAAAAALAAAAAAALAAAAAAADgAAAAADeAAAAAABeAAAAAABeAAAAAADDgAAAAADDgAAAAABDgAAAAADDgAAAAACDgAAAAADDgAAAAAADgAAAAAAVgAAAAAADgAAAAAAUAAAAAAALAAAAAAADgAAAAAADgAAAAACHQAAAAAAHQAAAAACfAAAAAAADgAAAAACDgAAAAACDgAAAAACDgAAAAAADgAAAAADDgAAAAABDgAAAAACVgAAAAAADgAAAAADUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAADgAAAAAADgAAAAADDgAAAAACDgAAAAACDgAAAAACDgAAAAABDgAAAAABDgAAAAAADgAAAAACUAAAAAAAUAAAAAAALAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAA
+          version: 6
+        0,0:
+          ind: 0,0
+          tiles: HQAAAAADHQAAAAACHQAAAAACDgAAAAAADgAAAAABDgAAAAABDgAAAAABDgAAAAACDgAAAAADUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAWQAAAAAGfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAACfAAAAAAADgAAAAAADgAAAAABDgAAAAABDgAAAAACDgAAAAABDgAAAAAADgAAAAACDgAAAAACWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAATwAAAAAAfAAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAfAAAAAAATwAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAATwAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAWQAAAAAIWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAIWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAKWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAGWQAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAMWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAACWQAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAJWQAAAAAAWQAAAAAFTwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAHWQAAAAAHWQAAAAAKWQAAAAAFWQAAAAAAWQAAAAALWQAAAAAA
+          version: 6
+        -1,0:
+          ind: -1,0
+          tiles: ewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAAWQAAAAAKWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAKWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAGHQAAAAADHQAAAAADHQAAAAAAfAAAAAAAHQAAAAAAHQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAIfAAAAAAAHQAAAAABHQAAAAACHQAAAAACHQAAAAADHQAAAAACHQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAfAAAAAAAHQAAAAABHQAAAAABWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAGTwAAAAAAHQAAAAABHQAAAAAAfAAAAAAAfAAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAADWQAAAAAATwAAAAAATwAAAAAATwAAAAAAfAAAAAAAfAAAAAAATwAAAAAATwAAAAAATwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATwAAAAAATwAAAAAATwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAGWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKTwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAA
+          version: 6
+        1,-1:
+          ind: 1,-1
+          tiles: HQAAAAADHQAAAAADHQAAAAACHQAAAAACHQAAAAAATQAAAAAATQAAAAAATQAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAACfAAAAAAAWQAAAAAAWQAAAAABWQAAAAACHQAAAAADHQAAAAADHQAAAAADHQAAAAAAHQAAAAADTQAAAAAATQAAAAAATQAAAAAAHQAAAAADHQAAAAACHQAAAAADHQAAAAACfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAHQAAAAABHQAAAAADHQAAAAAAHQAAAAABHQAAAAACHQAAAAAAHQAAAAADHQAAAAADHQAAAAAAHQAAAAADHQAAAAABHQAAAAACfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAHQAAAAADHQAAAAAAHQAAAAAAHQAAAAADHQAAAAADHQAAAAABHQAAAAACHQAAAAADHQAAAAADHQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAWQAAAAAMWQAAAAAHWQAAAAAAHQAAAAABHQAAAAAAHQAAAAADHQAAAAABHQAAAAACHQAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAABWQAAAAAAWQAAAAADWQAAAAAAWQAAAAACWQAAAAAAAAAAAAAAHQAAAAAAHQAAAAABHQAAAAABHQAAAAADHQAAAAABHQAAAAABHQAAAAABHQAAAAADHQAAAAABHQAAAAACWQAAAAAFWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAHQAAAAADHQAAAAABVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAHQAAAAACHQAAAAACHQAAAAACWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAACAAAAAAAAfAAAAAAAHQAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAHQAAAAADHQAAAAADHQAAAAACWQAAAAAETwAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAAAAAAAAAHQAAAAAAHQAAAAABVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAHQAAAAACHQAAAAADHQAAAAACWQAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAACVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAHQAAAAAAHQAAAAADHQAAAAACWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAfAAAAAAAHQAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAHQAAAAAAHQAAAAABHQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAABHQAAAAADHQAAAAAAHQAAAAAAHQAAAAABHQAAAAAAHQAAAAACHQAAAAABHQAAAAABWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAACHQAAAAADHQAAAAADHQAAAAACHQAAAAAAHQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAABHQAAAAADHQAAAAAAHQAAAAABWQAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAGfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAWQAAAAAATwAAAAAAWQAAAAAEWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAA
+          version: 6
+        0,-2:
+          ind: 0,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAGWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAWQAAAAAAWQAAAAAGWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAWwAAAAAAWwAAAAABWwAAAAAAWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAWQAAAAAAbgAAAAAAbgAAAAADbgAAAAADbgAAAAADbgAAAAAAfAAAAAAAagAAAAAAWwAAAAACWwAAAAADWwAAAAABWwAAAAABWwAAAAADfAAAAAAAHQAAAAAAHQAAAAABWQAAAAAAbgAAAAABbgAAAAABbgAAAAADbgAAAAADbgAAAAAAagAAAAAAagAAAAAAWwAAAAADWwAAAAAAWwAAAAABWwAAAAABWwAAAAAAfAAAAAAA
+          version: 6
+        -1,-2:
+          ind: -1,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAAFWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAGWQAAAAAAWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAHQAAAAABHQAAAAAAHQAAAAAC
+          version: 6
+        -1,1:
+          ind: -1,1
+          tiles: WQAAAAAIWQAAAAAAWQAAAAALWQAAAAAAWQAAAAADWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAGWQAAAAAAWQAAAAAFWQAAAAADWQAAAAAEWQAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAEWQAAAAAHWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAEFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFTwAAAAAATwAAAAAATwAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAACWQAAAAAAWQAAAAADTwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAALWQAAAAAHWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,1:
+          ind: 0,1
+          tiles: WQAAAAAAWQAAAAAEWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAAJWQAAAAAGWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAALWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAIWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAGWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAACWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAA
+          version: 6
+        1,1:
+          ind: 1,1
+          tiles: WQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAGWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAABWQAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,0:
+          ind: 1,0
+          tiles: WQAAAAAATwAAAAAATwAAAAAAWQAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAALWQAAAAALWQAAAAAAWQAAAAAMWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAFWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAHAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAHWQAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAEWQAAAAAJWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAABWQAAAAAATwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,-2:
+          ind: 1,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAABWQAAAAAAWQAAAAAAAAAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAWQAAAAAMWQAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAADWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAAMWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAagAAAAAAHQAAAAACHQAAAAADHQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAHQAAAAACHQAAAAABagAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJfAAAAAAAagAAAAAAHQAAAAADHQAAAAACHQAAAAADHQAAAAACHQAAAAACHQAAAAADHQAAAAABHQAAAAABHQAAAAABagAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAagAAAAAAHQAAAAAAHQAAAAABHQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAACHQAAAAADHQAAAAACagAAAAAAfAAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAEHQAAAAACHQAAAAACHQAAAAABHQAAAAABTQAAAAAATQAAAAAATQAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAAAfAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAD
+          version: 6
+        -2,0:
+          ind: -2,0
+          tiles: ewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAHWQAAAAAAWQAAAAABTwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAATwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAETwAAAAAATwAAAAAATwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAALWQAAAAAAWQAAAAALWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAALWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAA
+          version: 6
+        -2,1:
+          ind: -2,1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAAFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAATwAAAAAAWQAAAAAKFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAJWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAHWQAAAAAKWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAGWQAAAAAJWQAAAAALWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAALWQAAAAAIWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAGFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAEWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAEWQAAAAAAWQAAAAAMWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAEWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAIWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAFWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAA
+          version: 6
+        -2,-2:
+          ind: -2,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,0:
+          ind: 2,0
+          tiles: TwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,-1:
+          ind: 2,-1
+          tiles: TwAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAAAWQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAAAWQAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,-2:
+          ind: 2,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAIWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -2,2:
+          ind: -2,2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -3,-2:
+          ind: -3,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,2:
+          ind: 0,2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAFWQAAAAAEWQAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,2:
+          ind: 1,2
+          tiles: WQAAAAAAWQAAAAAFWQAAAAACWQAAAAAJWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -3,0:
+          ind: -3,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            angle: -3.141592653589793 rad
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            311: 27,-15
+        - node:
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            309: 18,-19
+            310: 26,-19
+        - node:
+            color: '#FFFFFFFF'
+            id: Basalt1
+          decals:
+            368: 26.834131,4.97881
+        - node:
+            color: '#FFFFFFFF'
+            id: Bot
+          decals:
+            295: 21,-16
+            296: 22,-15
+            297: 23,-16
+            302: 22,-17
+            303: 17,-19
+            304: 27,-19
+        - node:
+            color: '#FFFFFFFF'
+            id: BotLeft
+          decals:
+            194: 5,-11
+            195: 4,-11
+            300: 23,-15
+            301: 21,-17
+            305: 27,-18
+            306: 17,-20
+        - node:
+            color: '#FFFFFFFF'
+            id: BotRight
+          decals:
+            298: 23,-17
+            299: 21,-15
+            307: 27,-20
+            308: 17,-18
+        - node:
+            color: '#FFFFFFFF'
+            id: Box
+          decals:
+            206: 12,-22
+        - node:
+            color: '#FFFFFFFF'
+            id: BrickTileDarkLineN
+          decals:
+            326: 2,-1
+            327: 1,-1
+            328: 0,-1
+        - node:
+            color: '#52B4E996'
+            id: BrickTileSteelBox
+          decals:
+            238: -3,-15
+            239: -2,-17
+            240: 1,-17
+            241: 1,-13
+            242: -2,-13
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerNe
+          decals:
+            143: 15,-12
+            149: 10,-11
+            186: 5,-11
+            332: 10,-7
+            339: 15,-7
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerNw
+          decals:
+            150: 9,-11
+            187: 3,-11
+            340: 12,-7
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerSe
+          decals:
+            141: 15,-15
+            188: 5,-13
+            259: 27,-17
+            264: 26,-20
+            329: 10,-9
+            342: 15,-9
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerSw
+          decals:
+            127: 14,-15
+            138: 9,-13
+            189: 3,-13
+            256: 17,-17
+            263: 18,-20
+            335: 5,-9
+            341: 12,-9
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelEndS
+          decals:
+            125: 10,-15
+            126: 12,-15
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelInnerNe
+          decals:
+            148: 10,-12
+            250: -3,-17
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelInnerSe
+          decals:
+            139: 10,-13
+            140: 12,-13
+            249: -3,-13
+            260: 26,-17
+            289: 20,-14
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelInnerSw
+          decals:
+            133: 10,-13
+            134: 12,-13
+            135: 14,-13
+            261: 18,-17
+            285: 24,-14
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineE
+          decals:
+            128: 12,-14
+            129: 10,-14
+            142: 15,-13
+            191: 5,-12
+            247: -3,-16
+            248: -3,-14
+            257: 26,-19
+            258: 26,-18
+            265: 20,-17
+            266: 20,-16
+            267: 20,-15
+            290: 20,-19
+            312: 27,-16
+            313: 27,-15
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineN
+          decals:
+            144: 14,-12
+            145: 13,-12
+            146: 12,-12
+            147: 11,-12
+            192: 4,-11
+            243: 0,-17
+            244: -1,-17
+            274: 26,-14
+            275: 25,-14
+            276: 23,-14
+            277: 22,-14
+            278: 21,-14
+            279: 20,-14
+            280: 18,-14
+            281: 19,-14
+            284: 24,-14
+            333: 9,-7
+            334: 8,-7
+            345: 13,-7
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineS
+          decals:
+            136: 13,-13
+            137: 11,-13
+            190: 4,-13
+            245: 0,-13
+            246: -1,-13
+            272: 25,-20
+            273: 19,-20
+            286: 23,-14
+            287: 22,-14
+            288: 21,-14
+            330: 8,-9
+            331: 7,-9
+            343: 14,-9
+            344: 13,-9
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineW
+          decals:
+            130: 14,-14
+            131: 12,-14
+            132: 10,-14
+            151: 9,-12
+            193: 3,-12
+            253: 18,-18
+            254: 17,-16
+            255: 17,-15
+            262: 18,-19
+            268: 24,-19
+            269: 24,-17
+            270: 24,-16
+            271: 24,-15
+            336: 5,-8
+            359: 5,-7
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteCornerNe
+          decals:
+            159: 7,-11
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteCornerNw
+          decals:
+            160: 6,-11
+            178: 3,-14
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteCornerSe
+          decals:
+            171: 7,-18
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteCornerSw
+          decals:
+            174: 3,-18
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteInnerNw
+          decals:
+            162: 6,-14
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteLineE
+          decals:
+            165: 7,-12
+            166: 7,-13
+            167: 7,-14
+            168: 7,-15
+            169: 7,-16
+            170: 7,-17
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteLineN
+          decals:
+            163: 5,-14
+            164: 4,-14
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteLineS
+          decals:
+            172: 6,-18
+            173: 5,-18
+            175: 4,-18
+        - node:
+            color: '#9FED5896'
+            id: BrickTileWhiteLineW
+          decals:
+            161: 6,-13
+            176: 3,-17
+            177: 3,-16
+        - node:
+            color: '#A4610647'
+            id: CheckerNWSE
+          decals:
+            196: -13,6
+            197: -14,6
+            198: -15,6
+            199: -15,7
+            200: -14,7
+            201: -13,7
+            202: -14,8
+            203: -15,8
+        - node:
+            color: '#D381C996'
+            id: CheckerNWSE
+          decals:
+            207: 10,-19
+            208: 11,-19
+            209: 12,-19
+            210: 13,-19
+            211: 14,-19
+            212: 14,-18
+            213: 14,-17
+            214: 13,-17
+            215: 13,-18
+            216: 12,-18
+            217: 12,-17
+            218: 11,-17
+            219: 11,-18
+            220: 10,-18
+            221: 10,-17
+        - node:
+            color: '#FFFFFFFF'
+            id: Delivery
+          decals:
+            204: -16,8
+            205: -16,9
+            251: 7,-18
+            252: 6,-18
+        - node:
+            color: '#DE3A3A96'
+            id: DeliveryGreyscale
+          decals:
+            283: 16,-14
+        - node:
+            color: '#9FED5896'
+            id: FullTileOverlayGreyscale
+          decals:
+            181: 5,-17
+            182: 5,-16
+            183: 5,-15
+            184: 6,-16
+            185: 4,-16
+        - node:
+            color: '#52B4E996'
+            id: HalfTileOverlayGreyscale
+          decals:
+            232: 1,-14
+            233: 0,-14
+            234: -1,-14
+        - node:
+            color: '#9FED5896'
+            id: HalfTileOverlayGreyscale
+          decals:
+            324: 11,-2
+        - node:
+            color: '#52B4E996'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            229: 1,-16
+            230: 0,-16
+            231: -1,-16
+        - node:
+            color: '#9FED5896'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            325: 11,0
+        - node:
+            color: '#52B4E996'
+            id: HalfTileOverlayGreyscale270
+          decals:
+            235: -2,-15
+        - node:
+            color: '#9FED5896'
+            id: HalfTileOverlayGreyscale270
+          decals:
+            323: 12,-1
+        - node:
+            color: '#9FED5896'
+            id: HalfTileOverlayGreyscale90
+          decals:
+            322: 10,-1
+        - node:
+            color: '#9FED5896'
+            id: QuarterTileOverlayGreyscale
+          decals:
+            314: 9,0
+            315: 10,0
+        - node:
+            color: '#9FED5896'
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            318: 13,-2
+            319: 12,-2
+        - node:
+            color: '#9FED5896'
+            id: QuarterTileOverlayGreyscale270
+          decals:
+            320: 9,-2
+            321: 10,-2
+        - node:
+            color: '#9FED5896'
+            id: QuarterTileOverlayGreyscale90
+          decals:
+            316: 13,0
+            317: 12,0
+        - node:
+            color: '#FFFFFFFF'
+            id: Rock06
+          decals:
+            75: 9.232971,15.9332485
+        - node:
+            color: '#52B4E996'
+            id: ThreeQuarterTileOverlayGreyscale
+          decals:
+            237: -2,-14
+        - node:
+            color: '#52B4E996'
+            id: ThreeQuarterTileOverlayGreyscale270
+          decals:
+            236: -2,-16
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnBox
+          decals:
+            124: -5,-3
+        - node:
+            angle: -1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: WarnCorner
+          decals:
+            21: 18,-5
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCorner
+          decals:
+            0: 17,-10
+            1: 18,-11
+            2: 19,-11
+        - node:
+            angle: 4.71238898038469 rad
+            color: '#FFFFFFFF'
+            id: WarnCorner
+          decals:
+            14: 17,-6
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerFlipped
+          decals:
+            7: 23,-10
+            13: 16,-6
+            19: 22,-11
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: WarnCornerFlipped
+          decals:
+            11: 23,-6
+            12: 22,-5
+        - node:
+            color: '#DE3A3A96'
+            id: WarnCornerGreyscaleNW
+          decals:
+            282: 17,-14
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSE
+          decals:
+            292: 20,-20
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSW
+          decals:
+            226: 10,-19
+            291: 24,-20
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnEndE
+          decals:
+            154: 1,-9
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnEndN
+          decals:
+            156: 7,-2
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnEndS
+          decals:
+            123: -6,21
+            155: 7,-4
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnEndW
+          decals:
+            153: 0,-9
+        - node:
+            color: '#DE3A3A96'
+            id: WarnFullGreyscale
+          decals:
+            352: 16,-8
+            353: 11,-8
+            354: 9,-10
+            355: 6,-10
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineE
+          decals:
+            158: 7,-3
+            294: 20,-18
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleE
+          decals:
+            152: 15,-14
+            349: 10,-8
+            350: 15,-8
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleN
+          decals:
+            351: 14,-7
+            356: 7,-7
+            357: 6,-7
+            358: 5,-7
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleS
+          decals:
+            346: 9,-9
+            347: 6,-9
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleW
+          decals:
+            348: 12,-8
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineGreyscaleW
+          decals:
+            179: 3,-15
+            180: 6,-12
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineN
+          decals:
+            222: 14,-19
+            223: 13,-19
+            224: 12,-19
+            225: 11,-19
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineS
+          decals:
+            94: -9,4
+            95: -9,3
+            96: -9,2
+            97: -9,1
+            98: -9,0
+            99: -9,-1
+            100: -9,-2
+            101: -9,-3
+            102: -9,-4
+            103: -9,-5
+            104: -9,-6
+            105: -9,-7
+            106: -9,-8
+            107: -9,-9
+            108: -9,-10
+            109: -9,-11
+            110: -9,-12
+            111: -9,-13
+            112: -9,-14
+            113: -9,-15
+            114: -9,-16
+            115: -9,-17
+            116: -9,-18
+            117: -9,-19
+            118: -9,-20
+            119: -9,-21
+            120: -9,-22
+            121: -9,-23
+            122: -9,-24
+            157: 7,-3
+            227: 10,-18
+            228: 10,-17
+            293: 24,-18
+        - node:
+            color: '#FFFFFFFF'
+            id: WarningLine
+          decals:
+            15: 19,-4
+            16: 20,-4
+            17: 21,-4
+        - node:
+            angle: 3.141592653589793 rad
+            color: '#FFFFFFFF'
+            id: WarningLine
+          decals:
+            3: 19,-11
+            4: 19,-12
+            5: 20,-12
+            6: 21,-12
+        - node:
+            angle: 4.71238898038469 rad
+            color: '#FFFFFFFF'
+            id: WarningLine
+          decals:
+            8: 24,-9
+            9: 24,-8
+            10: 24,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: WarningLineCornerFlipped
+          decals:
+            20: 22,-4
+        - node:
+            angle: 4.71238898038469 rad
+            color: '#FFFFFFFF'
+            id: WarningLineCornerFlipped
+          decals:
+            18: 24,-10
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerSw
+          decals:
+            363: 5,-6
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineS
+          decals:
+            361: 0,-6
+            362: -1,-6
+            364: 4,-6
+            365: 3,-6
+            366: 2,-6
+            367: 1,-6
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineW
+          decals:
+            337: 5,-9
+            338: 5,-8
+            360: 5,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: bushsnowa1
+          decals:
+            67: 12.033197,7.701807
+            69: 14.310135,6.6772776
+        - node:
+            color: '#FFFFFFFF'
+            id: bushsnowa2
+          decals:
+            68: -1.884201,10.692345
+            70: 13.896899,12.679136
+            73: -2.6609726,10.251652
+        - node:
+            color: '#FFFFFFFF'
+            id: bushsnowb2
+          decals:
+            71: 12.943774,14.853275
+        - node:
+            color: '#FFFFFFFF'
+            id: bushsnowb3
+          decals:
+            72: 0.2452774,15.588417
+            74: -0.9488945,8.937782
+        - node:
+            color: '#AB0000FF'
+            id: d
+          decals:
+            373: 21.412256,2.9944348
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnowa1
+          decals:
+            30: 9.251883,16.971285
+            41: 4.707512,15.727119
+            47: -2.8426914,5.7681084
+            84: 16.072964,17.452217
+            85: -4.644718,19.141476
+            369: 26.896631,2.9944348
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnowa2
+          decals:
+            22: -3.6290493,-9.771207
+            25: 15.159365,5.392831
+            42: 2.707512,15.930454
+            53: 1.6412125,14.139866
+            62: 14.449558,12.269236
+            86: -6.332218,17.702477
+            87: -7.488468,14.82448
+            91: -5.738468,8.348984
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnowa3
+          decals:
+            44: -1.3739414,16.399694
+            54: 0.43808746,13.654987
+            57: 3.1880875,12.434965
+            58: 2.1568375,9.893942
+            63: 16.060982,2.673603
+            90: -6.207218,16.0445
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnowb1
+          decals:
+            51: 0.79449654,2.152192
+            55: 0.18808746,9.666458
+            79: 4.997473,19.080475
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnowb2
+          decals:
+            36: 6.1287537,4.4684677
+            38: 13.017959,2.0284252
+            61: 8.19574,16.289047
+            64: 3.43816,14.798347
+            78: 2.4505978,18.17328
+            92: -5.832218,13.979851
+            93: 4.1790752,7.8279076
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnowb3
+          decals:
+            23: -3.3477993,-19.991972
+            31: 9.061624,11.550716
+            35: 9.066255,4.2786684
+            50: -3.1864414,-0.9828911
+            52: -0.88188744,15.563225
+            65: 0.5527668,14.892197
+            83: 17.104214,9.229881
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnowc1
+          decals:
+            24: -3.9999733,-6.081314
+            26: 15.819311,9.398571
+            32: 12.170999,10.565315
+            39: 10.861709,2.2630453
+            40: 8.471084,13.624069
+            45: -2.1864414,7.911888
+            48: -0.6551914,1.8769035
+            49: -3.7333164,0.34661865
+            56: 4.1724625,13.733192
+            76: 2.5912228,19.753052
+            82: 17.947964,3.1297789
+            88: -7.175968,10.382353
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnowc2
+          decals:
+            27: 14.194311,14.208315
+            29: 12.819311,16.642818
+            33: 8.01938,8.972565
+            81: 19.322964,7.2277966
+            89: -5.675968,10.1320915
+        - node:
+            color: '#FFFFFFFF'
+            id: grasssnowc3
+          decals:
+            28: 15.694311,15.172535
+            34: 10.48813,7.3443623
+            37: 9.0946245,2.0440664
+            43: -2.8895664,16.211998
+            46: -4.0458164,7.6303444
+            59: 0.45371246,11.270374
+            60: 9.166802,10.222887
+            66: -1.9470882,14.409473
+            77: 6.122473,18.001226
+            80: 18.166714,4.631343
+        - node:
+            color: '#AB0000FF'
+            id: i
+          decals:
+            374: 21.677881,2.8381848
+        - node:
+            color: '#AB0000FF'
+            id: k
+          decals:
+            377: 23.427881,2.8069348
+        - node:
+            color: '#AB0000FF'
+            id: n
+          decals:
+            372: 20.943506,2.9006848
+            378: 22.959131,2.9631848
+        - node:
+            color: '#AB0000FF'
+            id: r
+          decals:
+            375: 22.099756,2.7913098
+        - node:
+            color: '#AB0000FF'
+            id: s
+          decals:
+            370: 20.224756,2.9788098
+        - node:
+            color: '#AB0000FF'
+            id: shortline
+          decals:
+            376: 22.552881,2.8381848
+        - node:
+            color: '#AB0000FF'
+            id: y
+          decals:
+            371: 20.568506,2.9319348
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          -1,-2:
+            0: 65535
+          -1,-1:
+            0: 65503
+            1: 32
+          0,-1:
+            0: 65535
+          -2,-4:
+            0: 65535
+          -2,-3:
+            0: 65535
+          -2,-2:
+            0: 65535
+          -2,-1:
+            0: 65535
+          -1,-4:
+            0: 65535
+          -1,-3:
+            0: 65535
+          0,-4:
+            0: 65535
+          0,-3:
+            0: 65535
+          0,-2:
+            0: 65535
+          1,-4:
+            0: 57343
+            1: 8192
+          1,-3:
+            0: 65535
+          1,-2:
+            0: 65535
+          1,-1:
+            0: 65535
+          2,-4:
+            0: 62815
+            1: 2720
+          2,-3:
+            0: 65535
+          2,-2:
+            0: 32767
+            1: 32768
+          2,-1:
+            0: 65533
+            1: 2
+          3,-4:
+            0: 64991
+            1: 544
+          3,-3:
+            0: 65535
+          3,-2:
+            0: 57343
+            1: 8192
+          3,-1:
+            0: 65535
+          0,0:
+            0: 65535
+          0,1:
+            0: 65535
+          0,2:
+            0: 65535
+          0,3:
+            0: 65535
+          1,0:
+            0: 65535
+          1,1:
+            0: 65535
+          1,2:
+            0: 65535
+          1,3:
+            0: 65535
+          2,0:
+            0: 65535
+          2,1:
+            0: 65535
+          2,2:
+            0: 65535
+          2,3:
+            0: 65535
+          3,0:
+            0: 65535
+          3,1:
+            0: 65535
+          3,2:
+            0: 65535
+          3,3:
+            0: 65535
+          -2,0:
+            0: 65535
+          -2,1:
+            0: 65535
+          -2,2:
+            0: 65535
+          -2,3:
+            0: 65535
+          -1,0:
+            0: 65535
+          -1,1:
+            0: 65535
+          -1,2:
+            0: 65535
+          -1,3:
+            0: 65535
+          4,-4:
+            0: 65535
+          4,-3:
+            0: 65535
+          4,-2:
+            0: 65535
+          4,-1:
+            0: 65535
+          5,-4:
+            0: 65519
+            1: 16
+          5,-3:
+            0: 65535
+          5,-2:
+            0: 65535
+          5,-1:
+            0: 65535
+          6,-4:
+            0: 65519
+            1: 16
+          6,-3:
+            0: 65535
+          6,-2:
+            0: 65535
+          6,-1:
+            0: 65535
+          7,-4:
+            0: 65535
+          7,-3:
+            0: 65535
+          7,-2:
+            0: 65535
+          7,-1:
+            0: 65535
+          0,-6:
+            0: 65535
+          0,-5:
+            0: 65535
+          1,-6:
+            0: 65535
+          1,-5:
+            0: 62463
+            1: 3072
+          2,-6:
+            0: 65535
+          2,-5:
+            0: 65535
+          3,-6:
+            0: 65535
+          3,-5:
+            0: 65535
+          -2,-6:
+            0: 65535
+          -2,-5:
+            0: 65535
+          -1,-6:
+            0: 65535
+          -1,-5:
+            0: 65535
+          -2,4:
+            0: 65535
+          -1,4:
+            0: 65535
+          0,4:
+            0: 65535
+          1,4:
+            0: 65535
+          2,4:
+            0: 65535
+          3,4:
+            0: 65535
+          4,4:
+            0: 65535
+          4,0:
+            0: 65535
+          4,1:
+            0: 65535
+          4,2:
+            0: 65535
+          4,3:
+            0: 65535
+          5,0:
+            0: 65535
+          6,0:
+            0: 65535
+          7,0:
+            0: 65535
+          4,-6:
+            0: 65535
+          4,-5:
+            0: 65535
+          5,-6:
+            0: 65535
+          5,-5:
+            0: 65535
+          6,-6:
+            0: 65535
+          6,-5:
+            0: 65535
+          7,-6:
+            0: 65535
+          7,-5:
+            0: 65535
+          -4,-4:
+            0: 65535
+          -4,-3:
+            0: 4095
+          -3,-4:
+            0: 65535
+          -3,-3:
+            0: 61439
+          -3,-2:
+            0: 61166
+          -3,-1:
+            0: 61166
+          -4,0:
+            0: 65520
+            2: 15
+          -4,1:
+            0: 65535
+          -4,2:
+            0: 65535
+          -4,3:
+            0: 65535
+          -3,0:
+            0: 65534
+            2: 1
+          -3,1:
+            0: 65535
+          -3,2:
+            0: 65535
+          -3,3:
+            0: 65535
+          0,-7:
+            0: 65535
+          1,-7:
+            0: 61441
+            2: 3840
+          2,-7:
+            0: 4096
+            2: 57600
+          3,-7:
+            0: 32768
+            2: 28672
+          -4,-7:
+            0: 65535
+          -4,-6:
+            0: 65535
+          -4,-5:
+            0: 65535
+          -3,-7:
+            0: 65535
+          -3,-6:
+            0: 65535
+          -3,-5:
+            0: 65535
+          -1,-7:
+            0: 65535
+          -4,4:
+            0: 65535
+          -4,5:
+            0: 65535
+          -3,4:
+            0: 65535
+          -3,5:
+            0: 65535
+          -2,5:
+            0: 65535
+          -2,6:
+            0: 65535
+          -1,5:
+            0: 65535
+          -1,6:
+            0: 13107
+          0,5:
+            0: 8191
+          1,5:
+            0: 4095
+          2,5:
+            0: 65535
+          3,5:
+            0: 65535
+          4,5:
+            0: 65535
+          5,4:
+            0: 65535
+          5,5:
+            0: 30719
+          6,4:
+            0: 4915
+          5,1:
+            0: 65535
+          5,2:
+            0: 65535
+          5,3:
+            0: 65535
+          6,1:
+            0: 65535
+          6,2:
+            0: 30719
+          6,3:
+            0: 13107
+          7,1:
+            0: 16383
+          7,2:
+            0: 51
+          4,-7:
+            0: 61440
+          5,-7:
+            0: 61440
+          6,-7:
+            0: 61440
+          7,-7:
+            0: 28672
+          -8,-4:
+            0: 12
+          -7,-4:
+            0: 32783
+          -6,-4:
+            0: 61679
+          -5,-4:
+            0: 65535
+          -5,-3:
+            0: 4095
+          -6,3:
+            0: 65534
+          -6,2:
+            0: 52428
+          -5,0:
+            0: 65520
+            2: 15
+          -5,1:
+            0: 65535
+          -5,2:
+            0: 65535
+          -5,3:
+            0: 65535
+          -7,7:
+            0: 52424
+          -7,5:
+            0: 34944
+          -7,6:
+            0: 34952
+          -6,4:
+            0: 61183
+          -6,5:
+            0: 65535
+          -6,6:
+            0: 65535
+          -6,7:
+            0: 65535
+          -5,4:
+            0: 65535
+          -5,5:
+            0: 65535
+          -8,-6:
+            0: 65535
+          -8,-5:
+            0: 57343
+          -7,-5:
+            0: 65535
+          -7,-6:
+            0: 65535
+          -6,-6:
+            0: 65535
+          -6,-5:
+            0: 65535
+          -6,-7:
+            0: 64704
+          -5,-7:
+            0: 65528
+          -5,-6:
+            0: 65535
+          -5,-5:
+            0: 65535
+          8,0:
+            0: 17
+          8,-4:
+            0: 13107
+          8,-1:
+            0: 4369
+          8,-6:
+            0: 13072
+          8,-5:
+            0: 13107
+          -7,8:
+            0: 12
+          -6,8:
+            0: 3
+          -12,-6:
+            0: 65535
+          -12,-5:
+            0: 65535
+          -11,-6:
+            0: 65533
+          -11,-5:
+            0: 65535
+          -10,-6:
+            0: 65535
+          -10,-5:
+            0: 65535
+          -9,-6:
+            0: 65535
+          -9,-5:
+            0: 65535
+          -15,-4:
+            0: 65535
+          -15,-3:
+            0: 65535
+          -15,-2:
+            0: 65535
+          -15,-1:
+            0: 65535
+          -14,-4:
+            0: 65535
+          -14,-3:
+            0: 29495
+          -14,-2:
+            0: 30583
+          -14,-1:
+            0: 13175
+          -13,-4:
+            0: 4607
+          -12,-4:
+            0: 255
+          -11,-4:
+            0: 255
+          -10,-4:
+            0: 255
+          -9,-4:
+            0: 119
+          -15,-5:
+            0: 65535
+          -14,-5:
+            0: 65535
+          -14,-6:
+            0: 65535
+          -13,-6:
+            0: 65535
+          -13,-5:
+            0: 65535
+          -15,0:
+            0: 65518
+          -15,1:
+            0: 65535
+          -15,2:
+            0: 65535
+          -15,3:
+            0: 65535
+          -14,0:
+            0: 13171
+          -14,1:
+            0: 13075
+          -14,2:
+            0: 13107
+          -14,3:
+            0: 29491
+          -15,4:
+            0: 65535
+          -15,5:
+            0: 65535
+          -15,6:
+            0: 35007
+          -14,4:
+            0: 65535
+          -14,5:
+            0: 65535
+          -14,6:
+            0: 16383
+          -2,-7:
+            0: 65535
+          -4,6:
+            0: 65535
+          -4,7:
+            0: 4095
+          -3,6:
+            0: 65535
+          -3,7:
+            0: 511
+          -2,7:
+            0: 255
+          -1,7:
+            0: 51
+          2,6:
+            0: 52428
+          2,7:
+            0: 52428
+          3,6:
+            0: 65535
+          3,7:
+            0: 65535
+          4,6:
+            0: 65535
+          4,7:
+            0: 65535
+          5,6:
+            0: 13107
+          5,7:
+            0: 4915
+          -7,-3:
+            0: 2184
+          -6,-3:
+            0: 4095
+          -7,0:
+            0: 65520
+            2: 15
+          -7,1:
+            0: 15
+          -6,0:
+            0: 65520
+            2: 15
+          -6,1:
+            0: 15
+            2: 51328
+          -5,6:
+            0: 65535
+          -5,7:
+            0: 32767
+          -8,-7:
+            0: 63744
+          -7,-7:
+            0: 65407
+          -12,-7:
+            0: 65519
+          -11,-7:
+            0: 4983
+          -10,-7:
+            0: 60622
+          -9,-7:
+            0: 65535
+          -16,-4:
+            0: 65535
+          -16,-3:
+            0: 65535
+          -16,-2:
+            0: 65535
+          -16,-1:
+            0: 65535
+          -16,-7:
+            0: 13107
+          -16,-6:
+            0: 65535
+          -16,-5:
+            0: 65535
+          -15,-6:
+            0: 65535
+          -15,-7:
+            0: 52360
+          -14,-7:
+            0: 65535
+          -13,-7:
+            0: 63251
+          -16,0:
+            0: 65535
+          -16,1:
+            0: 65535
+          -16,2:
+            0: 65535
+          -16,3:
+            0: 65535
+          -16,4:
+            0: 65535
+          -16,5:
+            0: 65535
+          -16,6:
+            0: 255
+          -18,0:
+            0: 65535
+          -18,3:
+            0: 61440
+          -18,1:
+            0: 34956
+          -17,0:
+            0: 65535
+          -17,1:
+            0: 65535
+          -17,2:
+            0: 65519
+          -17,3:
+            0: 65535
+          -18,4:
+            0: 52991
+          -18,5:
+            0: 65532
+          -18,6:
+            0: 3823
+          -17,4:
+            0: 65535
+          -17,5:
+            0: 65535
+          -17,6:
+            0: 4095
+          -18,-4:
+            0: 65535
+          -18,-3:
+            0: 52479
+          -18,-1:
+            0: 65484
+          -18,-2:
+            0: 52428
+          -17,-4:
+            0: 65535
+          -17,-3:
+            0: 65535
+          -17,-2:
+            0: 65535
+          -17,-1:
+            0: 65535
+          -18,-6:
+            0: 65484
+          -18,-5:
+            0: 65535
+          -18,-7:
+            0: 52224
+          -17,-7:
+            0: 65484
+          -17,-6:
+            0: 65535
+          -17,-5:
+            0: 65535
+          2,8:
+            0: 12
+          3,8:
+            0: 15
+          4,8:
+            0: 15
+          5,8:
+            0: 1
+          -8,0:
+            0: 65520
+            2: 15
+          -8,1:
+            0: 15
+          -9,0:
+            0: 61152
+            2: 14
+          -9,1:
+            0: 14
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.213781
+          - 79.80423
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: RadiationGridResistance
+    - type: OccluderTree
+    - type: Shuttle
+    - type: GravityShake
+      shakeTimes: 10
+    - type: GasTileOverlay
+    - type: SpreaderGrid
+    - type: GridPathfinding
+    - type: BecomesStation
+      id: SyndicateOutpost
+  - uid: 1295
+    components:
+    - type: MetaData
+    - type: Transform
+    - type: Map
+    - type: PhysicsMap
+    - type: Broadphase
+    - type: OccluderTree
+    - type: Parallax
+      parallax: Sky
+    - type: MapAtmosphere
+      space: False
+      mixture:
+        volume: 2500
+        temperature: 248.15
+        moles:
+        - 21.824879
+        - 82.10312
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: LoadedMap
+    - type: GridTree
+    - type: MovedGrids
+- proto: AirlockExternalGlassNukeopLocked
+  entities:
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 104
+  - uid: 55
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 104
+  - uid: 56
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 104
+  - uid: 58
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 104
+- proto: AirlockGlassShuttle
+  entities:
+  - uid: 2053
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,-19.5
+      parent: 104
+  - uid: 2057
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-19.5
+      parent: 104
+  - uid: 2062
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,-19.5
+      parent: 104
+  - uid: 2185
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -21.5,-19.5
+      parent: 104
+  - uid: 2186
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -17.5,-19.5
+      parent: 104
+  - uid: 2187
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -13.5,-19.5
+      parent: 104
+  - uid: 2190
+    components:
+    - type: Transform
+      pos: -13.5,0.5
+      parent: 104
+  - uid: 2191
+    components:
+    - type: Transform
+      pos: -17.5,0.5
+      parent: 104
+  - uid: 2193
+    components:
+    - type: Transform
+      pos: -21.5,0.5
+      parent: 104
+  - uid: 2448
+    components:
+    - type: Transform
+      pos: -25.5,0.5
+      parent: 104
+  - uid: 2472
+    components:
+    - type: Transform
+      pos: -29.5,0.5
+      parent: 104
+    - type: GridFill
+      addComponents:
+      - type: NukeOpsShuttle
+      path: /Maps/Shuttles/infiltrator.yml
+  - uid: 2481
+    components:
+    - type: Transform
+      pos: -33.5,0.5
+      parent: 104
+- proto: AirlockSyndicateNukeopGlassLocked
+  entities:
+  - uid: 48
+    components:
+    - type: Transform
+      pos: -11.5,6.5
+      parent: 104
+  - uid: 65
+    components:
+    - type: Transform
+      pos: 2.5,-14.5
+      parent: 104
+  - uid: 96
+    components:
+    - type: Transform
+      pos: 8.5,-16.5
+      parent: 104
+  - uid: 112
+    components:
+    - type: Transform
+      pos: 16.5,-7.5
+      parent: 104
+  - uid: 122
+    components:
+    - type: Transform
+      pos: 9.5,-9.5
+      parent: 104
+  - uid: 130
+    components:
+    - type: Transform
+      pos: 11.5,-7.5
+      parent: 104
+  - uid: 131
+    components:
+    - type: Transform
+      pos: 8.5,-0.5
+      parent: 104
+  - uid: 165
+    components:
+    - type: Transform
+      pos: 10.5,-2.5
+      parent: 104
+  - uid: 190
+    components:
+    - type: Transform
+      pos: 16.5,-13.5
+      parent: 104
+  - uid: 302
+    components:
+    - type: Transform
+      pos: 14.5,-5.5
+      parent: 104
+  - uid: 305
+    components:
+    - type: Transform
+      pos: 6.5,-9.5
+      parent: 104
+- proto: AirlockSyndicateNukeopLocked
+  entities:
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 14.5,-1.5
+      parent: 104
+  - uid: 120
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,-7.5
+      parent: 104
+  - uid: 136
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-7.5
+      parent: 104
+  - uid: 148
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-10.5
+      parent: 104
+  - uid: 272
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-4.5
+      parent: 104
+- proto: AlwaysPoweredLightExterior
+  entities:
+  - uid: 1267
+    components:
+    - type: Transform
+      pos: -15.5,23.5
+      parent: 104
+- proto: AlwaysPoweredLightLED
+  entities:
+  - uid: 135
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-1.5
+      parent: 104
+  - uid: 974
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-17.5
+      parent: 104
+  - uid: 1286
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-5.5
+      parent: 104
+  - uid: 1287
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-11.5
+      parent: 104
+  - uid: 1288
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-20.5
+      parent: 104
+- proto: AlwaysPoweredWallLight
+  entities:
+  - uid: 258
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 104
+  - uid: 1356
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 104
+  - uid: 1470
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-14.5
+      parent: 104
+  - uid: 1471
+    components:
+    - type: Transform
+      pos: 12.5,-10.5
+      parent: 104
+  - uid: 1532
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-8.5
+      parent: 104
+  - uid: 1534
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-1.5
+      parent: 104
+  - uid: 1536
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-2.5
+      parent: 104
+  - uid: 1537
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-8.5
+      parent: 104
+  - uid: 1544
+    components:
+    - type: Transform
+      pos: 15.5,-6.5
+      parent: 104
+  - uid: 1545
+    components:
+    - type: Transform
+      pos: 14.5,-3.5
+      parent: 104
+  - uid: 1546
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-4.5
+      parent: 104
+  - uid: 1570
+    components:
+    - type: Transform
+      pos: 19.5,-5.5
+      parent: 104
+  - uid: 1571
+    components:
+    - type: Transform
+      pos: 21.5,-5.5
+      parent: 104
+  - uid: 1572
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,-9.5
+      parent: 104
+  - uid: 1573
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 21.5,-9.5
+      parent: 104
+  - uid: 1758
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,5.5
+      parent: 104
+  - uid: 1759
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,12.5
+      parent: 104
+  - uid: 1760
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-22.5
+      parent: 104
+  - uid: 1763
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-22.5
+      parent: 104
+  - uid: 1867
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-16.5
+      parent: 104
+  - uid: 2257
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,10.5
+      parent: 104
+  - uid: 2291
+    components:
+    - type: Transform
+      pos: 5.5,14.5
+      parent: 104
+  - uid: 2397
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-11.5
+      parent: 104
+  - uid: 2398
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-3.5
+      parent: 104
+  - uid: 2399
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-3.5
+      parent: 104
+  - uid: 2400
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-11.5
+      parent: 104
+  - uid: 2401
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-15.5
+      parent: 104
+  - uid: 2402
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-15.5
+      parent: 104
+  - uid: 2403
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-19.5
+      parent: 104
+  - uid: 2404
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,-19.5
+      parent: 104
+  - uid: 3375
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-11.5
+      parent: 104
+  - uid: 3377
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-11.5
+      parent: 104
+- proto: APCHyperCapacity
+  entities:
+  - uid: 1431
+    components:
+    - type: Transform
+      pos: 20.5,-12.5
+      parent: 104
+  - uid: 1445
+    components:
+    - type: Transform
+      pos: 13.5,-9.5
+      parent: 104
+  - uid: 1477
+    components:
+    - type: Transform
+      pos: 8.5,-5.5
+      parent: 104
+  - uid: 1574
+    components:
+    - type: Transform
+      pos: 21.5,-4.5
+      parent: 104
+- proto: AsteroidRock
+  entities:
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 16.5,1.5
+      parent: 104
+  - uid: 20
+    components:
+    - type: Transform
+      pos: -3.5,-10.5
+      parent: 104
+  - uid: 216
+    components:
+    - type: Transform
+      pos: -4.5,-9.5
+      parent: 104
+  - uid: 238
+    components:
+    - type: Transform
+      pos: -4.5,-13.5
+      parent: 104
+  - uid: 243
+    components:
+    - type: Transform
+      pos: -4.5,-6.5
+      parent: 104
+  - uid: 244
+    components:
+    - type: Transform
+      pos: -4.5,-8.5
+      parent: 104
+  - uid: 246
+    components:
+    - type: Transform
+      pos: -3.5,-8.5
+      parent: 104
+  - uid: 247
+    components:
+    - type: Transform
+      pos: -4.5,-12.5
+      parent: 104
+  - uid: 248
+    components:
+    - type: Transform
+      pos: -4.5,-7.5
+      parent: 104
+  - uid: 249
+    components:
+    - type: Transform
+      pos: -8.5,9.5
+      parent: 104
+  - uid: 250
+    components:
+    - type: Transform
+      pos: 0.5,-10.5
+      parent: 104
+  - uid: 251
+    components:
+    - type: Transform
+      pos: 15.5,1.5
+      parent: 104
+  - uid: 255
+    components:
+    - type: Transform
+      pos: -3.5,-7.5
+      parent: 104
+  - uid: 257
+    components:
+    - type: Transform
+      pos: 15.5,0.5
+      parent: 104
+  - uid: 259
+    components:
+    - type: Transform
+      pos: -4.5,-10.5
+      parent: 104
+  - uid: 263
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 104
+  - uid: 277
+    components:
+    - type: Transform
+      pos: -10.5,22.5
+      parent: 104
+  - uid: 292
+    components:
+    - type: Transform
+      pos: -9.5,21.5
+      parent: 104
+  - uid: 294
+    components:
+    - type: Transform
+      pos: -10.5,21.5
+      parent: 104
+  - uid: 295
+    components:
+    - type: Transform
+      pos: -11.5,22.5
+      parent: 104
+  - uid: 296
+    components:
+    - type: Transform
+      pos: -20.5,9.5
+      parent: 104
+  - uid: 358
+    components:
+    - type: Transform
+      pos: -22.5,21.5
+      parent: 104
+  - uid: 359
+    components:
+    - type: Transform
+      pos: -22.5,15.5
+      parent: 104
+  - uid: 360
+    components:
+    - type: Transform
+      pos: -22.5,16.5
+      parent: 104
+  - uid: 361
+    components:
+    - type: Transform
+      pos: -21.5,17.5
+      parent: 104
+  - uid: 362
+    components:
+    - type: Transform
+      pos: -21.5,16.5
+      parent: 104
+  - uid: 363
+    components:
+    - type: Transform
+      pos: -21.5,15.5
+      parent: 104
+  - uid: 364
+    components:
+    - type: Transform
+      pos: -21.5,14.5
+      parent: 104
+  - uid: 365
+    components:
+    - type: Transform
+      pos: -22.5,14.5
+      parent: 104
+  - uid: 366
+    components:
+    - type: Transform
+      pos: -21.5,13.5
+      parent: 104
+  - uid: 367
+    components:
+    - type: Transform
+      pos: -21.5,20.5
+      parent: 104
+  - uid: 368
+    components:
+    - type: Transform
+      pos: -21.5,21.5
+      parent: 104
+  - uid: 369
+    components:
+    - type: Transform
+      pos: -20.5,21.5
+      parent: 104
+  - uid: 370
+    components:
+    - type: Transform
+      pos: -19.5,21.5
+      parent: 104
+  - uid: 371
+    components:
+    - type: Transform
+      pos: -20.5,22.5
+      parent: 104
+  - uid: 372
+    components:
+    - type: Transform
+      pos: -18.5,21.5
+      parent: 104
+  - uid: 373
+    components:
+    - type: Transform
+      pos: -20.5,8.5
+      parent: 104
+  - uid: 374
+    components:
+    - type: Transform
+      pos: -22.5,22.5
+      parent: 104
+  - uid: 375
+    components:
+    - type: Transform
+      pos: -21.5,22.5
+      parent: 104
+  - uid: 376
+    components:
+    - type: Transform
+      pos: -23.5,22.5
+      parent: 104
+  - uid: 377
+    components:
+    - type: Transform
+      pos: -20.5,15.5
+      parent: 104
+  - uid: 401
+    components:
+    - type: Transform
+      pos: -20.5,20.5
+      parent: 104
+  - uid: 402
+    components:
+    - type: Transform
+      pos: -20.5,19.5
+      parent: 104
+  - uid: 403
+    components:
+    - type: Transform
+      pos: -20.5,18.5
+      parent: 104
+  - uid: 404
+    components:
+    - type: Transform
+      pos: -20.5,17.5
+      parent: 104
+  - uid: 405
+    components:
+    - type: Transform
+      pos: -20.5,16.5
+      parent: 104
+  - uid: 406
+    components:
+    - type: Transform
+      pos: -20.5,14.5
+      parent: 104
+  - uid: 407
+    components:
+    - type: Transform
+      pos: -24.5,23.5
+      parent: 104
+  - uid: 408
+    components:
+    - type: Transform
+      pos: -24.5,22.5
+      parent: 104
+  - uid: 409
+    components:
+    - type: Transform
+      pos: -20.5,10.5
+      parent: 104
+  - uid: 410
+    components:
+    - type: Transform
+      pos: -9.5,22.5
+      parent: 104
+  - uid: 415
+    components:
+    - type: Transform
+      pos: -18.5,23.5
+      parent: 104
+  - uid: 417
+    components:
+    - type: Transform
+      pos: -16.5,6.5
+      parent: 104
+  - uid: 419
+    components:
+    - type: Transform
+      pos: -7.5,21.5
+      parent: 104
+  - uid: 420
+    components:
+    - type: Transform
+      pos: -8.5,21.5
+      parent: 104
+  - uid: 421
+    components:
+    - type: Transform
+      pos: -10.5,23.5
+      parent: 104
+  - uid: 422
+    components:
+    - type: Transform
+      pos: -11.5,23.5
+      parent: 104
+  - uid: 423
+    components:
+    - type: Transform
+      pos: -19.5,22.5
+      parent: 104
+  - uid: 425
+    components:
+    - type: Transform
+      pos: -18.5,22.5
+      parent: 104
+  - uid: 426
+    components:
+    - type: Transform
+      pos: -7.5,12.5
+      parent: 104
+  - uid: 455
+    components:
+    - type: Transform
+      pos: 1.5,-19.5
+      parent: 104
+  - uid: 469
+    components:
+    - type: Transform
+      pos: -8.5,10.5
+      parent: 104
+  - uid: 471
+    components:
+    - type: Transform
+      pos: -9.5,10.5
+      parent: 104
+  - uid: 473
+    components:
+    - type: Transform
+      pos: -8.5,11.5
+      parent: 104
+  - uid: 475
+    components:
+    - type: Transform
+      pos: -9.5,11.5
+      parent: 104
+  - uid: 477
+    components:
+    - type: Transform
+      pos: 16.5,0.5
+      parent: 104
+  - uid: 478
+    components:
+    - type: Transform
+      pos: -6.5,12.5
+      parent: 104
+  - uid: 479
+    components:
+    - type: Transform
+      pos: -2.5,-18.5
+      parent: 104
+  - uid: 480
+    components:
+    - type: Transform
+      pos: -2.5,-19.5
+      parent: 104
+  - uid: 483
+    components:
+    - type: Transform
+      pos: -2.5,-10.5
+      parent: 104
+  - uid: 485
+    components:
+    - type: Transform
+      pos: -2.5,-6.5
+      parent: 104
+  - uid: 488
+    components:
+    - type: Transform
+      pos: -2.5,-7.5
+      parent: 104
+  - uid: 489
+    components:
+    - type: Transform
+      pos: -2.5,-8.5
+      parent: 104
+  - uid: 492
+    components:
+    - type: Transform
+      pos: -3.5,-20.5
+      parent: 104
+  - uid: 502
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 104
+  - uid: 504
+    components:
+    - type: Transform
+      pos: -2.5,-9.5
+      parent: 104
+  - uid: 505
+    components:
+    - type: Transform
+      pos: -3.5,-19.5
+      parent: 104
+  - uid: 506
+    components:
+    - type: Transform
+      pos: 17.5,-1.5
+      parent: 104
+  - uid: 509
+    components:
+    - type: Transform
+      pos: -4.5,-19.5
+      parent: 104
+  - uid: 511
+    components:
+    - type: Transform
+      pos: -4.5,-18.5
+      parent: 104
+  - uid: 512
+    components:
+    - type: Transform
+      pos: -9.5,12.5
+      parent: 104
+  - uid: 513
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 104
+  - uid: 521
+    components:
+    - type: Transform
+      pos: -4.5,-14.5
+      parent: 104
+  - uid: 522
+    components:
+    - type: Transform
+      pos: -1.5,19.5
+      parent: 104
+  - uid: 524
+    components:
+    - type: Transform
+      pos: -0.5,19.5
+      parent: 104
+  - uid: 525
+    components:
+    - type: Transform
+      pos: 9.5,20.5
+      parent: 104
+  - uid: 529
+    components:
+    - type: Transform
+      pos: 10.5,19.5
+      parent: 104
+  - uid: 531
+    components:
+    - type: Transform
+      pos: 11.5,19.5
+      parent: 104
+  - uid: 532
+    components:
+    - type: Transform
+      pos: 12.5,19.5
+      parent: 104
+  - uid: 533
+    components:
+    - type: Transform
+      pos: 16.5,19.5
+      parent: 104
+  - uid: 534
+    components:
+    - type: Transform
+      pos: 17.5,19.5
+      parent: 104
+  - uid: 535
+    components:
+    - type: Transform
+      pos: 18.5,19.5
+      parent: 104
+  - uid: 536
+    components:
+    - type: Transform
+      pos: 18.5,11.5
+      parent: 104
+  - uid: 537
+    components:
+    - type: Transform
+      pos: 18.5,12.5
+      parent: 104
+  - uid: 538
+    components:
+    - type: Transform
+      pos: 18.5,15.5
+      parent: 104
+  - uid: 539
+    components:
+    - type: Transform
+      pos: 18.5,18.5
+      parent: 104
+  - uid: 543
+    components:
+    - type: Transform
+      pos: 26.5,9.5
+      parent: 104
+  - uid: 546
+    components:
+    - type: Transform
+      pos: 28.5,3.5
+      parent: 104
+  - uid: 547
+    components:
+    - type: Transform
+      pos: 29.5,3.5
+      parent: 104
+  - uid: 548
+    components:
+    - type: Transform
+      pos: 30.5,3.5
+      parent: 104
+  - uid: 549
+    components:
+    - type: Transform
+      pos: 22.5,-22.5
+      parent: 104
+  - uid: 550
+    components:
+    - type: Transform
+      pos: 31.5,-20.5
+      parent: 104
+  - uid: 551
+    components:
+    - type: Transform
+      pos: 31.5,-19.5
+      parent: 104
+  - uid: 552
+    components:
+    - type: Transform
+      pos: 31.5,-18.5
+      parent: 104
+  - uid: 553
+    components:
+    - type: Transform
+      pos: 31.5,-17.5
+      parent: 104
+  - uid: 554
+    components:
+    - type: Transform
+      pos: 31.5,-16.5
+      parent: 104
+  - uid: 555
+    components:
+    - type: Transform
+      pos: 31.5,-15.5
+      parent: 104
+  - uid: 556
+    components:
+    - type: Transform
+      pos: 31.5,-14.5
+      parent: 104
+  - uid: 557
+    components:
+    - type: Transform
+      pos: 31.5,-13.5
+      parent: 104
+  - uid: 558
+    components:
+    - type: Transform
+      pos: 31.5,-12.5
+      parent: 104
+  - uid: 559
+    components:
+    - type: Transform
+      pos: 31.5,-7.5
+      parent: 104
+  - uid: 560
+    components:
+    - type: Transform
+      pos: 31.5,-6.5
+      parent: 104
+  - uid: 561
+    components:
+    - type: Transform
+      pos: 31.5,-5.5
+      parent: 104
+  - uid: 562
+    components:
+    - type: Transform
+      pos: 31.5,-4.5
+      parent: 104
+  - uid: 563
+    components:
+    - type: Transform
+      pos: 31.5,-3.5
+      parent: 104
+  - uid: 564
+    components:
+    - type: Transform
+      pos: 31.5,-2.5
+      parent: 104
+  - uid: 565
+    components:
+    - type: Transform
+      pos: 31.5,-1.5
+      parent: 104
+  - uid: 566
+    components:
+    - type: Transform
+      pos: 31.5,-0.5
+      parent: 104
+  - uid: 567
+    components:
+    - type: Transform
+      pos: 31.5,0.5
+      parent: 104
+  - uid: 568
+    components:
+    - type: Transform
+      pos: 31.5,1.5
+      parent: 104
+  - uid: 569
+    components:
+    - type: Transform
+      pos: 17.5,-22.5
+      parent: 104
+  - uid: 570
+    components:
+    - type: Transform
+      pos: 18.5,-22.5
+      parent: 104
+  - uid: 571
+    components:
+    - type: Transform
+      pos: 19.5,-22.5
+      parent: 104
+  - uid: 572
+    components:
+    - type: Transform
+      pos: 20.5,-22.5
+      parent: 104
+  - uid: 573
+    components:
+    - type: Transform
+      pos: 21.5,-22.5
+      parent: 104
+  - uid: 574
+    components:
+    - type: Transform
+      pos: -5.5,-22.5
+      parent: 104
+  - uid: 575
+    components:
+    - type: Transform
+      pos: 23.5,-22.5
+      parent: 104
+  - uid: 576
+    components:
+    - type: Transform
+      pos: 24.5,-22.5
+      parent: 104
+  - uid: 577
+    components:
+    - type: Transform
+      pos: 25.5,-22.5
+      parent: 104
+  - uid: 578
+    components:
+    - type: Transform
+      pos: 26.5,-22.5
+      parent: 104
+  - uid: 579
+    components:
+    - type: Transform
+      pos: 27.5,-22.5
+      parent: 104
+  - uid: 580
+    components:
+    - type: Transform
+      pos: 28.5,-22.5
+      parent: 104
+  - uid: 581
+    components:
+    - type: Transform
+      pos: -4.5,-20.5
+      parent: 104
+  - uid: 582
+    components:
+    - type: Transform
+      pos: -4.5,-15.5
+      parent: 104
+  - uid: 586
+    components:
+    - type: Transform
+      pos: 4.5,-22.5
+      parent: 104
+  - uid: 587
+    components:
+    - type: Transform
+      pos: 5.5,-22.5
+      parent: 104
+  - uid: 588
+    components:
+    - type: Transform
+      pos: 6.5,-22.5
+      parent: 104
+  - uid: 589
+    components:
+    - type: Transform
+      pos: 7.5,-22.5
+      parent: 104
+  - uid: 590
+    components:
+    - type: Transform
+      pos: 8.5,-22.5
+      parent: 104
+  - uid: 595
+    components:
+    - type: Transform
+      pos: -5.5,-21.5
+      parent: 104
+  - uid: 596
+    components:
+    - type: Transform
+      pos: -5.5,-20.5
+      parent: 104
+  - uid: 597
+    components:
+    - type: Transform
+      pos: -5.5,-19.5
+      parent: 104
+  - uid: 598
+    components:
+    - type: Transform
+      pos: -5.5,-18.5
+      parent: 104
+  - uid: 599
+    components:
+    - type: Transform
+      pos: -5.5,-17.5
+      parent: 104
+  - uid: 600
+    components:
+    - type: Transform
+      pos: -5.5,-16.5
+      parent: 104
+  - uid: 601
+    components:
+    - type: Transform
+      pos: -5.5,-15.5
+      parent: 104
+  - uid: 602
+    components:
+    - type: Transform
+      pos: -5.5,-14.5
+      parent: 104
+  - uid: 603
+    components:
+    - type: Transform
+      pos: -5.5,-13.5
+      parent: 104
+  - uid: 604
+    components:
+    - type: Transform
+      pos: -5.5,-12.5
+      parent: 104
+  - uid: 605
+    components:
+    - type: Transform
+      pos: -5.5,-11.5
+      parent: 104
+  - uid: 606
+    components:
+    - type: Transform
+      pos: -5.5,-10.5
+      parent: 104
+  - uid: 607
+    components:
+    - type: Transform
+      pos: -5.5,-9.5
+      parent: 104
+  - uid: 608
+    components:
+    - type: Transform
+      pos: -5.5,-8.5
+      parent: 104
+  - uid: 609
+    components:
+    - type: Transform
+      pos: -5.5,-7.5
+      parent: 104
+  - uid: 610
+    components:
+    - type: Transform
+      pos: -14.5,16.5
+      parent: 104
+  - uid: 614
+    components:
+    - type: Transform
+      pos: -16.5,15.5
+      parent: 104
+  - uid: 615
+    components:
+    - type: Transform
+      pos: -10.5,9.5
+      parent: 104
+  - uid: 618
+    components:
+    - type: Transform
+      pos: -8.5,12.5
+      parent: 104
+  - uid: 621
+    components:
+    - type: Transform
+      pos: -9.5,9.5
+      parent: 104
+  - uid: 622
+    components:
+    - type: Transform
+      pos: -10.5,10.5
+      parent: 104
+  - uid: 632
+    components:
+    - type: Transform
+      pos: -10.5,12.5
+      parent: 104
+  - uid: 637
+    components:
+    - type: Transform
+      pos: -10.5,11.5
+      parent: 104
+  - uid: 640
+    components:
+    - type: Transform
+      pos: -16.5,5.5
+      parent: 104
+  - uid: 648
+    components:
+    - type: Transform
+      pos: -11.5,13.5
+      parent: 104
+  - uid: 670
+    components:
+    - type: Transform
+      pos: -18.5,10.5
+      parent: 104
+  - uid: 672
+    components:
+    - type: Transform
+      pos: -16.5,16.5
+      parent: 104
+  - uid: 673
+    components:
+    - type: Transform
+      pos: -11.5,12.5
+      parent: 104
+  - uid: 674
+    components:
+    - type: Transform
+      pos: -19.5,15.5
+      parent: 104
+  - uid: 676
+    components:
+    - type: Transform
+      pos: -19.5,16.5
+      parent: 104
+  - uid: 677
+    components:
+    - type: Transform
+      pos: -18.5,11.5
+      parent: 104
+  - uid: 678
+    components:
+    - type: Transform
+      pos: -14.5,11.5
+      parent: 104
+  - uid: 679
+    components:
+    - type: Transform
+      pos: -14.5,17.5
+      parent: 104
+  - uid: 680
+    components:
+    - type: Transform
+      pos: -14.5,18.5
+      parent: 104
+  - uid: 681
+    components:
+    - type: Transform
+      pos: -15.5,14.5
+      parent: 104
+  - uid: 682
+    components:
+    - type: Transform
+      pos: -24.5,25.5
+      parent: 104
+  - uid: 684
+    components:
+    - type: Transform
+      pos: -17.5,13.5
+      parent: 104
+  - uid: 685
+    components:
+    - type: Transform
+      pos: -15.5,16.5
+      parent: 104
+  - uid: 686
+    components:
+    - type: Transform
+      pos: -12.5,12.5
+      parent: 104
+  - uid: 687
+    components:
+    - type: Transform
+      pos: -12.5,11.5
+      parent: 104
+  - uid: 688
+    components:
+    - type: Transform
+      pos: -11.5,14.5
+      parent: 104
+  - uid: 689
+    components:
+    - type: Transform
+      pos: -15.5,15.5
+      parent: 104
+  - uid: 690
+    components:
+    - type: Transform
+      pos: -14.5,14.5
+      parent: 104
+  - uid: 691
+    components:
+    - type: Transform
+      pos: -19.5,14.5
+      parent: 104
+  - uid: 692
+    components:
+    - type: Transform
+      pos: -13.5,16.5
+      parent: 104
+  - uid: 693
+    components:
+    - type: Transform
+      pos: -17.5,15.5
+      parent: 104
+  - uid: 694
+    components:
+    - type: Transform
+      pos: -11.5,9.5
+      parent: 104
+  - uid: 695
+    components:
+    - type: Transform
+      pos: -20.5,23.5
+      parent: 104
+  - uid: 699
+    components:
+    - type: Transform
+      pos: -18.5,8.5
+      parent: 104
+  - uid: 700
+    components:
+    - type: Transform
+      pos: -18.5,9.5
+      parent: 104
+  - uid: 701
+    components:
+    - type: Transform
+      pos: -13.5,12.5
+      parent: 104
+  - uid: 702
+    components:
+    - type: Transform
+      pos: -13.5,17.5
+      parent: 104
+  - uid: 703
+    components:
+    - type: Transform
+      pos: -13.5,18.5
+      parent: 104
+  - uid: 704
+    components:
+    - type: Transform
+      pos: -15.5,18.5
+      parent: 104
+  - uid: 705
+    components:
+    - type: Transform
+      pos: -17.5,14.5
+      parent: 104
+  - uid: 706
+    components:
+    - type: Transform
+      pos: -11.5,11.5
+      parent: 104
+  - uid: 708
+    components:
+    - type: Transform
+      pos: -17.5,11.5
+      parent: 104
+  - uid: 709
+    components:
+    - type: Transform
+      pos: -17.5,16.5
+      parent: 104
+  - uid: 711
+    components:
+    - type: Transform
+      pos: -17.5,10.5
+      parent: 104
+  - uid: 712
+    components:
+    - type: Transform
+      pos: -15.5,17.5
+      parent: 104
+  - uid: 714
+    components:
+    - type: Transform
+      pos: -11.5,17.5
+      parent: 104
+  - uid: 716
+    components:
+    - type: Transform
+      pos: -13.5,13.5
+      parent: 104
+  - uid: 717
+    components:
+    - type: Transform
+      pos: -13.5,14.5
+      parent: 104
+  - uid: 718
+    components:
+    - type: Transform
+      pos: -18.5,14.5
+      parent: 104
+  - uid: 719
+    components:
+    - type: Transform
+      pos: -18.5,15.5
+      parent: 104
+  - uid: 720
+    components:
+    - type: Transform
+      pos: -18.5,16.5
+      parent: 104
+  - uid: 721
+    components:
+    - type: Transform
+      pos: -17.5,8.5
+      parent: 104
+  - uid: 722
+    components:
+    - type: Transform
+      pos: -16.5,13.5
+      parent: 104
+  - uid: 723
+    components:
+    - type: Transform
+      pos: -16.5,14.5
+      parent: 104
+  - uid: 724
+    components:
+    - type: Transform
+      pos: -12.5,17.5
+      parent: 104
+  - uid: 725
+    components:
+    - type: Transform
+      pos: -12.5,18.5
+      parent: 104
+  - uid: 726
+    components:
+    - type: Transform
+      pos: -14.5,12.5
+      parent: 104
+  - uid: 728
+    components:
+    - type: Transform
+      pos: -14.5,13.5
+      parent: 104
+  - uid: 729
+    components:
+    - type: Transform
+      pos: -18.5,17.5
+      parent: 104
+  - uid: 733
+    components:
+    - type: Transform
+      pos: -18.5,18.5
+      parent: 104
+  - uid: 734
+    components:
+    - type: Transform
+      pos: -18.5,19.5
+      parent: 104
+  - uid: 735
+    components:
+    - type: Transform
+      pos: -12.5,13.5
+      parent: 104
+  - uid: 740
+    components:
+    - type: Transform
+      pos: -12.5,15.5
+      parent: 104
+  - uid: 741
+    components:
+    - type: Transform
+      pos: -19.5,17.5
+      parent: 104
+  - uid: 745
+    components:
+    - type: Transform
+      pos: -19.5,18.5
+      parent: 104
+  - uid: 746
+    components:
+    - type: Transform
+      pos: -19.5,19.5
+      parent: 104
+  - uid: 747
+    components:
+    - type: Transform
+      pos: -16.5,17.5
+      parent: 104
+  - uid: 752
+    components:
+    - type: Transform
+      pos: -16.5,18.5
+      parent: 104
+  - uid: 753
+    components:
+    - type: Transform
+      pos: -15.5,11.5
+      parent: 104
+  - uid: 755
+    components:
+    - type: Transform
+      pos: -15.5,12.5
+      parent: 104
+  - uid: 756
+    components:
+    - type: Transform
+      pos: -12.5,14.5
+      parent: 104
+  - uid: 757
+    components:
+    - type: Transform
+      pos: -16.5,12.5
+      parent: 104
+  - uid: 758
+    components:
+    - type: Transform
+      pos: -13.5,15.5
+      parent: 104
+  - uid: 759
+    components:
+    - type: Transform
+      pos: -19.5,9.5
+      parent: 104
+  - uid: 762
+    components:
+    - type: Transform
+      pos: -17.5,9.5
+      parent: 104
+  - uid: 763
+    components:
+    - type: Transform
+      pos: -17.5,17.5
+      parent: 104
+  - uid: 764
+    components:
+    - type: Transform
+      pos: -17.5,18.5
+      parent: 104
+  - uid: 765
+    components:
+    - type: Transform
+      pos: -16.5,11.5
+      parent: 104
+  - uid: 768
+    components:
+    - type: Transform
+      pos: -19.5,8.5
+      parent: 104
+  - uid: 771
+    components:
+    - type: Transform
+      pos: -6.5,13.5
+      parent: 104
+  - uid: 774
+    components:
+    - type: Transform
+      pos: -10.5,18.5
+      parent: 104
+  - uid: 775
+    components:
+    - type: Transform
+      pos: -10.5,17.5
+      parent: 104
+  - uid: 776
+    components:
+    - type: Transform
+      pos: -10.5,16.5
+      parent: 104
+  - uid: 777
+    components:
+    - type: Transform
+      pos: -10.5,15.5
+      parent: 104
+  - uid: 778
+    components:
+    - type: Transform
+      pos: -10.5,14.5
+      parent: 104
+  - uid: 779
+    components:
+    - type: Transform
+      pos: -10.5,13.5
+      parent: 104
+  - uid: 780
+    components:
+    - type: Transform
+      pos: -9.5,19.5
+      parent: 104
+  - uid: 781
+    components:
+    - type: Transform
+      pos: -9.5,18.5
+      parent: 104
+  - uid: 782
+    components:
+    - type: Transform
+      pos: -9.5,17.5
+      parent: 104
+  - uid: 783
+    components:
+    - type: Transform
+      pos: -9.5,16.5
+      parent: 104
+  - uid: 784
+    components:
+    - type: Transform
+      pos: -9.5,15.5
+      parent: 104
+  - uid: 785
+    components:
+    - type: Transform
+      pos: -9.5,14.5
+      parent: 104
+  - uid: 786
+    components:
+    - type: Transform
+      pos: -9.5,13.5
+      parent: 104
+  - uid: 787
+    components:
+    - type: Transform
+      pos: -8.5,19.5
+      parent: 104
+  - uid: 788
+    components:
+    - type: Transform
+      pos: -8.5,18.5
+      parent: 104
+  - uid: 789
+    components:
+    - type: Transform
+      pos: -8.5,17.5
+      parent: 104
+  - uid: 790
+    components:
+    - type: Transform
+      pos: -8.5,15.5
+      parent: 104
+  - uid: 791
+    components:
+    - type: Transform
+      pos: -8.5,14.5
+      parent: 104
+  - uid: 792
+    components:
+    - type: Transform
+      pos: -8.5,13.5
+      parent: 104
+  - uid: 793
+    components:
+    - type: Transform
+      pos: -7.5,19.5
+      parent: 104
+  - uid: 794
+    components:
+    - type: Transform
+      pos: -7.5,18.5
+      parent: 104
+  - uid: 795
+    components:
+    - type: Transform
+      pos: -7.5,15.5
+      parent: 104
+  - uid: 796
+    components:
+    - type: Transform
+      pos: -7.5,14.5
+      parent: 104
+  - uid: 797
+    components:
+    - type: Transform
+      pos: -7.5,13.5
+      parent: 104
+  - uid: 798
+    components:
+    - type: Transform
+      pos: -15.5,13.5
+      parent: 104
+  - uid: 801
+    components:
+    - type: Transform
+      pos: -12.5,16.5
+      parent: 104
+  - uid: 802
+    components:
+    - type: Transform
+      pos: -14.5,15.5
+      parent: 104
+  - uid: 803
+    components:
+    - type: Transform
+      pos: -19.5,23.5
+      parent: 104
+  - uid: 804
+    components:
+    - type: Transform
+      pos: -24.5,24.5
+      parent: 104
+  - uid: 805
+    components:
+    - type: Transform
+      pos: -19.5,10.5
+      parent: 104
+  - uid: 806
+    components:
+    - type: Transform
+      pos: -17.5,12.5
+      parent: 104
+  - uid: 807
+    components:
+    - type: Transform
+      pos: -11.5,16.5
+      parent: 104
+  - uid: 808
+    components:
+    - type: Transform
+      pos: -11.5,15.5
+      parent: 104
+  - uid: 809
+    components:
+    - type: Transform
+      pos: -13.5,11.5
+      parent: 104
+  - uid: 810
+    components:
+    - type: Transform
+      pos: -19.5,20.5
+      parent: 104
+  - uid: 1020
+    components:
+    - type: Transform
+      pos: -18.5,20.5
+      parent: 104
+  - uid: 1021
+    components:
+    - type: Transform
+      pos: -10.5,20.5
+      parent: 104
+  - uid: 1027
+    components:
+    - type: Transform
+      pos: -9.5,20.5
+      parent: 104
+  - uid: 1028
+    components:
+    - type: Transform
+      pos: -8.5,20.5
+      parent: 104
+  - uid: 1029
+    components:
+    - type: Transform
+      pos: -7.5,20.5
+      parent: 104
+  - uid: 1030
+    components:
+    - type: Transform
+      pos: -2.5,20.5
+      parent: 104
+  - uid: 1031
+    components:
+    - type: Transform
+      pos: -1.5,20.5
+      parent: 104
+  - uid: 1032
+    components:
+    - type: Transform
+      pos: -0.5,20.5
+      parent: 104
+  - uid: 1033
+    components:
+    - type: Transform
+      pos: 9.5,22.5
+      parent: 104
+  - uid: 1036
+    components:
+    - type: Transform
+      pos: 10.5,20.5
+      parent: 104
+  - uid: 1041
+    components:
+    - type: Transform
+      pos: 11.5,20.5
+      parent: 104
+  - uid: 1042
+    components:
+    - type: Transform
+      pos: 12.5,20.5
+      parent: 104
+  - uid: 1043
+    components:
+    - type: Transform
+      pos: 13.5,20.5
+      parent: 104
+  - uid: 1044
+    components:
+    - type: Transform
+      pos: 16.5,20.5
+      parent: 104
+  - uid: 1045
+    components:
+    - type: Transform
+      pos: 17.5,20.5
+      parent: 104
+  - uid: 1046
+    components:
+    - type: Transform
+      pos: 18.5,20.5
+      parent: 104
+  - uid: 1047
+    components:
+    - type: Transform
+      pos: 19.5,20.5
+      parent: 104
+  - uid: 1048
+    components:
+    - type: Transform
+      pos: 19.5,19.5
+      parent: 104
+  - uid: 1049
+    components:
+    - type: Transform
+      pos: 19.5,18.5
+      parent: 104
+  - uid: 1050
+    components:
+    - type: Transform
+      pos: 19.5,16.5
+      parent: 104
+  - uid: 1051
+    components:
+    - type: Transform
+      pos: 19.5,15.5
+      parent: 104
+  - uid: 1052
+    components:
+    - type: Transform
+      pos: 19.5,14.5
+      parent: 104
+  - uid: 1053
+    components:
+    - type: Transform
+      pos: 19.5,12.5
+      parent: 104
+  - uid: 1054
+    components:
+    - type: Transform
+      pos: 19.5,11.5
+      parent: 104
+  - uid: 1055
+    components:
+    - type: Transform
+      pos: 19.5,10.5
+      parent: 104
+  - uid: 1056
+    components:
+    - type: Transform
+      pos: -11.5,20.5
+      parent: 104
+  - uid: 1057
+    components:
+    - type: Transform
+      pos: 15.5,3.5
+      parent: 104
+  - uid: 1058
+    components:
+    - type: Transform
+      pos: 22.5,4.5
+      parent: 104
+  - uid: 1059
+    components:
+    - type: Transform
+      pos: 23.5,4.5
+      parent: 104
+  - uid: 1060
+    components:
+    - type: Transform
+      pos: 24.5,4.5
+      parent: 104
+  - uid: 1064
+    components:
+    - type: Transform
+      pos: 28.5,4.5
+      parent: 104
+  - uid: 1065
+    components:
+    - type: Transform
+      pos: 29.5,4.5
+      parent: 104
+  - uid: 1066
+    components:
+    - type: Transform
+      pos: 30.5,4.5
+      parent: 104
+  - uid: 1067
+    components:
+    - type: Transform
+      pos: 32.5,0.5
+      parent: 104
+  - uid: 1068
+    components:
+    - type: Transform
+      pos: 32.5,-0.5
+      parent: 104
+  - uid: 1069
+    components:
+    - type: Transform
+      pos: 32.5,-3.5
+      parent: 104
+  - uid: 1070
+    components:
+    - type: Transform
+      pos: 32.5,-12.5
+      parent: 104
+  - uid: 1071
+    components:
+    - type: Transform
+      pos: 32.5,-13.5
+      parent: 104
+  - uid: 1072
+    components:
+    - type: Transform
+      pos: 32.5,-14.5
+      parent: 104
+  - uid: 1073
+    components:
+    - type: Transform
+      pos: 32.5,-15.5
+      parent: 104
+  - uid: 1074
+    components:
+    - type: Transform
+      pos: 32.5,-16.5
+      parent: 104
+  - uid: 1075
+    components:
+    - type: Transform
+      pos: 32.5,-17.5
+      parent: 104
+  - uid: 1076
+    components:
+    - type: Transform
+      pos: 32.5,-18.5
+      parent: 104
+  - uid: 1077
+    components:
+    - type: Transform
+      pos: 32.5,-19.5
+      parent: 104
+  - uid: 1078
+    components:
+    - type: Transform
+      pos: 32.5,-20.5
+      parent: 104
+  - uid: 1079
+    components:
+    - type: Transform
+      pos: 32.5,-21.5
+      parent: 104
+  - uid: 1083
+    components:
+    - type: Transform
+      pos: -4.5,-16.5
+      parent: 104
+  - uid: 1084
+    components:
+    - type: Transform
+      pos: -4.5,-21.5
+      parent: 104
+  - uid: 1085
+    components:
+    - type: Transform
+      pos: 28.5,-23.5
+      parent: 104
+  - uid: 1092
+    components:
+    - type: Transform
+      pos: 27.5,-23.5
+      parent: 104
+  - uid: 1093
+    components:
+    - type: Transform
+      pos: 26.5,-23.5
+      parent: 104
+  - uid: 1094
+    components:
+    - type: Transform
+      pos: 25.5,-23.5
+      parent: 104
+  - uid: 1095
+    components:
+    - type: Transform
+      pos: 24.5,-23.5
+      parent: 104
+  - uid: 1096
+    components:
+    - type: Transform
+      pos: 23.5,-23.5
+      parent: 104
+  - uid: 1097
+    components:
+    - type: Transform
+      pos: 22.5,-23.5
+      parent: 104
+  - uid: 1098
+    components:
+    - type: Transform
+      pos: 21.5,-23.5
+      parent: 104
+  - uid: 1099
+    components:
+    - type: Transform
+      pos: 20.5,-23.5
+      parent: 104
+  - uid: 1100
+    components:
+    - type: Transform
+      pos: 19.5,-23.5
+      parent: 104
+  - uid: 1101
+    components:
+    - type: Transform
+      pos: 18.5,-23.5
+      parent: 104
+  - uid: 1105
+    components:
+    - type: Transform
+      pos: 8.5,-23.5
+      parent: 104
+  - uid: 1106
+    components:
+    - type: Transform
+      pos: 7.5,-23.5
+      parent: 104
+  - uid: 1107
+    components:
+    - type: Transform
+      pos: 6.5,-23.5
+      parent: 104
+  - uid: 1108
+    components:
+    - type: Transform
+      pos: 5.5,-23.5
+      parent: 104
+  - uid: 1109
+    components:
+    - type: Transform
+      pos: -23.5,23.5
+      parent: 104
+  - uid: 1155
+    components:
+    - type: Transform
+      pos: -23.5,24.5
+      parent: 104
+  - uid: 1156
+    components:
+    - type: Transform
+      pos: -23.5,25.5
+      parent: 104
+  - uid: 1157
+    components:
+    - type: Transform
+      pos: -22.5,32.5
+      parent: 104
+  - uid: 1158
+    components:
+    - type: Transform
+      pos: -23.5,30.5
+      parent: 104
+  - uid: 1160
+    components:
+    - type: Transform
+      pos: -23.5,31.5
+      parent: 104
+  - uid: 1161
+    components:
+    - type: Transform
+      pos: -22.5,23.5
+      parent: 104
+  - uid: 1162
+    components:
+    - type: Transform
+      pos: -22.5,24.5
+      parent: 104
+  - uid: 1163
+    components:
+    - type: Transform
+      pos: -22.5,25.5
+      parent: 104
+  - uid: 1164
+    components:
+    - type: Transform
+      pos: -21.5,26.5
+      parent: 104
+  - uid: 1165
+    components:
+    - type: Transform
+      pos: -22.5,30.5
+      parent: 104
+  - uid: 1166
+    components:
+    - type: Transform
+      pos: -21.5,30.5
+      parent: 104
+  - uid: 1167
+    components:
+    - type: Transform
+      pos: -24.5,31.5
+      parent: 104
+  - uid: 1168
+    components:
+    - type: Transform
+      pos: -23.5,20.5
+      parent: 104
+  - uid: 1169
+    components:
+    - type: Transform
+      pos: -24.5,21.5
+      parent: 104
+  - uid: 1170
+    components:
+    - type: Transform
+      pos: -22.5,31.5
+      parent: 104
+  - uid: 1171
+    components:
+    - type: Transform
+      pos: -25.5,30.5
+      parent: 104
+  - uid: 1172
+    components:
+    - type: Transform
+      pos: -25.5,31.5
+      parent: 104
+  - uid: 1173
+    components:
+    - type: Transform
+      pos: -25.5,32.5
+      parent: 104
+  - uid: 1174
+    components:
+    - type: Transform
+      pos: -23.5,21.5
+      parent: 104
+  - uid: 1175
+    components:
+    - type: Transform
+      pos: -23.5,29.5
+      parent: 104
+  - uid: 1176
+    components:
+    - type: Transform
+      pos: -22.5,20.5
+      parent: 104
+  - uid: 1177
+    components:
+    - type: Transform
+      pos: -23.5,15.5
+      parent: 104
+  - uid: 1178
+    components:
+    - type: Transform
+      pos: -23.5,13.5
+      parent: 104
+  - uid: 1179
+    components:
+    - type: Transform
+      pos: -22.5,13.5
+      parent: 104
+  - uid: 1180
+    components:
+    - type: Transform
+      pos: -11.5,10.5
+      parent: 104
+  - uid: 1224
+    components:
+    - type: Transform
+      pos: -23.5,14.5
+      parent: 104
+  - uid: 1250
+    components:
+    - type: Transform
+      pos: 1.5,-10.5
+      parent: 104
+  - uid: 1390
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 104
+  - uid: 1391
+    components:
+    - type: Transform
+      pos: -23.5,28.5
+      parent: 104
+  - uid: 1392
+    components:
+    - type: Transform
+      pos: -24.5,30.5
+      parent: 104
+  - uid: 1393
+    components:
+    - type: Transform
+      pos: -23.5,32.5
+      parent: 104
+  - uid: 1394
+    components:
+    - type: Transform
+      pos: -22.5,26.5
+      parent: 104
+  - uid: 1395
+    components:
+    - type: Transform
+      pos: -23.5,26.5
+      parent: 104
+  - uid: 1396
+    components:
+    - type: Transform
+      pos: -24.5,32.5
+      parent: 104
+  - uid: 1397
+    components:
+    - type: Transform
+      pos: -23.5,27.5
+      parent: 104
+  - uid: 1398
+    components:
+    - type: Transform
+      pos: -22.5,28.5
+      parent: 104
+  - uid: 1399
+    components:
+    - type: Transform
+      pos: -21.5,29.5
+      parent: 104
+  - uid: 1400
+    components:
+    - type: Transform
+      pos: -22.5,29.5
+      parent: 104
+  - uid: 1401
+    components:
+    - type: Transform
+      pos: -22.5,27.5
+      parent: 104
+  - uid: 1402
+    components:
+    - type: Transform
+      pos: -21.5,27.5
+      parent: 104
+  - uid: 1403
+    components:
+    - type: Transform
+      pos: -21.5,28.5
+      parent: 104
+  - uid: 1404
+    components:
+    - type: Transform
+      pos: -21.5,25.5
+      parent: 104
+  - uid: 1405
+    components:
+    - type: Transform
+      pos: -21.5,24.5
+      parent: 104
+  - uid: 1406
+    components:
+    - type: Transform
+      pos: -21.5,23.5
+      parent: 104
+  - uid: 1407
+    components:
+    - type: Transform
+      pos: 6.5,-24.5
+      parent: 104
+  - uid: 1408
+    components:
+    - type: Transform
+      pos: 7.5,-24.5
+      parent: 104
+  - uid: 1415
+    components:
+    - type: Transform
+      pos: 3.5,-21.5
+      parent: 104
+  - uid: 1416
+    components:
+    - type: Transform
+      pos: 4.5,-21.5
+      parent: 104
+  - uid: 1417
+    components:
+    - type: Transform
+      pos: 20.5,-24.5
+      parent: 104
+  - uid: 1418
+    components:
+    - type: Transform
+      pos: 21.5,-24.5
+      parent: 104
+  - uid: 1419
+    components:
+    - type: Transform
+      pos: 22.5,-24.5
+      parent: 104
+  - uid: 1420
+    components:
+    - type: Transform
+      pos: 23.5,-24.5
+      parent: 104
+  - uid: 1421
+    components:
+    - type: Transform
+      pos: 24.5,-24.5
+      parent: 104
+  - uid: 1422
+    components:
+    - type: Transform
+      pos: 25.5,-24.5
+      parent: 104
+  - uid: 1423
+    components:
+    - type: Transform
+      pos: 26.5,-24.5
+      parent: 104
+  - uid: 1424
+    components:
+    - type: Transform
+      pos: 27.5,-24.5
+      parent: 104
+  - uid: 1425
+    components:
+    - type: Transform
+      pos: -4.5,-22.5
+      parent: 104
+  - uid: 1427
+    components:
+    - type: Transform
+      pos: -4.5,-17.5
+      parent: 104
+  - uid: 1433
+    components:
+    - type: Transform
+      pos: 5.5,-24.5
+      parent: 104
+  - uid: 1434
+    components:
+    - type: Transform
+      pos: 33.5,-21.5
+      parent: 104
+  - uid: 1435
+    components:
+    - type: Transform
+      pos: 33.5,-20.5
+      parent: 104
+  - uid: 1436
+    components:
+    - type: Transform
+      pos: 33.5,-19.5
+      parent: 104
+  - uid: 1437
+    components:
+    - type: Transform
+      pos: 33.5,-18.5
+      parent: 104
+  - uid: 1440
+    components:
+    - type: Transform
+      pos: 33.5,-17.5
+      parent: 104
+  - uid: 1441
+    components:
+    - type: Transform
+      pos: 33.5,-16.5
+      parent: 104
+  - uid: 1442
+    components:
+    - type: Transform
+      pos: 33.5,-15.5
+      parent: 104
+  - uid: 1443
+    components:
+    - type: Transform
+      pos: 33.5,-14.5
+      parent: 104
+  - uid: 1444
+    components:
+    - type: Transform
+      pos: 33.5,-13.5
+      parent: 104
+  - uid: 1446
+    components:
+    - type: Transform
+      pos: 33.5,-12.5
+      parent: 104
+  - uid: 1447
+    components:
+    - type: Transform
+      pos: 30.5,5.5
+      parent: 104
+  - uid: 1448
+    components:
+    - type: Transform
+      pos: 29.5,5.5
+      parent: 104
+  - uid: 1472
+    components:
+    - type: Transform
+      pos: 28.5,5.5
+      parent: 104
+  - uid: 1542
+    components:
+    - type: Transform
+      pos: 24.5,5.5
+      parent: 104
+  - uid: 1550
+    components:
+    - type: Transform
+      pos: 23.5,5.5
+      parent: 104
+  - uid: 1552
+    components:
+    - type: Transform
+      pos: 22.5,5.5
+      parent: 104
+  - uid: 1553
+    components:
+    - type: Transform
+      pos: 21.5,5.5
+      parent: 104
+  - uid: 1557
+    components:
+    - type: Transform
+      pos: 19.5,19.5
+      parent: 104
+  - uid: 1559
+    components:
+    - type: Transform
+      pos: 19.5,20.5
+      parent: 104
+  - uid: 1560
+    components:
+    - type: Transform
+      pos: 19.5,21.5
+      parent: 104
+  - uid: 1562
+    components:
+    - type: Transform
+      pos: -11.5,19.5
+      parent: 104
+  - uid: 1564
+    components:
+    - type: Transform
+      pos: -11.5,18.5
+      parent: 104
+  - uid: 1566
+    components:
+    - type: Transform
+      pos: 20.5,9.5
+      parent: 104
+  - uid: 1567
+    components:
+    - type: Transform
+      pos: 20.5,10.5
+      parent: 104
+  - uid: 1568
+    components:
+    - type: Transform
+      pos: 20.5,11.5
+      parent: 104
+  - uid: 1569
+    components:
+    - type: Transform
+      pos: 20.5,12.5
+      parent: 104
+  - uid: 1594
+    components:
+    - type: Transform
+      pos: 20.5,13.5
+      parent: 104
+  - uid: 1598
+    components:
+    - type: Transform
+      pos: 20.5,14.5
+      parent: 104
+  - uid: 1599
+    components:
+    - type: Transform
+      pos: 20.5,15.5
+      parent: 104
+  - uid: 1600
+    components:
+    - type: Transform
+      pos: 20.5,16.5
+      parent: 104
+  - uid: 1601
+    components:
+    - type: Transform
+      pos: 20.5,17.5
+      parent: 104
+  - uid: 1602
+    components:
+    - type: Transform
+      pos: 20.5,18.5
+      parent: 104
+  - uid: 1603
+    components:
+    - type: Transform
+      pos: 20.5,19.5
+      parent: 104
+  - uid: 1604
+    components:
+    - type: Transform
+      pos: 20.5,20.5
+      parent: 104
+  - uid: 1605
+    components:
+    - type: Transform
+      pos: 20.5,21.5
+      parent: 104
+  - uid: 1606
+    components:
+    - type: Transform
+      pos: -10.5,19.5
+      parent: 104
+  - uid: 1607
+    components:
+    - type: Transform
+      pos: 19.5,11.5
+      parent: 104
+  - uid: 1608
+    components:
+    - type: Transform
+      pos: 19.5,12.5
+      parent: 104
+  - uid: 1609
+    components:
+    - type: Transform
+      pos: 19.5,15.5
+      parent: 104
+  - uid: 1610
+    components:
+    - type: Transform
+      pos: 18.5,21.5
+      parent: 104
+  - uid: 1611
+    components:
+    - type: Transform
+      pos: 17.5,21.5
+      parent: 104
+  - uid: 1612
+    components:
+    - type: Transform
+      pos: 16.5,21.5
+      parent: 104
+  - uid: 1613
+    components:
+    - type: Transform
+      pos: 15.5,21.5
+      parent: 104
+  - uid: 1614
+    components:
+    - type: Transform
+      pos: 14.5,21.5
+      parent: 104
+  - uid: 1615
+    components:
+    - type: Transform
+      pos: 13.5,21.5
+      parent: 104
+  - uid: 1616
+    components:
+    - type: Transform
+      pos: 12.5,21.5
+      parent: 104
+  - uid: 1623
+    components:
+    - type: Transform
+      pos: 11.5,21.5
+      parent: 104
+  - uid: 1625
+    components:
+    - type: Transform
+      pos: 10.5,21.5
+      parent: 104
+  - uid: 1632
+    components:
+    - type: Transform
+      pos: 9.5,21.5
+      parent: 104
+  - uid: 1636
+    components:
+    - type: Transform
+      pos: -0.5,21.5
+      parent: 104
+  - uid: 1637
+    components:
+    - type: Transform
+      pos: -1.5,21.5
+      parent: 104
+  - uid: 1638
+    components:
+    - type: Transform
+      pos: -2.5,21.5
+      parent: 104
+  - uid: 1639
+    components:
+    - type: Transform
+      pos: -0.5,22.5
+      parent: 104
+  - uid: 1640
+    components:
+    - type: Transform
+      pos: -1.5,22.5
+      parent: 104
+  - uid: 1641
+    components:
+    - type: Transform
+      pos: -2.5,22.5
+      parent: 104
+  - uid: 1642
+    components:
+    - type: Transform
+      pos: -3.5,22.5
+      parent: 104
+  - uid: 1643
+    components:
+    - type: Transform
+      pos: -7.5,22.5
+      parent: 104
+  - uid: 1644
+    components:
+    - type: Transform
+      pos: -8.5,22.5
+      parent: 104
+  - uid: 1645
+    components:
+    - type: Transform
+      pos: -8.5,23.5
+      parent: 104
+  - uid: 1646
+    components:
+    - type: Transform
+      pos: -9.5,23.5
+      parent: 104
+  - uid: 1647
+    components:
+    - type: Transform
+      pos: -10.5,23.5
+      parent: 104
+  - uid: 1649
+    components:
+    - type: Transform
+      pos: 28.5,7.5
+      parent: 104
+  - uid: 1650
+    components:
+    - type: Transform
+      pos: 28.5,8.5
+      parent: 104
+  - uid: 1651
+    components:
+    - type: Transform
+      pos: 22.5,13.5
+      parent: 104
+  - uid: 1657
+    components:
+    - type: Transform
+      pos: 23.5,13.5
+      parent: 104
+  - uid: 1658
+    components:
+    - type: Transform
+      pos: 17.5,22.5
+      parent: 104
+  - uid: 1659
+    components:
+    - type: Transform
+      pos: 24.5,16.5
+      parent: 104
+  - uid: 1660
+    components:
+    - type: Transform
+      pos: 24.5,15.5
+      parent: 104
+  - uid: 1661
+    components:
+    - type: Transform
+      pos: 24.5,14.5
+      parent: 104
+  - uid: 1662
+    components:
+    - type: Transform
+      pos: 23.5,17.5
+      parent: 104
+  - uid: 1663
+    components:
+    - type: Transform
+      pos: 28.5,6.5
+      parent: 104
+  - uid: 1664
+    components:
+    - type: Transform
+      pos: 23.5,14.5
+      parent: 104
+  - uid: 1665
+    components:
+    - type: Transform
+      pos: 22.5,14.5
+      parent: 104
+  - uid: 1666
+    components:
+    - type: Transform
+      pos: 23.5,12.5
+      parent: 104
+  - uid: 1667
+    components:
+    - type: Transform
+      pos: 21.5,8.5
+      parent: 104
+  - uid: 1676
+    components:
+    - type: Transform
+      pos: 24.5,9.5
+      parent: 104
+  - uid: 1677
+    components:
+    - type: Transform
+      pos: 24.5,10.5
+      parent: 104
+  - uid: 1678
+    components:
+    - type: Transform
+      pos: 24.5,17.5
+      parent: 104
+  - uid: 1679
+    components:
+    - type: Transform
+      pos: 23.5,16.5
+      parent: 104
+  - uid: 1682
+    components:
+    - type: Transform
+      pos: 23.5,15.5
+      parent: 104
+  - uid: 1683
+    components:
+    - type: Transform
+      pos: 24.5,11.5
+      parent: 104
+  - uid: 1685
+    components:
+    - type: Transform
+      pos: 23.5,11.5
+      parent: 104
+  - uid: 1686
+    components:
+    - type: Transform
+      pos: 21.5,9.5
+      parent: 104
+  - uid: 1687
+    components:
+    - type: Transform
+      pos: 27.5,7.5
+      parent: 104
+  - uid: 1688
+    components:
+    - type: Transform
+      pos: 27.5,8.5
+      parent: 104
+  - uid: 1691
+    components:
+    - type: Transform
+      pos: 26.5,8.5
+      parent: 104
+  - uid: 1692
+    components:
+    - type: Transform
+      pos: 22.5,15.5
+      parent: 104
+  - uid: 1693
+    components:
+    - type: Transform
+      pos: 24.5,12.5
+      parent: 104
+  - uid: 1695
+    components:
+    - type: Transform
+      pos: 23.5,10.5
+      parent: 104
+  - uid: 1696
+    components:
+    - type: Transform
+      pos: 22.5,10.5
+      parent: 104
+  - uid: 1698
+    components:
+    - type: Transform
+      pos: 12.5,22.5
+      parent: 104
+  - uid: 1700
+    components:
+    - type: Transform
+      pos: 25.5,9.5
+      parent: 104
+  - uid: 1701
+    components:
+    - type: Transform
+      pos: 25.5,10.5
+      parent: 104
+  - uid: 1702
+    components:
+    - type: Transform
+      pos: 13.5,22.5
+      parent: 104
+  - uid: 1709
+    components:
+    - type: Transform
+      pos: 24.5,13.5
+      parent: 104
+  - uid: 1710
+    components:
+    - type: Transform
+      pos: 22.5,8.5
+      parent: 104
+  - uid: 1712
+    components:
+    - type: Transform
+      pos: 22.5,9.5
+      parent: 104
+  - uid: 1713
+    components:
+    - type: Transform
+      pos: 11.5,22.5
+      parent: 104
+  - uid: 1714
+    components:
+    - type: Transform
+      pos: 25.5,11.5
+      parent: 104
+  - uid: 1715
+    components:
+    - type: Transform
+      pos: 22.5,16.5
+      parent: 104
+  - uid: 1716
+    components:
+    - type: Transform
+      pos: 22.5,17.5
+      parent: 104
+  - uid: 1717
+    components:
+    - type: Transform
+      pos: 19.5,22.5
+      parent: 104
+  - uid: 1719
+    components:
+    - type: Transform
+      pos: 21.5,13.5
+      parent: 104
+  - uid: 1720
+    components:
+    - type: Transform
+      pos: 23.5,9.5
+      parent: 104
+  - uid: 1721
+    components:
+    - type: Transform
+      pos: 21.5,11.5
+      parent: 104
+  - uid: 1722
+    components:
+    - type: Transform
+      pos: 22.5,11.5
+      parent: 104
+  - uid: 1723
+    components:
+    - type: Transform
+      pos: 10.5,22.5
+      parent: 104
+  - uid: 1724
+    components:
+    - type: Transform
+      pos: 22.5,18.5
+      parent: 104
+  - uid: 1725
+    components:
+    - type: Transform
+      pos: 16.5,22.5
+      parent: 104
+  - uid: 1726
+    components:
+    - type: Transform
+      pos: 15.5,22.5
+      parent: 104
+  - uid: 1727
+    components:
+    - type: Transform
+      pos: 14.5,22.5
+      parent: 104
+  - uid: 1729
+    components:
+    - type: Transform
+      pos: 23.5,13.5
+      parent: 104
+  - uid: 1731
+    components:
+    - type: Transform
+      pos: -11.5,21.5
+      parent: 104
+  - uid: 1732
+    components:
+    - type: Transform
+      pos: 22.5,12.5
+      parent: 104
+  - uid: 1733
+    components:
+    - type: Transform
+      pos: 27.5,6.5
+      parent: 104
+  - uid: 1734
+    components:
+    - type: Transform
+      pos: 22.5,19.5
+      parent: 104
+  - uid: 1735
+    components:
+    - type: Transform
+      pos: 18.5,22.5
+      parent: 104
+  - uid: 1736
+    components:
+    - type: Transform
+      pos: 21.5,21.5
+      parent: 104
+  - uid: 1740
+    components:
+    - type: Transform
+      pos: -11.5,20.5
+      parent: 104
+  - uid: 1741
+    components:
+    - type: Transform
+      pos: 21.5,10.5
+      parent: 104
+  - uid: 1742
+    components:
+    - type: Transform
+      pos: 21.5,20.5
+      parent: 104
+  - uid: 1743
+    components:
+    - type: Transform
+      pos: 20.5,22.5
+      parent: 104
+  - uid: 1744
+    components:
+    - type: Transform
+      pos: 21.5,19.5
+      parent: 104
+  - uid: 1745
+    components:
+    - type: Transform
+      pos: 21.5,18.5
+      parent: 104
+  - uid: 1746
+    components:
+    - type: Transform
+      pos: 21.5,17.5
+      parent: 104
+  - uid: 1747
+    components:
+    - type: Transform
+      pos: 21.5,16.5
+      parent: 104
+  - uid: 1748
+    components:
+    - type: Transform
+      pos: 21.5,15.5
+      parent: 104
+  - uid: 1749
+    components:
+    - type: Transform
+      pos: 21.5,14.5
+      parent: 104
+  - uid: 1750
+    components:
+    - type: Transform
+      pos: 21.5,12.5
+      parent: 104
+  - uid: 1751
+    components:
+    - type: Transform
+      pos: 9.5,19.5
+      parent: 104
+  - uid: 1752
+    components:
+    - type: Transform
+      pos: -2.5,23.5
+      parent: 104
+  - uid: 1753
+    components:
+    - type: Transform
+      pos: -3.5,23.5
+      parent: 104
+  - uid: 1754
+    components:
+    - type: Transform
+      pos: -4.5,23.5
+      parent: 104
+  - uid: 1755
+    components:
+    - type: Transform
+      pos: -5.5,23.5
+      parent: 104
+  - uid: 1756
+    components:
+    - type: Transform
+      pos: -6.5,23.5
+      parent: 104
+  - uid: 1757
+    components:
+    - type: Transform
+      pos: -7.5,23.5
+      parent: 104
+  - uid: 1762
+    components:
+    - type: Transform
+      pos: 1.5,-18.5
+      parent: 104
+  - uid: 1767
+    components:
+    - type: Transform
+      pos: -19.5,7.5
+      parent: 104
+  - uid: 1768
+    components:
+    - type: Transform
+      pos: -19.5,6.5
+      parent: 104
+  - uid: 1769
+    components:
+    - type: Transform
+      pos: -19.5,5.5
+      parent: 104
+  - uid: 1770
+    components:
+    - type: Transform
+      pos: -18.5,7.5
+      parent: 104
+  - uid: 1771
+    components:
+    - type: Transform
+      pos: -18.5,6.5
+      parent: 104
+  - uid: 1772
+    components:
+    - type: Transform
+      pos: -18.5,5.5
+      parent: 104
+  - uid: 1773
+    components:
+    - type: Transform
+      pos: -17.5,7.5
+      parent: 104
+  - uid: 1774
+    components:
+    - type: Transform
+      pos: -17.5,6.5
+      parent: 104
+  - uid: 1775
+    components:
+    - type: Transform
+      pos: -17.5,5.5
+      parent: 104
+  - uid: 1776
+    components:
+    - type: Transform
+      pos: -21.5,19.5
+      parent: 104
+  - uid: 1777
+    components:
+    - type: Transform
+      pos: -22.5,19.5
+      parent: 104
+  - uid: 1778
+    components:
+    - type: Transform
+      pos: -21.5,18.5
+      parent: 104
+  - uid: 1779
+    components:
+    - type: Transform
+      pos: -22.5,18.5
+      parent: 104
+  - uid: 1780
+    components:
+    - type: Transform
+      pos: -22.5,17.5
+      parent: 104
+  - uid: 1781
+    components:
+    - type: Transform
+      pos: -23.5,17.5
+      parent: 104
+  - uid: 1782
+    components:
+    - type: Transform
+      pos: -23.5,16.5
+      parent: 104
+  - uid: 1792
+    components:
+    - type: Transform
+      pos: 4.5,-19.5
+      parent: 104
+  - uid: 1793
+    components:
+    - type: Transform
+      pos: 4.5,-20.5
+      parent: 104
+  - uid: 1794
+    components:
+    - type: Transform
+      pos: 2.5,-19.5
+      parent: 104
+  - uid: 1795
+    components:
+    - type: Transform
+      pos: 2.5,-20.5
+      parent: 104
+  - uid: 1796
+    components:
+    - type: Transform
+      pos: -1.5,-10.5
+      parent: 104
+  - uid: 1797
+    components:
+    - type: Transform
+      pos: 3.5,-19.5
+      parent: 104
+  - uid: 1798
+    components:
+    - type: Transform
+      pos: 3.5,-20.5
+      parent: 104
+  - uid: 1801
+    components:
+    - type: Transform
+      pos: 7.5,-19.5
+      parent: 104
+  - uid: 1802
+    components:
+    - type: Transform
+      pos: 7.5,-20.5
+      parent: 104
+  - uid: 1803
+    components:
+    - type: Transform
+      pos: 7.5,-21.5
+      parent: 104
+  - uid: 1804
+    components:
+    - type: Transform
+      pos: 5.5,-19.5
+      parent: 104
+  - uid: 1805
+    components:
+    - type: Transform
+      pos: 5.5,-20.5
+      parent: 104
+  - uid: 1806
+    components:
+    - type: Transform
+      pos: 5.5,-21.5
+      parent: 104
+  - uid: 1807
+    components:
+    - type: Transform
+      pos: 6.5,-19.5
+      parent: 104
+  - uid: 1808
+    components:
+    - type: Transform
+      pos: 6.5,-20.5
+      parent: 104
+  - uid: 1809
+    components:
+    - type: Transform
+      pos: 6.5,-21.5
+      parent: 104
+  - uid: 1835
+    components:
+    - type: Transform
+      pos: 8.5,-19.5
+      parent: 104
+  - uid: 1836
+    components:
+    - type: Transform
+      pos: 8.5,-20.5
+      parent: 104
+  - uid: 1837
+    components:
+    - type: Transform
+      pos: 8.5,-21.5
+      parent: 104
+  - uid: 1865
+    components:
+    - type: Transform
+      pos: 16.5,-21.5
+      parent: 104
+  - uid: 1870
+    components:
+    - type: Transform
+      pos: 17.5,-21.5
+      parent: 104
+  - uid: 1875
+    components:
+    - type: Transform
+      pos: 18.5,-21.5
+      parent: 104
+  - uid: 1880
+    components:
+    - type: Transform
+      pos: 19.5,-21.5
+      parent: 104
+  - uid: 1884
+    components:
+    - type: Transform
+      pos: 20.5,-21.5
+      parent: 104
+  - uid: 1888
+    components:
+    - type: Transform
+      pos: 21.5,-21.5
+      parent: 104
+  - uid: 1892
+    components:
+    - type: Transform
+      pos: 22.5,-21.5
+      parent: 104
+  - uid: 1896
+    components:
+    - type: Transform
+      pos: 23.5,-21.5
+      parent: 104
+  - uid: 1900
+    components:
+    - type: Transform
+      pos: 24.5,-21.5
+      parent: 104
+  - uid: 1904
+    components:
+    - type: Transform
+      pos: 25.5,-21.5
+      parent: 104
+  - uid: 1909
+    components:
+    - type: Transform
+      pos: 28.5,-11.5
+      parent: 104
+  - uid: 1910
+    components:
+    - type: Transform
+      pos: 28.5,-10.5
+      parent: 104
+  - uid: 1911
+    components:
+    - type: Transform
+      pos: 28.5,-9.5
+      parent: 104
+  - uid: 1912
+    components:
+    - type: Transform
+      pos: 28.5,-8.5
+      parent: 104
+  - uid: 1913
+    components:
+    - type: Transform
+      pos: 26.5,-21.5
+      parent: 104
+  - uid: 1923
+    components:
+    - type: Transform
+      pos: 26.5,-11.5
+      parent: 104
+  - uid: 1924
+    components:
+    - type: Transform
+      pos: 26.5,-10.5
+      parent: 104
+  - uid: 1925
+    components:
+    - type: Transform
+      pos: 26.5,-9.5
+      parent: 104
+  - uid: 1926
+    components:
+    - type: Transform
+      pos: 26.5,-8.5
+      parent: 104
+  - uid: 1927
+    components:
+    - type: Transform
+      pos: 26.5,-7.5
+      parent: 104
+  - uid: 1928
+    components:
+    - type: Transform
+      pos: 26.5,-6.5
+      parent: 104
+  - uid: 1930
+    components:
+    - type: Transform
+      pos: 26.5,-5.5
+      parent: 104
+  - uid: 1934
+    components:
+    - type: Transform
+      pos: 26.5,-4.5
+      parent: 104
+  - uid: 1935
+    components:
+    - type: Transform
+      pos: 26.5,-3.5
+      parent: 104
+  - uid: 1936
+    components:
+    - type: Transform
+      pos: 26.5,-2.5
+      parent: 104
+  - uid: 1937
+    components:
+    - type: Transform
+      pos: 26.5,-1.5
+      parent: 104
+  - uid: 1938
+    components:
+    - type: Transform
+      pos: 26.5,-0.5
+      parent: 104
+  - uid: 1939
+    components:
+    - type: Transform
+      pos: 26.5,0.5
+      parent: 104
+  - uid: 1940
+    components:
+    - type: Transform
+      pos: 26.5,1.5
+      parent: 104
+  - uid: 1942
+    components:
+    - type: Transform
+      pos: 27.5,-21.5
+      parent: 104
+  - uid: 1952
+    components:
+    - type: Transform
+      pos: 27.5,-11.5
+      parent: 104
+  - uid: 1953
+    components:
+    - type: Transform
+      pos: 27.5,-10.5
+      parent: 104
+  - uid: 1954
+    components:
+    - type: Transform
+      pos: 27.5,-9.5
+      parent: 104
+  - uid: 1955
+    components:
+    - type: Transform
+      pos: 27.5,-8.5
+      parent: 104
+  - uid: 1956
+    components:
+    - type: Transform
+      pos: 27.5,-7.5
+      parent: 104
+  - uid: 1957
+    components:
+    - type: Transform
+      pos: 27.5,-6.5
+      parent: 104
+  - uid: 1958
+    components:
+    - type: Transform
+      pos: 27.5,-5.5
+      parent: 104
+  - uid: 1959
+    components:
+    - type: Transform
+      pos: 27.5,-4.5
+      parent: 104
+  - uid: 1960
+    components:
+    - type: Transform
+      pos: 27.5,-3.5
+      parent: 104
+  - uid: 1961
+    components:
+    - type: Transform
+      pos: 27.5,-2.5
+      parent: 104
+  - uid: 1962
+    components:
+    - type: Transform
+      pos: 27.5,-1.5
+      parent: 104
+  - uid: 1963
+    components:
+    - type: Transform
+      pos: 27.5,-0.5
+      parent: 104
+  - uid: 1964
+    components:
+    - type: Transform
+      pos: 27.5,0.5
+      parent: 104
+  - uid: 1965
+    components:
+    - type: Transform
+      pos: 27.5,1.5
+      parent: 104
+  - uid: 1966
+    components:
+    - type: Transform
+      pos: 27.5,2.5
+      parent: 104
+  - uid: 1967
+    components:
+    - type: Transform
+      pos: 28.5,-21.5
+      parent: 104
+  - uid: 1973
+    components:
+    - type: Transform
+      pos: 30.5,-1.5
+      parent: 104
+  - uid: 1974
+    components:
+    - type: Transform
+      pos: 30.5,-0.5
+      parent: 104
+  - uid: 1975
+    components:
+    - type: Transform
+      pos: 30.5,0.5
+      parent: 104
+  - uid: 1976
+    components:
+    - type: Transform
+      pos: 30.5,1.5
+      parent: 104
+  - uid: 1977
+    components:
+    - type: Transform
+      pos: 30.5,2.5
+      parent: 104
+  - uid: 1978
+    components:
+    - type: Transform
+      pos: 28.5,-7.5
+      parent: 104
+  - uid: 1979
+    components:
+    - type: Transform
+      pos: 28.5,-6.5
+      parent: 104
+  - uid: 1980
+    components:
+    - type: Transform
+      pos: 28.5,-5.5
+      parent: 104
+  - uid: 1981
+    components:
+    - type: Transform
+      pos: 28.5,-4.5
+      parent: 104
+  - uid: 1982
+    components:
+    - type: Transform
+      pos: 28.5,-3.5
+      parent: 104
+  - uid: 1983
+    components:
+    - type: Transform
+      pos: 28.5,-2.5
+      parent: 104
+  - uid: 1984
+    components:
+    - type: Transform
+      pos: 28.5,-1.5
+      parent: 104
+  - uid: 1985
+    components:
+    - type: Transform
+      pos: 28.5,-0.5
+      parent: 104
+  - uid: 1986
+    components:
+    - type: Transform
+      pos: 28.5,0.5
+      parent: 104
+  - uid: 1987
+    components:
+    - type: Transform
+      pos: 28.5,1.5
+      parent: 104
+  - uid: 1988
+    components:
+    - type: Transform
+      pos: 28.5,2.5
+      parent: 104
+  - uid: 1989
+    components:
+    - type: Transform
+      pos: 29.5,-20.5
+      parent: 104
+  - uid: 1990
+    components:
+    - type: Transform
+      pos: 29.5,-19.5
+      parent: 104
+  - uid: 1991
+    components:
+    - type: Transform
+      pos: 29.5,-18.5
+      parent: 104
+  - uid: 1992
+    components:
+    - type: Transform
+      pos: 29.5,-17.5
+      parent: 104
+  - uid: 1993
+    components:
+    - type: Transform
+      pos: 29.5,-16.5
+      parent: 104
+  - uid: 1994
+    components:
+    - type: Transform
+      pos: 29.5,-15.5
+      parent: 104
+  - uid: 1995
+    components:
+    - type: Transform
+      pos: 29.5,-14.5
+      parent: 104
+  - uid: 1996
+    components:
+    - type: Transform
+      pos: 29.5,-13.5
+      parent: 104
+  - uid: 1997
+    components:
+    - type: Transform
+      pos: 29.5,-12.5
+      parent: 104
+  - uid: 1998
+    components:
+    - type: Transform
+      pos: 29.5,-11.5
+      parent: 104
+  - uid: 1999
+    components:
+    - type: Transform
+      pos: 29.5,-10.5
+      parent: 104
+  - uid: 2000
+    components:
+    - type: Transform
+      pos: 29.5,-9.5
+      parent: 104
+  - uid: 2001
+    components:
+    - type: Transform
+      pos: 29.5,-8.5
+      parent: 104
+  - uid: 2002
+    components:
+    - type: Transform
+      pos: 29.5,-7.5
+      parent: 104
+  - uid: 2003
+    components:
+    - type: Transform
+      pos: 29.5,-6.5
+      parent: 104
+  - uid: 2004
+    components:
+    - type: Transform
+      pos: 29.5,-5.5
+      parent: 104
+  - uid: 2005
+    components:
+    - type: Transform
+      pos: 29.5,-4.5
+      parent: 104
+  - uid: 2006
+    components:
+    - type: Transform
+      pos: 29.5,-3.5
+      parent: 104
+  - uid: 2007
+    components:
+    - type: Transform
+      pos: 29.5,-2.5
+      parent: 104
+  - uid: 2008
+    components:
+    - type: Transform
+      pos: 29.5,-1.5
+      parent: 104
+  - uid: 2009
+    components:
+    - type: Transform
+      pos: 29.5,-0.5
+      parent: 104
+  - uid: 2010
+    components:
+    - type: Transform
+      pos: 29.5,0.5
+      parent: 104
+  - uid: 2011
+    components:
+    - type: Transform
+      pos: 29.5,1.5
+      parent: 104
+  - uid: 2012
+    components:
+    - type: Transform
+      pos: 29.5,2.5
+      parent: 104
+  - uid: 2013
+    components:
+    - type: Transform
+      pos: 30.5,-19.5
+      parent: 104
+  - uid: 2014
+    components:
+    - type: Transform
+      pos: 30.5,-18.5
+      parent: 104
+  - uid: 2015
+    components:
+    - type: Transform
+      pos: 30.5,-17.5
+      parent: 104
+  - uid: 2020
+    components:
+    - type: Transform
+      pos: 30.5,-16.5
+      parent: 104
+  - uid: 2023
+    components:
+    - type: Transform
+      pos: 30.5,-15.5
+      parent: 104
+  - uid: 2024
+    components:
+    - type: Transform
+      pos: 30.5,-14.5
+      parent: 104
+  - uid: 2025
+    components:
+    - type: Transform
+      pos: 30.5,-13.5
+      parent: 104
+  - uid: 2026
+    components:
+    - type: Transform
+      pos: 30.5,-12.5
+      parent: 104
+  - uid: 2029
+    components:
+    - type: Transform
+      pos: 30.5,-9.5
+      parent: 104
+  - uid: 2030
+    components:
+    - type: Transform
+      pos: 30.5,-8.5
+      parent: 104
+  - uid: 2032
+    components:
+    - type: Transform
+      pos: 30.5,-7.5
+      parent: 104
+  - uid: 2033
+    components:
+    - type: Transform
+      pos: 30.5,-6.5
+      parent: 104
+  - uid: 2034
+    components:
+    - type: Transform
+      pos: 30.5,-5.5
+      parent: 104
+  - uid: 2035
+    components:
+    - type: Transform
+      pos: 30.5,-4.5
+      parent: 104
+  - uid: 2036
+    components:
+    - type: Transform
+      pos: 30.5,-3.5
+      parent: 104
+  - uid: 2037
+    components:
+    - type: Transform
+      pos: 30.5,-2.5
+      parent: 104
+  - uid: 2038
+    components:
+    - type: Transform
+      pos: 20.5,-0.5
+      parent: 104
+  - uid: 2039
+    components:
+    - type: Transform
+      pos: 20.5,-1.5
+      parent: 104
+  - uid: 2040
+    components:
+    - type: Transform
+      pos: 15.5,2.5
+      parent: 104
+  - uid: 2041
+    components:
+    - type: Transform
+      pos: 16.5,2.5
+      parent: 104
+  - uid: 2042
+    components:
+    - type: Transform
+      pos: 19.5,0.5
+      parent: 104
+  - uid: 2043
+    components:
+    - type: Transform
+      pos: 19.5,-0.5
+      parent: 104
+  - uid: 2044
+    components:
+    - type: Transform
+      pos: 19.5,-1.5
+      parent: 104
+  - uid: 2047
+    components:
+    - type: Transform
+      pos: 25.5,0.5
+      parent: 104
+  - uid: 2049
+    components:
+    - type: Transform
+      pos: 25.5,-0.5
+      parent: 104
+  - uid: 2051
+    components:
+    - type: Transform
+      pos: 25.5,-1.5
+      parent: 104
+  - uid: 2054
+    components:
+    - type: Transform
+      pos: 24.5,0.5
+      parent: 104
+  - uid: 2055
+    components:
+    - type: Transform
+      pos: 24.5,-0.5
+      parent: 104
+  - uid: 2056
+    components:
+    - type: Transform
+      pos: 24.5,-1.5
+      parent: 104
+  - uid: 2058
+    components:
+    - type: Transform
+      pos: 23.5,1.5
+      parent: 104
+  - uid: 2059
+    components:
+    - type: Transform
+      pos: 23.5,0.5
+      parent: 104
+  - uid: 2060
+    components:
+    - type: Transform
+      pos: 23.5,-0.5
+      parent: 104
+  - uid: 2061
+    components:
+    - type: Transform
+      pos: 23.5,-1.5
+      parent: 104
+  - uid: 2063
+    components:
+    - type: Transform
+      pos: 22.5,1.5
+      parent: 104
+  - uid: 2064
+    components:
+    - type: Transform
+      pos: 22.5,0.5
+      parent: 104
+  - uid: 2065
+    components:
+    - type: Transform
+      pos: 22.5,-0.5
+      parent: 104
+  - uid: 2066
+    components:
+    - type: Transform
+      pos: 22.5,-1.5
+      parent: 104
+  - uid: 2067
+    components:
+    - type: Transform
+      pos: 14.5,2.5
+      parent: 104
+  - uid: 2068
+    components:
+    - type: Transform
+      pos: 15.5,1.5
+      parent: 104
+  - uid: 2069
+    components:
+    - type: Transform
+      pos: 21.5,0.5
+      parent: 104
+  - uid: 2070
+    components:
+    - type: Transform
+      pos: 21.5,-0.5
+      parent: 104
+  - uid: 2071
+    components:
+    - type: Transform
+      pos: 21.5,-1.5
+      parent: 104
+  - uid: 2072
+    components:
+    - type: Transform
+      pos: 14.5,3.5
+      parent: 104
+  - uid: 2073
+    components:
+    - type: Transform
+      pos: 17.5,-0.5
+      parent: 104
+  - uid: 2074
+    components:
+    - type: Transform
+      pos: 17.5,0.5
+      parent: 104
+  - uid: 2075
+    components:
+    - type: Transform
+      pos: 17.5,1.5
+      parent: 104
+  - uid: 2076
+    components:
+    - type: Transform
+      pos: 18.5,-1.5
+      parent: 104
+  - uid: 2077
+    components:
+    - type: Transform
+      pos: 18.5,-0.5
+      parent: 104
+  - uid: 2078
+    components:
+    - type: Transform
+      pos: 18.5,0.5
+      parent: 104
+  - uid: 2079
+    components:
+    - type: Transform
+      pos: 18.5,1.5
+      parent: 104
+  - uid: 2080
+    components:
+    - type: Transform
+      pos: -12.5,28.5
+      parent: 104
+  - uid: 2084
+    components:
+    - type: Transform
+      pos: -12.5,27.5
+      parent: 104
+  - uid: 2085
+    components:
+    - type: Transform
+      pos: -12.5,26.5
+      parent: 104
+  - uid: 2086
+    components:
+    - type: Transform
+      pos: -12.5,25.5
+      parent: 104
+  - uid: 2087
+    components:
+    - type: Transform
+      pos: -16.5,25.5
+      parent: 104
+  - uid: 2088
+    components:
+    - type: Transform
+      pos: -3.5,-6.5
+      parent: 104
+  - uid: 2091
+    components:
+    - type: Transform
+      pos: -15.5,25.5
+      parent: 104
+  - uid: 2093
+    components:
+    - type: Transform
+      pos: -14.5,26.5
+      parent: 104
+  - uid: 2094
+    components:
+    - type: Transform
+      pos: -14.5,25.5
+      parent: 104
+  - uid: 2096
+    components:
+    - type: Transform
+      pos: -13.5,27.5
+      parent: 104
+  - uid: 2098
+    components:
+    - type: Transform
+      pos: -13.5,26.5
+      parent: 104
+  - uid: 2099
+    components:
+    - type: Transform
+      pos: -13.5,25.5
+      parent: 104
+  - uid: 2100
+    components:
+    - type: Transform
+      pos: -20.5,30.5
+      parent: 104
+  - uid: 2101
+    components:
+    - type: Transform
+      pos: -20.5,29.5
+      parent: 104
+  - uid: 2102
+    components:
+    - type: Transform
+      pos: -20.5,28.5
+      parent: 104
+  - uid: 2103
+    components:
+    - type: Transform
+      pos: -20.5,27.5
+      parent: 104
+  - uid: 2104
+    components:
+    - type: Transform
+      pos: -20.5,26.5
+      parent: 104
+  - uid: 2105
+    components:
+    - type: Transform
+      pos: -20.5,25.5
+      parent: 104
+  - uid: 2106
+    components:
+    - type: Transform
+      pos: -20.5,24.5
+      parent: 104
+  - uid: 2107
+    components:
+    - type: Transform
+      pos: -19.5,30.5
+      parent: 104
+  - uid: 2108
+    components:
+    - type: Transform
+      pos: -19.5,29.5
+      parent: 104
+  - uid: 2109
+    components:
+    - type: Transform
+      pos: -19.5,28.5
+      parent: 104
+  - uid: 2110
+    components:
+    - type: Transform
+      pos: -19.5,27.5
+      parent: 104
+  - uid: 2111
+    components:
+    - type: Transform
+      pos: -19.5,26.5
+      parent: 104
+  - uid: 2112
+    components:
+    - type: Transform
+      pos: -19.5,25.5
+      parent: 104
+  - uid: 2113
+    components:
+    - type: Transform
+      pos: -19.5,24.5
+      parent: 104
+  - uid: 2115
+    components:
+    - type: Transform
+      pos: -18.5,30.5
+      parent: 104
+  - uid: 2116
+    components:
+    - type: Transform
+      pos: -18.5,29.5
+      parent: 104
+  - uid: 2117
+    components:
+    - type: Transform
+      pos: -18.5,28.5
+      parent: 104
+  - uid: 2118
+    components:
+    - type: Transform
+      pos: -18.5,27.5
+      parent: 104
+  - uid: 2119
+    components:
+    - type: Transform
+      pos: -18.5,26.5
+      parent: 104
+  - uid: 2120
+    components:
+    - type: Transform
+      pos: -18.5,25.5
+      parent: 104
+  - uid: 2121
+    components:
+    - type: Transform
+      pos: -18.5,24.5
+      parent: 104
+  - uid: 2122
+    components:
+    - type: Transform
+      pos: -17.5,28.5
+      parent: 104
+  - uid: 2123
+    components:
+    - type: Transform
+      pos: -17.5,27.5
+      parent: 104
+  - uid: 2124
+    components:
+    - type: Transform
+      pos: -17.5,25.5
+      parent: 104
+  - uid: 2125
+    components:
+    - type: Transform
+      pos: -11.5,28.5
+      parent: 104
+  - uid: 2127
+    components:
+    - type: Transform
+      pos: -11.5,27.5
+      parent: 104
+  - uid: 2128
+    components:
+    - type: Transform
+      pos: -11.5,26.5
+      parent: 104
+  - uid: 2129
+    components:
+    - type: Transform
+      pos: -11.5,25.5
+      parent: 104
+  - uid: 2130
+    components:
+    - type: Transform
+      pos: -11.5,24.5
+      parent: 104
+  - uid: 2131
+    components:
+    - type: Transform
+      pos: -21.5,31.5
+      parent: 104
+  - uid: 2132
+    components:
+    - type: Transform
+      pos: -20.5,31.5
+      parent: 104
+  - uid: 2133
+    components:
+    - type: Transform
+      pos: -19.5,31.5
+      parent: 104
+  - uid: 2134
+    components:
+    - type: Transform
+      pos: -10.5,28.5
+      parent: 104
+  - uid: 2136
+    components:
+    - type: Transform
+      pos: -10.5,27.5
+      parent: 104
+  - uid: 2137
+    components:
+    - type: Transform
+      pos: -10.5,26.5
+      parent: 104
+  - uid: 2138
+    components:
+    - type: Transform
+      pos: -10.5,25.5
+      parent: 104
+  - uid: 2139
+    components:
+    - type: Transform
+      pos: -10.5,24.5
+      parent: 104
+  - uid: 2140
+    components:
+    - type: Transform
+      pos: -9.5,29.5
+      parent: 104
+  - uid: 2141
+    components:
+    - type: Transform
+      pos: -9.5,28.5
+      parent: 104
+  - uid: 2142
+    components:
+    - type: Transform
+      pos: -9.5,27.5
+      parent: 104
+  - uid: 2143
+    components:
+    - type: Transform
+      pos: -9.5,26.5
+      parent: 104
+  - uid: 2144
+    components:
+    - type: Transform
+      pos: -9.5,25.5
+      parent: 104
+  - uid: 2145
+    components:
+    - type: Transform
+      pos: -9.5,24.5
+      parent: 104
+  - uid: 2146
+    components:
+    - type: Transform
+      pos: -8.5,29.5
+      parent: 104
+  - uid: 2147
+    components:
+    - type: Transform
+      pos: -8.5,28.5
+      parent: 104
+  - uid: 2148
+    components:
+    - type: Transform
+      pos: -8.5,27.5
+      parent: 104
+  - uid: 2149
+    components:
+    - type: Transform
+      pos: -8.5,26.5
+      parent: 104
+  - uid: 2150
+    components:
+    - type: Transform
+      pos: -8.5,25.5
+      parent: 104
+  - uid: 2151
+    components:
+    - type: Transform
+      pos: -8.5,24.5
+      parent: 104
+  - uid: 2152
+    components:
+    - type: Transform
+      pos: -7.5,29.5
+      parent: 104
+  - uid: 2153
+    components:
+    - type: Transform
+      pos: -7.5,28.5
+      parent: 104
+  - uid: 2154
+    components:
+    - type: Transform
+      pos: -7.5,27.5
+      parent: 104
+  - uid: 2155
+    components:
+    - type: Transform
+      pos: -7.5,26.5
+      parent: 104
+  - uid: 2156
+    components:
+    - type: Transform
+      pos: -7.5,25.5
+      parent: 104
+  - uid: 2157
+    components:
+    - type: Transform
+      pos: -7.5,24.5
+      parent: 104
+  - uid: 2158
+    components:
+    - type: Transform
+      pos: -6.5,29.5
+      parent: 104
+  - uid: 2159
+    components:
+    - type: Transform
+      pos: -6.5,28.5
+      parent: 104
+  - uid: 2160
+    components:
+    - type: Transform
+      pos: -6.5,27.5
+      parent: 104
+  - uid: 2161
+    components:
+    - type: Transform
+      pos: -6.5,26.5
+      parent: 104
+  - uid: 2162
+    components:
+    - type: Transform
+      pos: -6.5,25.5
+      parent: 104
+  - uid: 2163
+    components:
+    - type: Transform
+      pos: -6.5,24.5
+      parent: 104
+  - uid: 2164
+    components:
+    - type: Transform
+      pos: -5.5,29.5
+      parent: 104
+  - uid: 2165
+    components:
+    - type: Transform
+      pos: -5.5,28.5
+      parent: 104
+  - uid: 2166
+    components:
+    - type: Transform
+      pos: -5.5,27.5
+      parent: 104
+  - uid: 2167
+    components:
+    - type: Transform
+      pos: -5.5,26.5
+      parent: 104
+  - uid: 2168
+    components:
+    - type: Transform
+      pos: -5.5,25.5
+      parent: 104
+  - uid: 2169
+    components:
+    - type: Transform
+      pos: -5.5,24.5
+      parent: 104
+  - uid: 2170
+    components:
+    - type: Transform
+      pos: -4.5,29.5
+      parent: 104
+  - uid: 2171
+    components:
+    - type: Transform
+      pos: -4.5,28.5
+      parent: 104
+  - uid: 2172
+    components:
+    - type: Transform
+      pos: -4.5,27.5
+      parent: 104
+  - uid: 2173
+    components:
+    - type: Transform
+      pos: -4.5,26.5
+      parent: 104
+  - uid: 2174
+    components:
+    - type: Transform
+      pos: -4.5,25.5
+      parent: 104
+  - uid: 2175
+    components:
+    - type: Transform
+      pos: -4.5,24.5
+      parent: 104
+  - uid: 2176
+    components:
+    - type: Transform
+      pos: -3.5,28.5
+      parent: 104
+  - uid: 2177
+    components:
+    - type: Transform
+      pos: -3.5,27.5
+      parent: 104
+  - uid: 2178
+    components:
+    - type: Transform
+      pos: -3.5,26.5
+      parent: 104
+  - uid: 2179
+    components:
+    - type: Transform
+      pos: -3.5,25.5
+      parent: 104
+  - uid: 2180
+    components:
+    - type: Transform
+      pos: -3.5,24.5
+      parent: 104
+  - uid: 2181
+    components:
+    - type: Transform
+      pos: -2.5,26.5
+      parent: 104
+  - uid: 2183
+    components:
+    - type: Transform
+      pos: -2.5,25.5
+      parent: 104
+  - uid: 2184
+    components:
+    - type: Transform
+      pos: -2.5,24.5
+      parent: 104
+  - uid: 2192
+    components:
+    - type: Transform
+      pos: -5.5,-23.5
+      parent: 104
+  - uid: 2194
+    components:
+    - type: Transform
+      pos: 15.5,29.5
+      parent: 104
+  - uid: 2195
+    components:
+    - type: Transform
+      pos: 10.5,24.5
+      parent: 104
+  - uid: 2196
+    components:
+    - type: Transform
+      pos: 15.5,31.5
+      parent: 104
+  - uid: 2197
+    components:
+    - type: Transform
+      pos: 16.5,26.5
+      parent: 104
+  - uid: 2198
+    components:
+    - type: Transform
+      pos: 15.5,30.5
+      parent: 104
+  - uid: 2199
+    components:
+    - type: Transform
+      pos: 15.5,32.5
+      parent: 104
+  - uid: 2200
+    components:
+    - type: Transform
+      pos: 16.5,23.5
+      parent: 104
+  - uid: 2201
+    components:
+    - type: Transform
+      pos: 16.5,24.5
+      parent: 104
+  - uid: 2202
+    components:
+    - type: Transform
+      pos: 16.5,25.5
+      parent: 104
+  - uid: 2203
+    components:
+    - type: Transform
+      pos: 10.5,23.5
+      parent: 104
+  - uid: 2204
+    components:
+    - type: Transform
+      pos: 10.5,25.5
+      parent: 104
+  - uid: 2205
+    components:
+    - type: Transform
+      pos: 10.5,26.5
+      parent: 104
+  - uid: 2206
+    components:
+    - type: Transform
+      pos: 10.5,27.5
+      parent: 104
+  - uid: 2207
+    components:
+    - type: Transform
+      pos: 10.5,28.5
+      parent: 104
+  - uid: 2208
+    components:
+    - type: Transform
+      pos: 11.5,23.5
+      parent: 104
+  - uid: 2209
+    components:
+    - type: Transform
+      pos: 11.5,24.5
+      parent: 104
+  - uid: 2210
+    components:
+    - type: Transform
+      pos: 11.5,25.5
+      parent: 104
+  - uid: 2211
+    components:
+    - type: Transform
+      pos: 11.5,26.5
+      parent: 104
+  - uid: 2212
+    components:
+    - type: Transform
+      pos: 11.5,27.5
+      parent: 104
+  - uid: 2213
+    components:
+    - type: Transform
+      pos: 11.5,28.5
+      parent: 104
+  - uid: 2214
+    components:
+    - type: Transform
+      pos: 11.5,29.5
+      parent: 104
+  - uid: 2215
+    components:
+    - type: Transform
+      pos: 12.5,23.5
+      parent: 104
+  - uid: 2216
+    components:
+    - type: Transform
+      pos: 12.5,24.5
+      parent: 104
+  - uid: 2217
+    components:
+    - type: Transform
+      pos: 12.5,25.5
+      parent: 104
+  - uid: 2218
+    components:
+    - type: Transform
+      pos: 12.5,26.5
+      parent: 104
+  - uid: 2219
+    components:
+    - type: Transform
+      pos: 12.5,27.5
+      parent: 104
+  - uid: 2220
+    components:
+    - type: Transform
+      pos: 12.5,28.5
+      parent: 104
+  - uid: 2221
+    components:
+    - type: Transform
+      pos: 12.5,29.5
+      parent: 104
+  - uid: 2222
+    components:
+    - type: Transform
+      pos: 12.5,30.5
+      parent: 104
+  - uid: 2223
+    components:
+    - type: Transform
+      pos: 12.5,31.5
+      parent: 104
+  - uid: 2224
+    components:
+    - type: Transform
+      pos: 13.5,23.5
+      parent: 104
+  - uid: 2225
+    components:
+    - type: Transform
+      pos: 13.5,24.5
+      parent: 104
+  - uid: 2226
+    components:
+    - type: Transform
+      pos: 13.5,25.5
+      parent: 104
+  - uid: 2227
+    components:
+    - type: Transform
+      pos: 13.5,26.5
+      parent: 104
+  - uid: 2228
+    components:
+    - type: Transform
+      pos: 13.5,27.5
+      parent: 104
+  - uid: 2229
+    components:
+    - type: Transform
+      pos: 13.5,28.5
+      parent: 104
+  - uid: 2230
+    components:
+    - type: Transform
+      pos: 13.5,29.5
+      parent: 104
+  - uid: 2231
+    components:
+    - type: Transform
+      pos: 13.5,30.5
+      parent: 104
+  - uid: 2232
+    components:
+    - type: Transform
+      pos: 13.5,31.5
+      parent: 104
+  - uid: 2233
+    components:
+    - type: Transform
+      pos: 14.5,23.5
+      parent: 104
+  - uid: 2234
+    components:
+    - type: Transform
+      pos: 14.5,24.5
+      parent: 104
+  - uid: 2235
+    components:
+    - type: Transform
+      pos: 14.5,25.5
+      parent: 104
+  - uid: 2236
+    components:
+    - type: Transform
+      pos: 14.5,26.5
+      parent: 104
+  - uid: 2237
+    components:
+    - type: Transform
+      pos: 14.5,27.5
+      parent: 104
+  - uid: 2238
+    components:
+    - type: Transform
+      pos: 14.5,28.5
+      parent: 104
+  - uid: 2239
+    components:
+    - type: Transform
+      pos: 14.5,29.5
+      parent: 104
+  - uid: 2240
+    components:
+    - type: Transform
+      pos: 14.5,30.5
+      parent: 104
+  - uid: 2241
+    components:
+    - type: Transform
+      pos: 14.5,31.5
+      parent: 104
+  - uid: 2242
+    components:
+    - type: Transform
+      pos: 14.5,32.5
+      parent: 104
+  - uid: 2243
+    components:
+    - type: Transform
+      pos: 15.5,23.5
+      parent: 104
+  - uid: 2244
+    components:
+    - type: Transform
+      pos: 15.5,24.5
+      parent: 104
+  - uid: 2245
+    components:
+    - type: Transform
+      pos: 15.5,25.5
+      parent: 104
+  - uid: 2246
+    components:
+    - type: Transform
+      pos: 15.5,26.5
+      parent: 104
+  - uid: 2247
+    components:
+    - type: Transform
+      pos: 15.5,27.5
+      parent: 104
+  - uid: 2248
+    components:
+    - type: Transform
+      pos: 15.5,28.5
+      parent: 104
+  - uid: 2249
+    components:
+    - type: Transform
+      pos: 19.5,25.5
+      parent: 104
+  - uid: 2250
+    components:
+    - type: Transform
+      pos: 19.5,26.5
+      parent: 104
+  - uid: 2251
+    components:
+    - type: Transform
+      pos: 19.5,27.5
+      parent: 104
+  - uid: 2252
+    components:
+    - type: Transform
+      pos: 19.5,28.5
+      parent: 104
+  - uid: 2253
+    components:
+    - type: Transform
+      pos: 19.5,29.5
+      parent: 104
+  - uid: 2254
+    components:
+    - type: Transform
+      pos: 19.5,30.5
+      parent: 104
+  - uid: 2255
+    components:
+    - type: Transform
+      pos: 19.5,31.5
+      parent: 104
+  - uid: 2256
+    components:
+    - type: Transform
+      pos: 20.5,26.5
+      parent: 104
+  - uid: 2259
+    components:
+    - type: Transform
+      pos: 20.5,27.5
+      parent: 104
+  - uid: 2260
+    components:
+    - type: Transform
+      pos: 20.5,28.5
+      parent: 104
+  - uid: 2261
+    components:
+    - type: Transform
+      pos: 20.5,29.5
+      parent: 104
+  - uid: 2262
+    components:
+    - type: Transform
+      pos: 16.5,27.5
+      parent: 104
+  - uid: 2263
+    components:
+    - type: Transform
+      pos: 16.5,28.5
+      parent: 104
+  - uid: 2264
+    components:
+    - type: Transform
+      pos: 16.5,29.5
+      parent: 104
+  - uid: 2265
+    components:
+    - type: Transform
+      pos: 16.5,30.5
+      parent: 104
+  - uid: 2266
+    components:
+    - type: Transform
+      pos: 16.5,31.5
+      parent: 104
+  - uid: 2267
+    components:
+    - type: Transform
+      pos: 16.5,32.5
+      parent: 104
+  - uid: 2268
+    components:
+    - type: Transform
+      pos: 17.5,23.5
+      parent: 104
+  - uid: 2269
+    components:
+    - type: Transform
+      pos: 17.5,24.5
+      parent: 104
+  - uid: 2270
+    components:
+    - type: Transform
+      pos: 17.5,25.5
+      parent: 104
+  - uid: 2271
+    components:
+    - type: Transform
+      pos: 17.5,26.5
+      parent: 104
+  - uid: 2272
+    components:
+    - type: Transform
+      pos: 17.5,27.5
+      parent: 104
+  - uid: 2273
+    components:
+    - type: Transform
+      pos: 17.5,28.5
+      parent: 104
+  - uid: 2274
+    components:
+    - type: Transform
+      pos: 17.5,29.5
+      parent: 104
+  - uid: 2275
+    components:
+    - type: Transform
+      pos: 17.5,30.5
+      parent: 104
+  - uid: 2276
+    components:
+    - type: Transform
+      pos: 17.5,31.5
+      parent: 104
+  - uid: 2277
+    components:
+    - type: Transform
+      pos: 17.5,32.5
+      parent: 104
+  - uid: 2278
+    components:
+    - type: Transform
+      pos: 18.5,23.5
+      parent: 104
+  - uid: 2279
+    components:
+    - type: Transform
+      pos: 18.5,24.5
+      parent: 104
+  - uid: 2280
+    components:
+    - type: Transform
+      pos: 18.5,25.5
+      parent: 104
+  - uid: 2281
+    components:
+    - type: Transform
+      pos: 18.5,26.5
+      parent: 104
+  - uid: 2282
+    components:
+    - type: Transform
+      pos: 18.5,27.5
+      parent: 104
+  - uid: 2283
+    components:
+    - type: Transform
+      pos: 18.5,28.5
+      parent: 104
+  - uid: 2284
+    components:
+    - type: Transform
+      pos: 18.5,29.5
+      parent: 104
+  - uid: 2285
+    components:
+    - type: Transform
+      pos: 18.5,30.5
+      parent: 104
+  - uid: 2286
+    components:
+    - type: Transform
+      pos: 18.5,31.5
+      parent: 104
+  - uid: 2287
+    components:
+    - type: Transform
+      pos: 18.5,32.5
+      parent: 104
+  - uid: 2288
+    components:
+    - type: Transform
+      pos: 19.5,23.5
+      parent: 104
+  - uid: 2289
+    components:
+    - type: Transform
+      pos: 19.5,24.5
+      parent: 104
+- proto: BalloonSyn
+  entities:
+  - uid: 1327
+    components:
+    - type: Transform
+      pos: 0.03361702,-6.368435
+      parent: 104
+- proto: BaseComputer
+  entities:
+  - uid: 18
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-8.5
+      parent: 104
+  - uid: 29
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-8.5
+      parent: 104
+  - uid: 111
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-1.5
+      parent: 104
+  - uid: 2292
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-2.5
+      parent: 104
+  - uid: 2295
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-3.5
+      parent: 104
+- proto: Beaker
+  entities:
+  - uid: 2031
+    components:
+    - type: Transform
+      pos: 3.6114278,-10.732791
+      parent: 104
+  - uid: 2095
+    components:
+    - type: Transform
+      pos: 4.017678,-12.520861
+      parent: 104
+- proto: Bed
+  entities:
+  - uid: 957
+    components:
+    - type: Transform
+      pos: 15.5,-3.5
+      parent: 104
+  - uid: 1548
+    components:
+    - type: Transform
+      pos: 15.5,-4.5
+      parent: 104
+- proto: BedsheetMedical
+  entities:
+  - uid: 1872
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 104
+  - uid: 1877
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 104
+  - uid: 1898
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 104
+  - uid: 1899
+    components:
+    - type: Transform
+      pos: -1.5,-12.5
+      parent: 104
+- proto: BedsheetSyndie
+  entities:
+  - uid: 154
+    components:
+    - type: Transform
+      pos: 15.5,-3.5
+      parent: 104
+  - uid: 289
+    components:
+    - type: Transform
+      pos: 15.5,-4.5
+      parent: 104
+- proto: BigBox
+  entities:
+  - uid: 2458
+    components:
+    - type: Transform
+      pos: 13.500806,-4.4874377
+      parent: 104
+- proto: Bookshelf
+  entities:
+  - uid: 140
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 104
+- proto: BoozeDispenser
+  entities:
+  - uid: 230
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-8.5
+      parent: 104
+- proto: BoxBeaker
+  entities:
+  - uid: 2114
+    components:
+    - type: Transform
+      pos: 5.539936,-12.489611
+      parent: 104
+- proto: BoxFolderBlack
+  entities:
+  - uid: 1022
+    components:
+    - type: Transform
+      pos: -13.494709,9.54891
+      parent: 104
+- proto: BoxMagazinePistolCaselessRiflePractice
+  entities:
+  - uid: 1635
+    components:
+    - type: Transform
+      pos: 5.4970627,10.597828
+      parent: 104
+- proto: BoxMagazinePistolSubMachineGunPractice
+  entities:
+  - uid: 1634
+    components:
+    - type: Transform
+      pos: 5.388983,13.953581
+      parent: 104
+- proto: BoxPillCanister
+  entities:
+  - uid: 1844
+    components:
+    - type: Transform
+      pos: 5.430561,-12.364611
+      parent: 104
+- proto: BoxShotgunPractice
+  entities:
+  - uid: 1633
+    components:
+    - type: Transform
+      pos: 5.4972115,14.562988
+      parent: 104
+    - type: BallisticAmmoProvider
+      unspawnedCount: 12
+- proto: Bucket
+  entities:
+  - uid: 153
+    components:
+    - type: Transform
+      pos: 10.809023,-4.25956
+      parent: 104
+- proto: CableApcExtension
+  entities:
+  - uid: 13
+    components:
+    - type: Transform
+      pos: -10.5,-5.5
+      parent: 104
+  - uid: 24
+    components:
+    - type: Transform
+      pos: -31.5,0.5
+      parent: 104
+  - uid: 100
+    components:
+    - type: Transform
+      pos: 13.5,0.5
+      parent: 104
+  - uid: 143
+    components:
+    - type: Transform
+      pos: 12.5,0.5
+      parent: 104
+  - uid: 213
+    components:
+    - type: Transform
+      pos: -16.5,-19.5
+      parent: 104
+  - uid: 214
+    components:
+    - type: Transform
+      pos: -15.5,-19.5
+      parent: 104
+  - uid: 220
+    components:
+    - type: Transform
+      pos: 11.5,0.5
+      parent: 104
+  - uid: 235
+    components:
+    - type: Transform
+      pos: 1.5,-13.5
+      parent: 104
+  - uid: 245
+    components:
+    - type: Transform
+      pos: 12.5,-18.5
+      parent: 104
+  - uid: 254
+    components:
+    - type: Transform
+      pos: -30.5,0.5
+      parent: 104
+  - uid: 279
+    components:
+    - type: Transform
+      pos: 11.5,-0.5
+      parent: 104
+  - uid: 287
+    components:
+    - type: Transform
+      pos: -15.5,0.5
+      parent: 104
+  - uid: 297
+    components:
+    - type: Transform
+      pos: 3.5,-14.5
+      parent: 104
+  - uid: 390
+    components:
+    - type: Transform
+      pos: -10.5,-7.5
+      parent: 104
+  - uid: 397
+    components:
+    - type: Transform
+      pos: -10.5,0.5
+      parent: 104
+  - uid: 411
+    components:
+    - type: Transform
+      pos: -10.5,-8.5
+      parent: 104
+  - uid: 412
+    components:
+    - type: Transform
+      pos: -26.5,-19.5
+      parent: 104
+  - uid: 428
+    components:
+    - type: Transform
+      pos: -23.5,-19.5
+      parent: 104
+  - uid: 429
+    components:
+    - type: Transform
+      pos: -10.5,-0.5
+      parent: 104
+  - uid: 430
+    components:
+    - type: Transform
+      pos: -10.5,1.5
+      parent: 104
+  - uid: 432
+    components:
+    - type: Transform
+      pos: -27.5,0.5
+      parent: 104
+  - uid: 433
+    components:
+    - type: Transform
+      pos: -17.5,-19.5
+      parent: 104
+  - uid: 434
+    components:
+    - type: Transform
+      pos: -21.5,-19.5
+      parent: 104
+  - uid: 435
+    components:
+    - type: Transform
+      pos: -10.5,-4.5
+      parent: 104
+  - uid: 436
+    components:
+    - type: Transform
+      pos: -10.5,-6.5
+      parent: 104
+  - uid: 437
+    components:
+    - type: Transform
+      pos: -10.5,-9.5
+      parent: 104
+  - uid: 438
+    components:
+    - type: Transform
+      pos: -20.5,-19.5
+      parent: 104
+  - uid: 439
+    components:
+    - type: Transform
+      pos: -10.5,-3.5
+      parent: 104
+  - uid: 442
+    components:
+    - type: Transform
+      pos: -19.5,-19.5
+      parent: 104
+  - uid: 444
+    components:
+    - type: Transform
+      pos: -10.5,1.5
+      parent: 104
+  - uid: 445
+    components:
+    - type: Transform
+      pos: -26.5,0.5
+      parent: 104
+  - uid: 449
+    components:
+    - type: Transform
+      pos: -18.5,-19.5
+      parent: 104
+  - uid: 452
+    components:
+    - type: Transform
+      pos: -30.5,-19.5
+      parent: 104
+  - uid: 453
+    components:
+    - type: Transform
+      pos: -29.5,-19.5
+      parent: 104
+  - uid: 454
+    components:
+    - type: Transform
+      pos: -23.5,0.5
+      parent: 104
+  - uid: 465
+    components:
+    - type: Transform
+      pos: -28.5,-19.5
+      parent: 104
+  - uid: 466
+    components:
+    - type: Transform
+      pos: -27.5,-19.5
+      parent: 104
+  - uid: 467
+    components:
+    - type: Transform
+      pos: -24.5,-19.5
+      parent: 104
+  - uid: 476
+    components:
+    - type: Transform
+      pos: -22.5,-19.5
+      parent: 104
+  - uid: 619
+    components:
+    - type: Transform
+      pos: -10.5,-12.5
+      parent: 104
+  - uid: 624
+    components:
+    - type: Transform
+      pos: -10.5,-10.5
+      parent: 104
+  - uid: 625
+    components:
+    - type: Transform
+      pos: -10.5,-11.5
+      parent: 104
+  - uid: 627
+    components:
+    - type: Transform
+      pos: -10.5,-15.5
+      parent: 104
+  - uid: 628
+    components:
+    - type: Transform
+      pos: -10.5,-16.5
+      parent: 104
+  - uid: 630
+    components:
+    - type: Transform
+      pos: -10.5,-17.5
+      parent: 104
+  - uid: 657
+    components:
+    - type: Transform
+      pos: -25.5,-19.5
+      parent: 104
+  - uid: 659
+    components:
+    - type: Transform
+      pos: -32.5,-19.5
+      parent: 104
+  - uid: 660
+    components:
+    - type: Transform
+      pos: -31.5,-19.5
+      parent: 104
+  - uid: 666
+    components:
+    - type: Transform
+      pos: -22.5,0.5
+      parent: 104
+  - uid: 814
+    components:
+    - type: Transform
+      pos: -6.5,-3.5
+      parent: 104
+  - uid: 832
+    components:
+    - type: Transform
+      pos: -7.5,-3.5
+      parent: 104
+  - uid: 840
+    components:
+    - type: Transform
+      pos: -25.5,0.5
+      parent: 104
+  - uid: 845
+    components:
+    - type: Transform
+      pos: -10.5,-1.5
+      parent: 104
+  - uid: 866
+    components:
+    - type: Transform
+      pos: -10.5,-2.5
+      parent: 104
+  - uid: 867
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 104
+  - uid: 868
+    components:
+    - type: Transform
+      pos: -10.5,-3.5
+      parent: 104
+  - uid: 870
+    components:
+    - type: Transform
+      pos: -9.5,-3.5
+      parent: 104
+  - uid: 877
+    components:
+    - type: Transform
+      pos: -8.5,-3.5
+      parent: 104
+  - uid: 884
+    components:
+    - type: Transform
+      pos: -4.5,-3.5
+      parent: 104
+  - uid: 920
+    components:
+    - type: Transform
+      pos: -10.5,-13.5
+      parent: 104
+  - uid: 926
+    components:
+    - type: Transform
+      pos: -12.5,0.5
+      parent: 104
+  - uid: 927
+    components:
+    - type: Transform
+      pos: -12.5,-19.5
+      parent: 104
+  - uid: 929
+    components:
+    - type: Transform
+      pos: -24.5,0.5
+      parent: 104
+  - uid: 931
+    components:
+    - type: Transform
+      pos: 12.5,-19.5
+      parent: 104
+  - uid: 933
+    components:
+    - type: Transform
+      pos: -10.5,-19.5
+      parent: 104
+  - uid: 934
+    components:
+    - type: Transform
+      pos: -10.5,-14.5
+      parent: 104
+  - uid: 960
+    components:
+    - type: Transform
+      pos: 12.5,-17.5
+      parent: 104
+  - uid: 961
+    components:
+    - type: Transform
+      pos: 11.5,-16.5
+      parent: 104
+  - uid: 962
+    components:
+    - type: Transform
+      pos: 6.5,-14.5
+      parent: 104
+  - uid: 963
+    components:
+    - type: Transform
+      pos: -14.5,0.5
+      parent: 104
+  - uid: 967
+    components:
+    - type: Transform
+      pos: 9.5,-16.5
+      parent: 104
+  - uid: 968
+    components:
+    - type: Transform
+      pos: 7.5,-16.5
+      parent: 104
+  - uid: 969
+    components:
+    - type: Transform
+      pos: -10.5,-18.5
+      parent: 104
+  - uid: 970
+    components:
+    - type: Transform
+      pos: -33.5,-19.5
+      parent: 104
+  - uid: 971
+    components:
+    - type: Transform
+      pos: -33.5,0.5
+      parent: 104
+  - uid: 973
+    components:
+    - type: Transform
+      pos: 5.5,-17.5
+      parent: 104
+  - uid: 979
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 104
+  - uid: 981
+    components:
+    - type: Transform
+      pos: 5.5,-14.5
+      parent: 104
+  - uid: 982
+    components:
+    - type: Transform
+      pos: 12.5,-16.5
+      parent: 104
+  - uid: 983
+    components:
+    - type: Transform
+      pos: 5.5,-16.5
+      parent: 104
+  - uid: 1081
+    components:
+    - type: Transform
+      pos: -17.5,0.5
+      parent: 104
+  - uid: 1082
+    components:
+    - type: Transform
+      pos: -11.5,0.5
+      parent: 104
+  - uid: 1115
+    components:
+    - type: Transform
+      pos: 4.5,-14.5
+      parent: 104
+  - uid: 1116
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 104
+  - uid: 1117
+    components:
+    - type: Transform
+      pos: 6.5,-16.5
+      parent: 104
+  - uid: 1122
+    components:
+    - type: Transform
+      pos: 1.5,-14.5
+      parent: 104
+  - uid: 1131
+    components:
+    - type: Transform
+      pos: -13.5,0.5
+      parent: 104
+  - uid: 1152
+    components:
+    - type: Transform
+      pos: 12.5,-20.5
+      parent: 104
+  - uid: 1154
+    components:
+    - type: Transform
+      pos: 3.5,-13.5
+      parent: 104
+  - uid: 1182
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 104
+  - uid: 1183
+    components:
+    - type: Transform
+      pos: 7.5,-14.5
+      parent: 104
+  - uid: 1187
+    components:
+    - type: Transform
+      pos: -20.5,0.5
+      parent: 104
+  - uid: 1189
+    components:
+    - type: Transform
+      pos: -32.5,0.5
+      parent: 104
+  - uid: 1191
+    components:
+    - type: Transform
+      pos: 3.5,-12.5
+      parent: 104
+  - uid: 1194
+    components:
+    - type: Transform
+      pos: 2.5,-14.5
+      parent: 104
+  - uid: 1195
+    components:
+    - type: Transform
+      pos: 8.5,-16.5
+      parent: 104
+  - uid: 1200
+    components:
+    - type: Transform
+      pos: 1.5,-15.5
+      parent: 104
+  - uid: 1204
+    components:
+    - type: Transform
+      pos: 10.5,-16.5
+      parent: 104
+  - uid: 1232
+    components:
+    - type: Transform
+      pos: -10.5,6.5
+      parent: 104
+  - uid: 1233
+    components:
+    - type: Transform
+      pos: -10.5,5.5
+      parent: 104
+  - uid: 1234
+    components:
+    - type: Transform
+      pos: -10.5,4.5
+      parent: 104
+  - uid: 1235
+    components:
+    - type: Transform
+      pos: -10.5,3.5
+      parent: 104
+  - uid: 1236
+    components:
+    - type: Transform
+      pos: -10.5,2.5
+      parent: 104
+  - uid: 1237
+    components:
+    - type: Transform
+      pos: -11.5,6.5
+      parent: 104
+  - uid: 1238
+    components:
+    - type: Transform
+      pos: -12.5,6.5
+      parent: 104
+  - uid: 1239
+    components:
+    - type: Transform
+      pos: -13.5,6.5
+      parent: 104
+  - uid: 1240
+    components:
+    - type: Transform
+      pos: -14.5,6.5
+      parent: 104
+  - uid: 1249
+    components:
+    - type: Transform
+      pos: -11.5,-19.5
+      parent: 104
+  - uid: 1275
+    components:
+    - type: Transform
+      pos: -6.5,-2.5
+      parent: 104
+  - uid: 1277
+    components:
+    - type: Transform
+      pos: -21.5,0.5
+      parent: 104
+  - uid: 1278
+    components:
+    - type: Transform
+      pos: -16.5,0.5
+      parent: 104
+  - uid: 1281
+    components:
+    - type: Transform
+      pos: -6.5,-1.5
+      parent: 104
+  - uid: 1282
+    components:
+    - type: Transform
+      pos: -6.5,-0.5
+      parent: 104
+  - uid: 1283
+    components:
+    - type: Transform
+      pos: -6.5,0.5
+      parent: 104
+  - uid: 1292
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 104
+  - uid: 1337
+    components:
+    - type: Transform
+      pos: -6.5,-4.5
+      parent: 104
+  - uid: 1338
+    components:
+    - type: Transform
+      pos: -6.5,-5.5
+      parent: 104
+  - uid: 1339
+    components:
+    - type: Transform
+      pos: -6.5,-6.5
+      parent: 104
+  - uid: 1340
+    components:
+    - type: Transform
+      pos: -6.5,-7.5
+      parent: 104
+  - uid: 1341
+    components:
+    - type: Transform
+      pos: -6.5,-8.5
+      parent: 104
+  - uid: 1342
+    components:
+    - type: Transform
+      pos: -6.5,-9.5
+      parent: 104
+  - uid: 1343
+    components:
+    - type: Transform
+      pos: -6.5,-10.5
+      parent: 104
+  - uid: 1344
+    components:
+    - type: Transform
+      pos: -6.5,-11.5
+      parent: 104
+  - uid: 1345
+    components:
+    - type: Transform
+      pos: -6.5,-12.5
+      parent: 104
+  - uid: 1346
+    components:
+    - type: Transform
+      pos: -6.5,-13.5
+      parent: 104
+  - uid: 1347
+    components:
+    - type: Transform
+      pos: -6.5,-14.5
+      parent: 104
+  - uid: 1348
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 104
+  - uid: 1349
+    components:
+    - type: Transform
+      pos: -6.5,-16.5
+      parent: 104
+  - uid: 1429
+    components:
+    - type: Transform
+      pos: -18.5,0.5
+      parent: 104
+  - uid: 1430
+    components:
+    - type: Transform
+      pos: -19.5,0.5
+      parent: 104
+  - uid: 1439
+    components:
+    - type: Transform
+      pos: 20.5,-12.5
+      parent: 104
+  - uid: 1449
+    components:
+    - type: Transform
+      pos: 16.5,-13.5
+      parent: 104
+  - uid: 1450
+    components:
+    - type: Transform
+      pos: 15.5,-13.5
+      parent: 104
+  - uid: 1451
+    components:
+    - type: Transform
+      pos: 15.5,-12.5
+      parent: 104
+  - uid: 1452
+    components:
+    - type: Transform
+      pos: 15.5,-11.5
+      parent: 104
+  - uid: 1453
+    components:
+    - type: Transform
+      pos: 15.5,-10.5
+      parent: 104
+  - uid: 1454
+    components:
+    - type: Transform
+      pos: 14.5,-10.5
+      parent: 104
+  - uid: 1455
+    components:
+    - type: Transform
+      pos: 13.5,-10.5
+      parent: 104
+  - uid: 1456
+    components:
+    - type: Transform
+      pos: 12.5,-10.5
+      parent: 104
+  - uid: 1457
+    components:
+    - type: Transform
+      pos: 11.5,-10.5
+      parent: 104
+  - uid: 1458
+    components:
+    - type: Transform
+      pos: 15.5,-14.5
+      parent: 104
+  - uid: 1459
+    components:
+    - type: Transform
+      pos: 14.5,-14.5
+      parent: 104
+  - uid: 1460
+    components:
+    - type: Transform
+      pos: 13.5,-14.5
+      parent: 104
+  - uid: 1461
+    components:
+    - type: Transform
+      pos: 12.5,-14.5
+      parent: 104
+  - uid: 1473
+    components:
+    - type: Transform
+      pos: -13.5,-19.5
+      parent: 104
+  - uid: 1474
+    components:
+    - type: Transform
+      pos: 7.5,-5.5
+      parent: 104
+  - uid: 1475
+    components:
+    - type: Transform
+      pos: 6.5,-1.5
+      parent: 104
+  - uid: 1476
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 104
+  - uid: 1488
+    components:
+    - type: Transform
+      pos: 6.5,-5.5
+      parent: 104
+  - uid: 1489
+    components:
+    - type: Transform
+      pos: 8.5,-5.5
+      parent: 104
+  - uid: 1490
+    components:
+    - type: Transform
+      pos: 6.5,-4.5
+      parent: 104
+  - uid: 1491
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 104
+  - uid: 1492
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 104
+  - uid: 1493
+    components:
+    - type: Transform
+      pos: 6.5,-0.5
+      parent: 104
+  - uid: 1494
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 104
+  - uid: 1495
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 104
+  - uid: 1496
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 104
+  - uid: 1497
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 104
+  - uid: 1498
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 104
+  - uid: 1499
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 104
+  - uid: 1500
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 104
+  - uid: 1501
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 104
+  - uid: 1502
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 104
+  - uid: 1503
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 104
+  - uid: 1504
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 104
+  - uid: 1505
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 104
+  - uid: 1506
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 104
+  - uid: 1507
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 104
+  - uid: 1508
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 104
+  - uid: 1509
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 104
+  - uid: 1510
+    components:
+    - type: Transform
+      pos: 0.5,-7.5
+      parent: 104
+  - uid: 1511
+    components:
+    - type: Transform
+      pos: 1.5,-7.5
+      parent: 104
+  - uid: 1512
+    components:
+    - type: Transform
+      pos: 2.5,-7.5
+      parent: 104
+  - uid: 1513
+    components:
+    - type: Transform
+      pos: 4.5,-7.5
+      parent: 104
+  - uid: 1514
+    components:
+    - type: Transform
+      pos: 3.5,-7.5
+      parent: 104
+  - uid: 1515
+    components:
+    - type: Transform
+      pos: 5.5,-7.5
+      parent: 104
+  - uid: 1516
+    components:
+    - type: Transform
+      pos: 5.5,-8.5
+      parent: 104
+  - uid: 1517
+    components:
+    - type: Transform
+      pos: 6.5,-8.5
+      parent: 104
+  - uid: 1518
+    components:
+    - type: Transform
+      pos: 7.5,-8.5
+      parent: 104
+  - uid: 1519
+    components:
+    - type: Transform
+      pos: 8.5,-8.5
+      parent: 104
+  - uid: 1520
+    components:
+    - type: Transform
+      pos: 9.5,-8.5
+      parent: 104
+  - uid: 1521
+    components:
+    - type: Transform
+      pos: 10.5,-8.5
+      parent: 104
+  - uid: 1522
+    components:
+    - type: Transform
+      pos: 10.5,-7.5
+      parent: 104
+  - uid: 1523
+    components:
+    - type: Transform
+      pos: 11.5,-7.5
+      parent: 104
+  - uid: 1524
+    components:
+    - type: Transform
+      pos: 12.5,-7.5
+      parent: 104
+  - uid: 1525
+    components:
+    - type: Transform
+      pos: 13.5,-7.5
+      parent: 104
+  - uid: 1526
+    components:
+    - type: Transform
+      pos: 14.5,-7.5
+      parent: 104
+  - uid: 1527
+    components:
+    - type: Transform
+      pos: 14.5,-7.5
+      parent: 104
+  - uid: 1528
+    components:
+    - type: Transform
+      pos: 15.5,-7.5
+      parent: 104
+  - uid: 1529
+    components:
+    - type: Transform
+      pos: 14.5,-6.5
+      parent: 104
+  - uid: 1530
+    components:
+    - type: Transform
+      pos: 14.5,-5.5
+      parent: 104
+  - uid: 1531
+    components:
+    - type: Transform
+      pos: 14.5,-4.5
+      parent: 104
+  - uid: 1533
+    components:
+    - type: Transform
+      pos: -29.5,0.5
+      parent: 104
+  - uid: 1538
+    components:
+    - type: Transform
+      pos: 7.5,-0.5
+      parent: 104
+  - uid: 1539
+    components:
+    - type: Transform
+      pos: 8.5,-0.5
+      parent: 104
+  - uid: 1540
+    components:
+    - type: Transform
+      pos: 9.5,-0.5
+      parent: 104
+  - uid: 1541
+    components:
+    - type: Transform
+      pos: 8.5,-0.5
+      parent: 104
+  - uid: 1543
+    components:
+    - type: Transform
+      pos: 10.5,-0.5
+      parent: 104
+  - uid: 1575
+    components:
+    - type: Transform
+      pos: 21.5,-5.5
+      parent: 104
+  - uid: 1576
+    components:
+    - type: Transform
+      pos: 20.5,-5.5
+      parent: 104
+  - uid: 1577
+    components:
+    - type: Transform
+      pos: 19.5,-5.5
+      parent: 104
+  - uid: 1578
+    components:
+    - type: Transform
+      pos: 19.5,-6.5
+      parent: 104
+  - uid: 1579
+    components:
+    - type: Transform
+      pos: 19.5,-7.5
+      parent: 104
+  - uid: 1580
+    components:
+    - type: Transform
+      pos: 19.5,-9.5
+      parent: 104
+  - uid: 1581
+    components:
+    - type: Transform
+      pos: 19.5,-9.5
+      parent: 104
+  - uid: 1582
+    components:
+    - type: Transform
+      pos: 19.5,-8.5
+      parent: 104
+  - uid: 1583
+    components:
+    - type: Transform
+      pos: 20.5,-9.5
+      parent: 104
+  - uid: 1584
+    components:
+    - type: Transform
+      pos: 21.5,-9.5
+      parent: 104
+  - uid: 1585
+    components:
+    - type: Transform
+      pos: 21.5,-4.5
+      parent: 104
+  - uid: 1586
+    components:
+    - type: Transform
+      pos: 18.5,-7.5
+      parent: 104
+  - uid: 1587
+    components:
+    - type: Transform
+      pos: 17.5,-7.5
+      parent: 104
+  - uid: 1588
+    components:
+    - type: Transform
+      pos: 21.5,-8.5
+      parent: 104
+  - uid: 1589
+    components:
+    - type: Transform
+      pos: 21.5,-7.5
+      parent: 104
+  - uid: 1590
+    components:
+    - type: Transform
+      pos: 21.5,-6.5
+      parent: 104
+  - uid: 1591
+    components:
+    - type: Transform
+      pos: 10.5,-1.5
+      parent: 104
+  - uid: 1592
+    components:
+    - type: Transform
+      pos: 10.5,-3.5
+      parent: 104
+  - uid: 1593
+    components:
+    - type: Transform
+      pos: 10.5,-2.5
+      parent: 104
+  - uid: 1595
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 104
+  - uid: 1596
+    components:
+    - type: Transform
+      pos: -2.5,-3.5
+      parent: 104
+  - uid: 1597
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 104
+  - uid: 1941
+    components:
+    - type: Transform
+      pos: -28.5,0.5
+      parent: 104
+  - uid: 1948
+    components:
+    - type: Transform
+      pos: -14.5,-19.5
+      parent: 104
+  - uid: 2301
+    components:
+    - type: Transform
+      pos: 12.5,-21.5
+      parent: 104
+  - uid: 2302
+    components:
+    - type: Transform
+      pos: 11.5,-21.5
+      parent: 104
+  - uid: 2303
+    components:
+    - type: Transform
+      pos: 13.5,-21.5
+      parent: 104
+  - uid: 2304
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 104
+  - uid: 2305
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 104
+  - uid: 2306
+    components:
+    - type: Transform
+      pos: -1.5,-14.5
+      parent: 104
+  - uid: 2307
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 104
+  - uid: 2374
+    components:
+    - type: Transform
+      pos: 20.5,-12.5
+      parent: 104
+  - uid: 2375
+    components:
+    - type: Transform
+      pos: 20.5,-13.5
+      parent: 104
+  - uid: 2376
+    components:
+    - type: Transform
+      pos: 20.5,-14.5
+      parent: 104
+  - uid: 2377
+    components:
+    - type: Transform
+      pos: 20.5,-15.5
+      parent: 104
+  - uid: 2378
+    components:
+    - type: Transform
+      pos: 20.5,-16.5
+      parent: 104
+  - uid: 2379
+    components:
+    - type: Transform
+      pos: 20.5,-17.5
+      parent: 104
+  - uid: 2381
+    components:
+    - type: Transform
+      pos: 20.5,-18.5
+      parent: 104
+  - uid: 2382
+    components:
+    - type: Transform
+      pos: 20.5,-19.5
+      parent: 104
+  - uid: 2383
+    components:
+    - type: Transform
+      pos: 19.5,-17.5
+      parent: 104
+  - uid: 2384
+    components:
+    - type: Transform
+      pos: 18.5,-17.5
+      parent: 104
+  - uid: 2385
+    components:
+    - type: Transform
+      pos: 21.5,-17.5
+      parent: 104
+  - uid: 2386
+    components:
+    - type: Transform
+      pos: 22.5,-17.5
+      parent: 104
+  - uid: 2387
+    components:
+    - type: Transform
+      pos: 23.5,-17.5
+      parent: 104
+  - uid: 2388
+    components:
+    - type: Transform
+      pos: 24.5,-17.5
+      parent: 104
+  - uid: 2389
+    components:
+    - type: Transform
+      pos: 25.5,-17.5
+      parent: 104
+  - uid: 2390
+    components:
+    - type: Transform
+      pos: 26.5,-17.5
+      parent: 104
+  - uid: 2391
+    components:
+    - type: Transform
+      pos: 25.5,-18.5
+      parent: 104
+  - uid: 2392
+    components:
+    - type: Transform
+      pos: 25.5,-19.5
+      parent: 104
+  - uid: 2393
+    components:
+    - type: Transform
+      pos: 25.5,-16.5
+      parent: 104
+  - uid: 2394
+    components:
+    - type: Transform
+      pos: 25.5,-15.5
+      parent: 104
+  - uid: 2395
+    components:
+    - type: Transform
+      pos: 25.5,-14.5
+      parent: 104
+  - uid: 2396
+    components:
+    - type: Transform
+      pos: 25.5,-13.5
+      parent: 104
+  - uid: 2439
+    components:
+    - type: Transform
+      pos: 13.5,-9.5
+      parent: 104
+  - uid: 2440
+    components:
+    - type: Transform
+      pos: 5.5,-6.5
+      parent: 104
+  - uid: 2441
+    components:
+    - type: Transform
+      pos: 5.5,-5.5
+      parent: 104
+  - uid: 3378
+    components:
+    - type: Transform
+      pos: 7.5,-9.5
+      parent: 104
+  - uid: 3379
+    components:
+    - type: Transform
+      pos: 7.5,-10.5
+      parent: 104
+  - uid: 3380
+    components:
+    - type: Transform
+      pos: 6.5,-10.5
+      parent: 104
+  - uid: 3381
+    components:
+    - type: Transform
+      pos: 5.5,-10.5
+      parent: 104
+  - uid: 3382
+    components:
+    - type: Transform
+      pos: 4.5,-10.5
+      parent: 104
+  - uid: 3383
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 104
+  - uid: 3384
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 104
+- proto: CableApcStack
+  entities:
+  - uid: 211
+    components:
+    - type: Transform
+      pos: 11.428643,-10.548745
+      parent: 104
+  - uid: 1324
+    components:
+    - type: Transform
+      pos: 4.439247,-17.36072
+      parent: 104
+- proto: CableHV
+  entities:
+  - uid: 2334
+    components:
+    - type: Transform
+      pos: 17.5,-19.5
+      parent: 104
+  - uid: 2335
+    components:
+    - type: Transform
+      pos: 17.5,-18.5
+      parent: 104
+  - uid: 2336
+    components:
+    - type: Transform
+      pos: 17.5,-17.5
+      parent: 104
+  - uid: 2337
+    components:
+    - type: Transform
+      pos: 18.5,-19.5
+      parent: 104
+  - uid: 2338
+    components:
+    - type: Transform
+      pos: 19.5,-19.5
+      parent: 104
+  - uid: 2339
+    components:
+    - type: Transform
+      pos: 20.5,-19.5
+      parent: 104
+  - uid: 2340
+    components:
+    - type: Transform
+      pos: 21.5,-19.5
+      parent: 104
+  - uid: 2341
+    components:
+    - type: Transform
+      pos: 22.5,-19.5
+      parent: 104
+  - uid: 2342
+    components:
+    - type: Transform
+      pos: 23.5,-19.5
+      parent: 104
+  - uid: 2343
+    components:
+    - type: Transform
+      pos: 24.5,-19.5
+      parent: 104
+  - uid: 2344
+    components:
+    - type: Transform
+      pos: 25.5,-19.5
+      parent: 104
+  - uid: 2345
+    components:
+    - type: Transform
+      pos: 26.5,-19.5
+      parent: 104
+  - uid: 2346
+    components:
+    - type: Transform
+      pos: 27.5,-19.5
+      parent: 104
+  - uid: 2347
+    components:
+    - type: Transform
+      pos: 27.5,-18.5
+      parent: 104
+  - uid: 2348
+    components:
+    - type: Transform
+      pos: 27.5,-17.5
+      parent: 104
+  - uid: 2352
+    components:
+    - type: Transform
+      pos: 21.5,-18.5
+      parent: 104
+  - uid: 2353
+    components:
+    - type: Transform
+      pos: 22.5,-18.5
+      parent: 104
+  - uid: 2354
+    components:
+    - type: Transform
+      pos: 23.5,-18.5
+      parent: 104
+  - uid: 2355
+    components:
+    - type: Transform
+      pos: 22.5,-17.5
+      parent: 104
+  - uid: 2356
+    components:
+    - type: Transform
+      pos: 23.5,-17.5
+      parent: 104
+  - uid: 2357
+    components:
+    - type: Transform
+      pos: 24.5,-17.5
+      parent: 104
+  - uid: 2358
+    components:
+    - type: Transform
+      pos: 24.5,-16.5
+      parent: 104
+  - uid: 2359
+    components:
+    - type: Transform
+      pos: 24.5,-15.5
+      parent: 104
+  - uid: 2360
+    components:
+    - type: Transform
+      pos: 24.5,-14.5
+      parent: 104
+  - uid: 2361
+    components:
+    - type: Transform
+      pos: 21.5,-17.5
+      parent: 104
+  - uid: 2362
+    components:
+    - type: Transform
+      pos: 25.5,-14.5
+      parent: 104
+  - uid: 2363
+    components:
+    - type: Transform
+      pos: 26.5,-14.5
+      parent: 104
+  - uid: 2364
+    components:
+    - type: Transform
+      pos: 27.5,-14.5
+      parent: 104
+  - uid: 2365
+    components:
+    - type: Transform
+      pos: 27.5,-13.5
+      parent: 104
+- proto: CableHVStack
+  entities:
+  - uid: 209
+    components:
+    - type: Transform
+      pos: 11.334893,-10.282843
+      parent: 104
+- proto: CableMV
+  entities:
+  - uid: 240
+    components:
+    - type: Transform
+      pos: 17.5,-13.5
+      parent: 104
+  - uid: 1438
+    components:
+    - type: Transform
+      pos: 20.5,-12.5
+      parent: 104
+  - uid: 1462
+    components:
+    - type: Transform
+      pos: 16.5,-13.5
+      parent: 104
+  - uid: 1463
+    components:
+    - type: Transform
+      pos: 15.5,-13.5
+      parent: 104
+  - uid: 1464
+    components:
+    - type: Transform
+      pos: 15.5,-12.5
+      parent: 104
+  - uid: 1465
+    components:
+    - type: Transform
+      pos: 15.5,-11.5
+      parent: 104
+  - uid: 1466
+    components:
+    - type: Transform
+      pos: 15.5,-10.5
+      parent: 104
+  - uid: 1467
+    components:
+    - type: Transform
+      pos: 14.5,-10.5
+      parent: 104
+  - uid: 1468
+    components:
+    - type: Transform
+      pos: 13.5,-10.5
+      parent: 104
+  - uid: 1469
+    components:
+    - type: Transform
+      pos: 13.5,-9.5
+      parent: 104
+  - uid: 1478
+    components:
+    - type: Transform
+      pos: 12.5,-10.5
+      parent: 104
+  - uid: 1479
+    components:
+    - type: Transform
+      pos: 11.5,-10.5
+      parent: 104
+  - uid: 1480
+    components:
+    - type: Transform
+      pos: 10.5,-10.5
+      parent: 104
+  - uid: 1481
+    components:
+    - type: Transform
+      pos: 9.5,-10.5
+      parent: 104
+  - uid: 1482
+    components:
+    - type: Transform
+      pos: 9.5,-9.5
+      parent: 104
+  - uid: 1483
+    components:
+    - type: Transform
+      pos: 9.5,-8.5
+      parent: 104
+  - uid: 1484
+    components:
+    - type: Transform
+      pos: 9.5,-7.5
+      parent: 104
+  - uid: 1485
+    components:
+    - type: Transform
+      pos: 9.5,-6.5
+      parent: 104
+  - uid: 1486
+    components:
+    - type: Transform
+      pos: 8.5,-6.5
+      parent: 104
+  - uid: 1487
+    components:
+    - type: Transform
+      pos: 8.5,-5.5
+      parent: 104
+  - uid: 2322
+    components:
+    - type: Transform
+      pos: 18.5,-13.5
+      parent: 104
+  - uid: 2323
+    components:
+    - type: Transform
+      pos: 19.5,-13.5
+      parent: 104
+  - uid: 2324
+    components:
+    - type: Transform
+      pos: 20.5,-13.5
+      parent: 104
+  - uid: 2325
+    components:
+    - type: Transform
+      pos: 20.5,-12.5
+      parent: 104
+  - uid: 2367
+    components:
+    - type: Transform
+      pos: 27.5,-13.5
+      parent: 104
+  - uid: 2368
+    components:
+    - type: Transform
+      pos: 26.5,-13.5
+      parent: 104
+  - uid: 2369
+    components:
+    - type: Transform
+      pos: 25.5,-13.5
+      parent: 104
+  - uid: 2370
+    components:
+    - type: Transform
+      pos: 24.5,-13.5
+      parent: 104
+  - uid: 2371
+    components:
+    - type: Transform
+      pos: 23.5,-13.5
+      parent: 104
+  - uid: 2372
+    components:
+    - type: Transform
+      pos: 22.5,-13.5
+      parent: 104
+  - uid: 2373
+    components:
+    - type: Transform
+      pos: 21.5,-13.5
+      parent: 104
+- proto: CableMVStack
+  entities:
+  - uid: 210
+    components:
+    - type: Transform
+      pos: 11.381768,-10.407973
+      parent: 104
+- proto: CableTerminal
+  entities:
+  - uid: 2349
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 21.5,-19.5
+      parent: 104
+  - uid: 2350
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-19.5
+      parent: 104
+  - uid: 2351
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 23.5,-19.5
+      parent: 104
+- proto: Carpet
+  entities:
+  - uid: 2459
+    components:
+    - type: Transform
+      pos: 14.5,-4.5
+      parent: 104
+  - uid: 2460
+    components:
+    - type: Transform
+      pos: 14.5,-3.5
+      parent: 104
+- proto: Catwalk
+  entities:
+  - uid: 217
+    components:
+    - type: Transform
+      pos: -12.5,-19.5
+      parent: 104
+  - uid: 218
+    components:
+    - type: Transform
+      pos: -26.5,-20.5
+      parent: 104
+  - uid: 256
+    components:
+    - type: Transform
+      pos: -29.5,2.5
+      parent: 104
+  - uid: 264
+    components:
+    - type: Transform
+      pos: -24.5,-19.5
+      parent: 104
+  - uid: 278
+    components:
+    - type: Transform
+      pos: -21.5,-23.5
+      parent: 104
+  - uid: 381
+    components:
+    - type: Transform
+      pos: -20.5,-21.5
+      parent: 104
+  - uid: 382
+    components:
+    - type: Transform
+      pos: -20.5,-23.5
+      parent: 104
+  - uid: 383
+    components:
+    - type: Transform
+      pos: -20.5,-22.5
+      parent: 104
+  - uid: 384
+    components:
+    - type: Transform
+      pos: -26.5,-19.5
+      parent: 104
+  - uid: 385
+    components:
+    - type: Transform
+      pos: -30.5,4.5
+      parent: 104
+  - uid: 386
+    components:
+    - type: Transform
+      pos: -30.5,-19.5
+      parent: 104
+  - uid: 387
+    components:
+    - type: Transform
+      pos: -14.5,-20.5
+      parent: 104
+  - uid: 388
+    components:
+    - type: Transform
+      pos: -29.5,3.5
+      parent: 104
+  - uid: 389
+    components:
+    - type: Transform
+      pos: -14.5,-22.5
+      parent: 104
+  - uid: 391
+    components:
+    - type: Transform
+      pos: -33.5,3.5
+      parent: 104
+  - uid: 392
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -34.5,-21.5
+      parent: 104
+  - uid: 393
+    components:
+    - type: Transform
+      pos: -19.5,-22.5
+      parent: 104
+  - uid: 394
+    components:
+    - type: Transform
+      pos: -32.5,4.5
+      parent: 104
+  - uid: 395
+    components:
+    - type: Transform
+      pos: -24.5,-21.5
+      parent: 104
+  - uid: 396
+    components:
+    - type: Transform
+      pos: -10.5,-16.5
+      parent: 104
+  - uid: 398
+    components:
+    - type: Transform
+      pos: -9.5,-15.5
+      parent: 104
+  - uid: 399
+    components:
+    - type: Transform
+      pos: -10.5,-15.5
+      parent: 104
+  - uid: 400
+    components:
+    - type: Transform
+      pos: -9.5,-14.5
+      parent: 104
+  - uid: 413
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,3.5
+      parent: 104
+  - uid: 414
+    components:
+    - type: Transform
+      pos: -35.5,-19.5
+      parent: 104
+  - uid: 431
+    components:
+    - type: Transform
+      pos: -9.5,-13.5
+      parent: 104
+  - uid: 440
+    components:
+    - type: Transform
+      pos: -16.5,-21.5
+      parent: 104
+  - uid: 450
+    components:
+    - type: Transform
+      pos: -33.5,-20.5
+      parent: 104
+  - uid: 451
+    components:
+    - type: Transform
+      pos: -34.5,-19.5
+      parent: 104
+  - uid: 464
+    components:
+    - type: Transform
+      pos: -34.5,-20.5
+      parent: 104
+  - uid: 468
+    components:
+    - type: Transform
+      pos: -9.5,-21.5
+      parent: 104
+  - uid: 470
+    components:
+    - type: Transform
+      pos: -9.5,-20.5
+      parent: 104
+  - uid: 490
+    components:
+    - type: Transform
+      pos: -13.5,0.5
+      parent: 104
+  - uid: 491
+    components:
+    - type: Transform
+      pos: -12.5,1.5
+      parent: 104
+  - uid: 494
+    components:
+    - type: Transform
+      pos: -11.5,1.5
+      parent: 104
+  - uid: 496
+    components:
+    - type: Transform
+      pos: -14.5,1.5
+      parent: 104
+  - uid: 499
+    components:
+    - type: Transform
+      pos: -9.5,-19.5
+      parent: 104
+  - uid: 500
+    components:
+    - type: Transform
+      pos: -9.5,-18.5
+      parent: 104
+  - uid: 501
+    components:
+    - type: Transform
+      pos: -30.5,0.5
+      parent: 104
+  - uid: 503
+    components:
+    - type: Transform
+      pos: -29.5,1.5
+      parent: 104
+  - uid: 508
+    components:
+    - type: Transform
+      pos: -12.5,0.5
+      parent: 104
+  - uid: 510
+    components:
+    - type: Transform
+      pos: -31.5,0.5
+      parent: 104
+  - uid: 514
+    components:
+    - type: Transform
+      pos: -27.5,0.5
+      parent: 104
+  - uid: 515
+    components:
+    - type: Transform
+      pos: -30.5,1.5
+      parent: 104
+  - uid: 516
+    components:
+    - type: Transform
+      pos: -9.5,-17.5
+      parent: 104
+  - uid: 517
+    components:
+    - type: Transform
+      pos: -9.5,-16.5
+      parent: 104
+  - uid: 518
+    components:
+    - type: Transform
+      pos: -10.5,-14.5
+      parent: 104
+  - uid: 519
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-21.5
+      parent: 104
+  - uid: 520
+    components:
+    - type: Transform
+      pos: -28.5,0.5
+      parent: 104
+  - uid: 583
+    components:
+    - type: Transform
+      pos: -26.5,1.5
+      parent: 104
+  - uid: 584
+    components:
+    - type: Transform
+      pos: -10.5,-13.5
+      parent: 104
+  - uid: 616
+    components:
+    - type: Transform
+      pos: -31.5,3.5
+      parent: 104
+  - uid: 617
+    components:
+    - type: Transform
+      pos: -14.5,-23.5
+      parent: 104
+  - uid: 626
+    components:
+    - type: Transform
+      pos: -16.5,-22.5
+      parent: 104
+  - uid: 631
+    components:
+    - type: Transform
+      pos: -9.5,-23.5
+      parent: 104
+  - uid: 633
+    components:
+    - type: Transform
+      pos: -9.5,-22.5
+      parent: 104
+  - uid: 634
+    components:
+    - type: Transform
+      pos: -16.5,-23.5
+      parent: 104
+  - uid: 635
+    components:
+    - type: Transform
+      pos: -25.5,0.5
+      parent: 104
+  - uid: 636
+    components:
+    - type: Transform
+      pos: -27.5,1.5
+      parent: 104
+  - uid: 638
+    components:
+    - type: Transform
+      pos: -26.5,0.5
+      parent: 104
+  - uid: 639
+    components:
+    - type: Transform
+      pos: -24.5,1.5
+      parent: 104
+  - uid: 641
+    components:
+    - type: Transform
+      pos: -11.5,-22.5
+      parent: 104
+  - uid: 642
+    components:
+    - type: Transform
+      pos: -11.5,-23.5
+      parent: 104
+  - uid: 643
+    components:
+    - type: Transform
+      pos: -10.5,-23.5
+      parent: 104
+  - uid: 644
+    components:
+    - type: Transform
+      pos: -24.5,0.5
+      parent: 104
+  - uid: 645
+    components:
+    - type: Transform
+      pos: -25.5,1.5
+      parent: 104
+  - uid: 646
+    components:
+    - type: Transform
+      pos: -15.5,0.5
+      parent: 104
+  - uid: 647
+    components:
+    - type: Transform
+      pos: -13.5,-23.5
+      parent: 104
+  - uid: 652
+    components:
+    - type: Transform
+      pos: -14.5,0.5
+      parent: 104
+  - uid: 653
+    components:
+    - type: Transform
+      pos: -13.5,1.5
+      parent: 104
+  - uid: 654
+    components:
+    - type: Transform
+      pos: -29.5,0.5
+      parent: 104
+  - uid: 655
+    components:
+    - type: Transform
+      pos: -28.5,1.5
+      parent: 104
+  - uid: 656
+    components:
+    - type: Transform
+      pos: -35.5,-20.5
+      parent: 104
+  - uid: 658
+    components:
+    - type: Transform
+      pos: -11.5,0.5
+      parent: 104
+  - uid: 661
+    components:
+    - type: Transform
+      pos: -20.5,-19.5
+      parent: 104
+  - uid: 662
+    components:
+    - type: Transform
+      pos: -18.5,0.5
+      parent: 104
+  - uid: 663
+    components:
+    - type: Transform
+      pos: -12.5,-23.5
+      parent: 104
+  - uid: 664
+    components:
+    - type: Transform
+      pos: -17.5,1.5
+      parent: 104
+  - uid: 665
+    components:
+    - type: Transform
+      pos: -21.5,0.5
+      parent: 104
+  - uid: 667
+    components:
+    - type: Transform
+      pos: -20.5,-20.5
+      parent: 104
+  - uid: 668
+    components:
+    - type: Transform
+      pos: -32.5,1.5
+      parent: 104
+  - uid: 669
+    components:
+    - type: Transform
+      pos: -31.5,1.5
+      parent: 104
+  - uid: 707
+    components:
+    - type: Transform
+      pos: -32.5,0.5
+      parent: 104
+  - uid: 713
+    components:
+    - type: Transform
+      pos: -20.5,1.5
+      parent: 104
+  - uid: 715
+    components:
+    - type: Transform
+      pos: -10.5,-22.5
+      parent: 104
+  - uid: 736
+    components:
+    - type: Transform
+      pos: -10.5,-21.5
+      parent: 104
+  - uid: 737
+    components:
+    - type: Transform
+      pos: -10.5,-20.5
+      parent: 104
+  - uid: 738
+    components:
+    - type: Transform
+      pos: -20.5,0.5
+      parent: 104
+  - uid: 742
+    components:
+    - type: Transform
+      pos: -10.5,-19.5
+      parent: 104
+  - uid: 748
+    components:
+    - type: Transform
+      pos: -10.5,-18.5
+      parent: 104
+  - uid: 749
+    components:
+    - type: Transform
+      pos: -10.5,-17.5
+      parent: 104
+  - uid: 760
+    components:
+    - type: Transform
+      pos: -14.5,-21.5
+      parent: 104
+  - uid: 761
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,-21.5
+      parent: 104
+  - uid: 769
+    components:
+    - type: Transform
+      pos: -33.5,4.5
+      parent: 104
+  - uid: 772
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,-21.5
+      parent: 104
+  - uid: 799
+    components:
+    - type: Transform
+      pos: -26.5,3.5
+      parent: 104
+  - uid: 800
+    components:
+    - type: Transform
+      pos: -34.5,4.5
+      parent: 104
+  - uid: 812
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,-21.5
+      parent: 104
+  - uid: 813
+    components:
+    - type: Transform
+      pos: -29.5,4.5
+      parent: 104
+  - uid: 815
+    components:
+    - type: Transform
+      pos: -17.5,-23.5
+      parent: 104
+  - uid: 816
+    components:
+    - type: Transform
+      pos: -34.5,1.5
+      parent: 104
+  - uid: 817
+    components:
+    - type: Transform
+      pos: -24.5,-22.5
+      parent: 104
+  - uid: 818
+    components:
+    - type: Transform
+      pos: -24.5,-23.5
+      parent: 104
+  - uid: 820
+    components:
+    - type: Transform
+      pos: -21.5,-21.5
+      parent: 104
+  - uid: 821
+    components:
+    - type: Transform
+      pos: -21.5,-22.5
+      parent: 104
+  - uid: 822
+    components:
+    - type: Transform
+      pos: -27.5,3.5
+      parent: 104
+  - uid: 823
+    components:
+    - type: Transform
+      pos: -26.5,4.5
+      parent: 104
+  - uid: 824
+    components:
+    - type: Transform
+      pos: -25.5,4.5
+      parent: 104
+  - uid: 825
+    components:
+    - type: Transform
+      pos: -25.5,2.5
+      parent: 104
+  - uid: 826
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,-23.5
+      parent: 104
+  - uid: 827
+    components:
+    - type: Transform
+      pos: -27.5,4.5
+      parent: 104
+  - uid: 828
+    components:
+    - type: Transform
+      pos: -27.5,2.5
+      parent: 104
+  - uid: 829
+    components:
+    - type: Transform
+      pos: -26.5,2.5
+      parent: 104
+  - uid: 830
+    components:
+    - type: Transform
+      pos: -25.5,3.5
+      parent: 104
+  - uid: 831
+    components:
+    - type: Transform
+      pos: -19.5,-20.5
+      parent: 104
+  - uid: 833
+    components:
+    - type: Transform
+      pos: -18.5,-21.5
+      parent: 104
+  - uid: 834
+    components:
+    - type: Transform
+      pos: -17.5,0.5
+      parent: 104
+  - uid: 835
+    components:
+    - type: Transform
+      pos: -15.5,1.5
+      parent: 104
+  - uid: 836
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-21.5
+      parent: 104
+  - uid: 837
+    components:
+    - type: Transform
+      pos: -16.5,1.5
+      parent: 104
+  - uid: 839
+    components:
+    - type: Transform
+      pos: -32.5,3.5
+      parent: 104
+  - uid: 841
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,-22.5
+      parent: 104
+  - uid: 842
+    components:
+    - type: Transform
+      pos: -17.5,-22.5
+      parent: 104
+  - uid: 843
+    components:
+    - type: Transform
+      pos: -18.5,-23.5
+      parent: 104
+  - uid: 844
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,-22.5
+      parent: 104
+  - uid: 846
+    components:
+    - type: Transform
+      pos: -34.5,0.5
+      parent: 104
+  - uid: 847
+    components:
+    - type: Transform
+      pos: -19.5,-21.5
+      parent: 104
+  - uid: 848
+    components:
+    - type: Transform
+      pos: -16.5,0.5
+      parent: 104
+  - uid: 849
+    components:
+    - type: Transform
+      pos: -18.5,-22.5
+      parent: 104
+  - uid: 850
+    components:
+    - type: Transform
+      pos: -17.5,-21.5
+      parent: 104
+  - uid: 851
+    components:
+    - type: Transform
+      pos: -17.5,-19.5
+      parent: 104
+  - uid: 852
+    components:
+    - type: Transform
+      pos: -18.5,-19.5
+      parent: 104
+  - uid: 853
+    components:
+    - type: Transform
+      pos: -19.5,1.5
+      parent: 104
+  - uid: 854
+    components:
+    - type: Transform
+      pos: -17.5,-20.5
+      parent: 104
+  - uid: 855
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-21.5
+      parent: 104
+  - uid: 856
+    components:
+    - type: Transform
+      pos: -31.5,2.5
+      parent: 104
+  - uid: 857
+    components:
+    - type: Transform
+      pos: -19.5,0.5
+      parent: 104
+  - uid: 858
+    components:
+    - type: Transform
+      pos: -30.5,3.5
+      parent: 104
+  - uid: 859
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -28.5,-21.5
+      parent: 104
+  - uid: 860
+    components:
+    - type: Transform
+      pos: -33.5,1.5
+      parent: 104
+  - uid: 861
+    components:
+    - type: Transform
+      pos: -33.5,0.5
+      parent: 104
+  - uid: 862
+    components:
+    - type: Transform
+      pos: -31.5,-20.5
+      parent: 104
+  - uid: 863
+    components:
+    - type: Transform
+      pos: -32.5,-19.5
+      parent: 104
+  - uid: 864
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,-21.5
+      parent: 104
+  - uid: 865
+    components:
+    - type: Transform
+      pos: -28.5,2.5
+      parent: 104
+  - uid: 869
+    components:
+    - type: Transform
+      pos: -32.5,2.5
+      parent: 104
+  - uid: 871
+    components:
+    - type: Transform
+      pos: -31.5,4.5
+      parent: 104
+  - uid: 872
+    components:
+    - type: Transform
+      pos: -30.5,2.5
+      parent: 104
+  - uid: 873
+    components:
+    - type: Transform
+      pos: -18.5,1.5
+      parent: 104
+  - uid: 874
+    components:
+    - type: Transform
+      pos: -15.5,4.5
+      parent: 104
+  - uid: 875
+    components:
+    - type: Transform
+      pos: -15.5,3.5
+      parent: 104
+  - uid: 876
+    components:
+    - type: Transform
+      pos: -15.5,2.5
+      parent: 104
+  - uid: 878
+    components:
+    - type: Transform
+      pos: -23.5,-21.5
+      parent: 104
+  - uid: 879
+    components:
+    - type: Transform
+      pos: -23.5,-22.5
+      parent: 104
+  - uid: 880
+    components:
+    - type: Transform
+      pos: -23.5,-23.5
+      parent: 104
+  - uid: 881
+    components:
+    - type: Transform
+      pos: -18.5,-20.5
+      parent: 104
+  - uid: 882
+    components:
+    - type: Transform
+      pos: -22.5,-21.5
+      parent: 104
+  - uid: 883
+    components:
+    - type: Transform
+      pos: -19.5,-19.5
+      parent: 104
+  - uid: 885
+    components:
+    - type: Transform
+      pos: -32.5,-20.5
+      parent: 104
+  - uid: 886
+    components:
+    - type: Transform
+      pos: -33.5,-19.5
+      parent: 104
+  - uid: 887
+    components:
+    - type: Transform
+      pos: -28.5,4.5
+      parent: 104
+  - uid: 888
+    components:
+    - type: Transform
+      pos: -28.5,3.5
+      parent: 104
+  - uid: 889
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -34.5,-23.5
+      parent: 104
+  - uid: 890
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,-23.5
+      parent: 104
+  - uid: 891
+    components:
+    - type: Transform
+      pos: -33.5,2.5
+      parent: 104
+  - uid: 892
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-22.5
+      parent: 104
+  - uid: 893
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-23.5
+      parent: 104
+  - uid: 894
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-22.5
+      parent: 104
+  - uid: 895
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-23.5
+      parent: 104
+  - uid: 896
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-22.5
+      parent: 104
+  - uid: 897
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,-23.5
+      parent: 104
+  - uid: 898
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -28.5,-22.5
+      parent: 104
+  - uid: 899
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -28.5,-23.5
+      parent: 104
+  - uid: 900
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,-22.5
+      parent: 104
+  - uid: 901
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,-22.5
+      parent: 104
+  - uid: 902
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,-23.5
+      parent: 104
+  - uid: 903
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,-22.5
+      parent: 104
+  - uid: 904
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,-23.5
+      parent: 104
+  - uid: 905
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-22.5
+      parent: 104
+  - uid: 906
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-23.5
+      parent: 104
+  - uid: 907
+    components:
+    - type: Transform
+      pos: -19.5,-23.5
+      parent: 104
+  - uid: 908
+    components:
+    - type: Transform
+      pos: -21.5,-19.5
+      parent: 104
+  - uid: 909
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,-21.5
+      parent: 104
+  - uid: 910
+    components:
+    - type: Transform
+      pos: -31.5,-19.5
+      parent: 104
+  - uid: 911
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-21.5
+      parent: 104
+  - uid: 912
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -34.5,-22.5
+      parent: 104
+  - uid: 913
+    components:
+    - type: Transform
+      pos: -23.5,4.5
+      parent: 104
+  - uid: 914
+    components:
+    - type: Transform
+      pos: -21.5,-20.5
+      parent: 104
+  - uid: 915
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -23.5,3.5
+      parent: 104
+  - uid: 916
+    components:
+    - type: Transform
+      pos: -12.5,4.5
+      parent: 104
+  - uid: 917
+    components:
+    - type: Transform
+      pos: -12.5,3.5
+      parent: 104
+  - uid: 918
+    components:
+    - type: Transform
+      pos: -12.5,2.5
+      parent: 104
+  - uid: 919
+    components:
+    - type: Transform
+      pos: -22.5,-22.5
+      parent: 104
+  - uid: 921
+    components:
+    - type: Transform
+      pos: -15.5,-22.5
+      parent: 104
+  - uid: 922
+    components:
+    - type: Transform
+      pos: -30.5,-20.5
+      parent: 104
+  - uid: 923
+    components:
+    - type: Transform
+      pos: -13.5,4.5
+      parent: 104
+  - uid: 924
+    components:
+    - type: Transform
+      pos: -13.5,3.5
+      parent: 104
+  - uid: 925
+    components:
+    - type: Transform
+      pos: -13.5,2.5
+      parent: 104
+  - uid: 928
+    components:
+    - type: Transform
+      pos: -15.5,-23.5
+      parent: 104
+  - uid: 930
+    components:
+    - type: Transform
+      pos: -14.5,4.5
+      parent: 104
+  - uid: 932
+    components:
+    - type: Transform
+      pos: -14.5,2.5
+      parent: 104
+  - uid: 935
+    components:
+    - type: Transform
+      pos: -22.5,-20.5
+      parent: 104
+  - uid: 936
+    components:
+    - type: Transform
+      pos: -16.5,4.5
+      parent: 104
+  - uid: 937
+    components:
+    - type: Transform
+      pos: -16.5,3.5
+      parent: 104
+  - uid: 938
+    components:
+    - type: Transform
+      pos: -16.5,2.5
+      parent: 104
+  - uid: 939
+    components:
+    - type: Transform
+      pos: -27.5,-20.5
+      parent: 104
+  - uid: 940
+    components:
+    - type: Transform
+      pos: -15.5,-21.5
+      parent: 104
+  - uid: 941
+    components:
+    - type: Transform
+      pos: -13.5,-19.5
+      parent: 104
+  - uid: 943
+    components:
+    - type: Transform
+      pos: -17.5,4.5
+      parent: 104
+  - uid: 944
+    components:
+    - type: Transform
+      pos: -17.5,3.5
+      parent: 104
+  - uid: 945
+    components:
+    - type: Transform
+      pos: -17.5,2.5
+      parent: 104
+  - uid: 946
+    components:
+    - type: Transform
+      pos: -12.5,-22.5
+      parent: 104
+  - uid: 947
+    components:
+    - type: Transform
+      pos: -22.5,-23.5
+      parent: 104
+  - uid: 948
+    components:
+    - type: Transform
+      pos: -13.5,-21.5
+      parent: 104
+  - uid: 949
+    components:
+    - type: Transform
+      pos: -22.5,1.5
+      parent: 104
+  - uid: 950
+    components:
+    - type: Transform
+      pos: -18.5,4.5
+      parent: 104
+  - uid: 951
+    components:
+    - type: Transform
+      pos: -18.5,3.5
+      parent: 104
+  - uid: 952
+    components:
+    - type: Transform
+      pos: -18.5,2.5
+      parent: 104
+  - uid: 953
+    components:
+    - type: Transform
+      pos: -12.5,-21.5
+      parent: 104
+  - uid: 954
+    components:
+    - type: Transform
+      pos: -13.5,-22.5
+      parent: 104
+  - uid: 958
+    components:
+    - type: Transform
+      pos: -19.5,3.5
+      parent: 104
+  - uid: 959
+    components:
+    - type: Transform
+      pos: -19.5,2.5
+      parent: 104
+  - uid: 964
+    components:
+    - type: Transform
+      pos: -11.5,4.5
+      parent: 104
+  - uid: 965
+    components:
+    - type: Transform
+      pos: -11.5,3.5
+      parent: 104
+  - uid: 966
+    components:
+    - type: Transform
+      pos: -11.5,2.5
+      parent: 104
+  - uid: 972
+    components:
+    - type: Transform
+      pos: -11.5,-21.5
+      parent: 104
+  - uid: 984
+    components:
+    - type: Transform
+      pos: -9.5,-9.5
+      parent: 104
+  - uid: 985
+    components:
+    - type: Transform
+      pos: -9.5,-10.5
+      parent: 104
+  - uid: 986
+    components:
+    - type: Transform
+      pos: -9.5,-11.5
+      parent: 104
+  - uid: 987
+    components:
+    - type: Transform
+      pos: -9.5,-12.5
+      parent: 104
+  - uid: 988
+    components:
+    - type: Transform
+      pos: -10.5,4.5
+      parent: 104
+  - uid: 989
+    components:
+    - type: Transform
+      pos: -10.5,3.5
+      parent: 104
+  - uid: 990
+    components:
+    - type: Transform
+      pos: -10.5,2.5
+      parent: 104
+  - uid: 991
+    components:
+    - type: Transform
+      pos: -10.5,1.5
+      parent: 104
+  - uid: 992
+    components:
+    - type: Transform
+      pos: -10.5,0.5
+      parent: 104
+  - uid: 993
+    components:
+    - type: Transform
+      pos: -10.5,-0.5
+      parent: 104
+  - uid: 994
+    components:
+    - type: Transform
+      pos: -10.5,-1.5
+      parent: 104
+  - uid: 995
+    components:
+    - type: Transform
+      pos: -10.5,-2.5
+      parent: 104
+  - uid: 996
+    components:
+    - type: Transform
+      pos: -10.5,-3.5
+      parent: 104
+  - uid: 997
+    components:
+    - type: Transform
+      pos: -10.5,-4.5
+      parent: 104
+  - uid: 998
+    components:
+    - type: Transform
+      pos: -10.5,-5.5
+      parent: 104
+  - uid: 999
+    components:
+    - type: Transform
+      pos: -10.5,-6.5
+      parent: 104
+  - uid: 1000
+    components:
+    - type: Transform
+      pos: -10.5,-7.5
+      parent: 104
+  - uid: 1001
+    components:
+    - type: Transform
+      pos: -10.5,-8.5
+      parent: 104
+  - uid: 1002
+    components:
+    - type: Transform
+      pos: -10.5,-9.5
+      parent: 104
+  - uid: 1003
+    components:
+    - type: Transform
+      pos: -10.5,-10.5
+      parent: 104
+  - uid: 1004
+    components:
+    - type: Transform
+      pos: -10.5,-11.5
+      parent: 104
+  - uid: 1005
+    components:
+    - type: Transform
+      pos: -10.5,-12.5
+      parent: 104
+  - uid: 1006
+    components:
+    - type: Transform
+      pos: -9.5,4.5
+      parent: 104
+  - uid: 1007
+    components:
+    - type: Transform
+      pos: -9.5,3.5
+      parent: 104
+  - uid: 1008
+    components:
+    - type: Transform
+      pos: -9.5,2.5
+      parent: 104
+  - uid: 1009
+    components:
+    - type: Transform
+      pos: -9.5,1.5
+      parent: 104
+  - uid: 1010
+    components:
+    - type: Transform
+      pos: -9.5,0.5
+      parent: 104
+  - uid: 1011
+    components:
+    - type: Transform
+      pos: -9.5,-0.5
+      parent: 104
+  - uid: 1012
+    components:
+    - type: Transform
+      pos: -9.5,-1.5
+      parent: 104
+  - uid: 1013
+    components:
+    - type: Transform
+      pos: -9.5,-2.5
+      parent: 104
+  - uid: 1014
+    components:
+    - type: Transform
+      pos: -9.5,-3.5
+      parent: 104
+  - uid: 1015
+    components:
+    - type: Transform
+      pos: -9.5,-4.5
+      parent: 104
+  - uid: 1016
+    components:
+    - type: Transform
+      pos: -9.5,-5.5
+      parent: 104
+  - uid: 1017
+    components:
+    - type: Transform
+      pos: -9.5,-6.5
+      parent: 104
+  - uid: 1018
+    components:
+    - type: Transform
+      pos: -9.5,-7.5
+      parent: 104
+  - uid: 1019
+    components:
+    - type: Transform
+      pos: -9.5,-8.5
+      parent: 104
+  - uid: 1086
+    components:
+    - type: Transform
+      pos: -14.5,3.5
+      parent: 104
+  - uid: 1087
+    components:
+    - type: Transform
+      pos: -19.5,4.5
+      parent: 104
+  - uid: 1202
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,4.5
+      parent: 104
+  - uid: 1203
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,-23.5
+      parent: 104
+  - uid: 1222
+    components:
+    - type: Transform
+      pos: -34.5,2.5
+      parent: 104
+  - uid: 1223
+    components:
+    - type: Transform
+      pos: -34.5,3.5
+      parent: 104
+  - uid: 1280
+    components:
+    - type: Transform
+      pos: -23.5,-20.5
+      parent: 104
+  - uid: 1284
+    components:
+    - type: Transform
+      pos: -25.5,-19.5
+      parent: 104
+  - uid: 1289
+    components:
+    - type: Transform
+      pos: -28.5,-20.5
+      parent: 104
+  - uid: 1290
+    components:
+    - type: Transform
+      pos: -22.5,0.5
+      parent: 104
+  - uid: 1362
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 104
+  - uid: 1363
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 104
+  - uid: 1364
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 104
+  - uid: 1365
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 104
+  - uid: 1366
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 104
+  - uid: 1377
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 104
+  - uid: 1428
+    components:
+    - type: Transform
+      pos: -16.5,-19.5
+      parent: 104
+  - uid: 1535
+    components:
+    - type: Transform
+      pos: -13.5,-20.5
+      parent: 104
+  - uid: 1554
+    components:
+    - type: Transform
+      pos: -29.5,-19.5
+      parent: 104
+  - uid: 1674
+    components:
+    - type: Transform
+      pos: -28.5,-19.5
+      parent: 104
+  - uid: 1785
+    components:
+    - type: Transform
+      pos: -11.5,-19.5
+      parent: 104
+  - uid: 1786
+    components:
+    - type: Transform
+      pos: -22.5,-19.5
+      parent: 104
+  - uid: 1787
+    components:
+    - type: Transform
+      pos: -11.5,-20.5
+      parent: 104
+  - uid: 1788
+    components:
+    - type: Transform
+      pos: -27.5,-19.5
+      parent: 104
+  - uid: 1789
+    components:
+    - type: Transform
+      pos: -24.5,-20.5
+      parent: 104
+  - uid: 1791
+    components:
+    - type: Transform
+      pos: -25.5,-20.5
+      parent: 104
+  - uid: 1799
+    components:
+    - type: Transform
+      pos: -29.5,-20.5
+      parent: 104
+  - uid: 1825
+    components:
+    - type: Transform
+      pos: -12.5,-20.5
+      parent: 104
+  - uid: 1886
+    components:
+    - type: Transform
+      pos: -15.5,-20.5
+      parent: 104
+  - uid: 1887
+    components:
+    - type: Transform
+      pos: -14.5,-19.5
+      parent: 104
+  - uid: 1947
+    components:
+    - type: Transform
+      pos: -15.5,-19.5
+      parent: 104
+  - uid: 1949
+    components:
+    - type: Transform
+      pos: -23.5,-19.5
+      parent: 104
+  - uid: 2046
+    components:
+    - type: Transform
+      pos: -16.5,-20.5
+      parent: 104
+  - uid: 2048
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -23.5,2.5
+      parent: 104
+  - uid: 2050
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,2.5
+      parent: 104
+  - uid: 2052
+    components:
+    - type: Transform
+      pos: -23.5,1.5
+      parent: 104
+  - uid: 2188
+    components:
+    - type: Transform
+      pos: -21.5,1.5
+      parent: 104
+  - uid: 2405
+    components:
+    - type: Transform
+      pos: 23.5,-19.5
+      parent: 104
+  - uid: 2406
+    components:
+    - type: Transform
+      pos: 22.5,-19.5
+      parent: 104
+  - uid: 2407
+    components:
+    - type: Transform
+      pos: 21.5,-19.5
+      parent: 104
+  - uid: 2408
+    components:
+    - type: Transform
+      pos: 21.5,-17.5
+      parent: 104
+  - uid: 2409
+    components:
+    - type: Transform
+      pos: 22.5,-17.5
+      parent: 104
+  - uid: 2410
+    components:
+    - type: Transform
+      pos: 23.5,-17.5
+      parent: 104
+  - uid: 2505
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,3.5
+      parent: 104
+  - uid: 2507
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,4.5
+      parent: 104
+  - uid: 2508
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -21.5,2.5
+      parent: 104
+  - uid: 2514
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,3.5
+      parent: 104
+  - uid: 2515
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -21.5,4.5
+      parent: 104
+  - uid: 2521
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,2.5
+      parent: 104
+  - uid: 2526
+    components:
+    - type: Transform
+      pos: -23.5,0.5
+      parent: 104
+  - uid: 2553
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,4.5
+      parent: 104
+  - uid: 2554
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,2.5
+      parent: 104
+  - uid: 2557
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -21.5,3.5
+      parent: 104
+- proto: Chair
+  entities:
+  - uid: 487
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-20.5
+      parent: 104
+  - uid: 1367
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-4.5
+      parent: 104
+  - uid: 1376
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-4.5
+      parent: 104
+  - uid: 1878
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-21.5
+      parent: 104
+  - uid: 1879
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-22.5
+      parent: 104
+  - uid: 2312
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-13.5
+      parent: 104
+  - uid: 2313
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-14.5
+      parent: 104
+- proto: ChairFolding
+  entities:
+  - uid: 544
+    components:
+    - type: Transform
+      pos: 20.5,8.5
+      parent: 104
+  - uid: 1062
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,4.5
+      parent: 104
+  - uid: 1063
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,2.5
+      parent: 104
+- proto: ChairOfficeDark
+  entities:
+  - uid: 1298
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-17.5
+      parent: 104
+  - uid: 1304
+    components:
+    - type: Transform
+      pos: 11.5,-17.5
+      parent: 104
+  - uid: 1764
+    components:
+    - type: Transform
+      pos: -13.5,6.5
+      parent: 104
+  - uid: 2427
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-15.5
+      parent: 104
+  - uid: 2428
+    components:
+    - type: Transform
+      pos: 25.5,-15.5
+      parent: 104
+- proto: ChairOfficeLight
+  entities:
+  - uid: 751
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-16.5
+      parent: 104
+  - uid: 1124
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 104
+  - uid: 1296
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-11.5
+      parent: 104
+  - uid: 1297
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 104
+- proto: ChairPilotSeat
+  entities:
+  - uid: 326
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,-6.5
+      parent: 104
+  - uid: 327
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-7.5
+      parent: 104
+  - uid: 328
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,-7.5
+      parent: 104
+  - uid: 329
+    components:
+    - type: Transform
+      pos: 20.5,-8.5
+      parent: 104
+  - uid: 330
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,-6.5
+      parent: 104
+  - uid: 331
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-5.5
+      parent: 104
+  - uid: 332
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-5.5
+      parent: 104
+  - uid: 333
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-6.5
+      parent: 104
+  - uid: 334
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-8.5
+      parent: 104
+  - uid: 335
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-9.5
+      parent: 104
+  - uid: 336
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-9.5
+      parent: 104
+  - uid: 337
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,-8.5
+      parent: 104
+- proto: ChairWood
+  entities:
+  - uid: 2429
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 104
+- proto: chem_master
+  entities:
+  - uid: 2444
+    components:
+    - type: Transform
+      pos: 5.5,-10.5
+      parent: 104
+- proto: ChemicalPayload
+  entities:
+  - uid: 2380
+    components:
+    - type: Transform
+      pos: 3.3003616,-17.381208
+      parent: 104
+  - uid: 3110
+    components:
+    - type: Transform
+      pos: 3.6284866,-17.287361
+      parent: 104
+- proto: ChemistryHotplate
+  entities:
+  - uid: 1383
+    components:
+    - type: Transform
+      pos: 4.5,-12.5
+      parent: 104
+- proto: ChessBoard
+  entities:
+  - uid: 354
+    components:
+    - type: Transform
+      pos: 13.499366,-8.433407
+      parent: 104
+- proto: ClosetEmergencyFilledRandom
+  entities:
+  - uid: 1359
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 104
+- proto: ClosetL3Filled
+  entities:
+  - uid: 1153
+    components:
+    - type: Transform
+      pos: 7.5,-17.5
+      parent: 104
+- proto: ClosetRadiationSuitFilled
+  entities:
+  - uid: 1114
+    components:
+    - type: Transform
+      pos: 6.5,-17.5
+      parent: 104
+- proto: ClosetToolFilled
+  entities:
+  - uid: 2417
+    components:
+    - type: Transform
+      pos: 20.5,-14.5
+      parent: 104
+  - uid: 2418
+    components:
+    - type: Transform
+      pos: 24.5,-14.5
+      parent: 104
+- proto: ClothingBackpackDuffelSyndicateFilledMedical
+  entities:
+  - uid: 2437
+    components:
+    - type: Transform
+      pos: 0.5,-12.5
+      parent: 104
+- proto: ClothingBackpackWaterTank
+  entities:
+  - uid: 151
+    components:
+    - type: Transform
+      pos: 9.36168,-4.462339
+      parent: 104
+    - type: SolutionAmmoProvider
+      maxShots: 200
+- proto: ClothingBeltUtilityFilled
+  entities:
+  - uid: 212
+    components:
+    - type: Transform
+      pos: 13.897393,-10.470539
+      parent: 104
+- proto: ClothingEyesGlassesChemical
+  entities:
+  - uid: 1738
+    components:
+    - type: Transform
+      pos: 3.5009227,-11.519134
+      parent: 104
+- proto: ClothingNeckScarfStripedRed
+  entities:
+  - uid: 1150
+    components:
+    - type: Transform
+      pos: -2.530845,-16.461567
+      parent: 104
+- proto: ClothingNeckStethoscope
+  entities:
+  - uid: 1336
+    components:
+    - type: Transform
+      pos: 7.5027137,-12.301802
+      parent: 104
+- proto: ClothingShoesBootsSalvage
+  entities:
+  - uid: 542
+    components:
+    - type: Transform
+      pos: 19.574894,7.069533
+      parent: 104
+  - uid: 545
+    components:
+    - type: Transform
+      pos: 19.246769,6.507033
+      parent: 104
+- proto: CombatKnife
+  entities:
+  - uid: 1694
+    components:
+    - type: Transform
+      pos: 5.483225,11.368477
+      parent: 104
+- proto: ComfyChair
+  entities:
+  - uid: 21
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-8.5
+      parent: 104
+  - uid: 352
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-8.5
+      parent: 104
+- proto: computerBodyScanner
+  entities:
+  - uid: 2436
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-14.5
+      parent: 104
+- proto: ComputerPowerMonitoring
+  entities:
+  - uid: 1730
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 27.5,-14.5
+      parent: 104
+- proto: ComputerSurveillanceWirelessCameraMonitor
+  entities:
+  - uid: 1127
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,6.5
+      parent: 104
+- proto: CyberPen
+  entities:
+  - uid: 696
+    components:
+    - type: Transform
+      pos: -14.478909,9.585995
+      parent: 104
+- proto: DresserFilled
+  entities:
+  - uid: 349
+    components:
+    - type: Transform
+      pos: 13.5,-3.5
+      parent: 104
+- proto: DrinkAbsintheBottleFull
+  entities:
+  - uid: 15
+    components:
+    - type: Transform
+      pos: 3.9415665,-8.34479
+      parent: 104
+- proto: DrinkBeerBottleFull
+  entities:
+  - uid: 157
+    components:
+    - type: Transform
+      pos: 2.5961013,-2.2186527
+      parent: 104
+  - uid: 170
+    components:
+    - type: Transform
+      pos: 3.6117263,-3.1874027
+      parent: 104
+- proto: DrinkGinBottleFull
+  entities:
+  - uid: 134
+    components:
+    - type: Transform
+      pos: 3.2228165,-8.4229965
+      parent: 104
+- proto: DrinkWhiskeyBottleFull
+  entities:
+  - uid: 25
+    components:
+    - type: Transform
+      pos: -0.5303154,-6.2851996
+      parent: 104
+- proto: EmpGrenade
+  entities:
+  - uid: 2456
+    components:
+    - type: Transform
+      pos: 14.40774,-17.385033
+      parent: 104
+  - uid: 2457
+    components:
+    - type: Transform
+      pos: 14.62649,-17.385033
+      parent: 104
+- proto: ExtinguisherCabinetFilled
+  entities:
+  - uid: 139
+    components:
+    - type: Transform
+      pos: 28.5,-14.5
+      parent: 104
+  - uid: 141
+    components:
+    - type: Transform
+      pos: 14.5,-0.5
+      parent: 104
+  - uid: 1812
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 104
+  - uid: 1816
+    components:
+    - type: Transform
+      pos: 8.5,-10.5
+      parent: 104
+  - uid: 1822
+    components:
+    - type: Transform
+      pos: 15.5,-17.5
+      parent: 104
+- proto: FaxMachineSyndie
+  entities:
+  - uid: 81
+    components:
+    - type: Transform
+      pos: 7.5,-4.5
+      parent: 104
+- proto: filingCabinetDrawer
+  entities:
+  - uid: 1140
+    components:
+    - type: Transform
+      pos: -12.5,7.5
+      parent: 104
+- proto: filingCabinetDrawerRandom
+  entities:
+  - uid: 108
+    components:
+    - type: Transform
+      pos: 7.5,-5.5
+      parent: 104
+- proto: FirelockGlass
+  entities:
+  - uid: 1765
+    components:
+    - type: Transform
+      pos: -13.5,5.5
+      parent: 104
+- proto: Fireplace
+  entities:
+  - uid: 1273
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 104
+- proto: FloorDrain
+  entities:
+  - uid: 1361
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 104
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2438
+    components:
+    - type: Transform
+      pos: 10.5,-3.5
+      parent: 104
+    - type: Fixtures
+      fixtures: {}
+  - uid: 2443
+    components:
+    - type: Transform
+      pos: 4.5,-11.5
+      parent: 104
+    - type: Fixtures
+      fixtures: {}
+- proto: FloraRockSolid01
+  entities:
+  - uid: 1707
+    components:
+    - type: Transform
+      pos: 5.5565968,16.377468
+      parent: 104
+- proto: FloraRockSolid02
+  entities:
+  - uid: 1708
+    components:
+    - type: Transform
+      pos: -3.1481876,-0.15203857
+      parent: 104
+  - uid: 1711
+    components:
+    - type: Transform
+      pos: -1.3676796,16.13784
+      parent: 104
+- proto: FloraRockSolid03
+  entities:
+  - uid: 1706
+    components:
+    - type: Transform
+      pos: 13.550529,12.489372
+      parent: 104
+- proto: FloraTreeConifer01
+  entities:
+  - uid: 261
+    components:
+    - type: Transform
+      pos: 7.7892694,4.987089
+      parent: 104
+  - uid: 275
+    components:
+    - type: Transform
+      pos: -3.80645,4.798395
+      parent: 104
+  - uid: 281
+    components:
+    - type: Transform
+      pos: -1.0279694,6.890992
+      parent: 104
+  - uid: 1619
+    components:
+    - type: Transform
+      pos: 16.10984,7.3249645
+      parent: 104
+  - uid: 1622
+    components:
+    - type: Transform
+      pos: 7.42463,16.597832
+      parent: 104
+  - uid: 1626
+    components:
+    - type: Transform
+      pos: 11.605486,16.944057
+      parent: 104
+- proto: FloraTreeConifer02
+  entities:
+  - uid: 219
+    components:
+    - type: Transform
+      pos: 5.5,4.5
+      parent: 104
+  - uid: 260
+    components:
+    - type: Transform
+      pos: 7.7267694,7.536619
+      parent: 104
+  - uid: 267
+    components:
+    - type: Transform
+      pos: 12.789269,3.6888618
+      parent: 104
+  - uid: 268
+    components:
+    - type: Transform
+      pos: -0.17814255,7.5043383
+      parent: 104
+  - uid: 273
+    components:
+    - type: Transform
+      pos: -2.591959,2.9214401
+      parent: 104
+  - uid: 280
+    components:
+    - type: Transform
+      pos: 1.5111885,4.4898434
+      parent: 104
+  - uid: 1618
+    components:
+    - type: Transform
+      pos: 11.32859,10.093473
+      parent: 104
+  - uid: 1620
+    components:
+    - type: Transform
+      pos: 15.85984,13.16621
+      parent: 104
+  - uid: 1621
+    components:
+    - type: Transform
+      pos: 14.582346,17.286049
+      parent: 104
+- proto: FloraTreeConifer03
+  entities:
+  - uid: 271
+    components:
+    - type: Transform
+      pos: -1.1000175,4.26659
+      parent: 104
+  - uid: 1035
+    components:
+    - type: Transform
+      pos: 0.74747276,19.424063
+      parent: 104
+  - uid: 1673
+    components:
+    - type: Transform
+      pos: -3.5,15.5
+      parent: 104
+  - uid: 1830
+    components:
+    - type: Transform
+      pos: 8.497473,19.862019
+      parent: 104
+- proto: FloraTreeSnow01
+  entities:
+  - uid: 262
+    components:
+    - type: Transform
+      pos: 9.630766,6.7434845
+      parent: 104
+- proto: FloraTreeSnow02
+  entities:
+  - uid: 270
+    components:
+    - type: Transform
+      pos: -2.3114033,5.0917635
+      parent: 104
+  - uid: 1630
+    components:
+    - type: Transform
+      pos: 4.558771,16.696045
+      parent: 104
+- proto: FloraTreeSnow03
+  entities:
+  - uid: 274
+    components:
+    - type: Transform
+      pos: -3.3325882,6.8936405
+      parent: 104
+  - uid: 1629
+    components:
+    - type: Transform
+      pos: 9.924105,15.382175
+      parent: 104
+- proto: FloraTreeSnow04
+  entities:
+  - uid: 265
+    components:
+    - type: Transform
+      pos: 0.24603653,5.7335367
+      parent: 104
+  - uid: 276
+    components:
+    - type: Transform
+      pos: 5.8604717,5.2799397
+      parent: 104
+  - uid: 1624
+    components:
+    - type: Transform
+      pos: -3.1344147,13.722986
+      parent: 104
+- proto: FloraTreeSnow05
+  entities:
+  - uid: 269
+    components:
+    - type: Transform
+      pos: 0.30623245,3.9068413
+      parent: 104
+  - uid: 1627
+    components:
+    - type: Transform
+      pos: 13.331816,13.977352
+      parent: 104
+  - uid: 1628
+    components:
+    - type: Transform
+      pos: 15.066191,11.052429
+      parent: 104
+  - uid: 1631
+    components:
+    - type: Transform
+      pos: 2.1525211,16.977589
+      parent: 104
+  - uid: 1672
+    components:
+    - type: Transform
+      pos: -3.5,16.5
+      parent: 104
+- proto: FoodBoxDonkpocket
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      pos: 12.527094,-6.308407
+      parent: 104
+- proto: FoodBoxDonkpocketTeriyaki
+  entities:
+  - uid: 2475
+    components:
+    - type: Transform
+      pos: 12.636917,-6.187726
+      parent: 104
+- proto: FoodBoxDonut
+  entities:
+  - uid: 2445
+    components:
+    - type: Transform
+      pos: 2.5389562,-6.3072195
+      parent: 104
+- proto: FoodDonutJellySlugcat
+  entities:
+  - uid: 3327
+    components:
+    - type: Transform
+      pos: -5.7255287,20.539352
+      parent: 104
+- proto: GeneratorBasic15kW
+  entities:
+  - uid: 2326
+    components:
+    - type: Transform
+      pos: 27.5,-19.5
+      parent: 104
+  - uid: 2328
+    components:
+    - type: Transform
+      pos: 17.5,-17.5
+      parent: 104
+  - uid: 2329
+    components:
+    - type: Transform
+      pos: 17.5,-19.5
+      parent: 104
+  - uid: 2330
+    components:
+    - type: Transform
+      pos: 27.5,-17.5
+      parent: 104
+- proto: GeneratorRTG
+  entities:
+  - uid: 2415
+    components:
+    - type: Transform
+      pos: 17.5,-18.5
+      parent: 104
+  - uid: 2416
+    components:
+    - type: Transform
+      pos: 27.5,-18.5
+      parent: 104
+- proto: GravityGenerator
+  entities:
+  - uid: 2327
+    components:
+    - type: Transform
+      pos: 22.5,-15.5
+      parent: 104
+    - type: GravityGenerator
+      charge: 100
+    - type: PointLight
+      radius: 175.75
+- proto: GrenadeFlashBang
+  entities:
+  - uid: 2309
+    components:
+    - type: Transform
+      pos: 11.399388,-16.363453
+      parent: 104
+  - uid: 2310
+    components:
+    - type: Transform
+      pos: 11.571263,-16.363453
+      parent: 104
+- proto: Grille
+  entities:
+  - uid: 95
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 104
+  - uid: 115
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 104
+  - uid: 118
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 104
+  - uid: 147
+    components:
+    - type: Transform
+      pos: 11.5,1.5
+      parent: 104
+  - uid: 231
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 104
+  - uid: 232
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 104
+  - uid: 233
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 104
+  - uid: 234
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 104
+  - uid: 303
+    components:
+    - type: Transform
+      pos: 16.5,-6.5
+      parent: 104
+  - uid: 304
+    components:
+    - type: Transform
+      pos: 16.5,-8.5
+      parent: 104
+  - uid: 526
+    components:
+    - type: Transform
+      pos: 0.5,21.5
+      parent: 104
+  - uid: 527
+    components:
+    - type: Transform
+      pos: 6.5,21.5
+      parent: 104
+  - uid: 528
+    components:
+    - type: Transform
+      pos: 1.5,21.5
+      parent: 104
+  - uid: 1034
+    components:
+    - type: Transform
+      pos: 5.5,21.5
+      parent: 104
+  - uid: 1112
+    components:
+    - type: Transform
+      pos: -1.5,-17.5
+      parent: 104
+  - uid: 1120
+    components:
+    - type: Transform
+      pos: 2.5,-15.5
+      parent: 104
+  - uid: 1121
+    components:
+    - type: Transform
+      pos: 2.5,-13.5
+      parent: 104
+  - uid: 1146
+    components:
+    - type: Transform
+      pos: -12.5,5.5
+      parent: 104
+  - uid: 1148
+    components:
+    - type: Transform
+      pos: -14.5,5.5
+      parent: 104
+  - uid: 1241
+    components:
+    - type: Transform
+      pos: 5.5,-9.5
+      parent: 104
+  - uid: 1243
+    components:
+    - type: Transform
+      pos: 7.5,-9.5
+      parent: 104
+  - uid: 1389
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 104
+  - uid: 1410
+    components:
+    - type: Transform
+      pos: 8.5,-17.5
+      parent: 104
+  - uid: 1823
+    components:
+    - type: Transform
+      pos: 8.5,20.5
+      parent: 104
+  - uid: 1824
+    components:
+    - type: Transform
+      pos: 4.5,21.5
+      parent: 104
+  - uid: 1831
+    components:
+    - type: Transform
+      pos: 8.5,21.5
+      parent: 104
+  - uid: 1832
+    components:
+    - type: Transform
+      pos: 3.5,21.5
+      parent: 104
+  - uid: 1840
+    components:
+    - type: Transform
+      pos: 11.5,-23.5
+      parent: 104
+  - uid: 1841
+    components:
+    - type: Transform
+      pos: 10.5,-23.5
+      parent: 104
+  - uid: 1847
+    components:
+    - type: Transform
+      pos: 12.5,-23.5
+      parent: 104
+  - uid: 1854
+    components:
+    - type: Transform
+      pos: 13.5,-23.5
+      parent: 104
+  - uid: 1860
+    components:
+    - type: Transform
+      pos: 14.5,-23.5
+      parent: 104
+  - uid: 1931
+    components:
+    - type: Transform
+      pos: 0.5,20.5
+      parent: 104
+  - uid: 1932
+    components:
+    - type: Transform
+      pos: 7.5,21.5
+      parent: 104
+  - uid: 1933
+    components:
+    - type: Transform
+      pos: 2.5,21.5
+      parent: 104
+  - uid: 2189
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 104
+  - uid: 2296
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 104
+  - uid: 2318
+    components:
+    - type: Transform
+      pos: 11.5,-8.5
+      parent: 104
+  - uid: 2319
+    components:
+    - type: Transform
+      pos: 11.5,-6.5
+      parent: 104
+- proto: KitchenKnife
+  entities:
+  - uid: 1061
+    components:
+    - type: Transform
+      pos: 18.918644,6.663283
+      parent: 104
+- proto: KitchenMicrowave
+  entities:
+  - uid: 10
+    components:
+    - type: Transform
+      pos: 13.5,-6.5
+      parent: 104
+- proto: KitchenReagentGrinder
+  entities:
+  - uid: 1257
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 104
+- proto: LargeBeaker
+  entities:
+  - uid: 2021
+    components:
+    - type: Transform
+      pos: 5.039936,-12.489611
+      parent: 104
+- proto: LightPostSmall
+  entities:
+  - uid: 221
+    components:
+    - type: Transform
+      pos: 15.5,16.5
+      parent: 104
+  - uid: 222
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,3.5
+      parent: 104
+  - uid: 291
+    components:
+    - type: Transform
+      pos: 17.5,3.5
+      parent: 104
+  - uid: 540
+    components:
+    - type: Transform
+      pos: 27.5,4.5
+      parent: 104
+  - uid: 541
+    components:
+    - type: Transform
+      pos: 18.5,8.5
+      parent: 104
+  - uid: 629
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,8.5
+      parent: 104
+  - uid: 1226
+    components:
+    - type: Transform
+      pos: -4.5,-0.5
+      parent: 104
+  - uid: 1276
+    components:
+    - type: Transform
+      pos: -34.5,4.5
+      parent: 104
+  - uid: 1279
+    components:
+    - type: Transform
+      pos: -35.5,-23.5
+      parent: 104
+  - uid: 1413
+    components:
+    - type: Transform
+      pos: 0.5,-22.5
+      parent: 104
+  - uid: 1668
+    components:
+    - type: Transform
+      pos: 5.5,17.5
+      parent: 104
+  - uid: 1669
+    components:
+    - type: Transform
+      pos: 10.5,11.5
+      parent: 104
+  - uid: 1671
+    components:
+    - type: Transform
+      pos: -3.5,17.5
+      parent: 104
+  - uid: 1675
+    components:
+    - type: Transform
+      pos: 10.5,2.5
+      parent: 104
+- proto: LockerSyndicatePersonalFilled
+  entities:
+  - uid: 178
+    components:
+    - type: Transform
+      pos: 9.5,-13.5
+      parent: 104
+  - uid: 196
+    components:
+    - type: Transform
+      pos: 11.5,-14.5
+      parent: 104
+  - uid: 197
+    components:
+    - type: Transform
+      pos: 11.5,-13.5
+      parent: 104
+  - uid: 198
+    components:
+    - type: Transform
+      pos: 9.5,-14.5
+      parent: 104
+  - uid: 1271
+    components:
+    - type: Transform
+      pos: 13.5,-13.5
+      parent: 104
+  - uid: 1375
+    components:
+    - type: Transform
+      pos: 13.5,-14.5
+      parent: 104
+  - uid: 2476
+    components:
+    - type: Transform
+      pos: 15.5,-6.5
+      parent: 104
+- proto: MachineCentrifuge
+  entities:
+  - uid: 1728
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 104
+- proto: MachineElectrolysisUnit
+  entities:
+  - uid: 1718
+    components:
+    - type: Transform
+      pos: 3.5,-12.5
+      parent: 104
+- proto: MagazinePistolSubMachineGunPractice
+  entities:
+  - uid: 1648
+    components:
+    - type: Transform
+      pos: 5.7430096,13.989216
+      parent: 104
+    - type: BallisticAmmoProvider
+      unspawnedCount: 35
+- proto: MedicalBed
+  entities:
+  - uid: 1868
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 104
+  - uid: 1874
+    components:
+    - type: Transform
+      pos: -1.5,-12.5
+      parent: 104
+  - uid: 1890
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 104
+  - uid: 1891
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 104
+- proto: MedkitAdvancedFilled
+  entities:
+  - uid: 447
+    components:
+    - type: Transform
+      pos: 7.5183387,-10.279964
+      parent: 104
+- proto: MedkitBruteFilled
+  entities:
+  - uid: 138
+    components:
+    - type: Transform
+      pos: 7.5183387,-10.576839
+      parent: 104
+- proto: MedkitBurnFilled
+  entities:
+  - uid: 1894
+    components:
+    - type: Transform
+      pos: 7.5339637,-10.889339
+      parent: 104
+- proto: MedkitFilled
+  entities:
+  - uid: 770
+    components:
+    - type: Transform
+      pos: 0.48478004,-16.399067
+      parent: 104
+- proto: MedkitOxygenFilled
+  entities:
+  - uid: 1895
+    components:
+    - type: Transform
+      pos: 7.5339637,-11.186214
+      parent: 104
+- proto: MedkitRadiationFilled
+  entities:
+  - uid: 448
+    components:
+    - type: Transform
+      pos: 7.5495887,-11.733089
+      parent: 104
+- proto: MedkitToxinFilled
+  entities:
+  - uid: 1388
+    components:
+    - type: Transform
+      pos: 7.5339637,-11.436214
+      parent: 104
+- proto: Mirror
+  entities:
+  - uid: 142
+    components:
+    - type: Transform
+      pos: 9.5,1.5
+      parent: 104
+  - uid: 146
+    components:
+    - type: Transform
+      pos: 10.5,1.5
+      parent: 104
+- proto: ModularGrenade
+  entities:
+  - uid: 1326
+    components:
+    - type: Transform
+      pos: 4.001747,-17.289776
+      parent: 104
+  - uid: 1328
+    components:
+    - type: Transform
+      pos: 4.204872,-17.508755
+      parent: 104
+- proto: MopBucket
+  entities:
+  - uid: 149
+    components:
+    - type: Transform
+      pos: 11.5,-3.5
+      parent: 104
+- proto: MopItem
+  entities:
+  - uid: 150
+    components:
+    - type: Transform
+      pos: 11.5,-3.5
+      parent: 104
+- proto: Multitool
+  entities:
+  - uid: 1555
+    components:
+    - type: Transform
+      pos: 11.895346,-10.413807
+      parent: 104
+- proto: NukeDiskFake
+  entities:
+  - uid: 282
+    components:
+    - type: Transform
+      pos: 12.149857,15.427643
+      parent: 104
+- proto: OperatingTable
+  entities:
+  - uid: 2435
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 104
+- proto: Paper
+  entities:
+  - uid: 612
+    components:
+    - type: Transform
+      pos: -14.166584,9.634687
+      parent: 104
+- proto: PartRodMetal
+  entities:
+  - uid: 2425
+    components:
+    - type: Transform
+      pos: 24.5,-16.5
+      parent: 104
+  - uid: 2426
+    components:
+    - type: Transform
+      pos: 24.5,-16.5
+      parent: 104
+- proto: PhoneInstrumentSyndicate
+  entities:
+  - uid: 1684
+    components:
+    - type: Transform
+      pos: 1.4424791,-6.340748
+      parent: 104
+- proto: PianoInstrument
+  entities:
+  - uid: 2430
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 104
+- proto: PlasmaReinforcedWindowDirectional
+  entities:
+  - uid: 1817
+    components:
+    - type: Transform
+      pos: 13.5,-18.5
+      parent: 104
+  - uid: 1818
+    components:
+    - type: Transform
+      pos: 12.5,-18.5
+      parent: 104
+  - uid: 1819
+    components:
+    - type: Transform
+      pos: 11.5,-18.5
+      parent: 104
+  - uid: 1858
+    components:
+    - type: Transform
+      pos: 14.5,-18.5
+      parent: 104
+- proto: PlushieBee
+  entities:
+  - uid: 2317
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 104
+- proto: PlushieLizard
+  entities:
+  - uid: 1266
+    components:
+    - type: Transform
+      pos: -15.435635,22.055351
+      parent: 104
+  - uid: 2315
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 104
+  - uid: 3367
+    components:
+    - type: Transform
+      pos: -4.605839,20.481245
+      parent: 104
+- proto: PlushieNuke
+  entities:
+  - uid: 163
+    components:
+    - type: Transform
+      pos: 1.8113766,-6.337348
+      parent: 104
+  - uid: 283
+    components:
+    - type: Transform
+      pos: 12.912951,15.575253
+      parent: 104
+- proto: PlushieRouny
+  entities:
+  - uid: 2316
+    components:
+    - type: Transform
+      pos: -1.5,-12.5
+      parent: 104
+- proto: PlushieVox
+  entities:
+  - uid: 2314
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 104
+- proto: PortableScrubber
+  entities:
+  - uid: 811
+    components:
+    - type: Transform
+      pos: 10.5,-10.5
+      parent: 104
+- proto: PosterBroken
+  entities:
+  - uid: 227
+    components:
+    - type: Transform
+      pos: -0.5,10.5
+      parent: 104
+- proto: PosterContrabandC20r
+  entities:
+  - uid: 1556
+    components:
+    - type: Transform
+      pos: 10.5,-9.5
+      parent: 104
+- proto: PosterContrabandClown
+  entities:
+  - uid: 1681
+    components:
+    - type: Transform
+      pos: 12.5,1.5
+      parent: 104
+- proto: PosterContrabandCybersun600
+  entities:
+  - uid: 2466
+    components:
+    - type: Transform
+      pos: 8.5,-9.5
+      parent: 104
+- proto: PosterContrabandDonk
+  entities:
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 12.5,-5.5
+      parent: 104
+  - uid: 2465
+    components:
+    - type: Transform
+      pos: -10.5,8.5
+      parent: 104
+- proto: PosterContrabandDonutCorp
+  entities:
+  - uid: 2450
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 104
+- proto: PosterContrabandEnergySwords
+  entities:
+  - uid: 1384
+    components:
+    - type: Transform
+      pos: 14.5,-9.5
+      parent: 104
+- proto: PosterContrabandEnlistGorlex
+  entities:
+  - uid: 2461
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 104
+- proto: PosterContrabandInterdyne
+  entities:
+  - uid: 2464
+    components:
+    - type: Transform
+      pos: 8.5,-12.5
+      parent: 104
+- proto: PosterContrabandLustyExomorph
+  entities:
+  - uid: 754
+    components:
+    - type: Transform
+      pos: -3.5,-13.5
+      parent: 104
+  - uid: 2447
+    components:
+    - type: Transform
+      pos: 15.5,-15.5
+      parent: 104
+- proto: PosterContrabandMoth
+  entities:
+  - uid: 2462
+    components:
+    - type: Transform
+      pos: 8.5,-2.5
+      parent: 104
+- proto: PosterContrabandNuclearDeviceInformational
+  entities:
+  - uid: 2298
+    components:
+    - type: Transform
+      pos: -1.5,-5.5
+      parent: 104
+- proto: PosterContrabandPower
+  entities:
+  - uid: 1563
+    components:
+    - type: Transform
+      pos: 19.5,-12.5
+      parent: 104
+- proto: PosterContrabandPunchShit
+  entities:
+  - uid: 2451
+    components:
+    - type: Transform
+      pos: 25.5,-12.5
+      parent: 104
+- proto: PosterContrabandRebelsUnite
+  entities:
+  - uid: 2446
+    components:
+    - type: Transform
+      pos: 8.5,-3.5
+      parent: 104
+- proto: PosterContrabandRedRum
+  entities:
+  - uid: 1387
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 104
+- proto: PosterContrabandRevolver
+  entities:
+  - uid: 2452
+    components:
+    - type: Transform
+      pos: -1.5,-7.5
+      parent: 104
+- proto: PosterContrabandRobustSoftdrinks
+  entities:
+  - uid: 1245
+    components:
+    - type: Transform
+      pos: -9.5,8.5
+      parent: 104
+- proto: PosterContrabandSyndicatePistol
+  entities:
+  - uid: 1386
+    components:
+    - type: Transform
+      pos: 12.5,-9.5
+      parent: 104
+- proto: PosterContrabandSyndicateRecruitment
+  entities:
+  - uid: 1242
+    components:
+    - type: Transform
+      pos: -15.5,7.5
+      parent: 104
+  - uid: 1561
+    components:
+    - type: Transform
+      pos: 16.5,-11.5
+      parent: 104
+  - uid: 2453
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 104
+  - uid: 2454
+    components:
+    - type: Transform
+      pos: 12.5,-15.5
+      parent: 104
+- proto: PosterContrabandTheBigGasTruth
+  entities:
+  - uid: 2455
+    components:
+    - type: Transform
+      pos: 10.5,-15.5
+      parent: 104
+- proto: PosterContrabandVoteWeh
+  entities:
+  - uid: 1113
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 104
+  - uid: 1227
+    components:
+    - type: Transform
+      pos: -17.5,24.5
+      parent: 104
+  - uid: 1228
+    components:
+    - type: Transform
+      pos: -16.5,24.5
+      parent: 104
+  - uid: 1229
+    components:
+    - type: Transform
+      pos: -15.5,24.5
+      parent: 104
+  - uid: 1230
+    components:
+    - type: Transform
+      pos: -14.5,24.5
+      parent: 104
+  - uid: 1231
+    components:
+    - type: Transform
+      pos: -13.5,24.5
+      parent: 104
+  - uid: 1248
+    components:
+    - type: Transform
+      pos: -12.5,24.5
+      parent: 104
+  - uid: 1251
+    components:
+    - type: Transform
+      pos: -12.5,23.5
+      parent: 104
+  - uid: 1252
+    components:
+    - type: Transform
+      pos: -12.5,22.5
+      parent: 104
+  - uid: 1253
+    components:
+    - type: Transform
+      pos: -12.5,21.5
+      parent: 104
+  - uid: 1254
+    components:
+    - type: Transform
+      pos: -12.5,20.5
+      parent: 104
+  - uid: 1255
+    components:
+    - type: Transform
+      pos: -12.5,19.5
+      parent: 104
+  - uid: 1256
+    components:
+    - type: Transform
+      pos: -13.5,19.5
+      parent: 104
+  - uid: 1258
+    components:
+    - type: Transform
+      pos: -14.5,19.5
+      parent: 104
+  - uid: 1259
+    components:
+    - type: Transform
+      pos: -15.5,19.5
+      parent: 104
+  - uid: 1260
+    components:
+    - type: Transform
+      pos: -16.5,19.5
+      parent: 104
+  - uid: 1261
+    components:
+    - type: Transform
+      pos: -17.5,19.5
+      parent: 104
+  - uid: 1262
+    components:
+    - type: Transform
+      pos: -17.5,20.5
+      parent: 104
+  - uid: 1263
+    components:
+    - type: Transform
+      pos: -17.5,21.5
+      parent: 104
+  - uid: 1264
+    components:
+    - type: Transform
+      pos: -17.5,22.5
+      parent: 104
+  - uid: 1265
+    components:
+    - type: Transform
+      pos: -17.5,23.5
+      parent: 104
+  - uid: 1565
+    components:
+    - type: Transform
+      pos: 12.5,-3.5
+      parent: 104
+- proto: PosterContrabandWaffleCorp
+  entities:
+  - uid: 2463
+    components:
+    - type: Transform
+      pos: 14.5,-2.5
+      parent: 104
+- proto: PosterLegitAnatomyPoster
+  entities:
+  - uid: 2320
+    components:
+    - type: Transform
+      pos: 2.5,-11.5
+      parent: 104
+- proto: PosterLegitCleanliness
+  entities:
+  - uid: 955
+    components:
+    - type: Transform
+      pos: 0.5,-11.5
+      parent: 104
+- proto: PosterLegitIan
+  entities:
+  - uid: 1551
+    components:
+    - type: Transform
+      pos: -0.5,12.5
+      parent: 104
+- proto: PosterLegitIonRifle
+  entities:
+  - uid: 1558
+    components:
+    - type: Transform
+      pos: 16.5,-14.5
+      parent: 104
+- proto: PosterLegitNanotrasenLogo
+  entities:
+  - uid: 237
+    components:
+    - type: Transform
+      pos: -0.5,14.5
+      parent: 104
+- proto: PosterMapSplit
+  entities:
+  - uid: 350
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 104
+- proto: PosterMapWaystation
+  entities:
+  - uid: 2449
+    components:
+    - type: Transform
+      pos: 10.5,-5.5
+      parent: 104
+- proto: PottedPlant24
+  entities:
+  - uid: 1143
+    components:
+    - type: Transform
+      pos: -14.5,7.5
+      parent: 104
+- proto: PottedPlantBioluminscent
+  entities:
+  - uid: 7
+    components:
+    - type: Transform
+      pos: 15.481667,-8.824032
+      parent: 104
+- proto: PottedPlantRandom
+  entities:
+  - uid: 1656
+    components:
+    - type: Transform
+      pos: 9.5,-1.5
+      parent: 104
+- proto: PottedPlantRandomPlastic
+  entities:
+  - uid: 1654
+    components:
+    - type: Transform
+      pos: 8.5,-6.5
+      parent: 104
+  - uid: 1655
+    components:
+    - type: Transform
+      pos: 5.5,-8.5
+      parent: 104
+- proto: Poweredlight
+  entities:
+  - uid: 1333
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-0.5
+      parent: 104
+- proto: PoweredLightPostSmall
+  entities:
+  - uid: 2525
+    components:
+    - type: Transform
+      pos: -10.5,0.5
+      parent: 104
+  - uid: 2527
+    components:
+    - type: Transform
+      pos: -31.5,0.5
+      parent: 104
+  - uid: 2528
+    components:
+    - type: Transform
+      pos: -27.5,0.5
+      parent: 104
+  - uid: 2529
+    components:
+    - type: Transform
+      pos: -23.5,0.5
+      parent: 104
+  - uid: 2530
+    components:
+    - type: Transform
+      pos: -19.5,0.5
+      parent: 104
+  - uid: 2531
+    components:
+    - type: Transform
+      pos: -15.5,0.5
+      parent: 104
+  - uid: 2532
+    components:
+    - type: Transform
+      pos: -10.5,-19.5
+      parent: 104
+  - uid: 2533
+    components:
+    - type: Transform
+      pos: -15.5,-19.5
+      parent: 104
+  - uid: 2534
+    components:
+    - type: Transform
+      pos: -19.5,-19.5
+      parent: 104
+  - uid: 2535
+    components:
+    - type: Transform
+      pos: -23.5,-19.5
+      parent: 104
+  - uid: 2536
+    components:
+    - type: Transform
+      pos: -27.5,-19.5
+      parent: 104
+  - uid: 2537
+    components:
+    - type: Transform
+      pos: -31.5,-19.5
+      parent: 104
+- proto: PoweredSmallLight
+  entities:
+  - uid: 23
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-1.5
+      parent: 104
+- proto: Rack
+  entities:
+  - uid: 472
+    components:
+    - type: Transform
+      pos: 11.5,-16.5
+      parent: 104
+  - uid: 1360
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 104
+- proto: Railing
+  entities:
+  - uid: 253
+    components:
+    - type: Transform
+      pos: -31.5,0.5
+      parent: 104
+  - uid: 446
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-6.5
+      parent: 104
+  - uid: 456
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-2.5
+      parent: 104
+  - uid: 457
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-3.5
+      parent: 104
+  - uid: 458
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-4.5
+      parent: 104
+  - uid: 459
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,5.5
+      parent: 104
+  - uid: 461
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-5.5
+      parent: 104
+  - uid: 481
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,6.5
+      parent: 104
+  - uid: 523
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -8.5,7.5
+      parent: 104
+  - uid: 585
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-22.5
+      parent: 104
+  - uid: 942
+    components:
+    - type: Transform
+      pos: -20.5,0.5
+      parent: 104
+  - uid: 956
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -34.5,1.5
+      parent: 104
+  - uid: 1080
+    components:
+    - type: Transform
+      pos: -34.5,-23.5
+      parent: 104
+  - uid: 1111
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-0.5
+      parent: 104
+  - uid: 1159
+    components:
+    - type: Transform
+      pos: -22.5,-23.5
+      parent: 104
+  - uid: 1301
+    components:
+    - type: Transform
+      pos: -28.5,-23.5
+      parent: 104
+  - uid: 1302
+    components:
+    - type: Transform
+      pos: -21.5,-23.5
+      parent: 104
+  - uid: 1303
+    components:
+    - type: Transform
+      pos: -26.5,-23.5
+      parent: 104
+  - uid: 1305
+    components:
+    - type: Transform
+      pos: -24.5,-23.5
+      parent: 104
+  - uid: 1306
+    components:
+    - type: Transform
+      pos: -20.5,-23.5
+      parent: 104
+  - uid: 1307
+    components:
+    - type: Transform
+      pos: -19.5,-23.5
+      parent: 104
+  - uid: 1308
+    components:
+    - type: Transform
+      pos: -18.5,-23.5
+      parent: 104
+  - uid: 1309
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,4.5
+      parent: 104
+  - uid: 1310
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,4.5
+      parent: 104
+  - uid: 1311
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -23.5,4.5
+      parent: 104
+  - uid: 1312
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,4.5
+      parent: 104
+  - uid: 1313
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -25.5,4.5
+      parent: 104
+  - uid: 1314
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,4.5
+      parent: 104
+  - uid: 1315
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,4.5
+      parent: 104
+  - uid: 1316
+    components:
+    - type: Transform
+      pos: -32.5,-23.5
+      parent: 104
+  - uid: 1317
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -29.5,4.5
+      parent: 104
+  - uid: 1319
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,4.5
+      parent: 104
+  - uid: 1323
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -34.5,3.5
+      parent: 104
+  - uid: 1352
+    components:
+    - type: Transform
+      pos: -23.5,-23.5
+      parent: 104
+  - uid: 1353
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -33.5,4.5
+      parent: 104
+  - uid: 1354
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -28.5,4.5
+      parent: 104
+  - uid: 1355
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,4.5
+      parent: 104
+  - uid: 1357
+    components:
+    - type: Transform
+      pos: -27.5,-23.5
+      parent: 104
+  - uid: 1373
+    components:
+    - type: Transform
+      pos: -31.5,-23.5
+      parent: 104
+  - uid: 1374
+    components:
+    - type: Transform
+      pos: -29.5,-23.5
+      parent: 104
+  - uid: 1378
+    components:
+    - type: Transform
+      pos: -25.5,-23.5
+      parent: 104
+  - uid: 1379
+    components:
+    - type: Transform
+      pos: -30.5,-23.5
+      parent: 104
+  - uid: 1414
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-1.5
+      parent: 104
+  - uid: 1432
+    components:
+    - type: Transform
+      pos: -33.5,-23.5
+      parent: 104
+  - uid: 1800
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-21.5
+      parent: 104
+  - uid: 1838
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-18.5
+      parent: 104
+  - uid: 1839
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-17.5
+      parent: 104
+  - uid: 1845
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-16.5
+      parent: 104
+  - uid: 1846
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-14.5
+      parent: 104
+  - uid: 1851
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-13.5
+      parent: 104
+  - uid: 1852
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-15.5
+      parent: 104
+  - uid: 1857
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-7.5
+      parent: 104
+  - uid: 1882
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,4.5
+      parent: 104
+  - uid: 1902
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,4.5
+      parent: 104
+  - uid: 1903
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -21.5,4.5
+      parent: 104
+  - uid: 1916
+    components:
+    - type: Transform
+      pos: -15.5,-23.5
+      parent: 104
+  - uid: 1917
+    components:
+    - type: Transform
+      pos: -14.5,-23.5
+      parent: 104
+  - uid: 1918
+    components:
+    - type: Transform
+      pos: -13.5,-23.5
+      parent: 104
+  - uid: 1919
+    components:
+    - type: Transform
+      pos: -12.5,-23.5
+      parent: 104
+  - uid: 1920
+    components:
+    - type: Transform
+      pos: -11.5,-23.5
+      parent: 104
+  - uid: 1921
+    components:
+    - type: Transform
+      pos: -17.5,-23.5
+      parent: 104
+  - uid: 1922
+    components:
+    - type: Transform
+      pos: -16.5,-23.5
+      parent: 104
+  - uid: 1945
+    components:
+    - type: Transform
+      pos: -10.5,-23.5
+      parent: 104
+  - uid: 1946
+    components:
+    - type: Transform
+      pos: -9.5,-23.5
+      parent: 104
+  - uid: 1951
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -34.5,2.5
+      parent: 104
+  - uid: 2045
+    components:
+    - type: Transform
+      pos: -32.5,0.5
+      parent: 104
+  - uid: 2083
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-9.5
+      parent: 104
+  - uid: 2089
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-12.5
+      parent: 104
+  - uid: 2097
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-8.5
+      parent: 104
+  - uid: 2126
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-10.5
+      parent: 104
+  - uid: 2135
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-11.5
+      parent: 104
+  - uid: 2482
+    components:
+    - type: Transform
+      pos: -30.5,0.5
+      parent: 104
+  - uid: 2483
+    components:
+    - type: Transform
+      pos: -28.5,0.5
+      parent: 104
+  - uid: 2484
+    components:
+    - type: Transform
+      pos: -27.5,0.5
+      parent: 104
+  - uid: 2485
+    components:
+    - type: Transform
+      pos: -26.5,0.5
+      parent: 104
+  - uid: 2486
+    components:
+    - type: Transform
+      pos: -24.5,0.5
+      parent: 104
+  - uid: 2487
+    components:
+    - type: Transform
+      pos: -23.5,0.5
+      parent: 104
+  - uid: 2488
+    components:
+    - type: Transform
+      pos: -22.5,0.5
+      parent: 104
+  - uid: 2489
+    components:
+    - type: Transform
+      pos: -19.5,0.5
+      parent: 104
+  - uid: 2490
+    components:
+    - type: Transform
+      pos: -18.5,0.5
+      parent: 104
+  - uid: 2491
+    components:
+    - type: Transform
+      pos: -16.5,0.5
+      parent: 104
+  - uid: 2492
+    components:
+    - type: Transform
+      pos: -15.5,0.5
+      parent: 104
+  - uid: 2493
+    components:
+    - type: Transform
+      pos: -14.5,0.5
+      parent: 104
+  - uid: 2494
+    components:
+    - type: Transform
+      pos: -12.5,0.5
+      parent: 104
+  - uid: 2495
+    components:
+    - type: Transform
+      pos: -11.5,0.5
+      parent: 104
+  - uid: 2497
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -11.5,-19.5
+      parent: 104
+  - uid: 2498
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -12.5,-19.5
+      parent: 104
+  - uid: 2499
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -14.5,-19.5
+      parent: 104
+  - uid: 2500
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -15.5,-19.5
+      parent: 104
+  - uid: 2501
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -16.5,-19.5
+      parent: 104
+  - uid: 2502
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -18.5,-19.5
+      parent: 104
+  - uid: 2503
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,-19.5
+      parent: 104
+  - uid: 2504
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -20.5,-19.5
+      parent: 104
+  - uid: 2506
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -22.5,-19.5
+      parent: 104
+  - uid: 2509
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -23.5,-19.5
+      parent: 104
+  - uid: 2510
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -24.5,-19.5
+      parent: 104
+  - uid: 2511
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -26.5,-19.5
+      parent: 104
+  - uid: 2512
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -27.5,-19.5
+      parent: 104
+  - uid: 2513
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -28.5,-19.5
+      parent: 104
+  - uid: 2516
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-19.5
+      parent: 104
+  - uid: 2517
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -31.5,-19.5
+      parent: 104
+  - uid: 2518
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -32.5,-19.5
+      parent: 104
+  - uid: 2519
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -34.5,-19.5
+      parent: 104
+  - uid: 2520
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-20.5
+      parent: 104
+- proto: RailingCorner
+  entities:
+  - uid: 1790
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -35.5,-23.5
+      parent: 104
+  - uid: 1950
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -34.5,4.5
+      parent: 104
+  - uid: 2496
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -34.5,0.5
+      parent: 104
+  - uid: 2522
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -35.5,-19.5
+      parent: 104
+- proto: RailingCornerSmall
+  entities:
+  - uid: 1285
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-23.5
+      parent: 104
+  - uid: 1761
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,8.5
+      parent: 104
+  - uid: 1869
+    components:
+    - type: Transform
+      pos: -8.5,-24.5
+      parent: 104
+  - uid: 1873
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-24.5
+      parent: 104
+  - uid: 1883
+    components:
+    - type: Transform
+      pos: -18.5,4.5
+      parent: 104
+  - uid: 2523
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,0.5
+      parent: 104
+  - uid: 2524
+    components:
+    - type: Transform
+      pos: -10.5,-19.5
+      parent: 104
+- proto: ReinforcedPlasmaWindow
+  entities:
+  - uid: 1842
+    components:
+    - type: Transform
+      pos: 12.5,-23.5
+      parent: 104
+  - uid: 1848
+    components:
+    - type: Transform
+      pos: 14.5,-23.5
+      parent: 104
+  - uid: 1849
+    components:
+    - type: Transform
+      pos: 11.5,-23.5
+      parent: 104
+  - uid: 1853
+    components:
+    - type: Transform
+      pos: 13.5,-23.5
+      parent: 104
+  - uid: 1855
+    components:
+    - type: Transform
+      pos: 10.5,-23.5
+      parent: 104
+- proto: ReinforcedWindow
+  entities:
+  - uid: 52
+    components:
+    - type: Transform
+      pos: 16.5,-6.5
+      parent: 104
+  - uid: 73
+    components:
+    - type: Transform
+      pos: 11.5,1.5
+      parent: 104
+  - uid: 89
+    components:
+    - type: Transform
+      pos: 7.5,-9.5
+      parent: 104
+  - uid: 99
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 104
+  - uid: 103
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 104
+  - uid: 127
+    components:
+    - type: Transform
+      pos: 11.5,-8.5
+      parent: 104
+  - uid: 128
+    components:
+    - type: Transform
+      pos: 11.5,-6.5
+      parent: 104
+  - uid: 129
+    components:
+    - type: Transform
+      pos: 16.5,-8.5
+      parent: 104
+  - uid: 155
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 104
+  - uid: 223
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 104
+  - uid: 224
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 104
+  - uid: 353
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 104
+  - uid: 498
+    components:
+    - type: Transform
+      pos: -1.5,-17.5
+      parent: 104
+  - uid: 530
+    components:
+    - type: Transform
+      pos: 8.5,20.5
+      parent: 104
+  - uid: 649
+    components:
+    - type: Transform
+      pos: -12.5,5.5
+      parent: 104
+  - uid: 1037
+    components:
+    - type: Transform
+      pos: 1.5,21.5
+      parent: 104
+  - uid: 1038
+    components:
+    - type: Transform
+      pos: 6.5,21.5
+      parent: 104
+  - uid: 1039
+    components:
+    - type: Transform
+      pos: 8.5,21.5
+      parent: 104
+  - uid: 1040
+    components:
+    - type: Transform
+      pos: 7.5,21.5
+      parent: 104
+  - uid: 1102
+    components:
+    - type: Transform
+      pos: 8.5,-17.5
+      parent: 104
+  - uid: 1103
+    components:
+    - type: Transform
+      pos: 2.5,21.5
+      parent: 104
+  - uid: 1118
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 104
+  - uid: 1142
+    components:
+    - type: Transform
+      pos: -14.5,5.5
+      parent: 104
+  - uid: 1186
+    components:
+    - type: Transform
+      pos: 2.5,-15.5
+      parent: 104
+  - uid: 1196
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 104
+  - uid: 1198
+    components:
+    - type: Transform
+      pos: 2.5,-13.5
+      parent: 104
+  - uid: 1382
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 104
+  - uid: 1385
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 104
+  - uid: 1820
+    components:
+    - type: Transform
+      pos: 5.5,21.5
+      parent: 104
+  - uid: 1821
+    components:
+    - type: Transform
+      pos: 0.5,21.5
+      parent: 104
+  - uid: 1828
+    components:
+    - type: Transform
+      pos: 4.5,21.5
+      parent: 104
+  - uid: 1829
+    components:
+    - type: Transform
+      pos: 0.5,20.5
+      parent: 104
+  - uid: 1929
+    components:
+    - type: Transform
+      pos: 3.5,21.5
+      parent: 104
+  - uid: 2081
+    components:
+    - type: Transform
+      pos: 5.5,-9.5
+      parent: 104
+- proto: RemoteSignaller
+  entities:
+  - uid: 1322
+    components:
+    - type: Transform
+      pos: 5.611122,-17.316748
+      parent: 104
+  - uid: 1332
+    components:
+    - type: Transform
+      pos: 5.267372,-17.316748
+      parent: 104
+- proto: Screwdriver
+  entities:
+  - uid: 1325
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.954872,-17.44188
+      parent: 104
+- proto: SheetGlass
+  entities:
+  - uid: 2421
+    components:
+    - type: Transform
+      pos: 20.5,-16.5
+      parent: 104
+  - uid: 2422
+    components:
+    - type: Transform
+      pos: 20.5,-16.5
+      parent: 104
+- proto: SheetPlasteel
+  entities:
+  - uid: 2423
+    components:
+    - type: Transform
+      pos: 24.5,-15.5
+      parent: 104
+  - uid: 2424
+    components:
+    - type: Transform
+      pos: 24.5,-15.5
+      parent: 104
+- proto: SheetPlastic
+  entities:
+  - uid: 460
+    components:
+    - type: Transform
+      pos: 12.60107,-16.44067
+      parent: 104
+- proto: SheetSteel
+  entities:
+  - uid: 286
+    components:
+    - type: Transform
+      pos: 13.50732,-16.456295
+      parent: 104
+  - uid: 1350
+    components:
+    - type: Transform
+      pos: 3.460312,-15.657375
+      parent: 104
+  - uid: 2419
+    components:
+    - type: Transform
+      pos: 20.5,-15.5
+      parent: 104
+  - uid: 2420
+    components:
+    - type: Transform
+      pos: 20.5,-15.5
+      parent: 104
+- proto: SignalTrigger
+  entities:
+  - uid: 1330
+    components:
+    - type: Transform
+      pos: 3.6284866,-16.955233
+      parent: 104
+  - uid: 1331
+    components:
+    - type: Transform
+      pos: 3.3003616,-17.06472
+      parent: 104
+- proto: SignDirectionalBar
+  entities:
+  - uid: 2297
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 104
+- proto: SignEscapePods
+  entities:
+  - uid: 1737
+    components:
+    - type: MetaData
+      desc: steel rain babey
+      name: drop pod sign
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,-8.5
+      parent: 104
+- proto: SignMedical
+  entities:
+  - uid: 351
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 104
+- proto: SignSurgery
+  entities:
+  - uid: 266
+    components:
+    - type: Transform
+      pos: 2.5,-12.5
+      parent: 104
+- proto: SignToxins2
+  entities:
+  - uid: 1318
+    components:
+    - type: Transform
+      pos: 8.5,-15.5
+      parent: 104
+- proto: SinkStemlessWater
+  entities:
+  - uid: 22
+    components:
+    - type: Transform
+      pos: 15.5,-1.5
+      parent: 104
+- proto: SinkWide
+  entities:
+  - uid: 144
+    components:
+    - type: Transform
+      pos: 9.5,0.5
+      parent: 104
+  - uid: 145
+    components:
+    - type: Transform
+      pos: 10.5,0.5
+      parent: 104
+  - uid: 1246
+    components:
+    - type: Transform
+      pos: 9.5,-3.5
+      parent: 104
+  - uid: 1358
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 104
+  - uid: 2311
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-7.5
+      parent: 104
+- proto: SmallLight
+  entities:
+  - uid: 484
+    components:
+    - type: Transform
+      pos: -12.5,7.5
+      parent: 104
+  - uid: 1024
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-6.5
+      parent: 104
+  - uid: 1141
+    components:
+    - type: Transform
+      pos: -13.5,9.5
+      parent: 104
+  - uid: 1766
+    components:
+    - type: Transform
+      pos: 11.5,-16.5
+      parent: 104
+- proto: SMESBasic
+  entities:
+  - uid: 2331
+    components:
+    - type: Transform
+      pos: 21.5,-18.5
+      parent: 104
+  - uid: 2332
+    components:
+    - type: Transform
+      pos: 22.5,-18.5
+      parent: 104
+  - uid: 2333
+    components:
+    - type: Transform
+      pos: 23.5,-18.5
+      parent: 104
+- proto: soda_dispenser
+  entities:
+  - uid: 225
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-8.5
+      parent: 104
+- proto: SpaceVillainArcadeFilled
+  entities:
+  - uid: 1652
+    components:
+    - type: Transform
+      pos: 10.5,-6.5
+      parent: 104
+  - uid: 1653
+    components:
+    - type: Transform
+      pos: 9.5,-6.5
+      parent: 104
+- proto: SpawnMobLizard
+  entities:
+  - uid: 2473
+    components:
+    - type: Transform
+      pos: 5.5,-1.5
+      parent: 104
+- proto: SpawnPointNukies
+  entities:
+  - uid: 167
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 104
+  - uid: 172
+    components:
+    - type: Transform
+      pos: 3.5,-7.5
+      parent: 104
+  - uid: 173
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 104
+  - uid: 2477
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 104
+  - uid: 2478
+    components:
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 104
+  - uid: 2479
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 104
+  - uid: 2480
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 104
+- proto: Spear
+  entities:
+  - uid: 3366
+    components:
+    - type: Transform
+      pos: -5.3505287,20.508072
+      parent: 104
+- proto: SprayBottle
+  entities:
+  - uid: 1699
+    components:
+    - type: Transform
+      pos: 14.060668,-16.439913
+      parent: 104
+- proto: StasisBed
+  entities:
+  - uid: 1130
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 104
+- proto: Stool
+  entities:
+  - uid: 156
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-3.5
+      parent: 104
+  - uid: 158
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 104
+  - uid: 164
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-3.5
+      parent: 104
+  - uid: 166
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 104
+  - uid: 169
+    components:
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 104
+  - uid: 194
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-13.5
+      parent: 104
+  - uid: 195
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-14.5
+      parent: 104
+  - uid: 200
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-14.5
+      parent: 104
+  - uid: 507
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-1.5
+      parent: 104
+  - uid: 1334
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-1.5
+      parent: 104
+  - uid: 1369
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-13.5
+      parent: 104
+  - uid: 1371
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-13.5
+      parent: 104
+  - uid: 1372
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-14.5
+      parent: 104
+- proto: StoolBar
+  entities:
+  - uid: 1
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 104
+  - uid: 2
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 104
+  - uid: 3
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 104
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 104
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 104
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 4.5,-5.5
+      parent: 104
+- proto: SubstationBasic
+  entities:
+  - uid: 2366
+    components:
+    - type: Transform
+      pos: 27.5,-13.5
+      parent: 104
+- proto: SurveillanceCameraGeneral
+  entities:
+  - uid: 85
+    components:
+    - type: Transform
+      pos: 1.5,-8.5
+      parent: 104
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Bar
+  - uid: 1144
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-16.5
+      parent: 104
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Dock
+  - uid: 1185
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -10.5,7.5
+      parent: 104
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Surveillance Shack
+  - uid: 1268
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-12.5
+      parent: 104
+  - uid: 1269
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-12.5
+      parent: 104
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Medbay
+  - uid: 1270
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-12.5
+      parent: 104
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Chem and Bombs
+  - uid: 1272
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-0.5
+      parent: 104
+  - uid: 1274
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-2.5
+      parent: 104
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
+      nameSet: True
+      id: Entrance
+  - uid: 1320
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-4.5
+      parent: 104
+  - uid: 1321
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-3.5
+      parent: 104
+- proto: SurveillanceCameraRouterGeneral
+  entities:
+  - uid: 620
+    components:
+    - type: Transform
+      pos: -15.5,9.5
+      parent: 104
+- proto: SurveillanceCameraWirelessRouterEntertainment
+  entities:
+  - uid: 978
+    components:
+    - type: Transform
+      pos: -15.5,8.5
+      parent: 104
+- proto: SurveillanceWirelessCameraAnchoredEntertainment
+  entities:
+  - uid: 1023
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,21.5
+      parent: 104
+    - type: SurveillanceCamera
+      setupAvailableNetworks:
+      - SurveillanceCameraEntertainment
+      nameSet: True
+      id: Weeh
+- proto: SyndicatePersonalAI
+  entities:
+  - uid: 160
+    components:
+    - type: Transform
+      pos: 1.4711013,-3.6405277
+      parent: 104
+- proto: SyndieFlag
+  entities:
+  - uid: 819
+    components:
+    - type: Transform
+      pos: 11.5,-9.5
+      parent: 104
+- proto: SyndieHandyFlag
+  entities:
+  - uid: 1810
+    components:
+    - type: Transform
+      pos: 3.5076954,-6.413422
+      parent: 104
+- proto: SyringeInaprovaline
+  entities:
+  - uid: 1151
+    components:
+    - type: Transform
+      pos: -2.530845,-12.414692
+      parent: 104
+- proto: Table
+  entities:
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 12.5,-6.5
+      parent: 104
+  - uid: 107
+    components:
+    - type: Transform
+      pos: 7.5,-4.5
+      parent: 104
+  - uid: 1090
+    components:
+    - type: Transform
+      pos: 7.5,-11.5
+      parent: 104
+  - uid: 1193
+    components:
+    - type: Transform
+      pos: 7.5,-12.5
+      parent: 104
+  - uid: 1300
+    components:
+    - type: Transform
+      pos: 7.5,-10.5
+      parent: 104
+  - uid: 1813
+    components:
+    - type: Transform
+      pos: 12.5,-16.5
+      parent: 104
+  - uid: 1814
+    components:
+    - type: Transform
+      pos: 13.5,-16.5
+      parent: 104
+  - uid: 1815
+    components:
+    - type: Transform
+      pos: 14.5,-16.5
+      parent: 104
+  - uid: 1859
+    components:
+    - type: Transform
+      pos: 14.5,-17.5
+      parent: 104
+  - uid: 2321
+    components:
+    - type: Transform
+      pos: 13.5,-6.5
+      parent: 104
+- proto: TableCarpet
+  entities:
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 13.5,-8.5
+      parent: 104
+- proto: TableGlass
+  entities:
+  - uid: 980
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 104
+  - uid: 1125
+    components:
+    - type: Transform
+      pos: -2.5,-12.5
+      parent: 104
+  - uid: 2090
+    components:
+    - type: Transform
+      pos: 0.5,-16.5
+      parent: 104
+  - uid: 2092
+    components:
+    - type: Transform
+      pos: 0.5,-12.5
+      parent: 104
+- proto: TablePlasmaGlass
+  entities:
+  - uid: 2411
+    components:
+    - type: Transform
+      pos: 20.5,-16.5
+      parent: 104
+  - uid: 2412
+    components:
+    - type: Transform
+      pos: 20.5,-15.5
+      parent: 104
+  - uid: 2413
+    components:
+    - type: Transform
+      pos: 24.5,-16.5
+      parent: 104
+  - uid: 2414
+    components:
+    - type: Transform
+      pos: 24.5,-15.5
+      parent: 104
+  - uid: 2431
+    components:
+    - type: Transform
+      pos: 17.5,-16.5
+      parent: 104
+  - uid: 2432
+    components:
+    - type: Transform
+      pos: 17.5,-15.5
+      parent: 104
+  - uid: 2433
+    components:
+    - type: Transform
+      pos: 27.5,-16.5
+      parent: 104
+  - uid: 2434
+    components:
+    - type: Transform
+      pos: 27.5,-15.5
+      parent: 104
+- proto: TableReinforced
+  entities:
+  - uid: 201
+    components:
+    - type: Transform
+      pos: 13.5,-10.5
+      parent: 104
+  - uid: 202
+    components:
+    - type: Transform
+      pos: 12.5,-10.5
+      parent: 104
+  - uid: 203
+    components:
+    - type: Transform
+      pos: 14.5,-10.5
+      parent: 104
+  - uid: 208
+    components:
+    - type: Transform
+      pos: 11.5,-10.5
+      parent: 104
+  - uid: 226
+    components:
+    - type: Transform
+      pos: 5.5,10.5
+      parent: 104
+  - uid: 229
+    components:
+    - type: Transform
+      pos: 5.5,11.5
+      parent: 104
+  - uid: 239
+    components:
+    - type: Transform
+      pos: 5.5,13.5
+      parent: 104
+  - uid: 241
+    components:
+    - type: Transform
+      pos: 5.5,14.5
+      parent: 104
+  - uid: 285
+    components:
+    - type: Transform
+      pos: 5.5,12.5
+      parent: 104
+  - uid: 697
+    components:
+    - type: Transform
+      pos: -13.5,5.5
+      parent: 104
+  - uid: 1129
+    components:
+    - type: Transform
+      pos: -14.5,9.5
+      parent: 104
+  - uid: 1149
+    components:
+    - type: Transform
+      pos: -13.5,9.5
+      parent: 104
+- proto: TableReinforcedGlass
+  entities:
+  - uid: 838
+    components:
+    - type: Transform
+      pos: 5.5,-17.5
+      parent: 104
+  - uid: 975
+    components:
+    - type: Transform
+      pos: 4.5,-17.5
+      parent: 104
+  - uid: 976
+    components:
+    - type: Transform
+      pos: 3.5,-17.5
+      parent: 104
+  - uid: 1192
+    components:
+    - type: Transform
+      pos: 3.5,-16.5
+      parent: 104
+  - uid: 1351
+    components:
+    - type: Transform
+      pos: 3.5,-15.5
+      parent: 104
+  - uid: 1739
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 104
+  - uid: 2016
+    components:
+    - type: Transform
+      pos: 4.5,-12.5
+      parent: 104
+  - uid: 2022
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 104
+  - uid: 2027
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 104
+  - uid: 2028
+    components:
+    - type: Transform
+      pos: 3.5,-12.5
+      parent: 104
+- proto: TableWood
+  entities:
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 104
+  - uid: 28
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-8.5
+      parent: 104
+  - uid: 30
+    components:
+    - type: Transform
+      pos: 3.5,-8.5
+      parent: 104
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 4.5,-8.5
+      parent: 104
+  - uid: 32
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-6.5
+      parent: 104
+  - uid: 33
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-6.5
+      parent: 104
+  - uid: 34
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-6.5
+      parent: 104
+  - uid: 35
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-6.5
+      parent: 104
+  - uid: 36
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-6.5
+      parent: 104
+  - uid: 37
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-6.5
+      parent: 104
+  - uid: 159
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 104
+  - uid: 162
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 104
+  - uid: 355
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 104
+- proto: TargetClown
+  entities:
+  - uid: 1291
+    components:
+    - type: Transform
+      pos: 0.5,12.5
+      parent: 104
+- proto: TargetHuman
+  entities:
+  - uid: 1293
+    components:
+    - type: Transform
+      pos: 0.5,14.5
+      parent: 104
+  - uid: 2308
+    components:
+    - type: Transform
+      pos: 12.5,-21.5
+      parent: 104
+- proto: TargetStrange
+  entities:
+  - uid: 1294
+    components:
+    - type: Transform
+      pos: 0.5,10.5
+      parent: 104
+- proto: TearGasGrenade
+  entities:
+  - uid: 306
+    components:
+    - type: Transform
+      pos: 14.638793,-16.908663
+      parent: 104
+  - uid: 1703
+    components:
+    - type: Transform
+      pos: 14.341918,-16.877413
+      parent: 104
+- proto: Telecrystal1
+  entities:
+  - uid: 2474
+    components:
+    - type: Transform
+      pos: 2.9398513,-3.4842777
+      parent: 104
+- proto: TimerTrigger
+  entities:
+  - uid: 1225
+    components:
+    - type: Transform
+      pos: 3.7048721,-16.445147
+      parent: 104
+  - uid: 1329
+    components:
+    - type: Transform
+      pos: 3.3003616,-16.470352
+      parent: 104
+- proto: ToiletEmpty
+  entities:
+  - uid: 293
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-1.5
+      parent: 104
+- proto: ToolboxElectricalFilled
+  entities:
+  - uid: 206
+    components:
+    - type: Transform
+      pos: 13.241143,-10.4236145
+      parent: 104
+- proto: ToolboxEmergencyFilled
+  entities:
+  - uid: 1368
+    components:
+    - type: Transform
+      pos: -2.4700382,-4.362167
+      parent: 104
+- proto: ToolboxSyndicateFilled
+  entities:
+  - uid: 205
+    components:
+    - type: Transform
+      pos: 12.366143,-10.392332
+      parent: 104
+- proto: ToyFigurineCaptain
+  entities:
+  - uid: 2470
+    components:
+    - type: Transform
+      pos: 2.5657434,-3.260709
+      parent: 104
+- proto: ToyFigurineNukie
+  entities:
+  - uid: 14
+    components:
+    - type: Transform
+      pos: 3.4242263,-2.6717777
+      parent: 104
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 3.5492263,-2.4374027
+      parent: 104
+  - uid: 2468
+    components:
+    - type: Transform
+      pos: 3.6429763,-2.6717777
+      parent: 104
+- proto: ToyFigurineNukieCommander
+  entities:
+  - uid: 2471
+    components:
+    - type: Transform
+      pos: 3.1898513,-2.9530277
+      parent: 104
+- proto: ToyFigurineNukieElite
+  entities:
+  - uid: 2467
+    components:
+    - type: Transform
+      pos: 3.1117263,-2.6874027
+      parent: 104
+- proto: ToyMauler
+  entities:
+  - uid: 2469
+    components:
+    - type: Transform
+      pos: 3.0179763,-2.3124027
+      parent: 104
+- proto: ToyNuke
+  entities:
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 4.4214306,-6.3946886
+      parent: 104
+  - uid: 284
+    components:
+    - type: Transform
+      pos: 12.453509,14.985125
+      parent: 104
+- proto: ToySkeleton
+  entities:
+  - uid: 17
+    components:
+    - type: Transform
+      pos: 3.5882664,-8.344303
+      parent: 104
+- proto: VariantCubeBox
+  entities:
+  - uid: 1826
+    components:
+    - type: Transform
+      pos: 14.485744,-16.427467
+      parent: 104
+- proto: VendingMachineBooze
+  entities:
+  - uid: 1380
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 104
+- proto: VendingMachineChang
+  entities:
+  - uid: 1208
+    components:
+    - type: Transform
+      pos: -10.5,7.5
+      parent: 104
+- proto: VendingMachineChemicalsSyndicate
+  entities:
+  - uid: 1335
+    components:
+    - type: Transform
+      pos: 4.5,-10.5
+      parent: 104
+- proto: VendingMachineCigs
+  entities:
+  - uid: 117
+    components:
+    - type: MetaData
+      name: cigarette machine
+    - type: Transform
+      pos: 7.5,0.5
+      parent: 104
+- proto: VendingMachineClothing
+  entities:
+  - uid: 1617
+    components:
+    - type: Transform
+      pos: 13.5,0.5
+      parent: 104
+- proto: VendingMachineCola
+  entities:
+  - uid: 116
+    components:
+    - type: Transform
+      pos: 5.5,0.5
+      parent: 104
+  - uid: 1244
+    components:
+    - type: Transform
+      pos: -9.5,7.5
+      parent: 104
+- proto: VendingMachineSnack
+  entities:
+  - uid: 2442
+    components:
+    - type: Transform
+      pos: 6.5,0.5
+      parent: 104
+- proto: VendingMachineSyndieDrobe
+  entities:
+  - uid: 1299
+    components:
+    - type: Transform
+      pos: 11.5,0.5
+      parent: 104
+- proto: VendingMachineTheater
+  entities:
+  - uid: 1680
+    components:
+    - type: Transform
+      pos: 12.5,0.5
+      parent: 104
+- proto: VendingMachineYouTool
+  entities:
+  - uid: 204
+    components:
+    - type: Transform
+      pos: 15.5,-10.5
+      parent: 104
+- proto: WallIce
+  entities:
+  - uid: 236
+    components:
+    - type: Transform
+      pos: -0.5,12.5
+      parent: 104
+  - uid: 356
+    components:
+    - type: Transform
+      pos: -6.5,21.5
+      parent: 104
+  - uid: 357
+    components:
+    - type: Transform
+      pos: -3.5,21.5
+      parent: 104
+  - uid: 416
+    components:
+    - type: Transform
+      pos: -4.5,21.5
+      parent: 104
+  - uid: 727
+    components:
+    - type: Transform
+      pos: -6.5,19.5
+      parent: 104
+  - uid: 1132
+    components:
+    - type: Transform
+      pos: -4.5,22.5
+      parent: 104
+  - uid: 1133
+    components:
+    - type: Transform
+      pos: -5.5,22.5
+      parent: 104
+  - uid: 1134
+    components:
+    - type: Transform
+      pos: -6.5,22.5
+      parent: 104
+  - uid: 1221
+    components:
+    - type: Transform
+      pos: -6.5,20.5
+      parent: 104
+  - uid: 1549
+    components:
+    - type: Transform
+      pos: -0.5,10.5
+      parent: 104
+  - uid: 1670
+    components:
+    - type: Transform
+      pos: -0.5,14.5
+      parent: 104
+- proto: WallmountTelevision
+  entities:
+  - uid: 977
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 104
+- proto: WallPlastitanium
+  entities:
+  - uid: 38
+    components:
+    - type: Transform
+      pos: 12.5,-4.5
+      parent: 104
+  - uid: 39
+    components:
+    - type: Transform
+      pos: 12.5,-3.5
+      parent: 104
+  - uid: 40
+    components:
+    - type: Transform
+      pos: 9.5,-5.5
+      parent: 104
+  - uid: 41
+    components:
+    - type: Transform
+      pos: 10.5,-5.5
+      parent: 104
+  - uid: 42
+    components:
+    - type: Transform
+      pos: 11.5,-5.5
+      parent: 104
+  - uid: 43
+    components:
+    - type: Transform
+      pos: 12.5,-5.5
+      parent: 104
+  - uid: 44
+    components:
+    - type: Transform
+      pos: 12.5,-5.5
+      parent: 104
+  - uid: 45
+    components:
+    - type: Transform
+      pos: 16.5,-5.5
+      parent: 104
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 20.5,-2.5
+      parent: 104
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 22.5,-2.5
+      parent: 104
+  - uid: 50
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-12.5
+      parent: 104
+  - uid: 51
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 19.5,-12.5
+      parent: 104
+  - uid: 53
+    components:
+    - type: Transform
+      pos: 17.5,-2.5
+      parent: 104
+  - uid: 54
+    components:
+    - type: Transform
+      pos: 18.5,-2.5
+      parent: 104
+  - uid: 57
+    components:
+    - type: Transform
+      pos: 13.5,-5.5
+      parent: 104
+  - uid: 59
+    components:
+    - type: Transform
+      pos: 8.5,-5.5
+      parent: 104
+  - uid: 60
+    components:
+    - type: Transform
+      pos: 8.5,-4.5
+      parent: 104
+  - uid: 61
+    components:
+    - type: Transform
+      pos: 8.5,-3.5
+      parent: 104
+  - uid: 62
+    components:
+    - type: Transform
+      pos: 12.5,-9.5
+      parent: 104
+  - uid: 63
+    components:
+    - type: Transform
+      pos: 11.5,-9.5
+      parent: 104
+  - uid: 64
+    components:
+    - type: Transform
+      pos: 10.5,-9.5
+      parent: 104
+  - uid: 66
+    components:
+    - type: Transform
+      pos: 8.5,-1.5
+      parent: 104
+  - uid: 67
+    components:
+    - type: Transform
+      pos: 8.5,-2.5
+      parent: 104
+  - uid: 68
+    components:
+    - type: Transform
+      pos: 9.5,-2.5
+      parent: 104
+  - uid: 69
+    components:
+    - type: Transform
+      pos: 11.5,-2.5
+      parent: 104
+  - uid: 70
+    components:
+    - type: Transform
+      pos: 14.5,1.5
+      parent: 104
+  - uid: 71
+    components:
+    - type: Transform
+      pos: 13.5,1.5
+      parent: 104
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 12.5,1.5
+      parent: 104
+  - uid: 74
+    components:
+    - type: Transform
+      pos: 10.5,1.5
+      parent: 104
+  - uid: 75
+    components:
+    - type: Transform
+      pos: 9.5,1.5
+      parent: 104
+  - uid: 76
+    components:
+    - type: Transform
+      pos: 8.5,0.5
+      parent: 104
+  - uid: 77
+    components:
+    - type: Transform
+      pos: 8.5,1.5
+      parent: 104
+  - uid: 78
+    components:
+    - type: Transform
+      pos: 7.5,1.5
+      parent: 104
+  - uid: 79
+    components:
+    - type: Transform
+      pos: 8.5,-11.5
+      parent: 104
+  - uid: 80
+    components:
+    - type: Transform
+      pos: 8.5,-9.5
+      parent: 104
+  - uid: 82
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 104
+  - uid: 83
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 104
+  - uid: 84
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 104
+  - uid: 86
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 104
+  - uid: 87
+    components:
+    - type: Transform
+      pos: 3.5,-9.5
+      parent: 104
+  - uid: 88
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 104
+  - uid: 90
+    components:
+    - type: Transform
+      pos: -1.5,-8.5
+      parent: 104
+  - uid: 91
+    components:
+    - type: Transform
+      pos: -1.5,-7.5
+      parent: 104
+  - uid: 92
+    components:
+    - type: Transform
+      pos: -1.5,-6.5
+      parent: 104
+  - uid: 93
+    components:
+    - type: Transform
+      pos: -1.5,-5.5
+      parent: 104
+  - uid: 94
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 104
+  - uid: 97
+    components:
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 104
+  - uid: 98
+    components:
+    - type: Transform
+      pos: 5.5,1.5
+      parent: 104
+  - uid: 101
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 104
+  - uid: 102
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 104
+  - uid: 105
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 104
+  - uid: 106
+    components:
+    - type: Transform
+      pos: 14.5,0.5
+      parent: 104
+  - uid: 110
+    components:
+    - type: Transform
+      pos: 12.5,-2.5
+      parent: 104
+  - uid: 113
+    components:
+    - type: Transform
+      pos: 8.5,-10.5
+      parent: 104
+  - uid: 114
+    components:
+    - type: Transform
+      pos: 16.5,-1.5
+      parent: 104
+  - uid: 119
+    components:
+    - type: Transform
+      pos: 24.5,-2.5
+      parent: 104
+  - uid: 121
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,-12.5
+      parent: 104
+  - uid: 123
+    components:
+    - type: Transform
+      pos: 21.5,-2.5
+      parent: 104
+  - uid: 124
+    components:
+    - type: Transform
+      pos: 19.5,-2.5
+      parent: 104
+  - uid: 125
+    components:
+    - type: Transform
+      pos: 16.5,-3.5
+      parent: 104
+  - uid: 126
+    components:
+    - type: Transform
+      pos: 16.5,-4.5
+      parent: 104
+  - uid: 132
+    components:
+    - type: Transform
+      pos: 23.5,-2.5
+      parent: 104
+  - uid: 133
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 104
+  - uid: 137
+    components:
+    - type: Transform
+      pos: 8.5,-12.5
+      parent: 104
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 14.5,-9.5
+      parent: 104
+  - uid: 171
+    components:
+    - type: Transform
+      pos: 13.5,-9.5
+      parent: 104
+  - uid: 174
+    components:
+    - type: Transform
+      pos: 15.5,-9.5
+      parent: 104
+  - uid: 175
+    components:
+    - type: Transform
+      pos: 16.5,-9.5
+      parent: 104
+  - uid: 176
+    components:
+    - type: Transform
+      pos: 15.5,-5.5
+      parent: 104
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 8.5,-13.5
+      parent: 104
+  - uid: 179
+    components:
+    - type: Transform
+      pos: 8.5,-14.5
+      parent: 104
+  - uid: 180
+    components:
+    - type: Transform
+      pos: 8.5,-15.5
+      parent: 104
+  - uid: 181
+    components:
+    - type: Transform
+      pos: 9.5,-15.5
+      parent: 104
+  - uid: 182
+    components:
+    - type: Transform
+      pos: 10.5,-15.5
+      parent: 104
+  - uid: 183
+    components:
+    - type: Transform
+      pos: 11.5,-15.5
+      parent: 104
+  - uid: 184
+    components:
+    - type: Transform
+      pos: 12.5,-15.5
+      parent: 104
+  - uid: 185
+    components:
+    - type: Transform
+      pos: 13.5,-15.5
+      parent: 104
+  - uid: 186
+    components:
+    - type: Transform
+      pos: 14.5,-15.5
+      parent: 104
+  - uid: 187
+    components:
+    - type: Transform
+      pos: 15.5,-15.5
+      parent: 104
+  - uid: 188
+    components:
+    - type: Transform
+      pos: 16.5,-15.5
+      parent: 104
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 16.5,-14.5
+      parent: 104
+  - uid: 191
+    components:
+    - type: Transform
+      pos: 16.5,-12.5
+      parent: 104
+  - uid: 192
+    components:
+    - type: Transform
+      pos: 16.5,-11.5
+      parent: 104
+  - uid: 193
+    components:
+    - type: Transform
+      pos: 16.5,-10.5
+      parent: 104
+  - uid: 199
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-17.5
+      parent: 104
+  - uid: 215
+    components:
+    - type: Transform
+      pos: 16.5,-0.5
+      parent: 104
+  - uid: 242
+    components:
+    - type: Transform
+      pos: -4.5,-5.5
+      parent: 104
+  - uid: 252
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 104
+  - uid: 288
+    components:
+    - type: Transform
+      pos: 14.5,-0.5
+      parent: 104
+  - uid: 290
+    components:
+    - type: Transform
+      pos: 15.5,-0.5
+      parent: 104
+  - uid: 298
+    components:
+    - type: Transform
+      pos: 13.5,-2.5
+      parent: 104
+  - uid: 299
+    components:
+    - type: Transform
+      pos: 14.5,-2.5
+      parent: 104
+  - uid: 300
+    components:
+    - type: Transform
+      pos: 15.5,-2.5
+      parent: 104
+  - uid: 301
+    components:
+    - type: Transform
+      pos: 16.5,-2.5
+      parent: 104
+  - uid: 307
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,-8.5
+      parent: 104
+  - uid: 308
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,-10.5
+      parent: 104
+  - uid: 309
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-11.5
+      parent: 104
+  - uid: 310
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-12.5
+      parent: 104
+  - uid: 311
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 24.5,-12.5
+      parent: 104
+  - uid: 312
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,-12.5
+      parent: 104
+  - uid: 313
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,-12.5
+      parent: 104
+  - uid: 314
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 22.5,-12.5
+      parent: 104
+  - uid: 315
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-12.5
+      parent: 104
+  - uid: 316
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 23.5,-6.5
+      parent: 104
+  - uid: 317
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,-4.5
+      parent: 104
+  - uid: 318
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 17.5,-6.5
+      parent: 104
+  - uid: 319
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,-4.5
+      parent: 104
+  - uid: 320
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 17.5,-8.5
+      parent: 104
+  - uid: 321
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 21.5,-10.5
+      parent: 104
+  - uid: 322
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-7.5
+      parent: 104
+  - uid: 339
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-10.5
+      parent: 104
+  - uid: 340
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-9.5
+      parent: 104
+  - uid: 341
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-8.5
+      parent: 104
+  - uid: 342
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-7.5
+      parent: 104
+  - uid: 343
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-6.5
+      parent: 104
+  - uid: 344
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-5.5
+      parent: 104
+  - uid: 345
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-4.5
+      parent: 104
+  - uid: 346
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-3.5
+      parent: 104
+  - uid: 347
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-2.5
+      parent: 104
+  - uid: 378
+    components:
+    - type: Transform
+      pos: -3.5,-16.5
+      parent: 104
+  - uid: 379
+    components:
+    - type: Transform
+      pos: -3.5,-13.5
+      parent: 104
+  - uid: 380
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-11.5
+      parent: 104
+  - uid: 418
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -12.5,8.5
+      parent: 104
+  - uid: 424
+    components:
+    - type: Transform
+      pos: -10.5,8.5
+      parent: 104
+  - uid: 427
+    components:
+    - type: Transform
+      pos: -1.5,-9.5
+      parent: 104
+  - uid: 441
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 104
+  - uid: 443
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 104
+  - uid: 462
+    components:
+    - type: Transform
+      pos: -5.5,-5.5
+      parent: 104
+  - uid: 463
+    components:
+    - type: Transform
+      pos: -4.5,-1.5
+      parent: 104
+  - uid: 474
+    components:
+    - type: Transform
+      pos: -5.5,-1.5
+      parent: 104
+  - uid: 482
+    components:
+    - type: Transform
+      pos: -9.5,8.5
+      parent: 104
+  - uid: 486
+    components:
+    - type: Transform
+      pos: -16.5,8.5
+      parent: 104
+  - uid: 493
+    components:
+    - type: Transform
+      pos: -3.5,-12.5
+      parent: 104
+  - uid: 495
+    components:
+    - type: Transform
+      pos: -2.5,-5.5
+      parent: 104
+  - uid: 497
+    components:
+    - type: Transform
+      pos: -2.5,-17.5
+      parent: 104
+  - uid: 591
+    components:
+    - type: Transform
+      pos: 15.5,-23.5
+      parent: 104
+  - uid: 592
+    components:
+    - type: Transform
+      pos: 9.5,-20.5
+      parent: 104
+  - uid: 593
+    components:
+    - type: Transform
+      pos: 9.5,-22.5
+      parent: 104
+  - uid: 594
+    components:
+    - type: Transform
+      pos: 9.5,-18.5
+      parent: 104
+  - uid: 611
+    components:
+    - type: Transform
+      pos: -5.5,-6.5
+      parent: 104
+  - uid: 613
+    components:
+    - type: Transform
+      pos: -13.5,19.5
+      parent: 104
+  - uid: 623
+    components:
+    - type: Transform
+      pos: -17.5,19.5
+      parent: 104
+  - uid: 651
+    components:
+    - type: Transform
+      pos: -17.5,23.5
+      parent: 104
+  - uid: 671
+    components:
+    - type: Transform
+      pos: -12.5,24.5
+      parent: 104
+  - uid: 675
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -12.5,9.5
+      parent: 104
+  - uid: 683
+    components:
+    - type: Transform
+      pos: -15.5,10.5
+      parent: 104
+  - uid: 698
+    components:
+    - type: Transform
+      pos: -14.5,10.5
+      parent: 104
+  - uid: 710
+    components:
+    - type: Transform
+      pos: -13.5,10.5
+      parent: 104
+  - uid: 730
+    components:
+    - type: Transform
+      pos: -12.5,10.5
+      parent: 104
+  - uid: 731
+    components:
+    - type: Transform
+      pos: -12.5,22.5
+      parent: 104
+  - uid: 732
+    components:
+    - type: Transform
+      pos: -15.5,19.5
+      parent: 104
+  - uid: 739
+    components:
+    - type: Transform
+      pos: -17.5,21.5
+      parent: 104
+  - uid: 743
+    components:
+    - type: Transform
+      pos: -16.5,9.5
+      parent: 104
+  - uid: 744
+    components:
+    - type: Transform
+      pos: -16.5,7.5
+      parent: 104
+  - uid: 750
+    components:
+    - type: Transform
+      pos: -3.5,-14.5
+      parent: 104
+  - uid: 767
+    components:
+    - type: Transform
+      pos: -16.5,10.5
+      parent: 104
+  - uid: 773
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-11.5
+      parent: 104
+  - uid: 1025
+    components:
+    - type: Transform
+      pos: 3.5,-18.5
+      parent: 104
+  - uid: 1026
+    components:
+    - type: Transform
+      pos: 4.5,-18.5
+      parent: 104
+  - uid: 1091
+    components:
+    - type: Transform
+      pos: -5.5,-2.5
+      parent: 104
+  - uid: 1104
+    components:
+    - type: Transform
+      pos: 9.5,-19.5
+      parent: 104
+  - uid: 1110
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 104
+  - uid: 1123
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-11.5
+      parent: 104
+  - uid: 1126
+    components:
+    - type: Transform
+      pos: -17.5,22.5
+      parent: 104
+  - uid: 1128
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -11.5,8.5
+      parent: 104
+  - uid: 1136
+    components:
+    - type: Transform
+      pos: -11.5,5.5
+      parent: 104
+  - uid: 1137
+    components:
+    - type: Transform
+      pos: -15.5,7.5
+      parent: 104
+  - uid: 1138
+    components:
+    - type: Transform
+      pos: -15.5,6.5
+      parent: 104
+  - uid: 1139
+    components:
+    - type: Transform
+      pos: -15.5,5.5
+      parent: 104
+  - uid: 1147
+    components:
+    - type: Transform
+      pos: -11.5,7.5
+      parent: 104
+  - uid: 1181
+    components:
+    - type: Transform
+      pos: 2.5,-16.5
+      parent: 104
+  - uid: 1184
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-11.5
+      parent: 104
+  - uid: 1188
+    components:
+    - type: Transform
+      pos: 2.5,-18.5
+      parent: 104
+  - uid: 1190
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-11.5
+      parent: 104
+  - uid: 1197
+    components:
+    - type: Transform
+      pos: 7.5,-18.5
+      parent: 104
+  - uid: 1199
+    components:
+    - type: Transform
+      pos: 5.5,-18.5
+      parent: 104
+  - uid: 1201
+    components:
+    - type: Transform
+      pos: 6.5,-18.5
+      parent: 104
+  - uid: 1205
+    components:
+    - type: Transform
+      pos: 2.5,-17.5
+      parent: 104
+  - uid: 1206
+    components:
+    - type: Transform
+      pos: 8.5,-18.5
+      parent: 104
+  - uid: 1207
+    components:
+    - type: Transform
+      pos: -17.5,24.5
+      parent: 104
+  - uid: 1209
+    components:
+    - type: Transform
+      pos: -17.5,20.5
+      parent: 104
+  - uid: 1210
+    components:
+    - type: Transform
+      pos: -14.5,19.5
+      parent: 104
+  - uid: 1211
+    components:
+    - type: Transform
+      pos: -12.5,23.5
+      parent: 104
+  - uid: 1212
+    components:
+    - type: Transform
+      pos: -16.5,19.5
+      parent: 104
+  - uid: 1213
+    components:
+    - type: Transform
+      pos: -12.5,19.5
+      parent: 104
+  - uid: 1214
+    components:
+    - type: Transform
+      pos: -16.5,24.5
+      parent: 104
+  - uid: 1215
+    components:
+    - type: Transform
+      pos: -12.5,20.5
+      parent: 104
+  - uid: 1216
+    components:
+    - type: Transform
+      pos: -15.5,24.5
+      parent: 104
+  - uid: 1218
+    components:
+    - type: Transform
+      pos: -14.5,24.5
+      parent: 104
+  - uid: 1219
+    components:
+    - type: Transform
+      pos: -12.5,21.5
+      parent: 104
+  - uid: 1220
+    components:
+    - type: Transform
+      pos: -13.5,24.5
+      parent: 104
+  - uid: 1381
+    components:
+    - type: Transform
+      pos: 16.5,-16.5
+      parent: 104
+  - uid: 1409
+    components:
+    - type: Transform
+      pos: 9.5,-21.5
+      parent: 104
+  - uid: 1411
+    components:
+    - type: Transform
+      pos: 9.5,-23.5
+      parent: 104
+  - uid: 1412
+    components:
+    - type: Transform
+      pos: 15.5,-16.5
+      parent: 104
+  - uid: 1426
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 104
+  - uid: 1783
+    components:
+    - type: Transform
+      pos: -3.5,-11.5
+      parent: 104
+  - uid: 1784
+    components:
+    - type: Transform
+      pos: -3.5,-17.5
+      parent: 104
+  - uid: 1811
+    components:
+    - type: Transform
+      pos: 15.5,-19.5
+      parent: 104
+  - uid: 1833
+    components:
+    - type: Transform
+      pos: 15.5,-17.5
+      parent: 104
+  - uid: 1834
+    components:
+    - type: Transform
+      pos: 15.5,-18.5
+      parent: 104
+  - uid: 1843
+    components:
+    - type: Transform
+      pos: 15.5,-22.5
+      parent: 104
+  - uid: 1850
+    components:
+    - type: Transform
+      pos: 15.5,-21.5
+      parent: 104
+  - uid: 1856
+    components:
+    - type: Transform
+      pos: 15.5,-20.5
+      parent: 104
+  - uid: 1861
+    components:
+    - type: Transform
+      pos: 26.5,-12.5
+      parent: 104
+  - uid: 1862
+    components:
+    - type: Transform
+      pos: 27.5,-12.5
+      parent: 104
+  - uid: 1863
+    components:
+    - type: Transform
+      pos: 28.5,-12.5
+      parent: 104
+  - uid: 1864
+    components:
+    - type: Transform
+      pos: 28.5,-14.5
+      parent: 104
+  - uid: 1866
+    components:
+    - type: Transform
+      pos: 28.5,-13.5
+      parent: 104
+  - uid: 1871
+    components:
+    - type: Transform
+      pos: 28.5,-19.5
+      parent: 104
+  - uid: 1876
+    components:
+    - type: Transform
+      pos: 28.5,-15.5
+      parent: 104
+  - uid: 1881
+    components:
+    - type: Transform
+      pos: 28.5,-16.5
+      parent: 104
+  - uid: 1885
+    components:
+    - type: Transform
+      pos: 28.5,-17.5
+      parent: 104
+  - uid: 1889
+    components:
+    - type: Transform
+      pos: 28.5,-18.5
+      parent: 104
+  - uid: 1893
+    components:
+    - type: Transform
+      pos: 28.5,-20.5
+      parent: 104
+  - uid: 1897
+    components:
+    - type: Transform
+      pos: 27.5,-20.5
+      parent: 104
+  - uid: 1901
+    components:
+    - type: Transform
+      pos: 26.5,-20.5
+      parent: 104
+  - uid: 1905
+    components:
+    - type: Transform
+      pos: 18.5,-20.5
+      parent: 104
+  - uid: 1906
+    components:
+    - type: Transform
+      pos: 17.5,-20.5
+      parent: 104
+  - uid: 1907
+    components:
+    - type: Transform
+      pos: 16.5,-20.5
+      parent: 104
+  - uid: 1908
+    components:
+    - type: Transform
+      pos: 16.5,-19.5
+      parent: 104
+  - uid: 1914
+    components:
+    - type: Transform
+      pos: 25.5,-20.5
+      parent: 104
+  - uid: 1915
+    components:
+    - type: Transform
+      pos: 16.5,-17.5
+      parent: 104
+  - uid: 1943
+    components:
+    - type: Transform
+      pos: 24.5,-20.5
+      parent: 104
+  - uid: 1944
+    components:
+    - type: Transform
+      pos: 16.5,-18.5
+      parent: 104
+  - uid: 1968
+    components:
+    - type: Transform
+      pos: 23.5,-20.5
+      parent: 104
+  - uid: 1969
+    components:
+    - type: Transform
+      pos: 22.5,-20.5
+      parent: 104
+  - uid: 1970
+    components:
+    - type: Transform
+      pos: 21.5,-20.5
+      parent: 104
+  - uid: 1971
+    components:
+    - type: Transform
+      pos: 20.5,-20.5
+      parent: 104
+  - uid: 1972
+    components:
+    - type: Transform
+      pos: 19.5,-20.5
+      parent: 104
+  - uid: 2017
+    components:
+    - type: Transform
+      pos: 2.5,-10.5
+      parent: 104
+  - uid: 2018
+    components:
+    - type: Transform
+      pos: 2.5,-11.5
+      parent: 104
+  - uid: 2019
+    components:
+    - type: Transform
+      pos: 2.5,-12.5
+      parent: 104
+  - uid: 2299
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 104
+  - uid: 2300
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 104
+- proto: WallPlastitaniumDiagonal
+  entities:
+  - uid: 323
+    components:
+    - type: Transform
+      pos: 18.5,-4.5
+      parent: 104
+  - uid: 324
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 22.5,-5.5
+      parent: 104
+  - uid: 325
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 23.5,-9.5
+      parent: 104
+  - uid: 338
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-9.5
+      parent: 104
+  - uid: 348
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,-9.5
+      parent: 104
+  - uid: 650
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,-10.5
+      parent: 104
+  - uid: 1088
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 18.5,-5.5
+      parent: 104
+  - uid: 1089
+    components:
+    - type: Transform
+      pos: 17.5,-5.5
+      parent: 104
+  - uid: 1119
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,-10.5
+      parent: 104
+  - uid: 1689
+    components:
+    - type: Transform
+      pos: 22.5,-9.5
+      parent: 104
+  - uid: 1690
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,-5.5
+      parent: 104
+  - uid: 1697
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-4.5
+      parent: 104
+- proto: WaterTankFull
+  entities:
+  - uid: 1547
+    components:
+    - type: Transform
+      pos: 11.5,-4.5
+      parent: 104
+- proto: WeaponPistolCobra
+  entities:
+  - uid: 1705
+    components:
+    - type: Transform
+      pos: 5.4793262,12.166912
+      parent: 104
+- proto: WeaponShotgunSawn
+  entities:
+  - uid: 228
+    components:
+    - type: Transform
+      pos: 5.347948,13.528896
+      parent: 104
+    - type: BallisticAmmoProvider
+      unspawnedCount: 2
+- proto: WeaponSprayNozzle
+  entities:
+  - uid: 152
+    components:
+    - type: Transform
+      pos: 9.67418,-4.571714
+      parent: 104
+- proto: WeaponSubMachineGunC20r
+  entities:
+  - uid: 1704
+    components:
+    - type: Transform
+      pos: 5.497257,12.817707
+      parent: 104
+- proto: WelderIndustrial
+  entities:
+  - uid: 207
+    components:
+    - type: Transform
+      pos: 14.5,-10.5
+      parent: 104
+- proto: Windoor
+  entities:
+  - uid: 27
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-7.5
+      parent: 104
+- proto: WindoorSecure
+  entities:
+  - uid: 1145
+    components:
+    - type: Transform
+      pos: -13.5,5.5
+      parent: 104
+  - uid: 1827
+    components:
+    - type: Transform
+      pos: 10.5,-18.5
+      parent: 104
+- proto: WindowReinforcedDirectional
+  entities:
+  - uid: 766
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-12.5
+      parent: 104
+  - uid: 1135
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-16.5
+      parent: 104
+  - uid: 1217
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,9.5
+      parent: 104
+  - uid: 1247
+    components:
+    - type: Transform
+      pos: 4.5,-12.5
+      parent: 104
+  - uid: 1370
+    components:
+    - type: Transform
+      pos: 3.5,-12.5
+      parent: 104
+  - uid: 2082
+    components:
+    - type: Transform
+      pos: 7.5,15.5
+      parent: 104
+  - uid: 2182
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-12.5
+      parent: 104
+  - uid: 2258
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 104
+  - uid: 2290
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,9.5
+      parent: 104
+  - uid: 2293
+    components:
+    - type: Transform
+      pos: 5.5,15.5
+      parent: 104
+  - uid: 2294
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-10.5
+      parent: 104
+...
diff --git a/Resources/Maps/Ruins/old_ai_sat.yml b/Resources/Maps/Ruins/old_ai_sat.yml
index 4ff3d5e37a..38be5e939c 100644
--- a/Resources/Maps/Ruins/old_ai_sat.yml
+++ b/Resources/Maps/Ruins/old_ai_sat.yml
@@ -4,11 +4,11 @@ meta:
 tilemap:
   0: Space
   29: FloorDark
-  89: FloorSteel
-  93: FloorSteelDamaged
-  120: Lattice
-  121: Plating
-  124: PlatingDamaged
+  91: FloorSteel
+  95: FloorSteelDamaged
+  123: Lattice
+  124: Plating
+  127: PlatingDamaged
 entities:
 - proto: ""
   entities:
@@ -23,47 +23,47 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAACWQAAAAADWQAAAAABWQAAAAABWQAAAAABeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAADWQAAAAACWQAAAAACWQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAADWQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAABWQAAAAADWQAAAAAAWQAAAAABWQAAAAACWQAAAAACWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAXQAAAAAAWQAAAAACeQAAAAAAWQAAAAABXQAAAAAEWQAAAAADeQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAXQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAADWQAAAAACXQAAAAADXQAAAAABWQAAAAACXQAAAAACWQAAAAACeQAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAABHQAAAAAAHQAAAAABHQAAAAACHQAAAAACWQAAAAACWQAAAAACWQAAAAAAWQAAAAADWQAAAAACWQAAAAABWQAAAAABHQAAAAACHQAAAAADHQAAAAACHQAAAAACAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAABWQAAAAAAXQAAAAAEWQAAAAABWQAAAAAAXQAAAAABWQAAAAABeQAAAAAAAAAAAAAAeAAAAAAAHQAAAAABeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAHQAAAAAAHQAAAAABHQAAAAABHQAAAAACHQAAAAABHQAAAAACHQAAAAAAHQAAAAACHQAAAAADeQAAAAAAHQAAAAACAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAABHQAAAAABHQAAAAABeQAAAAAAHQAAAAACHQAAAAAAHQAAAAABHQAAAAABeQAAAAAAeQAAAAAA
+          tiles: fAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABWwAAAAAAWwAAAAACWwAAAAADWwAAAAABWwAAAAABWwAAAAABfAAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABWwAAAAADWwAAAAACWwAAAAACWwAAAAAAWwAAAAAAWwAAAAABfAAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAWwAAAAACWwAAAAADWwAAAAAAWwAAAAABWwAAAAABfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAWwAAAAABWwAAAAABfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAWwAAAAABWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACWwAAAAABWwAAAAADWwAAAAAAWwAAAAABWwAAAAACWwAAAAACWwAAAAADWwAAAAABfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAXwAAAAAAWwAAAAACfAAAAAAAWwAAAAABXwAAAAAEWwAAAAADfAAAAAAAWwAAAAADWwAAAAACfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXwAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAWwAAAAADWwAAAAACXwAAAAADXwAAAAABWwAAAAACXwAAAAACWwAAAAACfAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAABHQAAAAAAHQAAAAABHQAAAAACHQAAAAACWwAAAAACWwAAAAACWwAAAAAAWwAAAAADWwAAAAACWwAAAAABWwAAAAABHQAAAAACHQAAAAADHQAAAAACHQAAAAACAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAWwAAAAABWwAAAAAAXwAAAAAEWwAAAAABWwAAAAAAXwAAAAABWwAAAAABfAAAAAAAAAAAAAAAewAAAAAAHQAAAAABewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAADAAAAAAAAfAAAAAAAfAAAAAAAHQAAAAACfAAAAAAAHQAAAAAAHQAAAAABHQAAAAABHQAAAAACHQAAAAABHQAAAAACHQAAAAAAHQAAAAACHQAAAAADfAAAAAAAHQAAAAACAAAAAAAAfAAAAAAAfAAAAAAAHQAAAAADHQAAAAABHQAAAAABHQAAAAABHQAAAAABfAAAAAAAHQAAAAACHQAAAAAAHQAAAAABHQAAAAABfAAAAAAAfAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAABHQAAAAADeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAABWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAABWQAAAAACWQAAAAABWQAAAAADWQAAAAADWQAAAAABeQAAAAAAeAAAAAAAeAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAfAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAHQAAAAABHQAAAAADfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAWwAAAAABWwAAAAAAWwAAAAABWwAAAAACWwAAAAACfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACWwAAAAABWwAAAAACWwAAAAABWwAAAAADWwAAAAADWwAAAAABfAAAAAAAewAAAAAAewAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAA
           version: 6
         1,0:
           ind: 1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAACHQAAAAABAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAHQAAAAADeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAHQAAAAACAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAHQAAAAACAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAHQAAAAAAAAAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAACHQAAAAABAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAfAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAewAAAAAAHQAAAAADewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAHQAAAAACAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAHQAAAAACAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAAAAAAAAAHQAAAAAAAAAAAAAAfAAAAAAAWwAAAAADWwAAAAAAWwAAAAACfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,1:
           ind: 0,1
-          tiles: HQAAAAABAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAADHQAAAAACeQAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAADHQAAAAABHQAAAAACeQAAAAAAHQAAAAABeAAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAADHQAAAAADeQAAAAAAfAAAAAAAfAAAAAAAeQAAAAAAHQAAAAACHQAAAAACHQAAAAADeQAAAAAAHQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAABHQAAAAABHQAAAAACfAAAAAACeQAAAAAAHQAAAAAAHQAAAAACHQAAAAABHQAAAAAAeQAAAAAAHQAAAAADeAAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAABHQAAAAADeQAAAAAAHQAAAAADHQAAAAADHQAAAAADHQAAAAAAHQAAAAABeQAAAAAAHQAAAAACeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACeQAAAAAAHQAAAAABHQAAAAADHQAAAAAAHQAAAAABHQAAAAACHQAAAAACeQAAAAAAeQAAAAAAHQAAAAABeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABeQAAAAAAHQAAAAACeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAACWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAAAWQAAAAABWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAACWQAAAAADWQAAAAABWQAAAAACWQAAAAADWQAAAAAAeQAAAAAAWQAAAAADWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAWQAAAAADWQAAAAAAWQAAAAACWQAAAAADWQAAAAABWQAAAAABeQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAA
+          tiles: HQAAAAABAAAAAAAAfAAAAAAAfAAAAAAAHQAAAAACHQAAAAADHQAAAAACfAAAAAAAHQAAAAAAfAAAAAAAHQAAAAAAHQAAAAADHQAAAAADHQAAAAABHQAAAAACfAAAAAAAHQAAAAABewAAAAAAfAAAAAAAfAAAAAAAHQAAAAADHQAAAAAAHQAAAAADHQAAAAADfAAAAAAAfwAAAAAAfwAAAAAAfAAAAAAAHQAAAAACHQAAAAACHQAAAAADfAAAAAAAHQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHQAAAAABHQAAAAACHQAAAAABHQAAAAABHQAAAAACfwAAAAACfAAAAAAAHQAAAAAAHQAAAAACHQAAAAABHQAAAAAAfAAAAAAAHQAAAAADewAAAAAAfAAAAAAAfAAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAABHQAAAAADfAAAAAAAHQAAAAADHQAAAAADHQAAAAADHQAAAAAAHQAAAAABfAAAAAAAHQAAAAACewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAHQAAAAACfAAAAAAAHQAAAAABHQAAAAADHQAAAAAAHQAAAAABHQAAAAACHQAAAAACfAAAAAAAfAAAAAAAHQAAAAABewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAACHQAAAAABfAAAAAAAHQAAAAACewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAWwAAAAAAWwAAAAABWwAAAAACWwAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAAAWwAAAAABWwAAAAAAWwAAAAACWwAAAAAAWwAAAAAAWwAAAAADfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADewAAAAAAewAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAWwAAAAACWwAAAAADWwAAAAABWwAAAAACWwAAAAADWwAAAAAAfAAAAAAAWwAAAAADWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAWwAAAAADWwAAAAAAWwAAAAACWwAAAAADWwAAAAABWwAAAAABfAAAAAAAWwAAAAAAWwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAfAAAAAAAWwAAAAAAWwAAAAADWwAAAAADWwAAAAAAWwAAAAAAWwAAAAAAfAAAAAAAWwAAAAACWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAA
           version: 6
         1,1:
           ind: 1,1
-          tiles: eQAAAAAAAAAAAAAAHQAAAAADAAAAAAAAeQAAAAAAWQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAHQAAAAABHQAAAAACHQAAAAADWQAAAAACWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAHQAAAAAAAAAAAAAAeQAAAAAAWQAAAAACWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAHQAAAAABAAAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAHQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAHQAAAAADAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAHQAAAAADeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAABWQAAAAACWQAAAAABWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAABWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAABWQAAAAACWQAAAAAAWQAAAAACXQAAAAADXQAAAAAEeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAAAWQAAAAAAXQAAAAACXQAAAAACXQAAAAADfAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWQAAAAABWQAAAAABXQAAAAAEXQAAAAAAfAAAAAACfAAAAAABeAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fAAAAAAAAAAAAAAAHQAAAAADAAAAAAAAfAAAAAAAWwAAAAAAWwAAAAABWwAAAAABfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAewAAAAAAHQAAAAABHQAAAAACHQAAAAADWwAAAAACWwAAAAABWwAAAAADfAAAAAAAfAAAAAAAewAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAewAAAAAAHQAAAAAAAAAAAAAAfAAAAAAAWwAAAAACWwAAAAADWwAAAAABfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAewAAAAAAHQAAAAABAAAAAAAAfAAAAAAAWwAAAAABWwAAAAAAWwAAAAACfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAewAAAAAAHQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAfAAAAAAAewAAAAAAewAAAAAAAAAAAAAAfAAAAAAAewAAAAAAHQAAAAADAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAewAAAAAAHQAAAAADewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAADWwAAAAABWwAAAAACWwAAAAABWwAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAAAWwAAAAAAWwAAAAABWwAAAAAAWwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAACWwAAAAAAWwAAAAACXwAAAAADXwAAAAAEfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAADWwAAAAAAWwAAAAAAXwAAAAACXwAAAAACXwAAAAADfwAAAAAAfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAABXwAAAAAEXwAAAAAAfwAAAAACfwAAAAABewAAAAAAfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,1:
           ind: -1,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,2:
           ind: 0,2
-          tiles: eAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: ewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAewAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -2,0:
           ind: -2,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -2,1:
           ind: -2,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         2,0:
           ind: 2,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -525,28 +525,13 @@ entities:
   - uid: 676
     components:
     - type: Transform
-      pos: 9.5,1.5
+      pos: 14.5,23.5
       parent: 1
   - uid: 677
     components:
     - type: Transform
       pos: 9.5,-2.5
       parent: 1
-  - uid: 678
-    components:
-    - type: Transform
-      pos: 9.5,-1.5
-      parent: 1
-  - uid: 679
-    components:
-    - type: Transform
-      pos: 9.5,-0.5
-      parent: 1
-  - uid: 680
-    components:
-    - type: Transform
-      pos: 9.5,0.5
-      parent: 1
 - proto: Chair
   entities:
   - uid: 274
@@ -1737,39 +1722,22 @@ entities:
     - type: Transform
       pos: 10.5,27.5
       parent: 1
-- proto: PoweredSmallLight
+- proto: PoweredSmallLightEmpty
   entities:
   - uid: 131
     components:
     - type: Transform
       pos: 11.5,6.5
       parent: 1
-  - uid: 155
-    components:
-    - type: Transform
-      pos: 9.5,11.5
-      parent: 1
   - uid: 156
     components:
     - type: Transform
       pos: 7.5,6.5
       parent: 1
-  - uid: 468
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,25.5
-      parent: 1
-  - uid: 611
-    components:
-    - type: Transform
-      pos: 17.5,28.5
-      parent: 1
   - uid: 612
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 23.5,17.5
+      pos: 2.5,11.5
       parent: 1
 - proto: Rack
   entities:
@@ -1996,7 +1964,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,1.5
       parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      pos: 9.5,11.5
+      parent: 1
   - uid: 321
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 23.5,17.5
+      parent: 1
+  - uid: 468
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -2008,15 +1987,21 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 12.5,0.5
       parent: 1
+  - uid: 611
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,25.5
+      parent: 1
   - uid: 615
     components:
     - type: Transform
       pos: 2.5,28.5
       parent: 1
-  - uid: 710
+  - uid: 678
     components:
     - type: Transform
-      pos: 2.5,11.5
+      pos: 17.5,28.5
       parent: 1
   - uid: 711
     components:
diff --git a/Resources/Maps/Ruins/syndicate_dropship.yml b/Resources/Maps/Ruins/syndicate_dropship.yml
new file mode 100644
index 0000000000..a856589015
--- /dev/null
+++ b/Resources/Maps/Ruins/syndicate_dropship.yml
@@ -0,0 +1,1243 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  29: FloorDark
+  34: FloorDarkMono
+  81: FloorShuttleBlack
+  124: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: grid
+    - type: Transform
+      pos: -1.1116635,0.37235177
+      parent: invalid
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: AAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAUQAAAAAAfAAAAAAAHQAAAAAAHQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAUQAAAAAAfAAAAAAAHQAAAAAAHQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAIgAAAAAAIgAAAAAAUQAAAAAAfAAAAAAAHQAAAAAAUQAAAAAAfAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAIgAAAAAAIgAAAAAAUQAAAAAAfAAAAAAAHQAAAAAAUQAAAAAAfAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAfAAAAAAAAAAAAAAA
+          version: 6
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+    - type: GridPathfinding
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            color: '#D4D4D419'
+            id: FullTileOverlayGreyscale
+          decals:
+            14: 4,-2
+            15: 5,-2
+            16: 6,-2
+            17: 7,-2
+            18: 8,-2
+            19: 9,-2
+            20: 10,-2
+            21: 11,-2
+        - node:
+            color: '#79150096'
+            id: HalfTileOverlayGreyscale270
+          decals:
+            10: 13,-2
+            13: 3,-1
+            22: 3,-2
+            23: 3,-3
+        - node:
+            color: '#79150096'
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            5: 12,-3
+        - node:
+            color: '#79150096'
+            id: QuarterTileOverlayGreyscale90
+          decals:
+            4: 12,-1
+        - node:
+            color: '#79150096'
+            id: ThreeQuarterTileOverlayGreyscale
+          decals:
+            6: 11,-4
+            8: 13,-1
+        - node:
+            color: '#79150096'
+            id: ThreeQuarterTileOverlayGreyscale180
+          decals:
+            12: 12,0
+        - node:
+            color: '#79150096'
+            id: ThreeQuarterTileOverlayGreyscale270
+          decals:
+            9: 13,-3
+            11: 11,0
+        - node:
+            color: '#79150096'
+            id: ThreeQuarterTileOverlayGreyscale90
+          decals:
+            7: 12,-4
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerNW
+          decals:
+            1: 6,-3
+            24: 9,-3
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSW
+          decals:
+            0: 6,-1
+            27: 9,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineS
+          decals:
+            2: 6,-4
+            3: 6,0
+            25: 9,-4
+            26: 9,0
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          0,0:
+            0: 239
+          0,-1:
+            0: 65535
+          1,0:
+            0: 255
+          2,0:
+            0: 255
+          3,0:
+            0: 255
+          0,-2:
+            0: 57344
+          1,-2:
+            0: 61440
+          1,-1:
+            0: 65535
+          2,-2:
+            0: 61440
+          2,-1:
+            0: 65535
+          3,-2:
+            0: 61440
+          3,-1:
+            0: 65535
+          4,0:
+            0: 17
+          4,-2:
+            0: 4096
+          4,-1:
+            0: 4369
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+- proto: AirlockHatchSyndicate
+  entities:
+  - uid: 14
+    components:
+    - type: Transform
+      pos: 10.5,-1.5
+      parent: 1
+  - uid: 33
+    components:
+    - type: Transform
+      pos: 8.5,-4.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 158
+  - uid: 42
+    components:
+    - type: Transform
+      pos: 8.5,1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 159
+  - uid: 73
+    components:
+    - type: Transform
+      pos: 7.5,-1.5
+      parent: 1
+    - type: DeviceLinkSink
+      invokeCounter: 2
+- proto: APCBasic
+  entities:
+  - uid: 62
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+- proto: AtmosDeviceFanTiny
+  entities:
+  - uid: 164
+    components:
+    - type: Transform
+      pos: 8.5,1.5
+      parent: 1
+  - uid: 165
+    components:
+    - type: Transform
+      pos: 8.5,-4.5
+      parent: 1
+- proto: BlastDoor
+  entities:
+  - uid: 101
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-3.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 133
+  - uid: 102
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,-4.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 133
+  - uid: 103
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,0.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 133
+  - uid: 104
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 133
+  - uid: 106
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 133
+  - uid: 107
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,0.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 133
+  - uid: 108
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-0.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 133
+  - uid: 109
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 133
+  - uid: 110
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-2.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 133
+  - uid: 111
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,-3.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 133
+  - uid: 112
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-4.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 133
+- proto: CableApcExtension
+  entities:
+  - uid: 59
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 1
+  - uid: 60
+    components:
+    - type: Transform
+      pos: 5.5,-1.5
+      parent: 1
+  - uid: 61
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 64
+    components:
+    - type: Transform
+      pos: 4.5,-1.5
+      parent: 1
+  - uid: 65
+    components:
+    - type: Transform
+      pos: 6.5,-1.5
+      parent: 1
+  - uid: 66
+    components:
+    - type: Transform
+      pos: 7.5,-1.5
+      parent: 1
+  - uid: 67
+    components:
+    - type: Transform
+      pos: 8.5,-1.5
+      parent: 1
+  - uid: 68
+    components:
+    - type: Transform
+      pos: 9.5,-1.5
+      parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      pos: 10.5,-1.5
+      parent: 1
+  - uid: 70
+    components:
+    - type: Transform
+      pos: 11.5,-1.5
+      parent: 1
+  - uid: 71
+    components:
+    - type: Transform
+      pos: 12.5,-1.5
+      parent: 1
+  - uid: 135
+    components:
+    - type: Transform
+      pos: 12.5,-0.5
+      parent: 1
+  - uid: 136
+    components:
+    - type: Transform
+      pos: 12.5,-2.5
+      parent: 1
+  - uid: 152
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 153
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 154
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+  - uid: 156
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 157
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+- proto: CableHV
+  entities:
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 1
+  - uid: 52
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 53
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 151
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+  - uid: 160
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+- proto: CableMV
+  entities:
+  - uid: 56
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 57
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 58
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 1
+  - uid: 63
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+- proto: CableTerminal
+  entities:
+  - uid: 22
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+- proto: ChairPilotSeat
+  entities:
+  - uid: 116
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-0.5
+      parent: 1
+  - uid: 117
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-1.5
+      parent: 1
+  - uid: 118
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-2.5
+      parent: 1
+  - uid: 120
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-2.5
+      parent: 1
+  - uid: 121
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-2.5
+      parent: 1
+  - uid: 122
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 1
+  - uid: 123
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+- proto: ComputerCrewMonitoring
+  entities:
+  - uid: 91
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-2.5
+      parent: 1
+- proto: ComputerPowerMonitoring
+  entities:
+  - uid: 93
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-0.5
+      parent: 1
+- proto: ComputerShuttleSyndie
+  entities:
+  - uid: 92
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-1.5
+      parent: 1
+- proto: GeneratorWallmountAPU
+  entities:
+  - uid: 51
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+- proto: Grille
+  entities:
+  - uid: 76
+    components:
+    - type: Transform
+      pos: 12.5,-4.5
+      parent: 1
+  - uid: 77
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,-4.5
+      parent: 1
+  - uid: 78
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,-3.5
+      parent: 1
+  - uid: 79
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-3.5
+      parent: 1
+  - uid: 80
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-2.5
+      parent: 1
+  - uid: 81
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-1.5
+      parent: 1
+  - uid: 82
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,-0.5
+      parent: 1
+  - uid: 83
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,0.5
+      parent: 1
+  - uid: 84
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 14.5,0.5
+      parent: 1
+  - uid: 85
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,1.5
+      parent: 1
+  - uid: 86
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,1.5
+      parent: 1
+- proto: Gyroscope
+  entities:
+  - uid: 94
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-2.5
+      parent: 1
+- proto: LockerSyndicateShipGearBasic
+  entities:
+  - uid: 95
+    components:
+    - type: Transform
+      pos: 6.5,-0.5
+      parent: 1
+  - uid: 98
+    components:
+    - type: Transform
+      pos: 9.5,0.5
+      parent: 1
+  - uid: 99
+    components:
+    - type: Transform
+      pos: 9.5,-0.5
+      parent: 1
+  - uid: 100
+    components:
+    - type: Transform
+      pos: 9.5,-3.5
+      parent: 1
+  - uid: 119
+    components:
+    - type: Transform
+      pos: 9.5,-2.5
+      parent: 1
+- proto: LockerSyndicateShipGearBasicChameleonKit
+  entities:
+  - uid: 97
+    components:
+    - type: Transform
+      pos: 6.5,-2.5
+      parent: 1
+- proto: MedkitFilled
+  entities:
+  - uid: 115
+    components:
+    - type: Transform
+      pos: 12.5,-3.5
+      parent: 1
+- proto: PlastitaniumWindow
+  entities:
+  - uid: 124
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,1.5
+      parent: 1
+  - uid: 125
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,1.5
+      parent: 1
+  - uid: 126
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,0.5
+      parent: 1
+  - uid: 127
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,0.5
+      parent: 1
+  - uid: 129
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-0.5
+      parent: 1
+  - uid: 130
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-1.5
+      parent: 1
+  - uid: 131
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-2.5
+      parent: 1
+  - uid: 147
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-3.5
+      parent: 1
+  - uid: 148
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-3.5
+      parent: 1
+  - uid: 149
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-4.5
+      parent: 1
+  - uid: 150
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-4.5
+      parent: 1
+- proto: Poweredlight
+  entities:
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 1
+  - uid: 45
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,1.5
+      parent: 1
+- proto: PoweredSmallLight
+  entities:
+  - uid: 137
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-3.5
+      parent: 1
+  - uid: 138
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,0.5
+      parent: 1
+  - uid: 141
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,0.5
+      parent: 1
+  - uid: 142
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-3.5
+      parent: 1
+  - uid: 145
+    components:
+    - type: Transform
+      pos: 5.5,-0.5
+      parent: 1
+  - uid: 146
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-2.5
+      parent: 1
+- proto: SignalButton
+  entities:
+  - uid: 133
+    components:
+    - type: MetaData
+      name: bridge blast door control
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.039636,0.26498932
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        106:
+        - Pressed: Toggle
+        104:
+        - Pressed: Toggle
+        107:
+        - Pressed: Toggle
+        103:
+        - Pressed: Toggle
+        108:
+        - Pressed: Toggle
+        109:
+        - Pressed: Toggle
+        110:
+        - Pressed: Toggle
+        101:
+        - Pressed: Toggle
+        111:
+        - Pressed: Toggle
+        102:
+        - Pressed: Toggle
+        112:
+        - Pressed: Toggle
+  - uid: 134
+    components:
+    - type: MetaData
+      name: Bridge Bolt Control
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.476158,0.26498932
+      parent: 1
+- proto: SignalButtonDirectional
+  entities:
+  - uid: 158
+    components:
+    - type: MetaData
+      name: External Bolt Control
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-3.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        33:
+        - Pressed: DoorBolt
+  - uid: 159
+    components:
+    - type: MetaData
+      name: external bolt control
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,0.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        42:
+        - Pressed: DoorBolt
+- proto: SignSpace
+  entities:
+  - uid: 128
+    components:
+    - type: Transform
+      pos: 9.5,1.5
+      parent: 1
+  - uid: 132
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-4.5
+      parent: 1
+- proto: SMESBasic
+  entities:
+  - uid: 54
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+- proto: SpawnMobSyndicateFootsoldierPilot
+  entities:
+  - uid: 143
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-1.5
+      parent: 1
+- proto: SubstationWallBasic
+  entities:
+  - uid: 162
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+- proto: TableReinforced
+  entities:
+  - uid: 87
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,0.5
+      parent: 1
+  - uid: 88
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,0.5
+      parent: 1
+  - uid: 89
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-3.5
+      parent: 1
+  - uid: 90
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-3.5
+      parent: 1
+- proto: Thruster
+  entities:
+  - uid: 12
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-0.5
+      parent: 1
+  - uid: 15
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 21
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,0.5
+      parent: 1
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
+  - uid: 46
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-4.5
+      parent: 1
+  - uid: 50
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-4.5
+      parent: 1
+  - uid: 96
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 1
+  - uid: 139
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-3.5
+      parent: 1
+  - uid: 163
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-1.5
+      parent: 1
+- proto: ToolboxEmergencyFilled
+  entities:
+  - uid: 113
+    components:
+    - type: Transform
+      pos: 11.5,-3.5
+      parent: 1
+- proto: WallPlastitanium
+  entities:
+  - uid: 3
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 1
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 6.5,0.5
+      parent: 1
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 7
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 1
+  - uid: 8
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-3.5
+      parent: 1
+  - uid: 9
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 13
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-4.5
+      parent: 1
+  - uid: 17
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,1.5
+      parent: 1
+  - uid: 23
+    components:
+    - type: Transform
+      pos: 5.5,0.5
+      parent: 1
+  - uid: 24
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
+  - uid: 27
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,0.5
+      parent: 1
+  - uid: 28
+    components:
+    - type: Transform
+      pos: 6.5,-3.5
+      parent: 1
+  - uid: 30
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-3.5
+      parent: 1
+  - uid: 31
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-2.5
+      parent: 1
+  - uid: 32
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-0.5
+      parent: 1
+  - uid: 34
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-4.5
+      parent: 1
+  - uid: 35
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-4.5
+      parent: 1
+  - uid: 36
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-3.5
+      parent: 1
+  - uid: 37
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-2.5
+      parent: 1
+  - uid: 38
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-0.5
+      parent: 1
+  - uid: 39
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,0.5
+      parent: 1
+  - uid: 40
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,1.5
+      parent: 1
+  - uid: 41
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,1.5
+      parent: 1
+  - uid: 43
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-3.5
+      parent: 1
+  - uid: 44
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 1
+  - uid: 74
+    components:
+    - type: Transform
+      pos: 11.5,1.5
+      parent: 1
+  - uid: 75
+    components:
+    - type: Transform
+      pos: 11.5,-4.5
+      parent: 1
+- proto: WallPlastitaniumDiagonal
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      pos: 7.5,1.5
+      parent: 1
+  - uid: 26
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-4.5
+      parent: 1
+- proto: WeaponCapacitorRecharger
+  entities:
+  - uid: 105
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,0.5
+      parent: 1
+- proto: WeaponPistolViper
+  entities:
+  - uid: 144
+    components:
+    - type: Transform
+      pos: 12.406186,-3.55441
+      parent: 1
+    - type: ChamberMagazineAmmoProvider
+      boltClosed: True
+- proto: WeaponTurretHostile
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,1.5
+      parent: 1
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 6.5,-4.5
+      parent: 1
+- proto: WindowReinforcedDirectional
+  entities:
+  - uid: 10
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-3.5
+      parent: 1
+  - uid: 18
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-0.5
+      parent: 1
+  - uid: 19
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 20
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 140
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,0.5
+      parent: 1
+- proto: Wrench
+  entities:
+  - uid: 114
+    components:
+    - type: Transform
+      pos: 11.5,-3.5
+      parent: 1
+...
diff --git a/Resources/Maps/Salvage/DeltaV/DV-atlas-medical.yml b/Resources/Maps/Salvage/DeltaV/DV-atlas-medical.yml
index 1bae431625..5152a44f4d 100644
--- a/Resources/Maps/Salvage/DeltaV/DV-atlas-medical.yml
+++ b/Resources/Maps/Salvage/DeltaV/DV-atlas-medical.yml
@@ -2857,7 +2857,7 @@ entities:
       parent: 234
     - type: Physics
       canCollide: False
-- proto: PillRomerol
+- proto: PillAmbuzol
   entities:
   - uid: 233
     components:
diff --git a/Resources/Maps/Shuttles/DeltaV/DV-pirateradio.yml b/Resources/Maps/Shuttles/DeltaV/DV-pirateradio.yml
index 9290de03a1..9cff388fc8 100644
--- a/Resources/Maps/Shuttles/DeltaV/DV-pirateradio.yml
+++ b/Resources/Maps/Shuttles/DeltaV/DV-pirateradio.yml
@@ -4,68 +4,71 @@ meta:
 tilemap:
   0: Space
   7: FloorAsteroidSand
-  9: FloorAsteroidSandRed
-  10: FloorAsteroidSandUnvariantized
-  65: FloorMetalDiamond
-  77: FloorRGlass
-  85: FloorShuttleRed
-  86: FloorShuttleWhite
-  92: FloorSteelCheckerDark
-  119: FloorWood
-  121: Lattice
+  25: FloorCave
+  32: FloorDark
+  38: FloorDarkOffset
+  41: FloorDarkPlastic
+  65: FloorLino
+  67: FloorMetalDiamond
+  80: FloorReinforced
+  89: FloorShuttleRed
+  90: FloorShuttleWhite
+  96: FloorSteelCheckerDark
+  109: FloorTechMaint
+  123: FloorWood
+  126: Lattice
 entities:
 - proto: ""
   entities:
   - uid: 1
     components:
-    - name: Syndicate Listening Post
-      type: MetaData
-    - rot: -1.0337585079667582 rad
-      pos: -0.5440744,-0.033024088
+    - type: MetaData
+      name: unknown
+    - type: Transform
       parent: invalid
-      type: Transform
-    - chunks:
+    - type: MapGrid
+      chunks:
         0,0:
           ind: 0,0
-          tiles: QQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAATQAAAAAATQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAeQAAAAAAeQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAVQAAAAAAQQAAAAAAQQAAAAAATQAAAAAATQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAeQAAAAAAeQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAVQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAeQAAAAAAeQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAVQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAABwAAAAAAeQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAACgAAAAAAQQAAAAAABwAAAAAAQQAAAAAAQQAAAAAAQQAAAAAABwAAAAAAeQAAAAAABwAAAAAACgAAAAAACgAAAAAACQAAAAAACQAAAAAACQAAAAAACgAAAAAACgAAAAAACQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAACQAAAAAACQAAAAAACgAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAACQAAAAAACgAAAAAACQAAAAAACQAAAAAABwAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAACQAAAAAACgAAAAAACQAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAACQAAAAAACgAAAAAAeQAAAAAACQAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: QwAAAAAAewAAAAADQQAAAAAAQQAAAAAAewAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAKQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAKQAAAAADUAAAAAAAfgAAAAAAfgAAAAAAQwAAAAAAewAAAAAAQQAAAAAAQQAAAAAAewAAAAADQwAAAAAAWQAAAAAAQwAAAAAAKQAAAAABJgAAAAAAJgAAAAAAJgAAAAAAKQAAAAABUAAAAAAAfgAAAAAAfgAAAAAAQwAAAAAAewAAAAAAQQAAAAAAQQAAAAAAewAAAAABKQAAAAABWQAAAAAAQwAAAAAAKQAAAAADKQAAAAACKQAAAAACKQAAAAACKQAAAAACUAAAAAAAfgAAAAAAfgAAAAAAKQAAAAAAewAAAAADewAAAAABewAAAAAAewAAAAABQwAAAAAAWQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAGQAAAAABfgAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAKQAAAAABQwAAAAAAQwAAAAAABwAAAAAABwAAAAAAGQAAAAAAGQAAAAABGQAAAAADGQAAAAADGQAAAAACGQAAAAABGQAAAAACGQAAAAAEQwAAAAAAbQAAAAAAQwAAAAAAbQAAAAAAbQAAAAAABwAAAAAAGQAAAAACGQAAAAAGGQAAAAACGQAAAAAEGQAAAAAFGQAAAAAEGQAAAAACGQAAAAAEGQAAAAABGQAAAAADQwAAAAAABwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAABwAAAAAAfgAAAAAAGQAAAAADGQAAAAAAGQAAAAAGGQAAAAABGQAAAAABGQAAAAAEGQAAAAADGQAAAAAAGQAAAAADGQAAAAABGQAAAAAAGQAAAAACGQAAAAAEGQAAAAACGQAAAAAEGQAAAAACGQAAAAAEGQAAAAAAGQAAAAAFGQAAAAAEGQAAAAACGQAAAAAFGQAAAAAFGQAAAAAAGQAAAAAGGQAAAAABGQAAAAAEGQAAAAAAGQAAAAABGQAAAAAAGQAAAAAAGQAAAAABGQAAAAAGGQAAAAAAGQAAAAACGQAAAAAFGQAAAAAEGQAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAADGQAAAAAFGQAAAAADGQAAAAABGQAAAAAGGQAAAAADGQAAAAAFGQAAAAABAAAAAAAAAAAAAAAAGQAAAAACGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAFGQAAAAAEGQAAAAAAGQAAAAABfgAAAAAAGQAAAAACGQAAAAAFGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAACGQAAAAABGQAAAAAFGQAAAAAFGQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAAGQAAAAAEAAAAAAAAGQAAAAAAGQAAAAAGAAAAAAAAGQAAAAACGQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: BwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAeQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAVQAAAAAAQQAAAAAAVQAAAAAAQQAAAAAAVQAAAAAAQQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAABwAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAACQAAAAAACQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAACQAAAAAAQQAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAQQAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAACQAAAAAAQQAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAQQAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAABwAAAAAAQQAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAQQAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAABwAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAABwAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAeQAAAAAAeQAAAAAA
+          tiles: GQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAAGQAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGGQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGAAAAAAAAGQAAAAAGGQAAAAABAAAAAAAAAAAAAAAAGQAAAAABAAAAAAAAAAAAAAAAGQAAAAACAAAAAAAAAAAAAAAAGQAAAAABGQAAAAADAAAAAAAAAAAAAAAAGQAAAAACGQAAAAAFGQAAAAAEGQAAAAACGQAAAAABGQAAAAAAGQAAAAABGQAAAAACGQAAAAABGQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAACAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAADGQAAAAAGGQAAAAADGQAAAAABGQAAAAAAGQAAAAAFGQAAAAACGQAAAAABGQAAAAACGQAAAAAFAAAAAAAAGQAAAAACGQAAAAAAAAAAAAAAAAAAAAAAGQAAAAAFGQAAAAAEGQAAAAAAGQAAAAAFfgAAAAAAGQAAAAABGQAAAAACGQAAAAADGQAAAAAGGQAAAAADGQAAAAAGGQAAAAAEGQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGGQAAAAAFGQAAAAADGQAAAAAAGQAAAAAFGQAAAAAFGQAAAAAGGQAAAAAGGQAAAAABGQAAAAAEGQAAAAAEGQAAAAAEGQAAAAAFGQAAAAAFGQAAAAAEAAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAGQAAAAABGQAAAAAEGQAAAAABGQAAAAAGGQAAAAABGQAAAAAAGQAAAAACGQAAAAABGQAAAAAEGQAAAAABGQAAAAAEGQAAAAAAWQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAWQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGQAAAAAEGQAAAAADGQAAAAAGGQAAAAADGQAAAAAGGQAAAAACGQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAQwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGQAAAAAEGQAAAAABQwAAAAAAQwAAAAAAKQAAAAACQwAAAAAAQwAAAAAAQwAAAAAAewAAAAAAewAAAAACewAAAAACQwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAQwAAAAAAGQAAAAABQwAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAAAQwAAAAAAewAAAAACewAAAAADewAAAAABQwAAAAAAKQAAAAAAKQAAAAABKQAAAAADKQAAAAAAQwAAAAAAGQAAAAAGQwAAAAAAYAAAAAACYAAAAAACYAAAAAAAYAAAAAABQwAAAAAAewAAAAACewAAAAABewAAAAADKQAAAAACKQAAAAAAKQAAAAACKQAAAAADKQAAAAADQwAAAAAAGQAAAAAGQwAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAACQwAAAAAAewAAAAACewAAAAACewAAAAAAQwAAAAAAKQAAAAADKQAAAAAAKQAAAAABKQAAAAABQwAAAAAAGQAAAAABQwAAAAAAQwAAAAAAKQAAAAACQwAAAAAAQwAAAAAAQwAAAAAAKQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAGQAAAAADKQAAAAACewAAAAABewAAAAABewAAAAACewAAAAADKQAAAAAAKQAAAAACKQAAAAABKQAAAAACKQAAAAABKQAAAAACKQAAAAACKQAAAAAAUAAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAABwAAAAAACQAAAAAACQAAAAAABwAAAAAAQQAAAAAAVQAAAAAAVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAACQAAAAAAeQAAAAAABwAAAAAAQQAAAAAAQQAAAAAAVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAABwAAAAAABwAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAACQAAAAAACgAAAAAABwAAAAAABwAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAACQAAAAAACQAAAAAABwAAAAAABwAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAAeQAAAAAABwAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAACQAAAAAACgAAAAAABwAAAAAABwAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAADAAAAAAAAGQAAAAACGQAAAAAFGQAAAAAEGQAAAAADQwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGGQAAAAACGQAAAAABGQAAAAAAfgAAAAAAGQAAAAADQwAAAAAAQwAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAAAGQAAAAAFGQAAAAAEQwAAAAAAQwAAAAAAQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAAGQAAAAAAGQAAAAAGGQAAAAABGQAAAAAAGQAAAAAFQwAAAAAAbQAAAAAAbQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAFGQAAAAAAGQAAAAAEAAAAAAAAGQAAAAABGQAAAAAFGQAAAAAFGQAAAAADQwAAAAAAbQAAAAAAbQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAADGQAAAAAFfgAAAAAAGQAAAAACQwAAAAAAbQAAAAAAbQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAACGQAAAAAAGQAAAAAEGQAAAAACGQAAAAAAGQAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAACGQAAAAAGGQAAAAAGGQAAAAAEGQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGGQAAAAAFGQAAAAABGQAAAAAFGQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAADGQAAAAABGQAAAAAAGQAAAAACGQAAAAAFGQAAAAABGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAACGQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAACQAAAAAACQAAAAAACgAAAAAACgAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAABwAAAAAABwAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAABwAAAAAABwAAAAAAQQAAAAAAVQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAABwAAAAAACQAAAAAACgAAAAAABwAAAAAABwAAAAAAQQAAAAAAVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAACQAAAAAACgAAAAAABwAAAAAABwAAAAAAQQAAAAAAVQAAAAAAVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAACQAAAAAACQAAAAAABwAAAAAABwAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAAeQAAAAAABwAAAAAAQQAAAAAAVgAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAACQAAAAAACgAAAAAABwAAAAAABwAAAAAAQQAAAAAAVgAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAABwAAAAAABwAAAAAAQQAAAAAAVQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAABwAAAAAAQQAAAAAAQQAAAAAAVQAAAAAAVQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEAAAAAAAAAAAAAAAAGQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGGQAAAAACAAAAAAAAGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAADGQAAAAADAAAAAAAAAAAAAAAAGQAAAAACGQAAAAACGQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAABAAAAAAAAGQAAAAADGQAAAAABGQAAAAADGQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAABGQAAAAAGGQAAAAAAGQAAAAAFGQAAAAABGQAAAAADGQAAAAAGGQAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAAGGQAAAAAEGQAAAAAAGQAAAAAAGQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAADGQAAAAAFGQAAAAACQwAAAAAAQwAAAAAAQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAAAGQAAAAAAGQAAAAAAQwAAAAAAIAAAAAADIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAACGQAAAAAAGQAAAAAFGQAAAAABQwAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAACGQAAAAAAGQAAAAAAGQAAAAADGQAAAAACGQAAAAAGGQAAAAAEQwAAAAAAWQAAAAAAWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAADGQAAAAABGQAAAAACGQAAAAABGQAAAAAEQwAAAAAAQwAAAAAAQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGGQAAAAAGfgAAAAAAGQAAAAAAQwAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAAGQAAAAAFGQAAAAABGQAAAAABGQAAAAACGQAAAAABGQAAAAAEQwAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGAAAAAAAAAAAAAAAAGQAAAAAAGQAAAAAAGQAAAAADGQAAAAAFQwAAAAAAKQAAAAACQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAAEGQAAAAABQwAAAAAAQwAAAAAAWQAAAAAAWQAAAAAA
           version: 6
         1,-1:
           ind: 1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAABwAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAACgAAAAAACQAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAADGQAAAAAFAAAAAAAAGQAAAAABGQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGGQAAAAABGQAAAAACGQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAAGQAAAAAGGQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAADGQAAAAAGGQAAAAABAAAAAAAAAAAAAAAAGQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAAGGQAAAAACAAAAAAAAAAAAAAAAGQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAFGQAAAAAFGQAAAAAAGQAAAAAAGQAAAAAAGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGGQAAAAADGQAAAAAFGQAAAAABGQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAACGQAAAAABGQAAAAADGQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         1,0:
           ind: 1,0
-          tiles: BwAAAAAACgAAAAAACQAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAACgAAAAAACQAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAACgAAAAAACQAAAAAACQAAAAAACQAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAACQAAAAAACQAAAAAABwAAAAAABwAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAABwAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAAAAAAAAAAAAAAAAAACQAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: GQAAAAADGQAAAAABGQAAAAADGQAAAAADGQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAAGQAAAAAAGQAAAAAEGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAACGQAAAAAAGQAAAAAGGQAAAAADGQAAAAACGQAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAADGQAAAAACGQAAAAABGQAAAAABGQAAAAAFGQAAAAAFGQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAACGQAAAAAEGQAAAAADGQAAAAAAGQAAAAAAGQAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAAAGQAAAAAGGQAAAAAFGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAAAAAAAAAAAAAAAAAAGQAAAAADGQAAAAADGQAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAGGQAAAAAAGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAEGQAAAAAAGQAAAAAGGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAFAAAAAAAAGQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
-      type: MapGrid
     - type: Broadphase
-    - bodyStatus: InAir
+    - type: Physics
+      bodyStatus: InAir
       angularDamping: 0.05
       linearDamping: 0.05
       fixedRotation: False
       bodyType: Dynamic
-      type: Physics
-    - fixtures: {}
-      type: Fixtures
+    - type: Fixtures
+      fixtures: {}
     - type: OccluderTree
     - type: SpreaderGrid
     - type: GridPathfinding
-    - gravityShakeSound: !type:SoundPathSpecifier
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg
-      type: Gravity
-    - chunkCollection:
+    - type: DecalGrid
+      chunkCollection:
         version: 2
         nodes:
         - node:
@@ -73,13 +76,132 @@ entities:
             id: Caution
           decals:
             0: 3.018731,5.165427
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnBox
+          decals:
+            18: 3,4
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallNW
+          decals:
+            40: 16,-2
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallSE
+          decals:
+            32: 5,7
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallSW
+          decals:
+            17: 4,7
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineN
+          decals:
+            16: 3,7
+            33: 6,7
+            35: 5,7
+            36: 4,7
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineS
+          decals:
+            34: 7,6
+            37: 16,3
+            38: 16,2
+            39: 16,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineW
+          decals:
+            41: 11,-8
+            42: 10,-8
+            43: 7,-9
+            44: 6,-9
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerNe
+          decals:
+            2: 12,2
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerNw
+          decals:
+            5: 8,2
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerSe
+          decals:
+            11: 12,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinCornerSw
+          decals:
+            12: 8,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerNe
+          decals:
+            28: 1,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerNw
+          decals:
+            29: 4,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerSe
+          decals:
+            30: 1,3
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinInnerSw
+          decals:
+            31: 4,3
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineE
+          decals:
+            9: 12,1
+            10: 12,0
+            22: 1,2
+            23: 1,1
+            24: 1,0
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineN
+          decals:
+            6: 9,2
+            7: 10,2
+            8: 11,2
+            26: 2,-1
+            27: 3,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineS
+          decals:
+            13: 9,-1
+            14: 10,-1
+            15: 11,-1
+            25: 2,3
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinLineW
+          decals:
+            3: 8,0
+            4: 8,1
+            19: 4,2
+            20: 4,1
+            21: 4,0
         - node:
             color: '#FF0000FF'
             id: space
           decals:
             1: 3.018731,4.884177
-      type: DecalGrid
-    - version: 2
+    - type: GridAtmosphere
+      version: 2
       data:
         tiles:
           0,0:
@@ -115,7 +237,7 @@ entities:
           3,-1:
             0: 65535
           0,2:
-            0: 53247
+            0: 61439
           1,2:
             0: 32767
           2,1:
@@ -135,13 +257,13 @@ entities:
           -2,1:
             0: 53230
           -1,2:
-            0: 11519
+            0: 12031
           -2,-2:
-            0: 65278
+            0: 65534
           -2,-1:
             0: 61182
           -2,-3:
-            0: 60596
+            0: 60660
           -1,-3:
             0: 65535
           4,-1:
@@ -151,57 +273,57 @@ entities:
           4,1:
             0: 2559
           0,-4:
-            0: 64769
+            0: 64897
           2,-3:
             0: 65527
           4,-2:
-            0: 30587
+            0: 30715
           0,3:
-            0: 11
+            0: 27
           1,3:
-            0: 2185
+            0: 2189
           2,2:
-            0: 2127
+            0: 2255
           3,2:
-            0: 1
+            0: 9
           1,-4:
-            0: 62482
+            0: 62483
           2,-4:
-            0: 4640
+            0: 12832
           3,-4:
-            0: 8448
+            0: 8960
           3,-3:
-            0: 63250
+            0: 63251
           -3,1:
-            0: 2092
+            0: 2094
           -3,0:
-            0: 32900
+            0: 32964
           -2,2:
-            0: 104
+            0: 232
           -1,3:
             0: 130
           -3,-2:
-            0: 2112
+            0: 3136
           -3,-1:
-            0: 1152
+            0: 1216
           -2,-4:
-            0: 16896
+            0: 25088
           -1,-4:
-            0: 57744
+            0: 60312
           4,-3:
-            0: 4644
+            0: 4902
           5,-2:
             0: 8193
           5,-1:
-            0: 274
+            0: 306
           4,2:
             0: 1
           5,0:
-            0: 21249
+            0: 29441
           5,1:
             0: 29459
           5,2:
-            0: 167
+            0: 175
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -219,4258 +341,4286 @@ entities:
           - 0
           - 0
         chunkSize: 4
-      type: GridAtmosphere
     - type: GasTileOverlay
     - type: RadiationGridResistance
     - type: Shuttle
+    - type: NavMap
 - proto: AirAlarm
   entities:
-  - uid: 2
+  - uid: 576
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,3.5
       parent: 1
-      type: Transform
-    - devices:
-      - 699
-      - 692
-      - 693
-      - 694
-      - 696
-      - 695
-      - 697
-      - 701
-      - 700
-      - 698
+    - type: DeviceList
+      devices:
       - 707
+      - 719
       - 708
+      - 720
+      - 721
       - 709
+      - 726
+      - 714
+      - 718
+      - 713
       - 710
-      - 703
-      - 706
-      - 705
-      type: DeviceList
-    - joinedGrid: 1
-      type: AtmosDevice
+      - 711
+      - 722
+      - 723
+      - 712
+      - 725
+      - 384
+      - 716
+      - 724
+    - type: AtmosDevice
+      joinedGrid: 1
 - proto: AirCanister
   entities:
   - uid: 3
     components:
-    - anchored: True
+    - type: Transform
+      anchored: True
       pos: 1.5,5.5
       parent: 1
-      type: Transform
-    - bodyType: Static
-      type: Physics
-    - joinedGrid: 1
-      type: AtmosDevice
+    - type: Physics
+      bodyType: Static
+    - type: AtmosDevice
+      joinedGrid: 1
 - proto: AirlockExternalShuttleSyndicateLocked
   entities:
   - uid: 4
     components:
-    - desc: The ominous red light fills you with dread
+    - type: MetaData
+      desc: The ominous red light fills you with dread
       name: suspicious airlock
-      type: MetaData
-    - pos: 3.5,6.5
+    - type: Transform
+      pos: 3.5,6.5
       parent: 1
-      type: Transform
-    - links:
-      - 793
-      type: DeviceLinkSink
+    - type: DeviceLinkSink
+      links:
+      - 806
     missingComponents:
     - Docking
 - proto: AirlockSyndicate
   entities:
   - uid: 5
     components:
-    - pos: 5.5,2.5
+    - type: Transform
+      pos: 5.5,2.5
+      parent: 1
+  - uid: 15
+    components:
+    - type: MetaData
+      name: armory airlock
+    - type: Transform
+      pos: 2.5,-5.5
       parent: 1
-      type: Transform
 - proto: AirlockSyndicateGlass
   entities:
   - uid: 6
     components:
-    - pos: 2.5,-1.5
+    - type: MetaData
+      name: kitchen airlock
+    - type: Transform
+      pos: 2.5,-1.5
       parent: 1
-      type: Transform
-    - secondsUntilStateChange: -1311.7554
-      state: Opening
-      type: Door
-  - uid: 8
+  - uid: 7
     components:
-    - rot: -1.5707963267948966 rad
+    - type: MetaData
+      name: rec-room airlock
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 6.5,-1.5
       parent: 1
-      type: Transform
-  - uid: 10
+  - uid: 8
     components:
-    - pos: 0.5,-0.5
+    - type: Transform
+      pos: 0.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 11
+  - uid: 9
     components:
-    - pos: 9.5,-3.5
+    - type: MetaData
+      name: hydroponics airlock
+    - type: Transform
+      pos: 9.5,-3.5
       parent: 1
-      type: Transform
-  - uid: 794
+  - uid: 10
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 5.5,-0.5
       parent: 1
-      type: Transform
 - proto: AirlockSyndicateGlassLocked
   entities:
-  - uid: 12
+  - uid: 11
     components:
-    - pos: 3.5,4.5
+    - type: MetaData
+      name: to-externals airlock
+    - type: Transform
+      pos: 3.5,4.5
       parent: 1
-      type: Transform
-  - uid: 13
+  - uid: 950
     components:
-    - rot: 3.141592653589793 rad
+    - type: MetaData
+      name: bridge airlock
+    - type: Transform
       pos: 7.5,-0.5
       parent: 1
-      type: Transform
 - proto: AirlockSyndicateLocked
   entities:
-  - uid: 9
+  - uid: 13
     components:
-    - rot: -1.5707963267948966 rad
+    - type: MetaData
+      name: air supply
+    - type: Transform
       pos: 2.5,5.5
       parent: 1
-      type: Transform
   - uid: 14
     components:
-    - rot: 3.141592653589793 rad
+    - type: MetaData
+      name: outpost maintenance
+    - type: Transform
       pos: 0.5,3.5
       parent: 1
-      type: Transform
-  - uid: 15
-    components:
-    - pos: 2.5,-5.5
-      parent: 1
-      type: Transform
 - proto: AlwaysPoweredLightColoredFrostyBlue
   entities:
   - uid: 16
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -0.5,-2.5
       parent: 1
-      type: Transform
 - proto: AlwaysPoweredLightColoredRed
   entities:
   - uid: 17
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 4.5,7.5
       parent: 1
-      type: Transform
-  - uid: 18
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.5,2.5
-      parent: 1
-      type: Transform
-  - uid: 19
-    components:
-    - pos: 11.5,-2.5
-      parent: 1
-      type: Transform
-  - uid: 20
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 6.5,-3.5
-      parent: 1
-      type: Transform
-  - uid: 21
-    components:
-    - pos: -1.5,-5.5
-      parent: 1
-      type: Transform
-  - uid: 22
-    components:
-    - pos: 12.5,2.5
-      parent: 1
-      type: Transform
 - proto: AlwaysPoweredSmallLightMaintenanceRed
   entities:
-  - uid: 864
+  - uid: 953
     components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,-7.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,5.5
+      parent: 1
+  - uid: 962
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,5.5
       parent: 1
-      type: Transform
 - proto: APCBasic
   entities:
-  - uid: 23
+  - uid: 24
     components:
-    - pos: 2.5,4.5
+    - type: Transform
+      pos: 2.5,4.5
       parent: 1
-      type: Transform
-  - uid: 24
+  - uid: 25
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 3.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 25
+  - uid: 26
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 7.5,0.5
       parent: 1
-      type: Transform
-    - hasAccess: True
+    - type: Apc
+      hasAccess: True
       lastExternalState: Good
       lastChargeState: Full
-      type: Apc
 - proto: AsteroidAltRock
   entities:
-  - uid: 26
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 10.5,4.5
-      parent: 1
-      type: Transform
   - uid: 27
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -4.5,1.5
+    - type: Transform
+      pos: -5.5,2.5
       parent: 1
-      type: Transform
   - uid: 28
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
       pos: -4.5,-0.5
       parent: 1
-      type: Transform
   - uid: 29
     components:
-    - pos: 4.5,8.5
+    - type: Transform
+      pos: 4.5,8.5
       parent: 1
-      type: Transform
   - uid: 30
     components:
-    - pos: 6.5,5.5
+    - type: Transform
+      pos: 6.5,5.5
       parent: 1
-      type: Transform
   - uid: 31
     components:
-    - pos: 5.5,8.5
+    - type: Transform
+      pos: 5.5,8.5
       parent: 1
-      type: Transform
   - uid: 32
     components:
-    - pos: 6.5,8.5
+    - type: Transform
+      pos: 6.5,8.5
       parent: 1
-      type: Transform
   - uid: 33
     components:
-    - pos: 2.5,7.5
+    - type: Transform
+      pos: 2.5,7.5
       parent: 1
-      type: Transform
   - uid: 34
     components:
-    - pos: 1.5,7.5
+    - type: Transform
+      pos: 0.5,7.5
       parent: 1
-      type: Transform
   - uid: 35
     components:
-    - pos: 3.5,8.5
+    - type: Transform
+      pos: 3.5,8.5
       parent: 1
-      type: Transform
   - uid: 36
     components:
-    - pos: 13.5,4.5
+    - type: Transform
+      pos: 14.5,3.5
       parent: 1
-      type: Transform
   - uid: 37
     components:
-    - pos: 14.5,3.5
+    - type: Transform
+      pos: 14.5,4.5
       parent: 1
-      type: Transform
   - uid: 38
     components:
-    - pos: 15.5,4.5
+    - type: Transform
+      pos: 15.5,4.5
       parent: 1
-      type: Transform
   - uid: 39
     components:
-    - pos: 14.5,4.5
+    - type: Transform
+      pos: 16.5,-9.5
       parent: 1
-      type: Transform
   - uid: 40
     components:
-    - pos: 13.5,5.5
+    - type: Transform
+      pos: 2.5,8.5
       parent: 1
-      type: Transform
   - uid: 41
     components:
-    - pos: 12.5,4.5
+    - type: Transform
+      pos: 7.5,5.5
       parent: 1
-      type: Transform
   - uid: 42
     components:
-    - pos: 2.5,8.5
+    - type: Transform
+      pos: 7.5,7.5
       parent: 1
-      type: Transform
   - uid: 43
     components:
-    - pos: 7.5,5.5
+    - type: Transform
+      pos: 8.5,5.5
       parent: 1
-      type: Transform
   - uid: 44
     components:
-    - pos: 7.5,7.5
+    - type: Transform
+      pos: 14.5,5.5
       parent: 1
-      type: Transform
   - uid: 45
     components:
-    - pos: 8.5,4.5
-      parent: 1
-      type: Transform
-  - uid: 46
-    components:
-    - pos: 8.5,5.5
+    - type: Transform
+      pos: -3.5,-10.5
       parent: 1
-      type: Transform
   - uid: 47
     components:
-    - pos: 9.5,4.5
+    - type: Transform
+      pos: -5.5,-6.5
       parent: 1
-      type: Transform
   - uid: 48
     components:
-    - pos: 11.5,4.5
+    - type: Transform
+      pos: -3.5,-5.5
       parent: 1
-      type: Transform
   - uid: 49
     components:
-    - pos: 11.5,5.5
+    - type: Transform
+      pos: -3.5,-6.5
       parent: 1
-      type: Transform
   - uid: 50
     components:
-    - pos: 9.5,5.5
+    - type: Transform
+      pos: -4.5,-2.5
       parent: 1
-      type: Transform
   - uid: 51
     components:
-    - pos: 14.5,5.5
+    - type: Transform
+      pos: -3.5,-3.5
       parent: 1
-      type: Transform
   - uid: 52
     components:
-    - pos: -3.5,-8.5
+    - type: Transform
+      pos: -4.5,-4.5
       parent: 1
-      type: Transform
   - uid: 53
     components:
-    - pos: -3.5,-7.5
-      parent: 1
-      type: Transform
-  - uid: 54
-    components:
-    - pos: -3.5,-6.5
+    - type: Transform
+      pos: -5.5,-4.5
       parent: 1
-      type: Transform
   - uid: 55
     components:
-    - pos: -3.5,-5.5
+    - type: Transform
+      pos: -0.5,-12.5
       parent: 1
-      type: Transform
   - uid: 56
     components:
-    - pos: -3.5,-4.5
+    - type: Transform
+      pos: -4.5,6.5
       parent: 1
-      type: Transform
   - uid: 57
     components:
-    - pos: -3.5,-3.5
+    - type: Transform
+      pos: -3.5,6.5
       parent: 1
-      type: Transform
   - uid: 58
     components:
-    - pos: -3.5,-2.5
+    - type: Transform
+      pos: -3.5,7.5
       parent: 1
-      type: Transform
   - uid: 59
     components:
-    - pos: -3.5,-1.5
+    - type: Transform
+      pos: -2.5,7.5
       parent: 1
-      type: Transform
   - uid: 60
     components:
-    - pos: -3.5,2.5
+    - type: Transform
+      pos: -1.5,7.5
       parent: 1
-      type: Transform
   - uid: 61
     components:
-    - pos: -3.5,3.5
+    - type: Transform
+      pos: 0.5,8.5
       parent: 1
-      type: Transform
   - uid: 62
     components:
-    - pos: -3.5,4.5
+    - type: Transform
+      pos: 0.5,10.5
       parent: 1
-      type: Transform
   - uid: 63
     components:
-    - pos: -3.5,5.5
+    - type: Transform
+      pos: 3.5,9.5
       parent: 1
-      type: Transform
   - uid: 64
     components:
-    - pos: -3.5,6.5
+    - type: Transform
+      pos: 4.5,9.5
       parent: 1
-      type: Transform
   - uid: 65
     components:
-    - pos: -3.5,7.5
+    - type: Transform
+      pos: -0.5,8.5
       parent: 1
-      type: Transform
   - uid: 66
     components:
-    - pos: -2.5,7.5
+    - type: Transform
+      pos: 1.5,8.5
       parent: 1
-      type: Transform
   - uid: 67
     components:
-    - pos: -1.5,7.5
+    - type: Transform
+      pos: 6.5,10.5
       parent: 1
-      type: Transform
   - uid: 68
     components:
-    - pos: -0.5,7.5
+    - type: Transform
+      pos: 0.5,9.5
       parent: 1
-      type: Transform
   - uid: 69
     components:
-    - pos: 0.5,7.5
+    - type: Transform
+      pos: -0.5,7.5
       parent: 1
-      type: Transform
   - uid: 70
     components:
-    - pos: 1.5,8.5
+    - type: Transform
+      pos: -4.5,7.5
       parent: 1
-      type: Transform
   - uid: 71
     components:
-    - pos: -0.5,8.5
+    - type: Transform
+      pos: -8.5,6.5
       parent: 1
-      type: Transform
   - uid: 72
     components:
-    - pos: 4.5,9.5
+    - type: Transform
+      pos: -1.5,-12.5
       parent: 1
-      type: Transform
   - uid: 73
     components:
-    - pos: 3.5,9.5
+    - type: Transform
+      pos: -4.5,2.5
       parent: 1
-      type: Transform
   - uid: 74
     components:
-    - pos: 5.5,9.5
+    - type: Transform
+      pos: -4.5,0.5
       parent: 1
-      type: Transform
   - uid: 75
     components:
-    - pos: 2.5,9.5
+    - type: Transform
+      pos: -4.5,-1.5
       parent: 1
-      type: Transform
   - uid: 76
     components:
-    - pos: 0.5,8.5
+    - type: Transform
+      pos: -3.5,-4.5
       parent: 1
-      type: Transform
   - uid: 77
     components:
-    - pos: -4.5,6.5
+    - type: Transform
+      pos: -3.5,-2.5
       parent: 1
-      type: Transform
   - uid: 78
     components:
-    - pos: -4.5,4.5
+    - type: Transform
+      pos: -3.5,-7.5
       parent: 1
-      type: Transform
   - uid: 79
     components:
-    - pos: -4.5,3.5
+    - type: Transform
+      pos: -4.5,-8.5
       parent: 1
-      type: Transform
   - uid: 80
     components:
-    - pos: -4.5,2.5
+    - type: Transform
+      pos: -4.5,-5.5
       parent: 1
-      type: Transform
   - uid: 81
     components:
-    - pos: -4.5,0.5
+    - type: Transform
+      pos: -4.5,-9.5
       parent: 1
-      type: Transform
   - uid: 82
     components:
-    - pos: -4.5,-1.5
+    - type: Transform
+      pos: -2.5,-9.5
       parent: 1
-      type: Transform
   - uid: 83
     components:
-    - pos: -4.5,-2.5
+    - type: Transform
+      pos: -1.5,-9.5
       parent: 1
-      type: Transform
   - uid: 84
     components:
-    - pos: -4.5,-4.5
+    - type: Transform
+      pos: 16.5,0.5
       parent: 1
-      type: Transform
   - uid: 85
     components:
-    - pos: -4.5,-5.5
+    - type: Transform
+      pos: 16.5,1.5
       parent: 1
-      type: Transform
   - uid: 86
     components:
-    - pos: -4.5,-7.5
-      parent: 1
-      type: Transform
-  - uid: 87
-    components:
-    - pos: -4.5,-6.5
+    - type: Transform
+      pos: 3.5,-10.5
       parent: 1
-      type: Transform
   - uid: 88
     components:
-    - pos: -3.5,-9.5
+    - type: Transform
+      pos: 6.5,-10.5
       parent: 1
-      type: Transform
   - uid: 89
     components:
-    - pos: -2.5,-9.5
+    - type: Transform
+      pos: 7.5,-12.5
       parent: 1
-      type: Transform
   - uid: 90
     components:
-    - pos: -1.5,-9.5
+    - type: Transform
+      pos: 9.5,-7.5
       parent: 1
-      type: Transform
   - uid: 91
     components:
-    - pos: -0.5,-9.5
+    - type: Transform
+      pos: 8.5,-8.5
       parent: 1
-      type: Transform
   - uid: 92
     components:
-    - pos: 1.5,-9.5
+    - type: Transform
+      pos: 13.5,-7.5
       parent: 1
-      type: Transform
   - uid: 93
     components:
-    - pos: 2.5,-9.5
+    - type: Transform
+      pos: 14.5,-6.5
       parent: 1
-      type: Transform
   - uid: 94
     components:
-    - pos: 16.5,1.5
+    - type: Transform
+      pos: 15.5,-6.5
       parent: 1
-      type: Transform
   - uid: 95
     components:
-    - pos: 16.5,0.5
+    - type: Transform
+      pos: 15.5,-5.5
       parent: 1
-      type: Transform
   - uid: 96
     components:
-    - pos: 0.5,-9.5
+    - type: Transform
+      pos: 15.5,-4.5
       parent: 1
-      type: Transform
   - uid: 97
     components:
-    - pos: 3.5,-9.5
+    - type: Transform
+      pos: 16.5,-6.5
       parent: 1
-      type: Transform
   - uid: 98
     components:
-    - pos: 4.5,-9.5
+    - type: Transform
+      pos: 15.5,-1.5
       parent: 1
-      type: Transform
   - uid: 99
     components:
-    - pos: 5.5,-9.5
+    - type: Transform
+      pos: 15.5,-2.5
       parent: 1
-      type: Transform
   - uid: 100
     components:
-    - pos: 6.5,-9.5
+    - type: Transform
+      pos: 18.5,-1.5
       parent: 1
-      type: Transform
   - uid: 101
     components:
-    - pos: 8.5,-8.5
+    - type: Transform
+      pos: 16.5,-5.5
       parent: 1
-      type: Transform
   - uid: 102
     components:
-    - pos: 9.5,-7.5
+    - type: Transform
+      pos: 16.5,-4.5
+      parent: 1
+  - uid: 103
+    components:
+    - type: Transform
+      pos: -3.5,-11.5
       parent: 1
-      type: Transform
   - uid: 104
     components:
-    - pos: 12.5,-7.5
+    - type: Transform
+      pos: -1.5,-11.5
       parent: 1
-      type: Transform
   - uid: 105
     components:
-    - pos: 14.5,-6.5
+    - type: Transform
+      pos: -2.5,11.5
       parent: 1
-      type: Transform
   - uid: 106
     components:
-    - pos: 15.5,-6.5
+    - type: Transform
+      pos: 2.5,-12.5
       parent: 1
-      type: Transform
   - uid: 107
     components:
-    - pos: 15.5,-5.5
+    - type: Transform
+      pos: 5.5,-10.5
       parent: 1
-      type: Transform
   - uid: 108
     components:
-    - pos: 15.5,-4.5
+    - type: Transform
+      pos: 7.5,-11.5
       parent: 1
-      type: Transform
   - uid: 109
     components:
-    - pos: 15.5,-3.5
+    - type: Transform
+      pos: 15.5,-8.5
       parent: 1
-      type: Transform
   - uid: 110
     components:
-    - pos: 15.5,-2.5
+    - type: Transform
+      pos: 19.5,2.5
       parent: 1
-      type: Transform
   - uid: 111
     components:
-    - pos: 15.5,-1.5
+    - type: Transform
+      pos: 17.5,5.5
       parent: 1
-      type: Transform
   - uid: 112
     components:
-    - pos: 16.5,-2.5
+    - type: Transform
+      pos: 8.5,-12.5
       parent: 1
-      type: Transform
   - uid: 113
     components:
-    - pos: 16.5,-3.5
+    - type: Transform
+      pos: 17.5,0.5
       parent: 1
-      type: Transform
   - uid: 114
     components:
-    - pos: 16.5,-4.5
+    - type: Transform
+      pos: 17.5,-2.5
       parent: 1
-      type: Transform
   - uid: 115
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -1.5,-10.5
+    - type: Transform
+      pos: 18.5,-0.5
       parent: 1
-      type: Transform
   - uid: 116
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -0.5,-10.5
+    - type: Transform
+      pos: 18.5,3.5
       parent: 1
-      type: Transform
   - uid: 117
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,-10.5
-      parent: 1
-      type: Transform
-  - uid: 118
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,-10.5
+    - type: Transform
+      pos: 17.5,3.5
       parent: 1
-      type: Transform
   - uid: 119
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 3.5,-10.5
+    - type: Transform
+      pos: 19.5,3.5
       parent: 1
-      type: Transform
   - uid: 120
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 5.5,-10.5
+    - type: Transform
+      pos: 19.5,4.5
       parent: 1
-      type: Transform
   - uid: 121
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,-10.5
+    - type: Transform
+      pos: 17.5,4.5
       parent: 1
-      type: Transform
   - uid: 122
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 11.5,-8.5
+    - type: Transform
+      pos: 18.5,4.5
       parent: 1
-      type: Transform
   - uid: 123
     components:
-    - rot: 3.141592653589793 rad
-      pos: 17.5,3.5
+    - type: Transform
+      pos: 16.5,4.5
       parent: 1
-      type: Transform
   - uid: 124
     components:
-    - rot: 3.141592653589793 rad
-      pos: 16.5,4.5
+    - type: Transform
+      pos: 16.5,5.5
       parent: 1
-      type: Transform
   - uid: 125
     components:
-    - pos: 9.5,-13.5
+    - type: Transform
+      pos: 15.5,5.5
       parent: 1
-      type: Transform
   - uid: 126
     components:
-    - rot: 3.141592653589793 rad
-      pos: 17.5,-0.5
+    - type: Transform
+      pos: 13.5,5.5
       parent: 1
-      type: Transform
   - uid: 127
     components:
-    - rot: 3.141592653589793 rad
-      pos: 17.5,-1.5
+    - type: Transform
+      pos: 11.5,8.5
       parent: 1
-      type: Transform
   - uid: 128
     components:
-    - rot: 3.141592653589793 rad
-      pos: 17.5,1.5
+    - type: Transform
+      pos: 12.5,8.5
       parent: 1
-      type: Transform
   - uid: 129
     components:
-    - rot: 3.141592653589793 rad
-      pos: 18.5,3.5
+    - type: Transform
+      pos: 9.5,6.5
       parent: 1
-      type: Transform
   - uid: 130
     components:
-    - rot: 3.141592653589793 rad
-      pos: 19.5,2.5
+    - type: Transform
+      pos: 8.5,8.5
       parent: 1
-      type: Transform
   - uid: 131
     components:
-    - rot: 3.141592653589793 rad
-      pos: 17.5,4.5
+    - type: Transform
+      pos: 7.5,8.5
       parent: 1
-      type: Transform
   - uid: 132
     components:
-    - rot: 3.141592653589793 rad
-      pos: 18.5,4.5
+    - type: Transform
+      pos: 7.5,9.5
       parent: 1
-      type: Transform
   - uid: 133
     components:
-    - rot: 3.141592653589793 rad
-      pos: 19.5,3.5
+    - type: Transform
+      pos: 9.5,8.5
       parent: 1
-      type: Transform
   - uid: 134
     components:
-    - rot: 3.141592653589793 rad
-      pos: 19.5,4.5
+    - type: Transform
+      pos: 13.5,6.5
       parent: 1
-      type: Transform
   - uid: 135
     components:
-    - rot: 3.141592653589793 rad
-      pos: 17.5,5.5
+    - type: Transform
+      pos: 12.5,6.5
       parent: 1
-      type: Transform
   - uid: 136
     components:
-    - rot: 3.141592653589793 rad
-      pos: 15.5,5.5
+    - type: Transform
+      pos: 12.5,7.5
       parent: 1
-      type: Transform
   - uid: 137
     components:
-    - rot: 3.141592653589793 rad
-      pos: 16.5,5.5
+    - type: Transform
+      pos: 14.5,6.5
       parent: 1
-      type: Transform
   - uid: 138
     components:
-    - rot: 3.141592653589793 rad
-      pos: 14.5,6.5
+    - type: Transform
+      pos: 17.5,-0.5
       parent: 1
-      type: Transform
   - uid: 139
     components:
-    - rot: 3.141592653589793 rad
-      pos: 13.5,6.5
+    - type: Transform
+      pos: 20.5,0.5
       parent: 1
-      type: Transform
   - uid: 140
     components:
-    - rot: 3.141592653589793 rad
-      pos: 12.5,6.5
+    - type: Transform
+      pos: 17.5,1.5
       parent: 1
-      type: Transform
   - uid: 141
     components:
-    - rot: 3.141592653589793 rad
-      pos: 12.5,5.5
+    - type: Transform
+      pos: -0.5,13.5
       parent: 1
-      type: Transform
   - uid: 142
     components:
-    - rot: 3.141592653589793 rad
-      pos: 10.5,6.5
+    - type: Transform
+      pos: 0.5,13.5
       parent: 1
-      type: Transform
   - uid: 143
     components:
-    - rot: 3.141592653589793 rad
-      pos: 10.5,5.5
+    - type: Transform
+      pos: 19.5,1.5
       parent: 1
-      type: Transform
   - uid: 144
     components:
-    - rot: 3.141592653589793 rad
-      pos: 9.5,6.5
+    - type: Transform
+      pos: 21.5,2.5
       parent: 1
-      type: Transform
   - uid: 145
     components:
-    - rot: 3.141592653589793 rad
-      pos: 11.5,6.5
+    - type: Transform
+      pos: -6.5,9.5
       parent: 1
-      type: Transform
   - uid: 146
     components:
-    - rot: 3.141592653589793 rad
-      pos: 8.5,8.5
+    - type: Transform
+      pos: 19.5,5.5
       parent: 1
-      type: Transform
   - uid: 147
     components:
-    - rot: 3.141592653589793 rad
-      pos: 7.5,8.5
+    - type: Transform
+      pos: 20.5,6.5
       parent: 1
-      type: Transform
   - uid: 148
     components:
-    - rot: 3.141592653589793 rad
-      pos: 7.5,9.5
+    - type: Transform
+      pos: 20.5,7.5
       parent: 1
-      type: Transform
   - uid: 149
     components:
-    - rot: 3.141592653589793 rad
-      pos: 9.5,8.5
+    - type: Transform
+      pos: 1.5,12.5
       parent: 1
-      type: Transform
   - uid: 150
     components:
-    - rot: 3.141592653589793 rad
-      pos: 11.5,8.5
+    - type: Transform
+      pos: 20.5,5.5
       parent: 1
-      type: Transform
   - uid: 151
     components:
-    - rot: 3.141592653589793 rad
-      pos: 12.5,8.5
+    - type: Transform
+      pos: 22.5,8.5
       parent: 1
-      type: Transform
   - uid: 152
     components:
-    - rot: 3.141592653589793 rad
-      pos: 12.5,7.5
+    - type: Transform
+      pos: 21.5,8.5
       parent: 1
-      type: Transform
   - uid: 153
     components:
-    - rot: 3.141592653589793 rad
-      pos: 14.5,7.5
+    - type: Transform
+      pos: 21.5,6.5
       parent: 1
-      type: Transform
   - uid: 154
     components:
-    - rot: 3.141592653589793 rad
-      pos: 17.5,0.5
+    - type: Transform
+      pos: 21.5,7.5
       parent: 1
-      type: Transform
   - uid: 155
     components:
-    - rot: 3.141592653589793 rad
-      pos: 19.5,1.5
+    - type: Transform
+      pos: -5.5,9.5
       parent: 1
-      type: Transform
   - uid: 156
     components:
-    - rot: 3.141592653589793 rad
-      pos: 18.5,-0.5
+    - type: Transform
+      pos: 20.5,2.5
       parent: 1
-      type: Transform
   - uid: 157
     components:
-    - rot: 3.141592653589793 rad
-      pos: 20.5,0.5
+    - type: Transform
+      pos: 16.5,-2.5
       parent: 1
-      type: Transform
   - uid: 158
     components:
-    - rot: 3.141592653589793 rad
-      pos: 20.5,3.5
+    - type: Transform
+      pos: -2.5,12.5
       parent: 1
-      type: Transform
   - uid: 159
     components:
-    - rot: 3.141592653589793 rad
-      pos: 19.5,5.5
+    - type: Transform
+      pos: -10.5,5.5
       parent: 1
-      type: Transform
   - uid: 160
     components:
-    - rot: 3.141592653589793 rad
-      pos: 20.5,6.5
+    - type: Transform
+      pos: 17.5,-3.5
       parent: 1
-      type: Transform
   - uid: 161
     components:
-    - rot: 3.141592653589793 rad
-      pos: 20.5,7.5
+    - type: Transform
+      pos: 17.5,-4.5
       parent: 1
-      type: Transform
   - uid: 162
     components:
-    - rot: 3.141592653589793 rad
-      pos: 21.5,6.5
+    - type: Transform
+      pos: 18.5,-2.5
       parent: 1
-      type: Transform
   - uid: 163
     components:
-    - rot: 3.141592653589793 rad
-      pos: 20.5,5.5
+    - type: Transform
+      pos: 14.5,-7.5
       parent: 1
-      type: Transform
   - uid: 164
     components:
-    - rot: 3.141592653589793 rad
-      pos: 21.5,7.5
+    - type: Transform
+      pos: 12.5,-7.5
       parent: 1
-      type: Transform
   - uid: 165
     components:
-    - rot: 3.141592653589793 rad
-      pos: 21.5,8.5
+    - type: Transform
+      pos: 9.5,-8.5
       parent: 1
-      type: Transform
   - uid: 166
     components:
-    - rot: 3.141592653589793 rad
-      pos: 23.5,9.5
+    - type: Transform
+      pos: 11.5,-10.5
       parent: 1
-      type: Transform
   - uid: 167
     components:
-    - rot: 3.141592653589793 rad
-      pos: 22.5,8.5
+    - type: Transform
+      pos: 11.5,-8.5
       parent: 1
-      type: Transform
   - uid: 168
     components:
-    - rot: 3.141592653589793 rad
-      pos: 20.5,2.5
+    - type: Transform
+      pos: 14.5,-8.5
       parent: 1
-      type: Transform
   - uid: 169
     components:
-    - rot: 3.141592653589793 rad
-      pos: 20.5,4.5
+    - type: Transform
+      pos: 12.5,-10.5
       parent: 1
-      type: Transform
   - uid: 170
     components:
-    - rot: 3.141592653589793 rad
-      pos: 18.5,-1.5
+    - type: Transform
+      pos: 10.5,-11.5
       parent: 1
-      type: Transform
   - uid: 171
     components:
-    - rot: 3.141592653589793 rad
-      pos: 20.5,-1.5
+    - type: Transform
+      pos: 8.5,-10.5
       parent: 1
-      type: Transform
   - uid: 172
     components:
-    - rot: 3.141592653589793 rad
-      pos: 20.5,-2.5
+    - type: Transform
+      pos: 9.5,-10.5
       parent: 1
-      type: Transform
   - uid: 173
     components:
-    - rot: 3.141592653589793 rad
-      pos: 18.5,-2.5
+    - type: Transform
+      pos: -9.5,0.5
       parent: 1
-      type: Transform
   - uid: 174
     components:
-    - rot: 3.141592653589793 rad
-      pos: 17.5,-2.5
+    - type: Transform
+      pos: 13.5,-8.5
       parent: 1
-      type: Transform
   - uid: 175
     components:
-    - rot: 3.141592653589793 rad
-      pos: 17.5,-3.5
+    - type: Transform
+      pos: 17.5,-6.5
       parent: 1
-      type: Transform
   - uid: 176
     components:
-    - rot: 3.141592653589793 rad
-      pos: 17.5,-4.5
+    - type: Transform
+      pos: 12.5,-8.5
       parent: 1
-      type: Transform
   - uid: 177
     components:
-    - rot: 3.141592653589793 rad
-      pos: 13.5,-7.5
+    - type: Transform
+      pos: 15.5,-3.5
       parent: 1
-      type: Transform
   - uid: 178
     components:
-    - rot: 3.141592653589793 rad
-      pos: 14.5,-7.5
+    - type: Transform
+      pos: 16.5,-3.5
       parent: 1
-      type: Transform
   - uid: 179
     components:
-    - rot: 3.141592653589793 rad
-      pos: 9.5,-8.5
+    - type: Transform
+      pos: 17.5,-7.5
       parent: 1
-      type: Transform
   - uid: 180
     components:
-    - rot: 3.141592653589793 rad
-      pos: 8.5,-10.5
+    - type: Transform
+      pos: 16.5,-7.5
       parent: 1
-      type: Transform
   - uid: 181
     components:
-    - rot: 3.141592653589793 rad
-      pos: 12.5,-8.5
+    - type: Transform
+      pos: 15.5,-7.5
       parent: 1
-      type: Transform
   - uid: 182
     components:
-    - rot: 3.141592653589793 rad
-      pos: 13.5,-8.5
+    - type: Transform
+      pos: -9.5,-1.5
       parent: 1
-      type: Transform
   - uid: 183
     components:
-    - rot: 3.141592653589793 rad
-      pos: 9.5,-10.5
+    - type: Transform
+      pos: 10.5,-10.5
       parent: 1
-      type: Transform
   - uid: 184
     components:
-    - rot: 3.141592653589793 rad
-      pos: 10.5,-10.5
+    - type: Transform
+      pos: 9.5,-11.5
       parent: 1
-      type: Transform
   - uid: 185
     components:
-    - rot: 3.141592653589793 rad
-      pos: 11.5,-10.5
-      parent: 1
-      type: Transform
-  - uid: 186
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 12.5,-10.5
+    - type: Transform
+      pos: 0.5,-15.5
       parent: 1
-      type: Transform
   - uid: 187
     components:
-    - rot: 3.141592653589793 rad
-      pos: 14.5,-9.5
+    - type: Transform
+      pos: -9.5,-5.5
       parent: 1
-      type: Transform
   - uid: 188
     components:
-    - rot: 3.141592653589793 rad
-      pos: 14.5,-8.5
+    - type: Transform
+      pos: -7.5,-10.5
       parent: 1
-      type: Transform
   - uid: 189
     components:
-    - rot: 3.141592653589793 rad
-      pos: 15.5,-7.5
+    - type: Transform
+      pos: 17.5,-5.5
       parent: 1
-      type: Transform
   - uid: 190
     components:
-    - rot: 3.141592653589793 rad
-      pos: 15.5,-8.5
+    - type: Transform
+      pos: -6.5,-10.5
       parent: 1
-      type: Transform
   - uid: 191
     components:
-    - rot: 3.141592653589793 rad
-      pos: 16.5,-5.5
+    - type: Transform
+      pos: -5.5,-11.5
       parent: 1
-      type: Transform
   - uid: 192
     components:
-    - rot: 3.141592653589793 rad
-      pos: 16.5,-6.5
+    - type: Transform
+      pos: 14.5,-9.5
       parent: 1
-      type: Transform
   - uid: 193
     components:
-    - rot: 3.141592653589793 rad
-      pos: 16.5,-7.5
+    - type: Transform
+      pos: -5.5,-12.5
       parent: 1
-      type: Transform
   - uid: 194
     components:
-    - rot: 3.141592653589793 rad
-      pos: 17.5,-7.5
+    - type: Transform
+      pos: 18.5,-6.5
       parent: 1
-      type: Transform
   - uid: 195
     components:
-    - rot: 3.141592653589793 rad
-      pos: 17.5,-6.5
+    - type: Transform
+      pos: -6.5,-12.5
       parent: 1
-      type: Transform
   - uid: 196
     components:
-    - rot: 3.141592653589793 rad
-      pos: 17.5,-5.5
+    - type: Transform
+      pos: 20.5,-2.5
       parent: 1
-      type: Transform
   - uid: 197
     components:
-    - rot: 3.141592653589793 rad
-      pos: 10.5,-11.5
+    - type: Transform
+      pos: 20.5,-1.5
       parent: 1
-      type: Transform
   - uid: 198
     components:
-    - rot: 3.141592653589793 rad
-      pos: 9.5,-11.5
+    - type: Transform
+      pos: 21.5,4.5
       parent: 1
-      type: Transform
   - uid: 199
     components:
-    - rot: 3.141592653589793 rad
-      pos: 8.5,-11.5
+    - type: Transform
+      pos: 20.5,3.5
       parent: 1
-      type: Transform
   - uid: 200
     components:
-    - rot: 3.141592653589793 rad
-      pos: 13.5,-11.5
+    - type: Transform
+      pos: 20.5,4.5
       parent: 1
-      type: Transform
   - uid: 201
     components:
-    - rot: 3.141592653589793 rad
-      pos: 13.5,-12.5
+    - type: Transform
+      pos: 14.5,7.5
       parent: 1
-      type: Transform
   - uid: 202
     components:
-    - rot: 3.141592653589793 rad
-      pos: 12.5,-13.5
+    - type: Transform
+      pos: 15.5,7.5
       parent: 1
-      type: Transform
   - uid: 203
     components:
-    - rot: 3.141592653589793 rad
-      pos: 16.5,-8.5
+    - type: Transform
+      pos: -3.5,-13.5
       parent: 1
-      type: Transform
   - uid: 204
     components:
-    - rot: 3.141592653589793 rad
-      pos: 17.5,-9.5
+    - type: Transform
+      pos: 3.5,10.5
       parent: 1
-      type: Transform
   - uid: 205
     components:
-    - rot: 3.141592653589793 rad
-      pos: 17.5,-10.5
+    - type: Transform
+      pos: 2.5,10.5
       parent: 1
-      type: Transform
   - uid: 206
     components:
-    - rot: 3.141592653589793 rad
-      pos: 18.5,-11.5
+    - type: Transform
+      pos: 1.5,10.5
       parent: 1
-      type: Transform
   - uid: 207
     components:
-    - rot: 3.141592653589793 rad
-      pos: 19.5,-7.5
+    - type: Transform
+      pos: 5.5,10.5
       parent: 1
-      type: Transform
   - uid: 208
     components:
-    - rot: 3.141592653589793 rad
-      pos: 20.5,-7.5
+    - type: Transform
+      pos: 5.5,9.5
       parent: 1
-      type: Transform
   - uid: 209
     components:
-    - rot: 3.141592653589793 rad
-      pos: 18.5,-6.5
+    - type: Transform
+      pos: 5.5,11.5
       parent: 1
-      type: Transform
   - uid: 210
     components:
-    - rot: 3.141592653589793 rad
-      pos: 21.5,-3.5
+    - type: Transform
+      pos: 6.5,9.5
       parent: 1
-      type: Transform
   - uid: 211
     components:
-    - rot: 3.141592653589793 rad
-      pos: 21.5,-4.5
+    - type: Transform
+      pos: 3.5,11.5
       parent: 1
-      type: Transform
   - uid: 212
     components:
-    - rot: 3.141592653589793 rad
-      pos: 21.5,2.5
+    - type: Transform
+      pos: 1.5,9.5
       parent: 1
-      type: Transform
   - uid: 213
     components:
-    - rot: 3.141592653589793 rad
-      pos: 21.5,4.5
+    - type: Transform
+      pos: 2.5,9.5
       parent: 1
-      type: Transform
   - uid: 214
     components:
-    - rot: 3.141592653589793 rad
-      pos: 22.5,3.5
+    - type: Transform
+      pos: -0.5,9.5
       parent: 1
-      type: Transform
   - uid: 215
     components:
-    - rot: 3.141592653589793 rad
-      pos: 16.5,8.5
+    - type: Transform
+      pos: -1.5,8.5
       parent: 1
-      type: Transform
   - uid: 216
     components:
-    - rot: 3.141592653589793 rad
-      pos: 15.5,7.5
+    - type: Transform
+      pos: -0.5,10.5
       parent: 1
-      type: Transform
   - uid: 217
     components:
-    - rot: 3.141592653589793 rad
-      pos: 11.5,10.5
+    - type: Transform
+      pos: -2.5,9.5
       parent: 1
-      type: Transform
   - uid: 218
     components:
-    - rot: 3.141592653589793 rad
-      pos: 3.5,10.5
+    - type: Transform
+      pos: -3.5,-14.5
       parent: 1
-      type: Transform
   - uid: 219
     components:
-    - rot: 3.141592653589793 rad
-      pos: 3.5,11.5
+    - type: Transform
+      pos: -1.5,9.5
       parent: 1
-      type: Transform
   - uid: 220
     components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,11.5
+    - type: Transform
+      pos: -3.5,5.5
       parent: 1
-      type: Transform
   - uid: 221
     components:
-    - rot: 3.141592653589793 rad
-      pos: 5.5,11.5
+    - type: Transform
+      pos: -7.5,6.5
       parent: 1
-      type: Transform
   - uid: 222
     components:
-    - rot: 3.141592653589793 rad
-      pos: 5.5,10.5
+    - type: Transform
+      pos: -5.5,5.5
       parent: 1
-      type: Transform
   - uid: 223
     components:
-    - rot: 3.141592653589793 rad
-      pos: 6.5,10.5
+    - type: Transform
+      pos: -5.5,4.5
       parent: 1
-      type: Transform
   - uid: 224
     components:
-    - rot: 3.141592653589793 rad
-      pos: 6.5,9.5
+    - type: Transform
+      pos: 4.5,11.5
       parent: 1
-      type: Transform
   - uid: 225
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,10.5
+    - type: Transform
+      pos: -1.5,10.5
       parent: 1
-      type: Transform
   - uid: 226
     components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,9.5
+    - type: Transform
+      pos: -0.5,-14.5
       parent: 1
-      type: Transform
   - uid: 227
     components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,9.5
+    - type: Transform
+      pos: 9.5,-13.5
       parent: 1
-      type: Transform
   - uid: 228
     components:
-    - rot: 3.141592653589793 rad
-      pos: -0.5,9.5
+    - type: Transform
+      pos: 3.5,12.5
       parent: 1
-      type: Transform
   - uid: 229
     components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,8.5
+    - type: Transform
+      pos: 4.5,-15.5
       parent: 1
-      type: Transform
   - uid: 230
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,8.5
+    - type: Transform
+      pos: 4.5,-14.5
       parent: 1
-      type: Transform
   - uid: 231
     components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,9.5
+    - type: Transform
+      pos: 5.5,-15.5
       parent: 1
-      type: Transform
   - uid: 232
     components:
-    - rot: 3.141592653589793 rad
-      pos: -3.5,8.5
+    - type: Transform
+      pos: 9.5,-14.5
       parent: 1
-      type: Transform
   - uid: 233
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,9.5
+    - type: Transform
+      pos: 6.5,11.5
       parent: 1
-      type: Transform
   - uid: 234
     components:
-    - rot: 3.141592653589793 rad
-      pos: -4.5,7.5
+    - type: Transform
+      pos: 12.5,-13.5
       parent: 1
-      type: Transform
   - uid: 235
     components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,6.5
+    - type: Transform
+      pos: 13.5,-12.5
       parent: 1
-      type: Transform
   - uid: 236
     components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,5.5
+    - type: Transform
+      pos: -4.5,8.5
       parent: 1
-      type: Transform
   - uid: 237
     components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,4.5
+    - type: Transform
+      pos: -3.5,8.5
       parent: 1
-      type: Transform
   - uid: 238
     components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,10.5
+    - type: Transform
+      pos: -2.5,8.5
       parent: 1
-      type: Transform
   - uid: 239
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,11.5
+    - type: Transform
+      pos: -6.5,6.5
       parent: 1
-      type: Transform
   - uid: 240
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,12.5
+    - type: Transform
+      pos: -5.5,6.5
       parent: 1
-      type: Transform
   - uid: 241
     components:
-    - rot: 3.141592653589793 rad
-      pos: -0.5,13.5
+    - type: Transform
+      pos: -4.5,4.5
       parent: 1
-      type: Transform
   - uid: 242
     components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,12.5
+    - type: Transform
+      pos: 13.5,-11.5
       parent: 1
-      type: Transform
   - uid: 243
     components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,12.5
+    - type: Transform
+      pos: -9.5,4.5
       parent: 1
-      type: Transform
   - uid: 244
     components:
-    - rot: 3.141592653589793 rad
-      pos: 3.5,12.5
+    - type: Transform
+      pos: -8.5,4.5
       parent: 1
-      type: Transform
   - uid: 245
     components:
-    - rot: 3.141592653589793 rad
-      pos: 7.5,12.5
+    - type: Transform
+      pos: -8.5,3.5
       parent: 1
-      type: Transform
   - uid: 246
     components:
-    - rot: 3.141592653589793 rad
-      pos: 7.5,13.5
+    - type: Transform
+      pos: -7.5,3.5
       parent: 1
-      type: Transform
   - uid: 247
     components:
-    - rot: 3.141592653589793 rad
-      pos: 7.5,14.5
+    - type: Transform
+      pos: -6.5,3.5
       parent: 1
-      type: Transform
   - uid: 248
     components:
-    - rot: 3.141592653589793 rad
-      pos: 6.5,11.5
+    - type: Transform
+      pos: -5.5,3.5
       parent: 1
-      type: Transform
   - uid: 249
     components:
-    - rot: 3.141592653589793 rad
-      pos: -4.5,8.5
+    - type: Transform
+      pos: -6.5,5.5
       parent: 1
-      type: Transform
   - uid: 250
     components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,9.5
+    - type: Transform
+      pos: -4.5,1.5
       parent: 1
-      type: Transform
   - uid: 251
     components:
-    - rot: 3.141592653589793 rad
-      pos: -6.5,9.5
+    - type: Transform
+      pos: -6.5,2.5
       parent: 1
-      type: Transform
   - uid: 252
     components:
-    - rot: 3.141592653589793 rad
-      pos: -0.5,10.5
+    - type: Transform
+      pos: -8.5,1.5
       parent: 1
-      type: Transform
   - uid: 253
     components:
-    - rot: 3.141592653589793 rad
-      pos: -6.5,6.5
+    - type: Transform
+      pos: -7.5,0.5
       parent: 1
-      type: Transform
   - uid: 254
     components:
-    - rot: 3.141592653589793 rad
-      pos: -7.5,6.5
+    - type: Transform
+      pos: -5.5,0.5
       parent: 1
-      type: Transform
   - uid: 255
     components:
-    - rot: 3.141592653589793 rad
-      pos: -8.5,6.5
+    - type: Transform
+      pos: -6.5,0.5
       parent: 1
-      type: Transform
   - uid: 256
     components:
-    - rot: 3.141592653589793 rad
-      pos: -10.5,5.5
+    - type: Transform
+      pos: 18.5,-11.5
       parent: 1
-      type: Transform
   - uid: 257
     components:
-    - rot: 3.141592653589793 rad
-      pos: -9.5,4.5
+    - type: Transform
+      pos: -5.5,-0.5
       parent: 1
-      type: Transform
   - uid: 258
     components:
-    - rot: 3.141592653589793 rad
-      pos: -8.5,4.5
+    - type: Transform
+      pos: -5.5,-1.5
       parent: 1
-      type: Transform
   - uid: 259
     components:
-    - rot: 3.141592653589793 rad
-      pos: -8.5,3.5
+    - type: Transform
+      pos: 17.5,-10.5
       parent: 1
-      type: Transform
   - uid: 260
     components:
-    - rot: 3.141592653589793 rad
-      pos: -7.5,3.5
+    - type: Transform
+      pos: -8.5,-2.5
       parent: 1
-      type: Transform
   - uid: 261
     components:
-    - rot: 3.141592653589793 rad
-      pos: -6.5,3.5
+    - type: Transform
+      pos: -7.5,-2.5
       parent: 1
-      type: Transform
   - uid: 262
     components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,3.5
+    - type: Transform
+      pos: 16.5,-8.5
       parent: 1
-      type: Transform
   - uid: 263
     components:
-    - rot: 3.141592653589793 rad
-      pos: -6.5,5.5
+    - type: Transform
+      pos: 17.5,-9.5
       parent: 1
-      type: Transform
   - uid: 264
     components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,2.5
+    - type: Transform
+      pos: -3.5,-1.5
       parent: 1
-      type: Transform
   - uid: 265
     components:
-    - rot: 3.141592653589793 rad
-      pos: -6.5,2.5
+    - type: Transform
+      pos: 19.5,-7.5
       parent: 1
-      type: Transform
   - uid: 266
     components:
-    - rot: 3.141592653589793 rad
-      pos: -6.5,1.5
+    - type: Transform
+      pos: -5.5,-2.5
       parent: 1
-      type: Transform
   - uid: 267
     components:
-    - rot: 3.141592653589793 rad
-      pos: -7.5,1.5
+    - type: Transform
+      pos: -6.5,-7.5
       parent: 1
-      type: Transform
   - uid: 268
     components:
-    - rot: 3.141592653589793 rad
-      pos: -7.5,0.5
+    - type: Transform
+      pos: -4.5,-6.5
       parent: 1
-      type: Transform
   - uid: 269
     components:
-    - rot: 3.141592653589793 rad
-      pos: -6.5,0.5
+    - type: Transform
+      pos: -4.5,-10.5
       parent: 1
-      type: Transform
   - uid: 270
     components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,0.5
+    - type: Transform
+      pos: -4.5,-7.5
       parent: 1
-      type: Transform
   - uid: 271
     components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,-0.5
+    - type: Transform
+      pos: -5.5,-8.5
       parent: 1
-      type: Transform
   - uid: 272
     components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,-1.5
+    - type: Transform
+      pos: -3.5,-8.5
       parent: 1
-      type: Transform
   - uid: 273
     components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,-2.5
+    - type: Transform
+      pos: -2.5,-11.5
       parent: 1
-      type: Transform
   - uid: 274
     components:
-    - rot: 3.141592653589793 rad
-      pos: -6.5,-1.5
+    - type: Transform
+      pos: -3.5,-9.5
       parent: 1
-      type: Transform
   - uid: 275
     components:
-    - rot: 3.141592653589793 rad
-      pos: -7.5,-2.5
+    - type: Transform
+      pos: -1.5,-10.5
       parent: 1
-      type: Transform
   - uid: 276
     components:
-    - rot: 3.141592653589793 rad
-      pos: -7.5,-4.5
+    - type: Transform
+      pos: -5.5,-7.5
       parent: 1
-      type: Transform
   - uid: 277
     components:
-    - rot: 3.141592653589793 rad
-      pos: -6.5,-4.5
+    - type: Transform
+      pos: -2.5,-10.5
       parent: 1
-      type: Transform
   - uid: 278
     components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,-4.5
+    - type: Transform
+      pos: -0.5,-10.5
       parent: 1
-      type: Transform
   - uid: 279
     components:
-    - rot: 3.141592653589793 rad
-      pos: -6.5,-2.5
+    - type: Transform
+      pos: -0.5,-11.5
       parent: 1
-      type: Transform
   - uid: 280
     components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,-3.5
+    - type: Transform
+      pos: 0.5,-13.5
       parent: 1
-      type: Transform
   - uid: 281
     components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,-5.5
+    - type: Transform
+      pos: 2.5,-10.5
       parent: 1
-      type: Transform
   - uid: 282
     components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,-6.5
+    - type: Transform
+      pos: 2.5,-11.5
       parent: 1
-      type: Transform
   - uid: 283
     components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,-7.5
+    - type: Transform
+      pos: 20.5,-7.5
       parent: 1
-      type: Transform
   - uid: 284
     components:
-    - rot: 3.141592653589793 rad
-      pos: -4.5,-8.5
+    - type: Transform
+      pos: 6.5,-13.5
       parent: 1
-      type: Transform
   - uid: 285
     components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,-8.5
+    - type: Transform
+      pos: 5.5,-9.5
       parent: 1
-      type: Transform
   - uid: 286
     components:
-    - rot: 3.141592653589793 rad
-      pos: -4.5,-9.5
+    - type: Transform
+      pos: 6.5,-11.5
       parent: 1
-      type: Transform
   - uid: 287
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,-10.5
+    - type: Transform
+      pos: 7.5,-10.5
       parent: 1
-      type: Transform
   - uid: 288
     components:
-    - rot: 3.141592653589793 rad
-      pos: -3.5,-10.5
+    - type: Transform
+      pos: 21.5,-4.5
       parent: 1
-      type: Transform
   - uid: 289
     components:
-    - rot: 3.141592653589793 rad
-      pos: -3.5,-11.5
+    - type: Transform
+      pos: 6.5,-9.5
       parent: 1
-      type: Transform
   - uid: 290
     components:
-    - rot: 3.141592653589793 rad
-      pos: -4.5,-10.5
+    - type: Transform
+      pos: 21.5,-3.5
       parent: 1
-      type: Transform
   - uid: 291
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,-11.5
+    - type: Transform
+      pos: 3.5,-11.5
       parent: 1
-      type: Transform
   - uid: 292
     components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,-11.5
+    - type: Transform
+      pos: 5.5,-11.5
       parent: 1
-      type: Transform
   - uid: 293
     components:
-    - rot: 3.141592653589793 rad
-      pos: -0.5,-11.5
+    - type: Transform
+      pos: 3.5,-13.5
       parent: 1
-      type: Transform
   - uid: 294
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
       pos: 0.5,-10.5
       parent: 1
-      type: Transform
   - uid: 295
     components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,-11.5
+    - type: Transform
+      pos: -0.5,-9.5
       parent: 1
-      type: Transform
   - uid: 296
     components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,-11.5
+    - type: Transform
+      pos: -7.5,-6.5
       parent: 1
-      type: Transform
   - uid: 297
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-11.5
+    - type: Transform
+      pos: -5.5,-5.5
       parent: 1
-      type: Transform
   - uid: 298
     components:
-    - rot: 3.141592653589793 rad
-      pos: 3.5,-11.5
+    - type: Transform
+      pos: 8.5,-11.5
       parent: 1
-      type: Transform
   - uid: 299
     components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,-11.5
+    - type: Transform
+      pos: 4.5,-12.5
       parent: 1
-      type: Transform
   - uid: 300
     components:
-    - rot: 3.141592653589793 rad
-      pos: 5.5,-11.5
+    - type: Transform
+      pos: 4.5,-11.5
       parent: 1
-      type: Transform
   - uid: 301
     components:
-    - rot: 3.141592653589793 rad
-      pos: 6.5,-10.5
+    - type: Transform
+      pos: 22.5,3.5
       parent: 1
-      type: Transform
   - uid: 302
     components:
-    - rot: 3.141592653589793 rad
-      pos: 6.5,-11.5
+    - type: Transform
+      pos: 0.5,-11.5
       parent: 1
-      type: Transform
   - uid: 303
     components:
-    - rot: 3.141592653589793 rad
-      pos: 7.5,-11.5
+    - type: Transform
+      pos: 0.5,-12.5
       parent: 1
-      type: Transform
   - uid: 304
     components:
-    - rot: 3.141592653589793 rad
-      pos: 8.5,-12.5
+    - type: Transform
+      pos: 1.5,-11.5
       parent: 1
-      type: Transform
   - uid: 305
     components:
-    - rot: 3.141592653589793 rad
-      pos: 7.5,-12.5
+    - type: Transform
+      pos: 23.5,9.5
       parent: 1
-      type: Transform
-  - uid: 306
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,-12.5
-      parent: 1
-      type: Transform
   - uid: 307
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-12.5
+    - type: Transform
+      pos: 11.5,10.5
       parent: 1
-      type: Transform
   - uid: 308
     components:
-    - rot: 3.141592653589793 rad
-      pos: 6.5,-13.5
+    - type: Transform
+      pos: 7.5,12.5
       parent: 1
-      type: Transform
   - uid: 309
     components:
-    - rot: 3.141592653589793 rad
-      pos: 3.5,-13.5
+    - type: Transform
+      pos: 7.5,13.5
       parent: 1
-      type: Transform
   - uid: 310
     components:
-    - rot: 3.141592653589793 rad
-      pos: -0.5,-12.5
-      parent: 1
-      type: Transform
-  - uid: 311
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,-12.5
+    - type: Transform
+      pos: 7.5,14.5
       parent: 1
-      type: Transform
   - uid: 312
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
       pos: -6.5,-6.5
       parent: 1
-      type: Transform
   - uid: 313
     components:
-    - rot: 3.141592653589793 rad
-      pos: -6.5,-7.5
+    - type: Transform
+      pos: -7.5,-4.5
       parent: 1
-      type: Transform
   - uid: 314
     components:
-    - pos: 9.5,-14.5
+    - type: Transform
+      pos: -6.5,-4.5
       parent: 1
-      type: Transform
   - uid: 315
     components:
-    - pos: 4.5,-14.5
+    - type: Transform
+      pos: -6.5,-2.5
       parent: 1
-      type: Transform
   - uid: 316
     components:
-    - pos: 5.5,-15.5
+    - type: Transform
+      pos: -6.5,-1.5
       parent: 1
-      type: Transform
   - uid: 317
     components:
-    - pos: -0.5,-14.5
+    - type: Transform
+      pos: -6.5,1.5
       parent: 1
-      type: Transform
   - uid: 318
     components:
-    - pos: 0.5,-13.5
+    - type: Transform
+      pos: -7.5,1.5
       parent: 1
-      type: Transform
   - uid: 319
     components:
-    - pos: 0.5,-12.5
+    - type: Transform
+      pos: 3.5,-9.5
       parent: 1
-      type: Transform
   - uid: 320
     components:
-    - pos: 0.5,-15.5
+    - type: Transform
+      pos: 4.5,-9.5
       parent: 1
-      type: Transform
   - uid: 321
     components:
-    - pos: -3.5,-13.5
+    - type: Transform
+      pos: 2.5,-9.5
       parent: 1
-      type: Transform
   - uid: 322
     components:
-    - pos: -3.5,-14.5
+    - type: Transform
+      pos: 12.5,4.5
       parent: 1
-      type: Transform
   - uid: 323
     components:
-    - pos: -5.5,-11.5
+    - type: Transform
+      pos: 10.5,4.5
       parent: 1
-      type: Transform
   - uid: 324
     components:
-    - pos: -5.5,-12.5
+    - type: Transform
+      pos: 13.5,4.5
       parent: 1
-      type: Transform
   - uid: 325
     components:
-    - pos: -6.5,-13.5
+    - type: Transform
+      pos: 12.5,5.5
       parent: 1
-      type: Transform
   - uid: 326
     components:
-    - pos: -6.5,-10.5
+    - type: Transform
+      pos: -3.5,4.5
       parent: 1
-      type: Transform
   - uid: 327
     components:
-    - pos: -7.5,-10.5
+    - type: Transform
+      pos: 10.5,5.5
       parent: 1
-      type: Transform
   - uid: 328
     components:
-    - pos: -7.5,-6.5
+    - type: Transform
+      pos: 9.5,4.5
       parent: 1
-      type: Transform
   - uid: 329
     components:
-    - pos: -8.5,-5.5
+    - type: Transform
+      pos: 9.5,5.5
       parent: 1
-      type: Transform
   - uid: 330
     components:
-    - pos: -9.5,-6.5
+    - type: Transform
+      pos: 11.5,5.5
       parent: 1
-      type: Transform
   - uid: 331
     components:
-    - pos: -8.5,-2.5
-      parent: 1
-      type: Transform
-  - uid: 332
-    components:
-    - pos: -9.5,-1.5
+    - type: Transform
+      pos: 10.5,6.5
       parent: 1
-      type: Transform
   - uid: 333
     components:
-    - pos: -9.5,0.5
+    - type: Transform
+      pos: 11.5,4.5
       parent: 1
-      type: Transform
   - uid: 334
     components:
-    - pos: -8.5,1.5
+    - type: Transform
+      pos: 0.5,-9.5
       parent: 1
-      type: Transform
-  - uid: 761
+  - uid: 337
     components:
-    - pos: 2.5,-8.5
+    - type: Transform
+      pos: 1.5,7.5
       parent: 1
-      type: Transform
-  - uid: 762
+  - uid: 339
     components:
-    - pos: 1.5,-8.5
+    - type: Transform
+      pos: 1.5,-10.5
       parent: 1
-      type: Transform
-  - uid: 763
+  - uid: 364
     components:
-    - pos: 5.5,-8.5
+    - type: Transform
+      pos: 8.5,4.5
       parent: 1
-      type: Transform
-  - uid: 805
+  - uid: 372
     components:
-    - pos: 3.5,-8.5
+    - type: Transform
+      pos: 11.5,6.5
       parent: 1
-      type: Transform
-  - uid: 921
+  - uid: 373
     components:
-    - pos: 4.5,-8.5
+    - type: Transform
+      pos: 1.5,-9.5
       parent: 1
-      type: Transform
-  - uid: 922
+  - uid: 374
+    components:
+    - type: Transform
+      pos: -3.5,2.5
+      parent: 1
+  - uid: 609
+    components:
+    - type: Transform
+      pos: -4.5,3.5
+      parent: 1
+  - uid: 616
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 818
+    components:
+    - type: Transform
+      pos: -3.5,3.5
+      parent: 1
+  - uid: 884
+    components:
+    - type: Transform
+      pos: 17.5,-1.5
+      parent: 1
+- proto: AsteroidAltRockMining
+  entities:
+  - uid: 186
+    components:
+    - type: Transform
+      pos: -8.5,-5.5
+      parent: 1
+  - uid: 306
     components:
-    - pos: 0.5,-8.5
+    - type: Transform
+      pos: 16.5,8.5
       parent: 1
-      type: Transform
 - proto: AtmosDeviceFanTiny
   entities:
-  - uid: 335
+  - uid: 341
     components:
-    - pos: 3.5,6.5
+    - type: Transform
+      pos: 3.5,6.5
       parent: 1
-      type: Transform
 - proto: Bed
   entities:
-  - uid: 336
+  - uid: 342
     components:
-    - pos: -0.5,1.5
+    - type: Transform
+      pos: -0.5,1.5
       parent: 1
-      type: Transform
-  - uid: 337
+  - uid: 343
     components:
-    - pos: 6.5,1.5
+    - type: Transform
+      pos: 6.5,1.5
       parent: 1
-      type: Transform
-  - uid: 338
+  - uid: 344
     components:
-    - pos: 6.5,3.5
+    - type: Transform
+      pos: 6.5,3.5
       parent: 1
-      type: Transform
-  - uid: 339
+  - uid: 345
     components:
-    - pos: -1.5,1.5
+    - type: Transform
+      pos: -1.5,1.5
       parent: 1
-      type: Transform
 - proto: BedsheetSyndie
   entities:
-  - uid: 340
+  - uid: 346
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -0.5,1.5
       parent: 1
-      type: Transform
-  - uid: 341
+  - uid: 347
     components:
-    - pos: 6.5,1.5
+    - type: Transform
+      pos: 6.5,1.5
       parent: 1
-      type: Transform
-  - uid: 342
+  - uid: 348
     components:
-    - pos: 6.5,3.5
+    - type: Transform
+      pos: 6.5,3.5
       parent: 1
-      type: Transform
-  - uid: 343
+  - uid: 349
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -1.5,1.5
       parent: 1
-      type: Transform
+- proto: BenchSofaCorpLeft
+  entities:
+  - uid: 422
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-4.5
+      parent: 1
+  - uid: 423
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-5.5
+      parent: 1
+  - uid: 984
+    components:
+    - type: Transform
+      pos: 11.5,2.5
+      parent: 1
+- proto: BenchSofaCorpRight
+  entities:
+  - uid: 404
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-5.5
+      parent: 1
+  - uid: 421
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-4.5
+      parent: 1
+  - uid: 985
+    components:
+    - type: Transform
+      pos: 10.5,2.5
+      parent: 1
 - proto: BlastDoorOpen
   entities:
-  - uid: 344
+  - uid: 350
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 6.5,-6.5
       parent: 1
-      type: Transform
-    - links:
-      - 795
-      type: DeviceLinkSink
-  - uid: 345
+    - type: DeviceLinkSink
+      links:
+      - 807
+  - uid: 351
     components:
-    - pos: 13.5,0.5
+    - type: Transform
+      pos: 13.5,0.5
       parent: 1
-      type: Transform
-    - invokeCounter: 4
+    - type: DeviceLinkSink
+      invokeCounter: 4
       links:
-      - 792
-      type: DeviceLinkSink
-  - uid: 346
+      - 805
+  - uid: 352
     components:
-    - pos: 13.5,1.5
+    - type: Transform
+      pos: 13.5,1.5
       parent: 1
-      type: Transform
-    - invokeCounter: 4
+    - type: DeviceLinkSink
+      invokeCounter: 4
       links:
-      - 792
-      type: DeviceLinkSink
-  - uid: 347
+      - 805
+  - uid: 353
     components:
-    - pos: 13.5,-0.5
+    - type: Transform
+      pos: 13.5,-0.5
       parent: 1
-      type: Transform
-    - invokeCounter: 4
+    - type: DeviceLinkSink
+      invokeCounter: 4
       links:
-      - 792
-      type: DeviceLinkSink
-  - uid: 348
+      - 805
+  - uid: 354
     components:
-    - pos: 13.5,2.5
+    - type: Transform
+      pos: 13.5,2.5
       parent: 1
-      type: Transform
-    - invokeCounter: 4
+    - type: DeviceLinkSink
+      invokeCounter: 4
       links:
-      - 792
-      type: DeviceLinkSink
-  - uid: 349
+      - 805
+  - uid: 355
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 7.5,-6.5
       parent: 1
-      type: Transform
-    - links:
-      - 795
-      type: DeviceLinkSink
-  - uid: 350
+    - type: DeviceLinkSink
+      links:
+      - 807
+  - uid: 356
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 8.5,-6.5
       parent: 1
-      type: Transform
-    - links:
-      - 795
-      type: DeviceLinkSink
-  - uid: 351
+    - type: DeviceLinkSink
+      links:
+      - 807
+  - uid: 357
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 10.5,-5.5
       parent: 1
-      type: Transform
-    - links:
-      - 795
-      type: DeviceLinkSink
-  - uid: 352
+    - type: DeviceLinkSink
+      links:
+      - 807
+  - uid: 358
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 11.5,-5.5
       parent: 1
-      type: Transform
-    - links:
-      - 795
-      type: DeviceLinkSink
-  - uid: 353
+    - type: DeviceLinkSink
+      links:
+      - 807
+  - uid: 359
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 12.5,-5.5
       parent: 1
-      type: Transform
-    - links:
-      - 795
-      type: DeviceLinkSink
-  - uid: 354
+    - type: DeviceLinkSink
+      links:
+      - 807
+  - uid: 360
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 13.5,-5.5
       parent: 1
-      type: Transform
-    - links:
-      - 795
-      type: DeviceLinkSink
-  - uid: 947
+    - type: DeviceLinkSink
+      links:
+      - 807
+  - uid: 361
     components:
-    - pos: 10.5,-1.5
+    - type: Transform
+      pos: 10.5,-1.5
       parent: 1
-      type: Transform
-    - links:
-      - 792
-      type: DeviceLinkSink
+    - type: DeviceLinkSink
+      links:
+      - 805
 - proto: BoozeDispenser
   entities:
-  - uid: 355
+  - uid: 362
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 1.5,-3.5
       parent: 1
-      type: Transform
     - type: Emagged
 - proto: BoxHandcuff
   entities:
-  - uid: 357
+  - uid: 118
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 356
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 363
+    - type: Physics
+      canCollide: False
     - type: InsideEntityStorage
 - proto: BoxLethalshot
   entities:
-  - uid: 358
+  - uid: 365
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 356
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 363
+    - type: Physics
+      canCollide: False
     - type: InsideEntityStorage
-  - uid: 359
+  - uid: 366
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 356
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 363
+    - type: Physics
+      canCollide: False
     - type: InsideEntityStorage
 - proto: BoxShotgunFlare
   entities:
-  - uid: 360
+  - uid: 367
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 356
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 363
+    - type: Physics
+      canCollide: False
     - type: InsideEntityStorage
 - proto: BriefcaseBrownFilled
   entities:
-  - uid: 374
-    components:
-    - rot: 6.283185307179586 rad
-      pos: 4.443831,0.7256815
-      parent: 1
-      type: Transform
-    - storageUsed: 44
-      type: Storage
-    - containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 399
-          - 400
-          - 401
-          - 402
-          - 403
-          - 404
-          - 405
-          - 406
-          - 407
-          - 408
-          - 409
-          - 410
-          - 411
-          - 412
-          - 413
-          - 414
-          - 415
-          - 416
-          - 417
-          - 418
-          - 375
-          - 376
-          - 377
-          - 378
-          - 379
-          - 380
-          - 381
-          - 382
-          - 383
-          - 384
-          - 385
-          - 386
-          - 387
-          - 388
-          - 389
-          - 390
-          - 391
-          - 392
-          - 393
-          - 394
-          - 395
-          - 396
-          - 397
-          - 398
-      type: ContainerContainer
-- proto: BriefcaseSyndie
-  entities:
-  - uid: 419
-    components:
-    - rot: 6.283185307179586 rad
-      pos: 4.454247,1.5198011
-      parent: 1
-      type: Transform
-    - storageUsed: 39
-      type: Storage
-    - containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 431
-          - 420
-          - 425
-          - 424
-          - 421
-          - 426
-          - 432
-          - 430
-          - 427
-          - 422
-          - 429
-          - 423
-          - 428
-      type: ContainerContainer
-- proto: CableApcExtension
-  entities:
-  - uid: 433
-    components:
-    - pos: 7.5,0.5
-      parent: 1
-      type: Transform
-  - uid: 434
-    components:
-    - pos: 8.5,0.5
-      parent: 1
-      type: Transform
-  - uid: 435
-    components:
-    - pos: 9.5,0.5
-      parent: 1
-      type: Transform
-  - uid: 436
-    components:
-    - pos: 9.5,1.5
-      parent: 1
-      type: Transform
-  - uid: 437
+  - uid: 401
     components:
-    - pos: 9.5,-0.5
+    - type: Transform
+      pos: 12.580331,-0.57071495
       parent: 1
-      type: Transform
-  - uid: 438
+  - uid: 402
     components:
-    - pos: 2.5,4.5
+    - type: Transform
+      pos: 12.615925,0.015501022
       parent: 1
-      type: Transform
-  - uid: 439
+  - uid: 403
     components:
-    - pos: 2.5,3.5
+    - type: Transform
+      pos: 12.615925,-0.21887398
       parent: 1
-      type: Transform
+- proto: CableApcExtension
+  entities:
   - uid: 440
     components:
-    - pos: 1.5,2.5
+    - type: Transform
+      pos: 7.5,0.5
       parent: 1
-      type: Transform
   - uid: 441
     components:
-    - pos: 1.5,2.5
+    - type: Transform
+      pos: 8.5,0.5
       parent: 1
-      type: Transform
   - uid: 442
     components:
-    - pos: 3.5,2.5
+    - type: Transform
+      pos: 9.5,0.5
       parent: 1
-      type: Transform
   - uid: 443
     components:
-    - pos: 2.5,2.5
+    - type: Transform
+      pos: 9.5,1.5
       parent: 1
-      type: Transform
   - uid: 444
     components:
-    - pos: 3.5,1.5
+    - type: Transform
+      pos: 9.5,-0.5
       parent: 1
-      type: Transform
   - uid: 445
     components:
-    - pos: 3.5,0.5
+    - type: Transform
+      pos: 2.5,4.5
       parent: 1
-      type: Transform
   - uid: 446
     components:
-    - pos: 3.5,-5.5
+    - type: Transform
+      pos: 2.5,3.5
       parent: 1
-      type: Transform
   - uid: 447
     components:
-    - pos: 3.5,-4.5
+    - type: Transform
+      pos: 1.5,2.5
       parent: 1
-      type: Transform
   - uid: 448
     components:
-    - pos: 3.5,-3.5
+    - type: Transform
+      pos: 1.5,2.5
       parent: 1
-      type: Transform
   - uid: 449
     components:
-    - pos: -1.5,-3.5
+    - type: Transform
+      pos: 3.5,2.5
       parent: 1
-      type: Transform
   - uid: 450
     components:
-    - pos: 4.5,-3.5
+    - type: Transform
+      pos: 2.5,2.5
       parent: 1
-      type: Transform
   - uid: 451
     components:
-    - pos: 1.5,1.5
+    - type: Transform
+      pos: 3.5,1.5
       parent: 1
-      type: Transform
   - uid: 452
     components:
-    - pos: 1.5,0.5
+    - type: Transform
+      pos: 3.5,0.5
       parent: 1
-      type: Transform
   - uid: 453
     components:
-    - pos: 1.5,-0.5
+    - type: Transform
+      pos: 3.5,-5.5
       parent: 1
-      type: Transform
   - uid: 454
     components:
-    - pos: 0.5,-0.5
+    - type: Transform
+      pos: 3.5,-4.5
       parent: 1
-      type: Transform
   - uid: 455
     components:
-    - pos: -0.5,-0.5
+    - type: Transform
+      pos: 3.5,-3.5
       parent: 1
-      type: Transform
   - uid: 456
     components:
-    - pos: -0.5,0.5
+    - type: Transform
+      pos: -1.5,-3.5
       parent: 1
-      type: Transform
   - uid: 457
     components:
-    - pos: -1.5,-2.5
+    - type: Transform
+      pos: 4.5,-3.5
       parent: 1
-      type: Transform
   - uid: 458
     components:
-    - pos: -1.5,-0.5
+    - type: Transform
+      pos: 1.5,1.5
       parent: 1
-      type: Transform
   - uid: 459
     components:
-    - pos: -1.5,-1.5
+    - type: Transform
+      pos: 1.5,0.5
       parent: 1
-      type: Transform
   - uid: 460
     components:
-    - pos: 2.5,-5.5
+    - type: Transform
+      pos: 1.5,-0.5
       parent: 1
-      type: Transform
   - uid: 461
     components:
-    - pos: 2.5,-6.5
+    - type: Transform
+      pos: 0.5,-0.5
       parent: 1
-      type: Transform
   - uid: 462
     components:
-    - pos: 1.5,-6.5
+    - type: Transform
+      pos: -0.5,-0.5
       parent: 1
-      type: Transform
   - uid: 463
     components:
-    - pos: 0.5,-6.5
+    - type: Transform
+      pos: -0.5,0.5
       parent: 1
-      type: Transform
   - uid: 464
     components:
-    - pos: -0.5,-6.5
+    - type: Transform
+      pos: -1.5,-2.5
       parent: 1
-      type: Transform
   - uid: 465
     components:
-    - pos: 1.5,3.5
+    - type: Transform
+      pos: -1.5,-0.5
       parent: 1
-      type: Transform
   - uid: 466
     components:
-    - pos: 0.5,3.5
+    - type: Transform
+      pos: -1.5,-1.5
       parent: 1
-      type: Transform
   - uid: 467
     components:
-    - pos: -0.5,3.5
+    - type: Transform
+      pos: 2.5,-5.5
       parent: 1
-      type: Transform
   - uid: 468
     components:
-    - pos: -1.5,3.5
+    - type: Transform
+      pos: 2.5,-6.5
       parent: 1
-      type: Transform
   - uid: 469
     components:
-    - pos: -1.5,4.5
+    - type: Transform
+      pos: 1.5,-6.5
       parent: 1
-      type: Transform
   - uid: 470
     components:
-    - pos: 10.5,-0.5
+    - type: Transform
+      pos: 0.5,-6.5
       parent: 1
-      type: Transform
   - uid: 471
     components:
-    - pos: 10.5,-1.5
+    - type: Transform
+      pos: -0.5,-6.5
       parent: 1
-      type: Transform
   - uid: 472
     components:
-    - pos: 10.5,-2.5
+    - type: Transform
+      pos: 1.5,3.5
       parent: 1
-      type: Transform
   - uid: 473
     components:
-    - pos: 10.5,-3.5
+    - type: Transform
+      pos: 0.5,3.5
       parent: 1
-      type: Transform
   - uid: 474
     components:
-    - pos: 11.5,-3.5
+    - type: Transform
+      pos: -0.5,3.5
       parent: 1
-      type: Transform
   - uid: 475
     components:
-    - pos: 12.5,-3.5
+    - type: Transform
+      pos: -1.5,3.5
       parent: 1
-      type: Transform
   - uid: 476
     components:
-    - pos: 7.5,-0.5
+    - type: Transform
+      pos: -1.5,4.5
       parent: 1
-      type: Transform
   - uid: 477
     components:
-    - pos: 6.5,-0.5
+    - type: Transform
+      pos: 10.5,-0.5
       parent: 1
-      type: Transform
   - uid: 478
     components:
-    - pos: 6.5,-1.5
+    - type: Transform
+      pos: 10.5,-1.5
       parent: 1
-      type: Transform
   - uid: 479
     components:
-    - pos: 6.5,-2.5
+    - type: Transform
+      pos: 10.5,-2.5
       parent: 1
-      type: Transform
   - uid: 480
     components:
-    - pos: 6.5,-3.5
+    - type: Transform
+      pos: 10.5,-3.5
       parent: 1
-      type: Transform
   - uid: 481
     components:
-    - pos: 7.5,-3.5
+    - type: Transform
+      pos: 11.5,-3.5
       parent: 1
-      type: Transform
   - uid: 482
     components:
-    - pos: 7.5,-4.5
+    - type: Transform
+      pos: 12.5,-3.5
       parent: 1
-      type: Transform
   - uid: 483
     components:
-    - pos: 3.5,3.5
+    - type: Transform
+      pos: 7.5,-0.5
       parent: 1
-      type: Transform
   - uid: 484
     components:
-    - pos: 4.5,3.5
+    - type: Transform
+      pos: 6.5,-0.5
       parent: 1
-      type: Transform
   - uid: 485
     components:
-    - pos: 5.5,3.5
+    - type: Transform
+      pos: 6.5,-1.5
       parent: 1
-      type: Transform
-- proto: CableHV
-  entities:
   - uid: 486
     components:
-    - pos: -0.5,6.5
+    - type: Transform
+      pos: 6.5,-2.5
       parent: 1
-      type: Transform
   - uid: 487
     components:
-    - pos: -0.5,5.5
+    - type: Transform
+      pos: 6.5,-3.5
       parent: 1
-      type: Transform
   - uid: 488
     components:
-    - pos: 0.5,5.5
+    - type: Transform
+      pos: 7.5,-3.5
       parent: 1
-      type: Transform
   - uid: 489
     components:
-    - pos: -1.5,5.5
+    - type: Transform
+      pos: 7.5,-4.5
       parent: 1
-      type: Transform
   - uid: 490
     components:
-    - pos: -1.5,6.5
+    - type: Transform
+      pos: 3.5,3.5
       parent: 1
-      type: Transform
   - uid: 491
     components:
-    - pos: -1.5,4.5
+    - type: Transform
+      pos: 4.5,3.5
       parent: 1
-      type: Transform
   - uid: 492
     components:
-    - pos: -1.5,3.5
+    - type: Transform
+      pos: 5.5,3.5
+      parent: 1
+  - uid: 954
+    components:
+    - type: Transform
+      pos: 10.5,2.5
       parent: 1
-      type: Transform
+  - uid: 959
+    components:
+    - type: Transform
+      pos: 9.5,2.5
+      parent: 1
+- proto: CableHV
+  entities:
   - uid: 493
     components:
-    - pos: -0.5,3.5
+    - type: Transform
+      pos: -0.5,6.5
       parent: 1
-      type: Transform
   - uid: 494
     components:
-    - pos: -2.5,5.5
+    - type: Transform
+      pos: -0.5,5.5
       parent: 1
-      type: Transform
   - uid: 495
     components:
-    - pos: -2.5,4.5
+    - type: Transform
+      pos: 0.5,5.5
       parent: 1
-      type: Transform
   - uid: 496
     components:
-    - pos: -2.5,3.5
+    - type: Transform
+      pos: -1.5,5.5
       parent: 1
-      type: Transform
   - uid: 497
     components:
-    - pos: -1.5,2.5
+    - type: Transform
+      pos: -1.5,6.5
       parent: 1
-      type: Transform
   - uid: 498
     components:
-    - pos: -0.5,2.5
+    - type: Transform
+      pos: -1.5,4.5
       parent: 1
-      type: Transform
-- proto: CableMV
-  entities:
   - uid: 499
     components:
-    - pos: -1.5,4.5
+    - type: Transform
+      pos: -1.5,3.5
       parent: 1
-      type: Transform
   - uid: 500
     components:
-    - pos: -0.5,5.5
+    - type: Transform
+      pos: -0.5,3.5
       parent: 1
-      type: Transform
   - uid: 501
     components:
-    - pos: 0.5,5.5
+    - type: Transform
+      pos: -2.5,5.5
       parent: 1
-      type: Transform
   - uid: 502
     components:
-    - pos: -1.5,5.5
+    - type: Transform
+      pos: -2.5,4.5
       parent: 1
-      type: Transform
   - uid: 503
     components:
-    - pos: -1.5,3.5
+    - type: Transform
+      pos: -2.5,3.5
       parent: 1
-      type: Transform
   - uid: 504
     components:
-    - pos: -0.5,3.5
+    - type: Transform
+      pos: -1.5,2.5
       parent: 1
-      type: Transform
   - uid: 505
     components:
-    - pos: 1.5,3.5
+    - type: Transform
+      pos: -0.5,2.5
       parent: 1
-      type: Transform
+- proto: CableMV
+  entities:
   - uid: 506
     components:
-    - pos: 0.5,3.5
+    - type: Transform
+      pos: -1.5,4.5
       parent: 1
-      type: Transform
   - uid: 507
     components:
-    - pos: 2.5,3.5
+    - type: Transform
+      pos: -0.5,5.5
       parent: 1
-      type: Transform
   - uid: 508
     components:
-    - pos: 2.5,4.5
+    - type: Transform
+      pos: 0.5,5.5
       parent: 1
-      type: Transform
   - uid: 509
     components:
-    - pos: 2.5,2.5
+    - type: Transform
+      pos: -1.5,5.5
       parent: 1
-      type: Transform
   - uid: 510
     components:
-    - pos: 2.5,1.5
+    - type: Transform
+      pos: -1.5,3.5
       parent: 1
-      type: Transform
   - uid: 511
     components:
-    - pos: 2.5,0.5
+    - type: Transform
+      pos: -0.5,3.5
       parent: 1
-      type: Transform
   - uid: 512
     components:
-    - pos: 2.5,-0.5
+    - type: Transform
+      pos: 1.5,3.5
       parent: 1
-      type: Transform
   - uid: 513
     components:
-    - pos: 2.5,-1.5
+    - type: Transform
+      pos: 0.5,3.5
       parent: 1
-      type: Transform
   - uid: 514
     components:
-    - pos: 2.5,-2.5
+    - type: Transform
+      pos: 2.5,3.5
       parent: 1
-      type: Transform
   - uid: 515
     components:
-    - pos: 2.5,-3.5
+    - type: Transform
+      pos: 2.5,4.5
       parent: 1
-      type: Transform
   - uid: 516
     components:
-    - pos: 2.5,-4.5
+    - type: Transform
+      pos: 2.5,2.5
       parent: 1
-      type: Transform
   - uid: 517
     components:
-    - pos: 3.5,-4.5
+    - type: Transform
+      pos: 2.5,1.5
       parent: 1
-      type: Transform
   - uid: 518
     components:
-    - pos: 3.5,-5.5
+    - type: Transform
+      pos: 2.5,0.5
       parent: 1
-      type: Transform
   - uid: 519
     components:
-    - pos: 3.5,-0.5
+    - type: Transform
+      pos: 2.5,-0.5
       parent: 1
-      type: Transform
   - uid: 520
     components:
-    - pos: 4.5,-0.5
+    - type: Transform
+      pos: 2.5,-1.5
       parent: 1
-      type: Transform
   - uid: 521
     components:
-    - pos: 5.5,-0.5
+    - type: Transform
+      pos: 2.5,-2.5
       parent: 1
-      type: Transform
   - uid: 522
     components:
-    - pos: 6.5,-0.5
+    - type: Transform
+      pos: 2.5,-3.5
       parent: 1
-      type: Transform
   - uid: 523
     components:
-    - pos: 6.5,-0.5
+    - type: Transform
+      pos: 2.5,-4.5
       parent: 1
-      type: Transform
   - uid: 524
     components:
-    - pos: 7.5,-0.5
+    - type: Transform
+      pos: 3.5,-4.5
       parent: 1
-      type: Transform
   - uid: 525
     components:
-    - pos: 8.5,-0.5
+    - type: Transform
+      pos: 3.5,-5.5
       parent: 1
-      type: Transform
   - uid: 526
     components:
-    - pos: 8.5,0.5
+    - type: Transform
+      pos: 3.5,-0.5
       parent: 1
-      type: Transform
   - uid: 527
     components:
-    - pos: 7.5,0.5
+    - type: Transform
+      pos: 4.5,-0.5
       parent: 1
-      type: Transform
-- proto: ChairOfficeDark
-  entities:
   - uid: 528
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 9.5,1.5
+    - type: Transform
+      pos: 5.5,-0.5
       parent: 1
-      type: Transform
   - uid: 529
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 11.5,1.5
+    - type: Transform
+      pos: 6.5,-0.5
       parent: 1
-      type: Transform
   - uid: 530
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,0.5
+    - type: Transform
+      pos: 6.5,-0.5
       parent: 1
-      type: Transform
   - uid: 531
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,1.5
-      parent: 1
-      type: Transform
-- proto: ClothingBackpackDuffelSyndicatePyjamaBundle
-  entities:
-  - uid: 948
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.6718016,2.5031838
+    - type: Transform
+      pos: 7.5,-0.5
       parent: 1
-      type: Transform
-- proto: ClothingEyesBlindfold
-  entities:
-  - uid: 361
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 356
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-  - uid: 362
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 356
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-  - uid: 363
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 356
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-  - uid: 364
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 356
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-- proto: ClothingMaskGasVoiceChameleon
-  entities:
   - uid: 532
     components:
-    - pos: 8.6825,1.9966505
+    - type: Transform
+      pos: 8.5,-0.5
       parent: 1
-      type: Transform
-- proto: ClothingMaskMuzzle
-  entities:
-  - uid: 365
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 356
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-  - uid: 366
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 356
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-  - uid: 367
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 356
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-  - uid: 368
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 356
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-- proto: CombatKnife
-  entities:
-  - uid: 369
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 356
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-  - uid: 370
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 356
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-- proto: ComfyChair
-  entities:
   - uid: 533
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 8.5,-4.5
+    - type: Transform
+      pos: 8.5,0.5
       parent: 1
-      type: Transform
   - uid: 534
     components:
-    - pos: 1.5,2.5
+    - type: Transform
+      pos: 7.5,0.5
       parent: 1
-      type: Transform
-  - uid: 535
+- proto: CarpetBlack
+  entities:
+  - uid: 381
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 8.5,-5.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,2.5
       parent: 1
-      type: Transform
-  - uid: 536
+  - uid: 570
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 6.5,-4.5
       parent: 1
-      type: Transform
-  - uid: 537
+  - uid: 571
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 6.5,-5.5
       parent: 1
-      type: Transform
-- proto: ComputerBroken
-  entities:
-  - uid: 538
+  - uid: 572
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 12.5,-0.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-4.5
       parent: 1
-      type: Transform
-- proto: ComputerCrewMonitoring
-  entities:
-  - uid: 539
+  - uid: 573
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 12.5,0.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-5.5
       parent: 1
-      type: Transform
-- proto: ComputerIFFSyndicate
-  entities:
-  - uid: 540
+  - uid: 574
     components:
-    - pos: 9.5,2.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-5.5
       parent: 1
-      type: Transform
-- proto: ComputerShuttleSyndie
-  entities:
-  - uid: 541
+  - uid: 575
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 12.5,1.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-4.5
       parent: 1
-      type: Transform
-- proto: CrateFoodDonkpocketSavory
-  entities:
-  - uid: 542
+  - uid: 960
     components:
-    - pos: -0.5,-5.5
+    - type: Transform
+      pos: 2.5,2.5
       parent: 1
-      type: Transform
-    - air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-      type: EntityStorage
-- proto: CrowbarRed
-  entities:
-  - uid: 371
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 356
-      type: Transform
-    - canCollide: False
-      type: Physics
-    - type: InsideEntityStorage
-- proto: DefibrillatorCabinetFilled
-  entities:
-  - uid: 543
+  - uid: 964
     components:
-    - pos: -0.5,-1.5
+    - type: Transform
+      pos: 3.5,1.5
       parent: 1
-      type: Transform
-- proto: DiagnosisReportPaper
-  entities:
-  - uid: 545
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 546
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 547
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 548
+  - uid: 965
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 549
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-- proto: DisposalPipe
-  entities:
-  - uid: 951
-    components:
-    - pos: 10.5,-3.5
+    - type: Transform
+      pos: 2.5,0.5
       parent: 1
-      type: Transform
-  - uid: 952
+  - uid: 966
     components:
-    - pos: 10.5,-4.5
+    - type: Transform
+      pos: 3.5,0.5
       parent: 1
-      type: Transform
-  - uid: 953
+  - uid: 967
     components:
-    - pos: 10.5,-5.5
+    - type: Transform
+      pos: 2.5,1.5
       parent: 1
-      type: Transform
-- proto: DisposalTrunk
-  entities:
-  - uid: 949
+  - uid: 968
     components:
-    - rot: 3.141592653589793 rad
-      pos: 10.5,-6.5
+    - type: Transform
+      pos: -1.5,1.5
       parent: 1
-      type: Transform
-  - uid: 950
+  - uid: 969
     components:
-    - pos: 10.5,-2.5
+    - type: Transform
+      pos: -1.5,0.5
       parent: 1
-      type: Transform
-- proto: DisposalUnit
-  entities:
-  - uid: 103
+  - uid: 970
     components:
-    - pos: 10.5,-2.5
+    - type: Transform
+      pos: -2.5,0.5
       parent: 1
-      type: Transform
-- proto: DrinkMugDog
-  entities:
-  - uid: 590
+  - uid: 971
     components:
-    - rot: 6.283185307179586 rad
-      pos: 1.6752021,1.4137775
+    - type: Transform
+      pos: -1.5,-0.5
       parent: 1
-      type: Transform
-- proto: DrinkMugHeart
-  entities:
-  - uid: 591
+  - uid: 972
     components:
-    - pos: 1.2883832,1.4021075
+    - type: Transform
+      pos: -0.5,-0.5
       parent: 1
-      type: Transform
-- proto: DrinkMugOne
-  entities:
-  - uid: 592
+  - uid: 973
     components:
-    - pos: 1.6477582,1.7614824
+    - type: Transform
+      pos: -0.5,0.5
       parent: 1
-      type: Transform
-- proto: DrinkMugRainbow
-  entities:
-  - uid: 593
+  - uid: 974
     components:
-    - pos: 1.3040082,1.7302322
+    - type: Transform
+      pos: -0.5,1.5
       parent: 1
-      type: Transform
-- proto: EncryptionKeyCargo
-  entities:
-  - uid: 595
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 594
-      type: Transform
-    - canCollide: False
-      type: Physics
-- proto: EncryptionKeyCommand
-  entities:
-  - uid: 596
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 594
-      type: Transform
-    - canCollide: False
-      type: Physics
-- proto: EncryptionKeyCommon
-  entities:
-  - uid: 597
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 594
-      type: Transform
-    - canCollide: False
-      type: Physics
-- proto: EncryptionKeyEngineering
-  entities:
-  - uid: 598
+  - uid: 975
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 594
-      type: Transform
-    - canCollide: False
-      type: Physics
-- proto: EncryptionKeyMedical
-  entities:
-  - uid: 599
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 594
-      type: Transform
-    - canCollide: False
-      type: Physics
-- proto: EncryptionKeyScience
-  entities:
-  - uid: 600
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 594
-      type: Transform
-    - canCollide: False
-      type: Physics
-- proto: EncryptionKeySecurity
-  entities:
-  - uid: 601
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 594
-      type: Transform
-    - canCollide: False
-      type: Physics
-- proto: EncryptionKeyService
-  entities:
-  - uid: 602
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 594
-      type: Transform
-    - canCollide: False
-      type: Physics
-- proto: EncryptionKeySyndie
-  entities:
-  - uid: 603
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 594
-      type: Transform
-    - canCollide: False
-      type: Physics
-- proto: ExtinguisherCabinet
-  entities:
-  - uid: 604
+    - type: Transform
+      pos: 6.5,1.5
+      parent: 1
+  - uid: 976
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.5,0.5
+    - type: Transform
+      pos: 6.5,2.5
       parent: 1
-      type: Transform
-- proto: FaxMachineSyndie
-  entities:
-  - uid: 605
+  - uid: 977
     components:
-    - pos: 8.5,2.5
+    - type: Transform
+      pos: 6.5,3.5
       parent: 1
-      type: Transform
-- proto: filingCabinetDrawer
-  entities:
-  - uid: 544
+  - uid: 978
     components:
-    - pos: 8.5,0.5
+    - type: Transform
+      pos: 9.5,1.5
       parent: 1
-      type: Transform
-    - storageUsed: 45
-      type: Storage
-    - containers:
-        storagebase: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 570
-          - 571
-          - 572
-          - 573
-          - 574
-          - 575
-          - 576
-          - 577
-          - 578
-          - 579
-          - 550
-          - 551
-          - 552
-          - 553
-          - 554
-          - 555
-          - 556
-          - 557
-          - 558
-          - 559
-          - 545
-          - 546
-          - 547
-          - 548
-          - 549
-          - 565
-          - 566
-          - 567
-          - 568
-          - 569
-          - 580
-          - 581
-          - 582
-          - 583
-          - 584
-          - 585
-          - 586
-          - 587
-          - 588
-          - 589
-          - 560
-          - 561
-          - 562
-          - 563
-          - 564
-      type: ContainerContainer
-- proto: FireAlarm
-  entities:
-  - uid: 606
+  - uid: 979
     components:
-    - rot: 3.141592653589793 rad
-      pos: 3.5,-1.5
+    - type: Transform
+      pos: 9.5,0.5
       parent: 1
-      type: Transform
-    - devices:
-      - 613
-      - 614
-      - 607
-      - 608
-      - 609
-      - 618
-      - 616
-      - 610
-      - 612
-      - 843
-      type: DeviceList
-    - joinedGrid: 1
-      type: AtmosDevice
-- proto: Firelock
-  entities:
-  - uid: 607
+  - uid: 980
     components:
-    - rot: 3.141592653589793 rad
-      pos: 5.5,-0.5
+    - type: Transform
+      pos: 10.5,0.5
       parent: 1
-      type: Transform
-  - uid: 608
+  - uid: 981
     components:
-    - rot: 3.141592653589793 rad
-      pos: 7.5,-0.5
+    - type: Transform
+      pos: 10.5,1.5
       parent: 1
-      type: Transform
-  - uid: 609
+  - uid: 982
     components:
-    - rot: 3.141592653589793 rad
-      pos: 6.5,-1.5
+    - type: Transform
+      pos: 11.5,1.5
       parent: 1
-      type: Transform
-  - uid: 610
+  - uid: 983
     components:
-    - rot: 3.141592653589793 rad
-      pos: 5.5,2.5
+    - type: Transform
+      pos: 11.5,0.5
       parent: 1
-      type: Transform
-  - uid: 611
+- proto: ChairOfficeDark
+  entities:
+  - uid: 535
     components:
-    - rot: 3.141592653589793 rad
-      pos: 3.5,4.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,1.5
       parent: 1
-      type: Transform
-  - uid: 612
+  - uid: 536
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,5.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,1.5
       parent: 1
-      type: Transform
-  - uid: 613
+- proto: CigPackSyndicate
+  entities:
+  - uid: 558
     components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,3.5
+    - type: Transform
+      pos: 4.7080255,1.4853511
       parent: 1
-      type: Transform
-  - uid: 614
+  - uid: 569
     components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,-0.5
+    - type: Transform
+      pos: 4.7236505,1.7666011
       parent: 1
-      type: Transform
+- proto: ClosetWallBlack
+  entities:
+  - uid: 405
+    components:
+    - type: MetaData
+      desc: A closet packed with forged stamps
+      name: stamp closet
+    - type: Transform
+      pos: 10.5,3.5
+      parent: 1
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 411
+          - 410
+          - 409
+          - 408
+          - 407
+          - 406
+          - 412
+          - 413
+          - 414
+          - 415
+          - 416
+          - 417
+          - 418
+          - 419
+          - 420
+- proto: ClosetWallMixed
+  entities:
+  - uid: 388
+    components:
+    - type: MetaData
+      name: pyjama closet
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,2.5
+      parent: 1
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 400
+          - 399
+          - 393
+          - 392
+          - 391
+          - 390
+          - 398
+          - 397
+          - 396
+          - 395
+          - 394
+          - 389
+- proto: ClothingHeadPyjamaSyndicateBlack
+  entities:
+  - uid: 393
+    components:
+    - type: Transform
+      parent: 388
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 395
+    components:
+    - type: Transform
+      parent: 388
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingHeadPyjamaSyndicatePink
+  entities:
+  - uid: 396
+    components:
+    - type: Transform
+      parent: 388
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 399
+    components:
+    - type: Transform
+      parent: 388
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingHeadPyjamaSyndicateRed
+  entities:
+  - uid: 389
+    components:
+    - type: Transform
+      parent: 388
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 391
+    components:
+    - type: Transform
+      parent: 388
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingMaskGasVoiceChameleon
+  entities:
+  - uid: 540
+    components:
+    - type: Transform
+      pos: 11.346417,2.446512
+      parent: 1
+  - uid: 541
+    components:
+    - type: Transform
+      pos: 10.971417,2.462137
+      parent: 1
+- proto: ClothingUniformJumpsuitPyjamaSyndicateBlack
+  entities:
+  - uid: 392
+    components:
+    - type: Transform
+      parent: 388
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 397
+    components:
+    - type: Transform
+      parent: 388
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingUniformJumpsuitPyjamaSyndicatePink
+  entities:
+  - uid: 390
+    components:
+    - type: Transform
+      parent: 388
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 400
+    components:
+    - type: Transform
+      parent: 388
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingUniformJumpsuitPyjamaSyndicateRed
+  entities:
+  - uid: 394
+    components:
+    - type: Transform
+      parent: 388
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 398
+    components:
+    - type: Transform
+      parent: 388
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: CombatKnife
+  entities:
+  - uid: 376
+    components:
+    - type: Transform
+      parent: 363
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+  - uid: 377
+    components:
+    - type: Transform
+      parent: 363
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ComfyChair
+  entities:
+  - uid: 543
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 1
+- proto: ComputerCrewMonitoring
+  entities:
+  - uid: 548
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,0.5
+      parent: 1
+- proto: ComputerMassMedia
+  entities:
+  - uid: 311
+    components:
+    - type: Transform
+      pos: 9.5,2.5
+      parent: 1
+- proto: ComputerRadar
+  entities:
+  - uid: 550
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,1.5
+      parent: 1
+    - type: RadarConsole
+      maxRange: 2048
+    - type: WorldLoader
+      radius: 2048
+- proto: CrateFoodDonkpocketSavory
+  entities:
+  - uid: 551
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 1
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.1496
+        moles:
+        - 1.8856695
+        - 7.0937095
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+- proto: CrateServiceBureaucracy
+  entities:
+  - uid: 577
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 1
+- proto: CrowbarRed
+  entities:
+  - uid: 378
+    components:
+    - type: Transform
+      parent: 363
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 552
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+- proto: DiagnosisReportPaper
+  entities:
+  - uid: 432
+    components:
+    - type: Transform
+      pos: 8.472298,0.6316006
+      parent: 1
+  - uid: 554
+    components:
+    - type: Transform
+      pos: 8.472298,0.6316006
+      parent: 1
+  - uid: 562
+    components:
+    - type: Transform
+      pos: 8.472298,0.6316006
+      parent: 1
+  - uid: 564
+    components:
+    - type: Transform
+      pos: 8.472298,0.6316006
+      parent: 1
+  - uid: 566
+    components:
+    - type: Transform
+      pos: 8.472298,0.6316006
+      parent: 1
+- proto: DisposalPipe
+  entities:
+  - uid: 599
+    components:
+    - type: Transform
+      pos: 10.5,-3.5
+      parent: 1
+  - uid: 600
+    components:
+    - type: Transform
+      pos: 10.5,-4.5
+      parent: 1
+  - uid: 601
+    components:
+    - type: Transform
+      pos: 10.5,-5.5
+      parent: 1
+- proto: DisposalTrunk
+  entities:
+  - uid: 602
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-6.5
+      parent: 1
+  - uid: 603
+    components:
+    - type: Transform
+      pos: 10.5,-2.5
+      parent: 1
+- proto: DisposalUnit
+  entities:
+  - uid: 604
+    components:
+    - type: MetaData
+      name: escape hatch
+    - type: Transform
+      pos: 10.5,-2.5
+      parent: 1
+- proto: DrinkMugDog
+  entities:
+  - uid: 605
+    components:
+    - type: Transform
+      rot: 6.283185307179586 rad
+      pos: 1.6752021,1.4137775
+      parent: 1
+- proto: DrinkMugHeart
+  entities:
+  - uid: 606
+    components:
+    - type: Transform
+      pos: 1.2883832,1.4021075
+      parent: 1
+- proto: DrinkMugOne
+  entities:
+  - uid: 607
+    components:
+    - type: Transform
+      pos: 1.6477582,1.7614824
+      parent: 1
+- proto: DrinkMugRainbow
+  entities:
+  - uid: 608
+    components:
+    - type: Transform
+      pos: 1.3040082,1.7302322
+      parent: 1
+- proto: EncryptionKeyCommand
+  entities:
+  - uid: 613
+    components:
+    - type: Transform
+      parent: 612
+    - type: Physics
+      canCollide: False
+- proto: EncryptionKeyStationMaster
+  entities:
+  - uid: 614
+    components:
+    - type: Transform
+      parent: 612
+    - type: Physics
+      canCollide: False
+- proto: EncryptionKeySyndie
+  entities:
   - uid: 615
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      parent: 612
+    - type: Physics
+      canCollide: False
+- proto: ExtinguisherCabinet
+  entities:
+  - uid: 619
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,0.5
+      parent: 1
+- proto: FaxMachineListeningSyndie
+  entities:
+  - uid: 368
+    components:
+    - type: Transform
+      pos: 8.5,2.5
+      parent: 1
+- proto: filingCabinetDrawerRandom
+  entities:
+  - uid: 567
+    components:
+    - type: Transform
+      pos: 9.5,0.5
+      parent: 1
+- proto: FireAlarm
+  entities:
+  - uid: 621
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-1.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 628
+      - 629
+      - 622
+      - 623
+      - 624
+      - 632
+      - 631
+      - 625
+      - 627
+      - 633
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: Firelock
+  entities:
+  - uid: 622
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-0.5
+      parent: 1
+  - uid: 623
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-0.5
+      parent: 1
+  - uid: 624
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-1.5
+      parent: 1
+  - uid: 625
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,2.5
+      parent: 1
+  - uid: 626
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,4.5
+      parent: 1
+  - uid: 627
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,5.5
+      parent: 1
+  - uid: 628
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 629
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-0.5
+      parent: 1
+  - uid: 630
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -1.5,-1.5
       parent: 1
-      type: Transform
-  - uid: 616
+  - uid: 631
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 2.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 618
+  - uid: 632
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 2.5,-1.5
       parent: 1
-      type: Transform
-  - uid: 843
+  - uid: 633
     components:
-    - pos: 9.5,-3.5
+    - type: Transform
+      pos: 9.5,-3.5
       parent: 1
-      type: Transform
 - proto: ForensicReportPaper
   entities:
-  - uid: 550
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 551
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 552
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 553
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 554
+  - uid: 427
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.519173,0.6784754
+      parent: 1
   - uid: 555
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 556
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.519173,0.6784754
+      parent: 1
   - uid: 557
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 558
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.519173,0.6784754
+      parent: 1
+  - uid: 561
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 559
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.519173,0.6784754
+      parent: 1
+  - uid: 563
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.519173,0.6784754
+      parent: 1
 - proto: GasPassiveVent
   entities:
-  - uid: 619
+  - uid: 634
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,1.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 620
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 635
     components:
-    - pos: 6.5,6.5
+    - type: Transform
+      pos: 6.5,6.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 621
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 636
     components:
-    - pos: 4.5,10.5
+    - type: Transform
+      pos: 4.5,10.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 622
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 637
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 14.5,-0.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 623
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 638
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 13.5,-6.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 624
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 639
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 8.5,-7.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 625
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 640
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 4.5,-10.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 626
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 641
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -4.5,-3.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 627
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 642
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -4.5,5.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
 - proto: GasPipeBend
   entities:
-  - uid: 628
+  - uid: 643
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -3.5,0.5
       parent: 1
-      type: Transform
-  - uid: 629
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 644
     components:
-    - pos: -3.5,1.5
+    - type: Transform
+      pos: -3.5,1.5
       parent: 1
-      type: Transform
-  - uid: 630
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 645
     components:
-    - pos: 6.5,2.5
+    - type: Transform
+      pos: 6.5,2.5
       parent: 1
-      type: Transform
-  - uid: 631
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 646
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 632
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 647
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 2.5,-6.5
       parent: 1
-      type: Transform
-  - uid: 633
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 648
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 6.5,-3.5
       parent: 1
-      type: Transform
-  - uid: 634
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 649
     components:
-    - pos: 10.5,-0.5
+    - type: Transform
+      pos: 10.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 635
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 650
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 10.5,-3.5
       parent: 1
-      type: Transform
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
 - proto: GasPipeFourway
   entities:
-  - uid: 636
+  - uid: 651
     components:
-    - pos: 2.5,-0.5
+    - type: Transform
+      pos: 2.5,-0.5
       parent: 1
-      type: Transform
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
 - proto: GasPipeStraight
   entities:
-  - uid: 637
+  - uid: 652
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 1.5,4.5
       parent: 1
-      type: Transform
-  - uid: 638
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 653
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 0.5,3.5
       parent: 1
-      type: Transform
-  - uid: 639
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 654
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -4.5,1.5
       parent: 1
-      type: Transform
-  - uid: 640
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 655
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -2.5,0.5
       parent: 1
-      type: Transform
-  - uid: 641
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 656
     components:
-    - pos: 4.5,-7.5
+    - type: Transform
+      pos: 4.5,-7.5
       parent: 1
-      type: Transform
-  - uid: 642
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 657
     components:
-    - pos: 4.5,-8.5
+    - type: Transform
+      pos: 4.5,-8.5
       parent: 1
-      type: Transform
-  - uid: 643
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 658
     components:
-    - pos: 4.5,-9.5
+    - type: Transform
+      pos: 4.5,-9.5
       parent: 1
-      type: Transform
-  - uid: 644
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 659
     components:
-    - pos: 8.5,-6.5
+    - type: Transform
+      pos: 8.5,-6.5
       parent: 1
-      type: Transform
-  - uid: 645
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 660
     components:
-    - pos: 8.5,-5.5
+    - type: Transform
+      pos: 8.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 646
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 661
     components:
-    - pos: 8.5,-4.5
+    - type: Transform
+      pos: 8.5,-4.5
       parent: 1
-      type: Transform
-  - uid: 647
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 662
     components:
-    - pos: 13.5,-4.5
+    - type: Transform
+      pos: 13.5,-4.5
       parent: 1
-      type: Transform
-  - uid: 648
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 663
     components:
-    - pos: 13.5,-5.5
+    - type: Transform
+      pos: 13.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 649
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 664
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 13.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 650
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 665
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 12.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 651
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 666
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 6.5,4.5
       parent: 1
-      type: Transform
-  - uid: 652
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 667
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 6.5,5.5
       parent: 1
-      type: Transform
-  - uid: 653
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 668
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 4.5,4.5
       parent: 1
-      type: Transform
-  - uid: 654
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 669
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 4.5,5.5
       parent: 1
-      type: Transform
-  - uid: 655
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 670
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 4.5,6.5
       parent: 1
-      type: Transform
-  - uid: 656
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 671
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 4.5,7.5
       parent: 1
-      type: Transform
-  - uid: 657
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 672
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 4.5,8.5
       parent: 1
-      type: Transform
-  - uid: 658
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 673
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 4.5,9.5
       parent: 1
-      type: Transform
-  - uid: 659
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 674
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 7.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 660
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 675
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 5.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 661
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 676
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 5.5,2.5
       parent: 1
-      type: Transform
-  - uid: 662
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 677
     components:
-    - pos: -1.5,-1.5
+    - type: Transform
+      pos: -1.5,-1.5
       parent: 1
-      type: Transform
-  - uid: 663
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 678
     components:
-    - pos: 2.5,-5.5
+    - type: Transform
+      pos: 2.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 664
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 679
     components:
-    - pos: 2.5,-4.5
+    - type: Transform
+      pos: 2.5,-4.5
       parent: 1
-      type: Transform
-  - uid: 665
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 680
     components:
-    - pos: 2.5,-3.5
+    - type: Transform
+      pos: 2.5,-3.5
       parent: 1
-      type: Transform
-  - uid: 666
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 681
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,-3.5
       parent: 1
-      type: Transform
-  - uid: 667
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 682
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -3.5,-3.5
       parent: 1
-      type: Transform
-  - uid: 668
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 683
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -2.5,5.5
       parent: 1
-      type: Transform
-  - uid: 669
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 684
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -3.5,5.5
       parent: 1
-      type: Transform
-  - uid: 670
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 685
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 6.5,-2.5
       parent: 1
-      type: Transform
-  - uid: 671
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 686
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 6.5,-1.5
       parent: 1
-      type: Transform
-  - uid: 672
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 687
     components:
-    - pos: 10.5,-1.5
+    - type: Transform
+      pos: 10.5,-1.5
       parent: 1
-      type: Transform
-  - uid: 673
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 688
     components:
-    - pos: 10.5,-2.5
+    - type: Transform
+      pos: 10.5,-2.5
       parent: 1
-      type: Transform
-  - uid: 674
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 689
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 9.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 675
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 690
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 4.5,2.5
       parent: 1
-      type: Transform
-  - uid: 676
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 691
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 3.5,2.5
       parent: 1
-      type: Transform
-  - uid: 677
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 692
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 2.5,1.5
       parent: 1
-      type: Transform
-  - uid: 678
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 693
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 2.5,0.5
       parent: 1
-      type: Transform
-  - uid: 679
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 694
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 1.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 680
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 695
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 0.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 681
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 696
     components:
-    - pos: 2.5,-1.5
+    - type: Transform
+      pos: 2.5,-1.5
       parent: 1
-      type: Transform
-  - uid: 682
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 697
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 3.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 683
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 698
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 4.5,-0.5
       parent: 1
-      type: Transform
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
 - proto: GasPipeTJunction
   entities:
-  - uid: 684
+  - uid: 699
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 1.5,3.5
       parent: 1
-      type: Transform
-  - uid: 685
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 700
     components:
-    - pos: 2.5,3.5
+    - type: Transform
+      pos: 2.5,3.5
       parent: 1
-      type: Transform
-  - uid: 686
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 701
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 2.5,2.5
       parent: 1
-      type: Transform
-  - uid: 687
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 702
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -0.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 688
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 703
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 2.5,-2.5
       parent: 1
-      type: Transform
-  - uid: 689
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 704
     components:
-    - pos: 6.5,-0.5
+    - type: Transform
+      pos: 6.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 690
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 705
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 8.5,-0.5
       parent: 1
-      type: Transform
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
 - proto: GasPort
   entities:
-  - uid: 691
+  - uid: 706
     components:
-    - pos: 1.5,5.5
+    - type: Transform
+      pos: 1.5,5.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
 - proto: GasVentPump
   entities:
-  - uid: 692
+  - uid: 384
+    components:
+    - type: Transform
+      pos: 8.5,0.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 707
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -0.5,3.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 693
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 708
     components:
-    - pos: -0.5,0.5
+    - type: Transform
+      pos: -0.5,0.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 694
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 709
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -1.5,-2.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 695
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 710
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 3.5,-2.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 696
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 711
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 3.5,-6.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 697
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 712
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,-3.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 698
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 713
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 6.5,1.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 699
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 714
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 3.5,3.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 700
-    components:
-    - pos: 8.5,0.5
-      parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 701
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 716
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 11.5,-3.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 702
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 717
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -0.5,-3.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
+    - type: AtmosDevice
+      joinedGrid: 1
 - proto: GasVentScrubber
   entities:
-  - uid: 703
+  - uid: 718
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 6.5,3.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 704
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 719
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,5.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 705
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 720
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,0.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 706
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 721
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,-3.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 707
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 722
     components:
-    - pos: 4.5,-6.5
+    - type: Transform
+      pos: 4.5,-6.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 708
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 723
     components:
-    - pos: 8.5,-3.5
+    - type: Transform
+      pos: 8.5,-3.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 709
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 724
     components:
-    - pos: 13.5,-3.5
+    - type: Transform
+      pos: 13.5,-3.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 710
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 725
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 11.5,-0.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
-  - uid: 711
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 726
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 4.5,3.5
       parent: 1
-      type: Transform
-    - joinedGrid: 1
-      type: AtmosDevice
+    - type: DeviceNetwork
+      deviceLists:
+      - 576
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
 - proto: GeneratorWallmountAPU
   entities:
-  - uid: 712
-    components:
-    - pos: -1.5,6.5
-      parent: 1
-      type: Transform
-  - uid: 713
+  - uid: 727
     components:
-    - pos: -0.5,6.5
+    - type: Transform
+      pos: -1.5,6.5
       parent: 1
-      type: Transform
-  - uid: 714
+  - uid: 728
     components:
-    - pos: -2.5,5.5
+    - type: Transform
+      pos: -0.5,6.5
       parent: 1
-      type: Transform
-  - uid: 715
+  - uid: 729
     components:
-    - pos: -2.5,4.5
+    - type: Transform
+      pos: -2.5,5.5
       parent: 1
-      type: Transform
-  - uid: 716
+  - uid: 730
     components:
-    - pos: -2.5,3.5
+    - type: Transform
+      pos: -2.5,4.5
       parent: 1
-      type: Transform
-  - uid: 717
+  - uid: 732
     components:
-    - pos: -1.5,2.5
+    - type: Transform
+      pos: -1.5,2.5
       parent: 1
-      type: Transform
-  - uid: 718
+  - uid: 733
     components:
-    - pos: -0.5,2.5
+    - type: Transform
+      pos: -0.5,2.5
       parent: 1
-      type: Transform
 - proto: GravityGeneratorMini
   entities:
-  - uid: 719
+  - uid: 734
     components:
-    - pos: -0.5,5.5
+    - type: Transform
+      pos: -0.5,5.5
       parent: 1
-      type: Transform
 - proto: Grille
   entities:
-  - uid: 617
+  - uid: 735
     components:
-    - pos: 10.5,-1.5
+    - type: Transform
+      pos: 10.5,-1.5
       parent: 1
-      type: Transform
-  - uid: 720
+  - uid: 736
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
       pos: 12.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 721
+  - uid: 737
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
       pos: 13.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 722
+  - uid: 738
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
       pos: 13.5,0.5
       parent: 1
-      type: Transform
-  - uid: 723
+  - uid: 739
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
       pos: 13.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 724
+  - uid: 740
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
       pos: 13.5,1.5
       parent: 1
-      type: Transform
-  - uid: 725
+  - uid: 741
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
       pos: 13.5,2.5
       parent: 1
-      type: Transform
-  - uid: 726
+  - uid: 742
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
       pos: 7.5,-6.5
       parent: 1
-      type: Transform
-  - uid: 727
+  - uid: 743
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
       pos: 10.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 728
+  - uid: 744
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
       pos: 8.5,-6.5
       parent: 1
-      type: Transform
-  - uid: 729
+  - uid: 745
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
       pos: 6.5,-6.5
       parent: 1
-      type: Transform
-  - uid: 730
+  - uid: 746
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
       pos: 11.5,-5.5
       parent: 1
-      type: Transform
 - proto: HospitalCurtainsOpen
   entities:
-  - uid: 731
+  - uid: 747
     components:
-    - pos: 6.5,3.5
+    - type: Transform
+      pos: 6.5,3.5
       parent: 1
-      type: Transform
-  - uid: 732
+  - uid: 748
     components:
-    - pos: 6.5,1.5
+    - type: Transform
+      pos: 6.5,1.5
       parent: 1
-      type: Transform
-  - uid: 733
+  - uid: 749
     components:
-    - pos: -1.5,1.5
+    - type: Transform
+      pos: -1.5,1.5
       parent: 1
-      type: Transform
-  - uid: 734
+  - uid: 750
     components:
-    - pos: -0.5,1.5
+    - type: Transform
+      pos: -0.5,1.5
       parent: 1
-      type: Transform
 - proto: hydroponicsTray
   entities:
-  - uid: 735
+  - uid: 751
     components:
-    - pos: 12.5,-4.5
+    - type: Transform
+      pos: 12.5,-4.5
       parent: 1
-      type: Transform
-  - uid: 736
+  - uid: 752
     components:
-    - pos: 13.5,-4.5
+    - type: Transform
+      pos: 13.5,-4.5
       parent: 1
-      type: Transform
-  - uid: 737
+  - uid: 753
     components:
-    - pos: 11.5,-4.5
+    - type: Transform
+      pos: 11.5,-4.5
       parent: 1
-      type: Transform
-  - uid: 738
+  - uid: 754
     components:
-    - pos: 10.5,-4.5
+    - type: Transform
+      pos: 10.5,-4.5
       parent: 1
-      type: Transform
 - proto: KitchenMicrowave
   entities:
-  - uid: 739
+  - uid: 755
     components:
-    - pos: 1.5,-2.5
+    - type: Transform
+      pos: 1.5,-2.5
       parent: 1
-      type: Transform
 - proto: LandMineExplosive
   entities:
-  - uid: 740
+  - uid: 756
     components:
-    - pos: 12.446557,-9.501101
+    - type: Transform
+      pos: 12.446557,-9.501101
       parent: 1
-      type: Transform
-  - uid: 741
+  - uid: 757
     components:
-    - pos: 17.449137,2.529461
+    - type: Transform
+      pos: 17.449137,2.529461
       parent: 1
-      type: Transform
 - proto: LockerSyndicatePersonal
   entities:
-  - uid: 356
+  - uid: 363
     components:
-    - pos: -1.5,-5.5
+    - type: Transform
+      pos: -1.5,-5.5
       parent: 1
-      type: Transform
-    - air:
+    - type: EntityStorage
+      air:
         volume: 200
         immutable: False
         temperature: 293.1496
         moles:
-        - 1.8977377
-        - 7.139109
+        - 1.8978093
+        - 7.139378
         - 0
         - 0
         - 0
@@ -4481,1296 +4631,1102 @@ entities:
         - 0
         - 0
         - 0
-      type: EntityStorage
-    - containers:
+    - type: ContainerContainer
+      containers:
         entity_storage: !type:Container
           showEnts: False
           occludes: True
           ents:
-          - 373
-          - 369
-          - 358
-          - 360
-          - 359
-          - 372
-          - 357
-          - 365
-          - 364
-          - 371
-          - 361
-          - 362
-          - 366
-          - 363
+          - 378
+          - 377
+          - 379
           - 367
-          - 368
-          - 370
+          - 366
+          - 380
+          - 376
+          - 365
+          - 118
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
           ent: null
-      type: ContainerContainer
 - proto: MedkitCombatFilled
   entities:
-  - uid: 742
+  - uid: 758
     components:
-    - pos: -0.28039455,-3.70372
+    - type: Transform
+      pos: -0.28039455,-3.70372
       parent: 1
-      type: Transform
 - proto: MedkitFilled
   entities:
-  - uid: 743
+  - uid: 759
     components:
-    - pos: -0.57726955,-3.500595
+    - type: Transform
+      pos: -0.57726955,-3.500595
       parent: 1
-      type: Transform
-- proto: NukeDiskFake
+- proto: Mirror
   entities:
-  - uid: 744
+  - uid: 957
     components:
-    - pos: 16.778532,-0.7526432
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-3.5
       parent: 1
-      type: Transform
-- proto: Paper
+- proto: NukeDiskFake
   entities:
-  - uid: 375
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 376
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 377
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 378
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 379
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 380
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 381
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 382
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 383
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 384
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 385
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 386
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 387
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 388
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 389
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 390
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 391
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 392
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 393
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 394
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 395
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 396
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 397
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 398
+  - uid: 760
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      pos: 16.778532,-0.7526432
+      parent: 1
 - proto: PaperArtifactAnalyzer
   entities:
-  - uid: 560
+  - uid: 424
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 561
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.456674,0.66285014
+      parent: 1
+  - uid: 428
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 562
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.456674,0.66285014
+      parent: 1
+  - uid: 433
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 563
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.456674,0.66285014
+      parent: 1
+  - uid: 542
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 564
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.456674,0.66285014
+      parent: 1
+  - uid: 546
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.456674,0.66285014
+      parent: 1
 - proto: PaperBin10
   entities:
-  - uid: 745
+  - uid: 87
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,0.5
+      parent: 1
+  - uid: 761
     components:
-    - pos: 7.5,-5.5
+    - type: Transform
+      pos: 7.5,-5.5
       parent: 1
-      type: Transform
 - proto: PaperCaptainsThoughts
   entities:
-  - uid: 565
+  - uid: 430
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 566
+    - type: Transform
+      pos: 8.519173,0.64722514
+      parent: 1
+  - uid: 437
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 567
+    - type: Transform
+      pos: 8.519173,0.64722514
+      parent: 1
+  - uid: 537
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 568
+    - type: Transform
+      pos: 8.519173,0.64722514
+      parent: 1
+  - uid: 547
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 569
+    - type: Transform
+      pos: 8.519173,0.64722514
+      parent: 1
+  - uid: 553
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      pos: 8.519173,0.64722514
+      parent: 1
 - proto: PaperCargoBountyManifest
   entities:
-  - uid: 570
+  - uid: 426
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 571
+    - type: Transform
+      pos: 8.503549,0.6316006
+      parent: 1
+  - uid: 429
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 572
+    - type: Transform
+      pos: 8.503549,0.6316006
+      parent: 1
+  - uid: 434
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 573
+    - type: Transform
+      pos: 8.503549,0.6316006
+      parent: 1
+  - uid: 435
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 574
+    - type: Transform
+      pos: 8.503549,0.6316006
+      parent: 1
+  - uid: 544
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 575
+    - type: Transform
+      pos: 8.503549,0.6316006
+      parent: 1
+- proto: PaperCargoInvoice
+  entities:
+  - uid: 431
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 576
+    - type: Transform
+      pos: 8.487924,0.6316004
+      parent: 1
+  - uid: 436
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 577
+    - type: Transform
+      pos: 8.487924,0.6316004
+      parent: 1
+  - uid: 438
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 578
+    - type: Transform
+      pos: 8.487924,0.6316004
+      parent: 1
+  - uid: 439
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 579
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-- proto: PaperCargoInvoice
-  entities:
-  - uid: 580
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 581
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 582
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 583
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 584
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 585
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 586
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 587
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 588
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 589
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 544
-      type: Transform
-    - canCollide: False
-      type: Physics
-- proto: PaperOffice
-  entities:
-  - uid: 399
+    - type: Transform
+      pos: 8.487924,0.6316004
+      parent: 1
+  - uid: 538
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 400
+    - type: Transform
+      pos: 8.487924,0.6316004
+      parent: 1
+- proto: PaperCNCSheet
+  entities:
+  - uid: 539
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 401
+    - type: Transform
+      pos: 8.503549,0.6316006
+      parent: 1
+  - uid: 545
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 402
+    - type: Transform
+      pos: 8.503549,0.6316006
+      parent: 1
+  - uid: 556
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 403
+    - type: Transform
+      pos: 8.503549,0.6316006
+      parent: 1
+  - uid: 559
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 404
+    - type: Transform
+      pos: 8.503549,0.6316006
+      parent: 1
+  - uid: 560
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 405
+    - type: Transform
+      pos: 8.503549,0.6316006
+      parent: 1
+- proto: PlushieNuke
+  entities:
+  - uid: 762
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 406
+    - type: Transform
+      pos: 6.565984,3.4567177
+      parent: 1
+  - uid: 763
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 407
+    - type: Transform
+      pos: 16.527655,-0.5029521
+      parent: 1
+- proto: PlushieRouny
+  entities:
+  - uid: 764
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 408
+    - type: Transform
+      pos: 6.487859,1.4254675
+      parent: 1
+- proto: PosterContrabandDonk
+  entities:
+  - uid: 765
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 409
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+- proto: PosterContrabandSyndicateRecruitment
+  entities:
+  - uid: 766
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 410
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,6.5
+      parent: 1
+- proto: PosterLegitHotDonkExplosion
+  entities:
+  - uid: 767
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 411
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-4.5
+      parent: 1
+- proto: PosterLegitNoERP
+  entities:
+  - uid: 578
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 412
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,3.5
+      parent: 1
+- proto: PowerCellRecharger
+  entities:
+  - uid: 768
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 413
+    - type: Transform
+      pos: 8.5,1.5
+      parent: 1
+- proto: Poweredlight
+  entities:
+  - uid: 18
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 414
+    - type: Transform
+      pos: 6.5,3.5
+      parent: 1
+  - uid: 19
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 415
+    - type: Transform
+      pos: 12.5,-2.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 46
+  - uid: 21
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 416
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 46
+  - uid: 375
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 417
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 46
+  - uid: 731
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-  - uid: 418
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 46
+  - uid: 896
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 374
-      type: Transform
-    - canCollide: False
-      type: Physics
-- proto: PlushieNuke
-  entities:
-  - uid: 746
+    - type: Transform
+      pos: 0.5,-6.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 46
+  - uid: 917
     components:
-    - pos: 6.565984,3.4567177
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,1.5
       parent: 1
-      type: Transform
-  - uid: 747
+    - type: DeviceLinkSink
+      links:
+      - 46
+  - uid: 956
     components:
-    - pos: 16.527655,-0.5029521
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-3.5
       parent: 1
-      type: Transform
-- proto: PlushieRouny
-  entities:
-  - uid: 748
+    - type: DeviceLinkSink
+      links:
+      - 46
+  - uid: 958
     components:
-    - pos: 6.487859,1.4254675
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,1.5
       parent: 1
-      type: Transform
-- proto: PosterContrabandDonk
-  entities:
-  - uid: 749
+    - type: DeviceLinkSink
+      links:
+      - 46
+  - uid: 963
     components:
-    - pos: 1.5,-1.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,4.5
       parent: 1
-      type: Transform
-- proto: PosterContrabandSyndicateRecruitment
+    - type: DeviceLinkSink
+      links:
+      - 46
+- proto: PoweredLightColoredRed
   entities:
-  - uid: 750
+  - uid: 20
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,6.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-4.5
       parent: 1
-      type: Transform
-- proto: PosterLegitHotDonkExplosion
-  entities:
-  - uid: 751
+    - type: DeviceLinkSink
+      links:
+      - 46
+  - uid: 22
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -0.5,-4.5
+    - type: Transform
+      pos: 12.5,2.5
       parent: 1
-      type: Transform
-- proto: PowerCellRecharger
-  entities:
-  - uid: 752
+    - type: DeviceLinkSink
+      links:
+      - 46
+  - uid: 23
     components:
-    - pos: 8.5,1.5
+    - type: Transform
+      pos: -1.5,-5.5
       parent: 1
-      type: Transform
-- proto: PoweredLightColoredRed
-  entities:
-  - uid: 753
+    - type: DeviceLinkSink
+      links:
+      - 46
+  - uid: 769
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,-0.5
       parent: 1
-      type: Transform
+    - type: DeviceLinkSink
+      links:
+      - 46
     - type: Timer
-  - uid: 754
+  - uid: 770
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,4.5
       parent: 1
-      type: Transform
-  - uid: 755
+    - type: DeviceLinkSink
+      links:
+      - 46
+  - uid: 771
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 1.5,2.5
       parent: 1
-      type: Transform
+    - type: DeviceLinkSink
+      links:
+      - 46
     - type: Timer
-  - uid: 756
+  - uid: 772
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 1.5,-3.5
       parent: 1
-      type: Transform
-  - uid: 757
+    - type: DeviceLinkSink
+      links:
+      - 46
+  - uid: 773
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 4.5,0.5
       parent: 1
-      type: Transform
+    - type: DeviceLinkSink
+      links:
+      - 46
     - type: Timer
-  - uid: 758
+  - uid: 774
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 8.5,0.5
       parent: 1
-      type: Transform
-  - uid: 759
+    - type: DeviceLinkSink
+      links:
+      - 46
+  - uid: 775
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 4.5,-6.5
       parent: 1
-      type: Transform
+    - type: DeviceLinkSink
+      links:
+      - 46
+  - uid: 952
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,1.5
+      parent: 1
+  - uid: 955
+    components:
+    - type: Transform
+      pos: 11.5,-2.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 46
 - proto: Rack
   entities:
-  - uid: 764
+  - uid: 776
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,5.5
       parent: 1
-      type: Transform
-  - uid: 765
+  - uid: 777
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 4.5,5.5
       parent: 1
-      type: Transform
-  - uid: 766
+  - uid: 778
     components:
-    - pos: -0.5,-3.5
+    - type: Transform
+      pos: -0.5,-3.5
       parent: 1
-      type: Transform
 - proto: RandomArcade
   entities:
-  - uid: 767
+  - uid: 779
     components:
-    - pos: 7.5,-2.5
+    - type: Transform
+      pos: 7.5,-2.5
       parent: 1
-      type: Transform
 - proto: RandomPosterContraband
   entities:
-  - uid: 768
+  - uid: 780
     components:
-    - pos: 9.5,3.5
+    - type: Transform
+      pos: 9.5,3.5
       parent: 1
-      type: Transform
-  - uid: 769
+  - uid: 781
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 0.5,0.5
       parent: 1
-      type: Transform
-  - uid: 770
-    components:
-    - pos: 5.5,0.5
-      parent: 1
-      type: Transform
-  - uid: 771
+  - uid: 782
     components:
-    - pos: 11.5,3.5
+    - type: Transform
+      pos: 5.5,0.5
       parent: 1
-      type: Transform
-  - uid: 772
+  - uid: 784
     components:
-    - pos: -1.5,-4.5
+    - type: Transform
+      pos: -1.5,-4.5
       parent: 1
-      type: Transform
-  - uid: 773
+  - uid: 785
     components:
-    - pos: 14.5,-3.5
+    - type: Transform
+      pos: 14.5,-3.5
       parent: 1
-      type: Transform
-  - uid: 774
+  - uid: 786
     components:
-    - pos: 5.5,-3.5
+    - type: Transform
+      pos: 5.5,-3.5
       parent: 1
-      type: Transform
 - proto: RandomVendingDrinks
   entities:
-  - uid: 775
+  - uid: 787
     components:
-    - pos: 4.5,-2.5
+    - type: Transform
+      pos: 4.5,-2.5
       parent: 1
-      type: Transform
     - type: Emagged
 - proto: RandomVendingSnacks
   entities:
-  - uid: 776
+  - uid: 788
     components:
-    - pos: 4.5,-3.5
+    - type: Transform
+      pos: 4.5,-3.5
       parent: 1
-      type: Transform
     - type: Emagged
 - proto: ReinforcedPlasmaWindow
   entities:
-  - uid: 7
+  - uid: 789
     components:
-    - pos: 10.5,-1.5
+    - type: Transform
+      pos: 10.5,-1.5
       parent: 1
-      type: Transform
-  - uid: 777
+  - uid: 790
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
       pos: 10.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 778
+  - uid: 791
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
       pos: 12.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 779
+  - uid: 792
     components:
-    - pos: 13.5,-0.5
+    - type: Transform
+      pos: 13.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 780
+  - uid: 793
     components:
-    - pos: 13.5,0.5
+    - type: Transform
+      pos: 13.5,0.5
       parent: 1
-      type: Transform
-  - uid: 781
+  - uid: 794
     components:
-    - pos: 13.5,2.5
+    - type: Transform
+      pos: 13.5,2.5
       parent: 1
-      type: Transform
-  - uid: 782
+  - uid: 795
     components:
-    - pos: 13.5,1.5
+    - type: Transform
+      pos: 13.5,1.5
       parent: 1
-      type: Transform
-  - uid: 783
+  - uid: 796
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
       pos: 11.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 784
+  - uid: 797
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
       pos: 13.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 785
+  - uid: 798
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
       pos: 6.5,-6.5
       parent: 1
-      type: Transform
-  - uid: 786
+  - uid: 799
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
       pos: 7.5,-6.5
       parent: 1
-      type: Transform
-  - uid: 787
+  - uid: 800
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
       pos: 8.5,-6.5
       parent: 1
-      type: Transform
+- proto: RubberStampApproved
+  entities:
+  - uid: 407
+    components:
+    - type: Transform
+      parent: 405
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: RubberStampCaptain
   entities:
-  - uid: 420
+  - uid: 417
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 419
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 405
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: RubberStampCE
   entities:
-  - uid: 421
+  - uid: 413
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 419
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 405
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: RubberStampChaplain
   entities:
-  - uid: 422
+  - uid: 416
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 419
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 405
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: RubberStampClown
   entities:
-  - uid: 423
+  - uid: 414
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 419
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 405
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: RubberStampCMO
   entities:
-  - uid: 424
+  - uid: 412
+    components:
+    - type: Transform
+      parent: 405
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: RubberStampDenied
+  entities:
+  - uid: 411
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 419
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 405
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: RubberStampHop
   entities:
-  - uid: 425
+  - uid: 419
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 419
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 405
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: RubberStampHos
   entities:
-  - uid: 426
+  - uid: 409
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 419
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 405
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: RubberStampMantis
   entities:
-  - uid: 427
+  - uid: 415
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 419
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 405
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: RubberStampMime
   entities:
-  - uid: 428
+  - uid: 420
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 419
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 405
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: RubberStampQm
   entities:
-  - uid: 429
+  - uid: 408
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 419
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 405
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: RubberStampRd
   entities:
-  - uid: 430
+  - uid: 418
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 419
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 405
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: RubberStampSyndicate
   entities:
-  - uid: 431
+  - uid: 410
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 419
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 405
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: RubberStampWarden
   entities:
-  - uid: 432
+  - uid: 406
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 419
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 405
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: SalvageLorePaperGamingSpawner
   entities:
-  - uid: 788
+  - uid: 801
     components:
-    - pos: 12.5,-9.5
+    - type: Transform
+      pos: 12.5,-9.5
       parent: 1
-      type: Transform
 - proto: SheetPlasteel
   entities:
-  - uid: 789
+  - uid: 802
     components:
-    - pos: -1.4864182,5.563302
+    - type: Transform
+      pos: -1.4864182,5.563302
       parent: 1
-      type: Transform
 - proto: SheetRPGlass
   entities:
-  - uid: 790
+  - uid: 803
     components:
-    - pos: -1.2364185,5.563302
+    - type: Transform
+      pos: -1.2364185,5.563302
       parent: 1
-      type: Transform
 - proto: SheetSteel
   entities:
-  - uid: 791
+  - uid: 804
     components:
-    - pos: -1.6895431,5.500802
+    - type: Transform
+      pos: -1.6895431,5.500802
       parent: 1
-      type: Transform
 - proto: SignalButton
   entities:
-  - uid: 792
+  - uid: 805
     components:
-    - name: bridge blast doors button
-      type: MetaData
-    - rot: 3.141592653589793 rad
+    - type: MetaData
+      name: bridge blast doors button
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 11.5,-1.5
       parent: 1
-      type: Transform
-    - linkedPorts:
-        348:
+    - type: DeviceLinkSource
+      linkedPorts:
+        354:
         - Pressed: Toggle
-        346:
+        352:
         - Pressed: Toggle
-        345:
+        351:
         - Pressed: Toggle
-        347:
+        353:
         - Pressed: Toggle
-        947:
+        361:
         - Pressed: Toggle
-      type: DeviceLinkSource
-  - uid: 793
+  - uid: 806
     components:
-    - desc: A note taped to it reads, "Be sure to keep it bolted, else those crazy guards might try to drink vacuum"
+    - type: MetaData
+      desc: A note taped to it reads, "Be sure to keep it bolted, else those crazy guards might try to drink vacuum"
       name: external bolts button
-      type: MetaData
-    - pos: 4.5,4.5
+    - type: Transform
+      pos: 4.5,4.5
       parent: 1
-      type: Transform
-    - linkedPorts:
+    - type: DeviceLinkSource
+      linkedPorts:
         4:
         - Pressed: DoorBolt
-      type: DeviceLinkSource
-  - uid: 795
+  - uid: 807
     components:
-    - name: rec room blast shields button
-      type: MetaData
-    - rot: 1.5707963267948966 rad
+    - type: MetaData
+      name: rec room blast shields button
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 5.5,-2.5
       parent: 1
-      type: Transform
-    - linkedPorts:
-        344:
+    - type: DeviceLinkSource
+      linkedPorts:
+        350:
         - Pressed: Toggle
-        349:
+        355:
         - Pressed: Toggle
-        350:
+        356:
         - Pressed: Toggle
-        351:
+        357:
         - Pressed: Toggle
-        352:
+        358:
         - Pressed: Toggle
-        353:
+        359:
         - Pressed: Toggle
-        354:
+        360:
         - Pressed: Toggle
-      type: DeviceLinkSource
+- proto: SignalSwitchDirectional
+  entities:
+  - uid: 46
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-1.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        773:
+        - On: Off
+        - Off: On
+        21:
+        - On: On
+        - Off: Off
+        917:
+        - On: On
+        - Off: Off
+        771:
+        - On: Off
+        - Off: On
+        770:
+        - Off: On
+        - On: Off
+        963:
+        - On: On
+        - Off: Off
+        769:
+        - Off: On
+        - On: Off
+        375:
+        - On: On
+        - Off: Off
+        774:
+        - Off: On
+        - On: Off
+        958:
+        - On: On
+        - Off: Off
+        731:
+        - On: On
+        - Off: Off
+        772:
+        - On: Off
+        - Off: On
+        896:
+        - On: On
+        - Off: Off
+        775:
+        - On: Off
+        - Off: On
+        956:
+        - On: On
+        - Off: Off
+        20:
+        - On: Off
+        - Off: On
+        23:
+        - On: Off
+        - Off: On
+        955:
+        - On: Off
+        - Off: On
+        19:
+        - On: On
+        - Off: Off
+        22:
+        - On: Off
+        - Off: On
 - proto: SinkStemlessWater
   entities:
-  - uid: 796
+  - uid: 808
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,-3.5
       parent: 1
-      type: Transform
 - proto: SoapSyndie
   entities:
-  - uid: 797
+  - uid: 809
     components:
-    - rot: 6.283185307179586 rad
+    - type: Transform
+      rot: 6.283185307179586 rad
       pos: -1.5109272,-2.2405348
       parent: 1
-      type: Transform
 - proto: soda_dispenser
   entities:
-  - uid: 798
+  - uid: 810
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 1.5,-4.5
       parent: 1
-      type: Transform
     - type: Emagged
 - proto: SpawnMobRadioGuard
   entities:
-  - uid: 799
+  - uid: 811
     components:
-    - pos: 9.5,-0.5
+    - type: Transform
+      pos: 9.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 800
+  - uid: 812
     components:
-    - pos: 2.5,2.5
+    - type: Transform
+      pos: 2.5,2.5
       parent: 1
-      type: Transform
 - proto: SpawnPointGhostSyndicateListener
   entities:
-  - uid: 801
+  - uid: 813
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 1
+  - uid: 814
+    components:
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 1
+- proto: StationMapBroken
+  entities:
+  - uid: 815
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 1
+- proto: SubstationWallBasic
+  entities:
+  - uid: 816
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,5.5
+      parent: 1
+- proto: SuitStorageEVASyndicate
+  entities:
+  - uid: 611
     components:
-    - pos: -0.5,1.5
+    - type: Transform
+      pos: -0.5,-7.5
       parent: 1
-      type: Transform
-  - uid: 802
+  - uid: 817
     components:
-    - pos: -1.5,1.5
+    - type: Transform
+      pos: -1.5,-7.5
       parent: 1
-      type: Transform
-- proto: StationMapBroken
+    - 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: SyndicateMonitoringServer
   entities:
-  - uid: 803
+  - uid: 338
     components:
-    - pos: 1.5,4.5
+    - type: Transform
+      pos: 2.5,-7.5
       parent: 1
-      type: Transform
-- proto: SubstationWallBasic
+    - type: SingletonDeviceNetServer
+      active: False
+      available: False
+- proto: SyndicatePersonalAI
   entities:
-  - uid: 804
+  - uid: 819
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 0.5,5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.4855704,-4.514364
       parent: 1
-      type: Transform
-- proto: SuitStorageEVASyndicate
+- proto: SyndieHandyFlag
   entities:
-  - uid: 760
+  - uid: 951
     components:
-    - pos: -1.5,-7.5
+    - type: Transform
+      pos: 1.9013485,-7
       parent: 1
-      type: Transform
-- proto: SyndicateMonitoringServer
+- proto: SynthesizerInstrument
   entities:
-  - uid: 809
+  - uid: 820
     components:
-    - pos: 11.5,2.5
+    - type: Transform
+      pos: 6.5734386,-5.497705
       parent: 1
-      type: Transform
 - proto: TableCarpet
   entities:
-  - uid: 810
+  - uid: 821
     components:
-    - pos: 7.5,-5.5
+    - type: Transform
+      pos: 7.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 811
+  - uid: 822
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 1.5,1.5
       parent: 1
-      type: Transform
-  - uid: 812
+  - uid: 823
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 7.5,-4.5
       parent: 1
-      type: Transform
 - proto: TableGlass
   entities:
-  - uid: 813
+  - uid: 824
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-2.5
       parent: 1
-      type: Transform
-  - uid: 814
+  - uid: 825
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-3.5
       parent: 1
-      type: Transform
-  - uid: 815
+  - uid: 826
     components:
-    - pos: 1.5,-4.5
+    - type: Transform
+      pos: 1.5,-4.5
       parent: 1
-      type: Transform
-- proto: TablePlasmaGlass
+- proto: TableWoodReinforced
   entities:
-  - uid: 816
+  - uid: 382
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,0.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,0.5
       parent: 1
-      type: Transform
-  - uid: 817
+  - uid: 383
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,1.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,2.5
       parent: 1
-      type: Transform
-- proto: TableReinforced
-  entities:
-  - uid: 818
+  - uid: 385
     components:
-    - pos: 8.5,2.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,1.5
       parent: 1
-      type: Transform
-  - uid: 819
+  - uid: 386
     components:
-    - pos: 8.5,1.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 820
+  - uid: 387
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 12.5,2.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,2.5
+      parent: 1
+  - uid: 568
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,1.5
       parent: 1
-      type: Transform
 - proto: TelecomServerFilled
   entities:
-  - uid: 594
+  - uid: 612
     components:
-    - pos: 10.5,2.5
+    - type: Transform
+      pos: 1.5,-7.5
       parent: 1
-      type: Transform
-    - containers:
+    - type: ContainerContainer
+      containers:
         key_slots: !type:Container
           showEnts: False
           occludes: True
           ents:
-          - 602
-          - 601
-          - 599
-          - 595
-          - 600
-          - 598
-          - 597
-          - 596
-          - 603
+          - 613
+          - 614
+          - 615
         machine_board: !type:Container
           showEnts: False
           occludes: True
@@ -5779,693 +5735,707 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-      type: ContainerContainer
 - proto: ToiletEmpty
   entities:
-  - uid: 821
+  - uid: 832
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -0.5,-2.5
       parent: 1
-      type: Transform
 - proto: ToolboxSyndicateFilled
   entities:
-  - uid: 822
+  - uid: 833
     components:
-    - pos: 4.5174317,5.701203
+    - type: Transform
+      pos: 4.5174317,5.701203
       parent: 1
-      type: Transform
-  - uid: 823
+  - uid: 834
     components:
-    - pos: 4.5330567,5.310578
+    - type: Transform
+      pos: 4.5330567,5.310578
       parent: 1
-      type: Transform
 - proto: ToyFigurineNukie
   entities:
-  - uid: 824
+  - uid: 835
     components:
-    - pos: 12.208444,2.8347092
+    - type: Transform
+      pos: 12.208444,2.8347092
       parent: 1
-      type: Transform
 - proto: ToyFigurineNukieCommander
   entities:
-  - uid: 825
+  - uid: 836
     components:
-    - pos: 12.791773,2.838885
+    - type: Transform
+      pos: 12.791773,2.838885
       parent: 1
-      type: Transform
 - proto: ToyFigurineNukieElite
   entities:
-  - uid: 826
+  - uid: 837
     components:
-    - pos: 12.489692,2.4701266
+    - type: Transform
+      pos: 12.489692,2.4701266
       parent: 1
-      type: Transform
 - proto: ToyNuke
   entities:
-  - uid: 827
+  - uid: 838
     components:
-    - pos: 16.198624,-0.765656
+    - type: Transform
+      pos: 16.198624,-0.765656
       parent: 1
-      type: Transform
 - proto: VendingMachineBooze
   entities:
-  - uid: 828
+  - uid: 839
     components:
-    - pos: 4.5,-4.5
+    - type: Transform
+      pos: 4.5,-4.5
       parent: 1
-      type: Transform
     - type: Emagged
+- proto: VendingMachineCigs
+  entities:
+  - uid: 565
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
 - proto: VendingMachineGames
   entities:
-  - uid: 829
+  - uid: 840
     components:
-    - pos: 8.5,-2.5
+    - type: Transform
+      pos: 8.5,-2.5
       parent: 1
-      type: Transform
     - type: Emagged
 - proto: VendingMachineNutri
   entities:
-  - uid: 830
+  - uid: 841
     components:
-    - pos: 12.5,-2.5
+    - type: Transform
+      pos: 12.5,-2.5
       parent: 1
-      type: Transform
     - type: Emagged
 - proto: VendingMachineSeedsUnlocked
   entities:
-  - uid: 831
+  - uid: 842
     components:
-    - pos: 11.5,-2.5
+    - type: Transform
+      pos: 11.5,-2.5
       parent: 1
-      type: Transform
     - type: Emagged
 - proto: VendingMachineSyndieDrobe
   entities:
-  - uid: 832
+  - uid: 843
     components:
-    - pos: -2.5,0.5
+    - type: Transform
+      pos: -2.5,0.5
       parent: 1
-      type: Transform
     - type: Emagged
 - proto: VendingMachineTankDispenserEVA
   entities:
-  - uid: 833
+  - uid: 844
     components:
-    - pos: -1.5,3.5
+    - type: Transform
+      pos: -1.5,3.5
       parent: 1
-      type: Transform
 - proto: WallPlastitanium
   entities:
-  - uid: 806
-    components:
-    - pos: -2.5,-8.5
-      parent: 1
-      type: Transform
-  - uid: 807
-    components:
-    - pos: -1.5,-8.5
-      parent: 1
-      type: Transform
-  - uid: 808
-    components:
-    - pos: -0.5,-8.5
-      parent: 1
-      type: Transform
-  - uid: 834
-    components:
-    - pos: -0.5,-1.5
-      parent: 1
-      type: Transform
-  - uid: 835
-    components:
-    - pos: -2.5,6.5
-      parent: 1
-      type: Transform
-  - uid: 836
-    components:
-    - pos: 3.5,-1.5
-      parent: 1
-      type: Transform
-  - uid: 837
+  - uid: 54
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 14.5,-2.5
+    - type: Transform
+      pos: 5.5,-8.5
       parent: 1
-      type: Transform
-  - uid: 838
+  - uid: 332
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 14.5,-1.5
+    - type: Transform
+      pos: 10.5,3.5
       parent: 1
-      type: Transform
-  - uid: 839
+  - uid: 335
     components:
-    - pos: 8.5,-1.5
+    - type: Transform
+      pos: 2.5,-8.5
       parent: 1
-      type: Transform
-  - uid: 840
+  - uid: 336
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -3.5,1.5
+    - type: Transform
+      pos: 1.5,-8.5
       parent: 1
-      type: Transform
-  - uid: 841
+  - uid: 340
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -3.5,0.5
+    - type: Transform
+      pos: 0.5,-8.5
       parent: 1
-      type: Transform
-  - uid: 842
+  - uid: 425
     components:
-    - pos: 5.5,5.5
+    - type: Transform
+      pos: 4.5,-8.5
       parent: 1
-      type: Transform
-  - uid: 844
+  - uid: 617
     components:
-    - pos: -1.5,-4.5
+    - type: Transform
+      pos: 3.5,-8.5
       parent: 1
-      type: Transform
   - uid: 845
     components:
-    - pos: -2.5,-5.5
+    - type: Transform
+      pos: -2.5,-8.5
       parent: 1
-      type: Transform
   - uid: 846
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,6.5
+    - type: Transform
+      pos: -1.5,-8.5
       parent: 1
-      type: Transform
   - uid: 847
     components:
-    - pos: -0.5,6.5
+    - type: Transform
+      pos: -0.5,-8.5
       parent: 1
-      type: Transform
   - uid: 848
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,6.5
+    - type: Transform
+      pos: -0.5,-1.5
       parent: 1
-      type: Transform
   - uid: 849
     components:
-    - pos: 5.5,-4.5
+    - type: Transform
+      pos: -2.5,6.5
       parent: 1
-      type: Transform
   - uid: 850
     components:
-    - pos: 9.5,-1.5
+    - type: Transform
+      pos: 3.5,-1.5
       parent: 1
-      type: Transform
   - uid: 851
     components:
-    - pos: 11.5,-1.5
+    - type: Transform
+      pos: 14.5,-2.5
       parent: 1
-      type: Transform
   - uid: 852
     components:
-    - pos: 12.5,-1.5
+    - type: Transform
+      pos: 14.5,-1.5
       parent: 1
-      type: Transform
   - uid: 853
     components:
-    - pos: 5.5,-3.5
+    - type: Transform
+      pos: 8.5,-1.5
       parent: 1
-      type: Transform
   - uid: 854
     components:
-    - pos: 5.5,-2.5
+    - type: Transform
+      pos: -3.5,1.5
       parent: 1
-      type: Transform
   - uid: 855
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 5.5,-7.5
+    - type: Transform
+      pos: -3.5,0.5
       parent: 1
-      type: Transform
   - uid: 856
     components:
-    - pos: 7.5,-1.5
+    - type: Transform
+      pos: 5.5,5.5
       parent: 1
-      type: Transform
   - uid: 857
     components:
-    - pos: 13.5,-1.5
+    - type: Transform
+      pos: -1.5,-4.5
       parent: 1
-      type: Transform
   - uid: 858
     components:
-    - pos: 13.5,3.5
+    - type: Transform
+      pos: -2.5,-5.5
       parent: 1
-      type: Transform
   - uid: 859
     components:
-    - pos: 3.5,-5.5
+    - type: Transform
+      pos: 2.5,6.5
       parent: 1
-      type: Transform
   - uid: 860
     components:
-    - pos: 4.5,-5.5
+    - type: Transform
+      pos: -0.5,6.5
       parent: 1
-      type: Transform
   - uid: 861
     components:
-    - pos: -2.5,4.5
+    - type: Transform
+      pos: 4.5,6.5
       parent: 1
-      type: Transform
   - uid: 862
     components:
-    - pos: 5.5,-5.5
+    - type: Transform
+      pos: 5.5,-4.5
       parent: 1
-      type: Transform
   - uid: 863
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 5.5,-6.5
+    - type: Transform
+      pos: 9.5,-1.5
+      parent: 1
+  - uid: 864
+    components:
+    - type: Transform
+      pos: 11.5,-1.5
       parent: 1
-      type: Transform
   - uid: 865
     components:
-    - pos: 1.5,-5.5
+    - type: Transform
+      pos: 12.5,-1.5
       parent: 1
-      type: Transform
   - uid: 866
     components:
-    - pos: 0.5,-5.5
+    - type: Transform
+      pos: 5.5,-3.5
       parent: 1
-      type: Transform
   - uid: 867
     components:
-    - pos: 0.5,-4.5
+    - type: Transform
+      pos: 5.5,-2.5
       parent: 1
-      type: Transform
   - uid: 868
     components:
-    - pos: 12.5,3.5
+    - type: Transform
+      pos: 5.5,-7.5
       parent: 1
-      type: Transform
   - uid: 869
     components:
-    - pos: -2.5,-4.5
+    - type: Transform
+      pos: 7.5,-1.5
       parent: 1
-      type: Transform
   - uid: 870
     components:
-    - pos: -2.5,-2.5
+    - type: Transform
+      pos: 13.5,-1.5
       parent: 1
-      type: Transform
   - uid: 871
     components:
-    - pos: 0.5,-7.5
+    - type: Transform
+      pos: 13.5,3.5
       parent: 1
-      type: Transform
   - uid: 872
     components:
-    - pos: -0.5,-7.5
+    - type: Transform
+      pos: 3.5,-5.5
       parent: 1
-      type: Transform
   - uid: 873
     components:
-    - pos: -2.5,-6.5
+    - type: Transform
+      pos: 4.5,-5.5
       parent: 1
-      type: Transform
   - uid: 874
     components:
-    - pos: -0.5,-4.5
+    - type: Transform
+      pos: -2.5,4.5
       parent: 1
-      type: Transform
   - uid: 875
     components:
-    - pos: 0.5,0.5
+    - type: Transform
+      pos: 5.5,-5.5
       parent: 1
-      type: Transform
   - uid: 876
     components:
-    - pos: 0.5,1.5
+    - type: Transform
+      pos: 5.5,-6.5
       parent: 1
-      type: Transform
   - uid: 877
     components:
-    - pos: -1.5,2.5
+    - type: Transform
+      pos: 1.5,-5.5
       parent: 1
-      type: Transform
   - uid: 878
     components:
-    - pos: 7.5,4.5
+    - type: Transform
+      pos: 0.5,-5.5
       parent: 1
-      type: Transform
   - uid: 879
     components:
-    - pos: 0.5,5.5
+    - type: Transform
+      pos: 0.5,-4.5
       parent: 1
-      type: Transform
   - uid: 880
     components:
-    - pos: -2.5,2.5
+    - type: Transform
+      pos: 12.5,3.5
       parent: 1
-      type: Transform
   - uid: 881
     components:
-    - pos: -2.5,3.5
+    - type: Transform
+      pos: -2.5,-4.5
       parent: 1
-      type: Transform
   - uid: 882
     components:
-    - pos: -2.5,5.5
+    - type: Transform
+      pos: -2.5,-2.5
       parent: 1
-      type: Transform
   - uid: 883
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,4.5
-      parent: 1
-      type: Transform
-  - uid: 884
-    components:
-    - pos: 1.5,-7.5
+    - type: Transform
+      pos: 0.5,-7.5
       parent: 1
-      type: Transform
   - uid: 885
     components:
-    - pos: -2.5,-1.5
+    - type: Transform
+      pos: -2.5,-6.5
       parent: 1
-      type: Transform
   - uid: 886
     components:
-    - pos: 1.5,-1.5
+    - type: Transform
+      pos: -0.5,-4.5
       parent: 1
-      type: Transform
   - uid: 887
     components:
-    - pos: 0.5,-1.5
+    - type: Transform
+      pos: 0.5,0.5
       parent: 1
-      type: Transform
   - uid: 888
     components:
-    - pos: 0.5,-3.5
+    - type: Transform
+      pos: 0.5,1.5
       parent: 1
-      type: Transform
   - uid: 889
     components:
-    - pos: -2.5,-3.5
+    - type: Transform
+      pos: -1.5,2.5
       parent: 1
-      type: Transform
   - uid: 890
     components:
-    - pos: 0.5,-2.5
+    - type: Transform
+      pos: 7.5,4.5
       parent: 1
-      type: Transform
   - uid: 891
     components:
-    - pos: 11.5,3.5
+    - type: Transform
+      pos: 0.5,5.5
       parent: 1
-      type: Transform
   - uid: 892
     components:
-    - pos: 10.5,3.5
+    - type: Transform
+      pos: -2.5,2.5
       parent: 1
-      type: Transform
   - uid: 893
     components:
-    - pos: 9.5,3.5
+    - type: Transform
+      pos: -2.5,3.5
       parent: 1
-      type: Transform
   - uid: 894
     components:
-    - pos: 5.5,-1.5
+    - type: Transform
+      pos: -2.5,5.5
       parent: 1
-      type: Transform
   - uid: 895
     components:
-    - pos: 4.5,-1.5
-      parent: 1
-      type: Transform
-  - uid: 896
-    components:
-    - pos: 7.5,2.5
+    - type: Transform
+      pos: 1.5,4.5
       parent: 1
-      type: Transform
   - uid: 897
     components:
-    - pos: 7.5,1.5
+    - type: Transform
+      pos: -2.5,-1.5
       parent: 1
-      type: Transform
   - uid: 898
     components:
-    - pos: 7.5,0.5
+    - type: Transform
+      pos: 1.5,-1.5
       parent: 1
-      type: Transform
   - uid: 899
     components:
-    - pos: 7.5,3.5
+    - type: Transform
+      pos: 0.5,-1.5
       parent: 1
-      type: Transform
   - uid: 900
     components:
-    - pos: 8.5,3.5
+    - type: Transform
+      pos: 0.5,-3.5
       parent: 1
-      type: Transform
   - uid: 901
     components:
-    - pos: 5.5,0.5
+    - type: Transform
+      pos: -2.5,-3.5
       parent: 1
-      type: Transform
   - uid: 902
     components:
-    - pos: 6.5,0.5
+    - type: Transform
+      pos: 0.5,-2.5
       parent: 1
-      type: Transform
   - uid: 903
     components:
-    - pos: -2.5,-7.5
-      parent: 1
-      type: Transform
-  - uid: 904
-    components:
-    - pos: 3.5,-7.5
+    - type: Transform
+      pos: 11.5,3.5
       parent: 1
-      type: Transform
   - uid: 905
     components:
-    - pos: 2.5,-7.5
+    - type: Transform
+      pos: 9.5,3.5
       parent: 1
-      type: Transform
   - uid: 906
     components:
-    - pos: -2.5,-0.5
+    - type: Transform
+      pos: 5.5,-1.5
       parent: 1
-      type: Transform
   - uid: 907
     components:
-    - pos: 4.5,-7.5
+    - type: Transform
+      pos: 4.5,-1.5
       parent: 1
-      type: Transform
   - uid: 908
     components:
-    - pos: 0.5,2.5
+    - type: Transform
+      pos: 7.5,2.5
       parent: 1
-      type: Transform
   - uid: 909
     components:
-    - pos: -0.5,2.5
+    - type: Transform
+      pos: 7.5,1.5
       parent: 1
-      type: Transform
   - uid: 910
     components:
-    - pos: -2.5,1.5
+    - type: Transform
+      pos: 7.5,0.5
       parent: 1
-      type: Transform
   - uid: 911
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 0.5,4.5
+    - type: Transform
+      pos: 7.5,3.5
       parent: 1
-      type: Transform
   - uid: 912
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,4.5
+    - type: Transform
+      pos: 8.5,3.5
       parent: 1
-      type: Transform
   - uid: 913
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 5.5,1.5
+    - type: Transform
+      pos: 5.5,0.5
       parent: 1
-      type: Transform
   - uid: 914
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 5.5,4.5
+    - type: Transform
+      pos: 6.5,0.5
       parent: 1
-      type: Transform
   - uid: 915
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 5.5,3.5
+    - type: Transform
+      pos: -2.5,-7.5
       parent: 1
-      type: Transform
   - uid: 916
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,4.5
-      parent: 1
-      type: Transform
-  - uid: 917
-    components:
-    - pos: -1.5,6.5
+    - type: Transform
+      pos: 3.5,-7.5
       parent: 1
-      type: Transform
   - uid: 918
     components:
-    - pos: 0.5,6.5
+    - type: Transform
+      pos: -2.5,-0.5
       parent: 1
-      type: Transform
   - uid: 920
     components:
-    - pos: 6.5,4.5
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1
+  - uid: 921
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 1
+  - uid: 922
+    components:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 1
+  - uid: 923
+    components:
+    - type: Transform
+      pos: 0.5,4.5
       parent: 1
-      type: Transform
   - uid: 924
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 9.5,-6.5
+    - type: Transform
+      pos: 2.5,4.5
       parent: 1
-      type: Transform
   - uid: 925
     components:
-    - pos: 9.5,-4.5
+    - type: Transform
+      pos: 5.5,1.5
       parent: 1
-      type: Transform
   - uid: 926
     components:
-    - pos: 5.5,6.5
+    - type: Transform
+      pos: 5.5,4.5
       parent: 1
-      type: Transform
   - uid: 927
     components:
-    - pos: 9.5,-2.5
+    - type: Transform
+      pos: 5.5,3.5
       parent: 1
-      type: Transform
   - uid: 928
     components:
-    - pos: 1.5,6.5
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 1
+  - uid: 929
+    components:
+    - type: Transform
+      pos: -1.5,6.5
       parent: 1
-      type: Transform
   - uid: 930
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 14.5,-3.5
+    - type: Transform
+      pos: 0.5,6.5
       parent: 1
-      type: Transform
   - uid: 931
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 14.5,-4.5
+    - type: Transform
+      pos: 6.5,4.5
       parent: 1
-      type: Transform
   - uid: 932
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 14.5,-5.5
+    - type: Transform
+      pos: 9.5,-6.5
       parent: 1
-      type: Transform
   - uid: 933
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 9.5,-5.5
+    - type: Transform
+      pos: 9.5,-4.5
       parent: 1
-      type: Transform
   - uid: 934
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      pos: 5.5,6.5
+      parent: 1
+  - uid: 935
+    components:
+    - type: Transform
+      pos: 9.5,-2.5
+      parent: 1
+  - uid: 936
+    components:
+    - type: Transform
+      pos: 1.5,6.5
+      parent: 1
+  - uid: 937
+    components:
+    - type: Transform
+      pos: 14.5,-3.5
+      parent: 1
+  - uid: 938
+    components:
+    - type: Transform
+      pos: 14.5,-4.5
+      parent: 1
+  - uid: 939
+    components:
+    - type: Transform
+      pos: 14.5,-5.5
+      parent: 1
+  - uid: 940
+    components:
+    - type: Transform
+      pos: 9.5,-5.5
+      parent: 1
+  - uid: 941
+    components:
+    - type: Transform
       pos: -3.5,-0.5
       parent: 1
-      type: Transform
 - proto: WarpPoint
   entities:
-  - uid: 935
+  - uid: 942
+    components:
+    - type: MetaData
+      name: Syndicate Listening Post
+    - type: Transform
+      pos: 10.5,0.5
+      parent: 1
+- proto: WashingMachineFilledClothes
+  entities:
+  - uid: 2
     components:
-    - name: Syndicate Listening Post
-      type: MetaData
-    - pos: 10.5,0.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-7.5
       parent: 1
-      type: Transform
 - proto: WaterCooler
   entities:
-  - uid: 936
+  - uid: 943
     components:
-    - pos: 1.5,0.5
+    - type: Transform
+      pos: 1.5,0.5
       parent: 1
-      type: Transform
 - proto: WaterTankHighCapacity
   entities:
-  - uid: 937
+  - uid: 944
     components:
-    - pos: 13.5,-2.5
+    - type: Transform
+      pos: 13.5,-2.5
       parent: 1
-      type: Transform
 - proto: WeaponShotgunKammerer
   entities:
-  - uid: 372
+  - uid: 379
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 356
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 363
+    - type: Physics
+      canCollide: False
     - type: InsideEntityStorage
-  - uid: 373
+  - uid: 380
     components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 356
-      type: Transform
-    - canCollide: False
-      type: Physics
+    - type: Transform
+      parent: 363
+    - type: Physics
+      canCollide: False
     - type: InsideEntityStorage
 - proto: Windoor
   entities:
-  - uid: 919
+  - uid: 618
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-7.5
+      parent: 1
+  - uid: 945
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -1.5,-7.5
       parent: 1
-      type: Transform
-  - uid: 938
+  - uid: 946
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 4.5,5.5
       parent: 1
-      type: Transform
-  - uid: 939
+  - uid: 947
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -2.5,0.5
       parent: 1
-      type: Transform
 - proto: WindoorSecure
   entities:
-  - uid: 944
+  - uid: 610
     components:
-    - pos: -1.5,5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-7.5
       parent: 1
-      type: Transform
-  - uid: 945
+  - uid: 783
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-7.5
+      parent: 1
+  - uid: 948
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 1
+  - uid: 949
     components:
-    - pos: -0.5,5.5
+    - type: Transform
+      pos: -0.5,5.5
       parent: 1
-      type: Transform
 - proto: WoodDoor
   entities:
-  - uid: 946
+  - uid: 12
     components:
-    - pos: -1.5,-1.5
+    - type: Transform
+      pos: -1.5,-1.5
       parent: 1
-      type: Transform
-    - secondsUntilStateChange: -14097.95
-      state: Opening
-      type: Door
 ...
diff --git a/Resources/Maps/Shuttles/DeltaV/NTES_Seal.yml b/Resources/Maps/Shuttles/DeltaV/NTES_Seal.yml
index a9de39ef7d..930f6c74c7 100644
--- a/Resources/Maps/Shuttles/DeltaV/NTES_Seal.yml
+++ b/Resources/Maps/Shuttles/DeltaV/NTES_Seal.yml
@@ -9,11 +9,11 @@ tilemap:
   62: FloorLaundry
   65: FloorMetalDiamond
   78: FloorReinforced
-  84: FloorShuttlePurple
-  90: FloorSteel
-  105: FloorTechMaint
-  121: Lattice
-  122: Plating
+  86: FloorShuttlePurple
+  92: FloorSteel
+  107: FloorTechMaint
+  123: Lattice
+  124: Plating
 entities:
 - proto: ""
   entities:
@@ -28,35 +28,35 @@ entities:
       chunks:
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAQQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAQQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAVAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAADgAAAAACDgAAAAABDgAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAACHgAAAAACWgAAAAABHgAAAAAAHgAAAAADHgAAAAAAWgAAAAAAHgAAAAADegAAAAAADgAAAAAADgAAAAADDgAAAAADDgAAAAADDgAAAAABWgAAAAACWgAAAAAAWgAAAAAAHgAAAAADWgAAAAABHgAAAAADHgAAAAADHgAAAAADWgAAAAAAHgAAAAADegAAAAAADgAAAAACDgAAAAADDgAAAAABDgAAAAACDgAAAAACWgAAAAACWgAAAAADWgAAAAADHgAAAAADWgAAAAACHgAAAAABHgAAAAABHgAAAAADWgAAAAAAHgAAAAAAegAAAAAADgAAAAAADgAAAAADDgAAAAADDgAAAAABDgAAAAADWgAAAAADWgAAAAAAWgAAAAABHgAAAAACWgAAAAACHgAAAAAAHgAAAAADHgAAAAAAWgAAAAAAHgAAAAACegAAAAAADgAAAAAADgAAAAAADgAAAAACDgAAAAADDgAAAAACWgAAAAADWgAAAAAAWgAAAAACWgAAAAADWgAAAAADWgAAAAADWgAAAAADWgAAAAADWgAAAAADWgAAAAACWgAAAAADWgAAAAADWgAAAAACWgAAAAAAWgAAAAABWgAAAAABWgAAAAACWgAAAAAAWgAAAAADWgAAAAACWgAAAAACWgAAAAAAWgAAAAACWgAAAAADWgAAAAACWgAAAAABWgAAAAABWgAAAAAAWgAAAAAAWgAAAAACWgAAAAACWgAAAAAAWgAAAAAAWgAAAAAD
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAVgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAADgAAAAACDgAAAAABDgAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAACHgAAAAACXAAAAAABHgAAAAAAHgAAAAADHgAAAAAAXAAAAAAAHgAAAAADfAAAAAAADgAAAAAADgAAAAADDgAAAAADDgAAAAADDgAAAAABXAAAAAACXAAAAAAAXAAAAAAAHgAAAAADXAAAAAABHgAAAAADHgAAAAADHgAAAAADXAAAAAAAHgAAAAADfAAAAAAADgAAAAACDgAAAAADDgAAAAABDgAAAAACDgAAAAACXAAAAAACXAAAAAADXAAAAAADHgAAAAADXAAAAAACHgAAAAABHgAAAAABHgAAAAADXAAAAAAAHgAAAAAAfAAAAAAADgAAAAAADgAAAAADDgAAAAADDgAAAAABDgAAAAADXAAAAAADXAAAAAAAXAAAAAABHgAAAAACXAAAAAACHgAAAAAAHgAAAAADHgAAAAAAXAAAAAAAHgAAAAACfAAAAAAADgAAAAAADgAAAAAADgAAAAACDgAAAAADDgAAAAACXAAAAAADXAAAAAAAXAAAAAACXAAAAAADXAAAAAADXAAAAAADXAAAAAADXAAAAAADXAAAAAADXAAAAAACXAAAAAADXAAAAAADXAAAAAACXAAAAAAAXAAAAAABXAAAAAABXAAAAAACXAAAAAAAXAAAAAADXAAAAAACXAAAAAACXAAAAAAAXAAAAAACXAAAAAADXAAAAAACXAAAAAABXAAAAAABXAAAAAAAXAAAAAAAXAAAAAACXAAAAAACXAAAAAAAXAAAAAAAXAAAAAAD
           version: 6
         -1,0:
           ind: -1,0
-          tiles: WgAAAAAAegAAAAAAVAAAAAAAEQAAAAAAVAAAAAAAegAAAAAAHgAAAAABHgAAAAAAWgAAAAADHgAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAAVAAAAAAAWgAAAAADWgAAAAACegAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAegAAAAAAHgAAAAADHgAAAAABWgAAAAADHgAAAAABegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAWgAAAAAAWgAAAAABegAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAegAAAAAAHgAAAAABHgAAAAADWgAAAAACHgAAAAACegAAAAAATgAAAAAAWgAAAAAAWgAAAAADWgAAAAABWgAAAAAAWgAAAAAAegAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAegAAAAAAHgAAAAACHgAAAAABWgAAAAAAHgAAAAABegAAAAAATgAAAAAAWgAAAAADWgAAAAAAWgAAAAACWgAAAAAAWgAAAAACegAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAegAAAAAAHgAAAAACHgAAAAADWgAAAAADHgAAAAACegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAWgAAAAAAVAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAABVAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAVAAAAAAAWgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHgAAAAAAHgAAAAABHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAADHgAAAAACHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHgAAAAAAHgAAAAACHgAAAAAAVAAAAAAAHgAAAAABHgAAAAACHgAAAAAAHgAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAVAAAAAAAVAAAAAAAegAAAAAAegAAAAAAHgAAAAADHgAAAAABHgAAAAADHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAVAAAAAAAVAAAAAAAHgAAAAADHgAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: XAAAAAAAfAAAAAAAVgAAAAAAEQAAAAAAVgAAAAAAfAAAAAAAHgAAAAABHgAAAAAAXAAAAAADHgAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAVgAAAAAAXAAAAAADXAAAAAACfAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfAAAAAAAHgAAAAADHgAAAAABXAAAAAADHgAAAAABfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAXAAAAAAAXAAAAAABfAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfAAAAAAAHgAAAAABHgAAAAADXAAAAAACHgAAAAACfAAAAAAATgAAAAAAXAAAAAAAXAAAAAADXAAAAAABXAAAAAAAXAAAAAAAfAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfAAAAAAAHgAAAAACHgAAAAABXAAAAAAAHgAAAAABfAAAAAAATgAAAAAAXAAAAAADXAAAAAAAXAAAAAACXAAAAAAAXAAAAAACfAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfAAAAAAAHgAAAAACHgAAAAADXAAAAAADHgAAAAACfAAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAXAAAAAAAVgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABVgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAVgAAAAAAXAAAAAACewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHgAAAAAAHgAAAAABHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAADHgAAAAACHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAHgAAAAAAHgAAAAACHgAAAAAAVgAAAAAAHgAAAAABHgAAAAACHgAAAAAAHgAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAVgAAAAAAVgAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAABHgAAAAADHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAVgAAAAAAVgAAAAAAHgAAAAADHgAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVgAAAAAAVgAAAAAAHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVgAAAAAAVgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVgAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAQQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAQQAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAVAAAAAAAVAAAAAAAWgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAegAAAAAAHgAAAAADWgAAAAACHgAAAAABHgAAAAABHgAAAAAAWgAAAAACHgAAAAACWgAAAAADWgAAAAADWgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAegAAAAAAHgAAAAACWgAAAAAAHgAAAAABHgAAAAACHgAAAAABWgAAAAADHgAAAAADWgAAAAADWgAAAAADWgAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAegAAAAAAHgAAAAADWgAAAAADHgAAAAADHgAAAAACHgAAAAACWgAAAAACHgAAAAABWgAAAAABWgAAAAABWgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAegAAAAAAHgAAAAABWgAAAAABHgAAAAAAHgAAAAAAHgAAAAABWgAAAAAAHgAAAAADWgAAAAABWgAAAAABWgAAAAADWgAAAAADWgAAAAAAWgAAAAADWgAAAAADWgAAAAADWgAAAAADWgAAAAACWgAAAAAAWgAAAAACWgAAAAADWgAAAAACWgAAAAACWgAAAAAAWgAAAAABWgAAAAABWgAAAAACWgAAAAAAWgAAAAADWgAAAAADWgAAAAABWgAAAAADWgAAAAAAWgAAAAABWgAAAAABWgAAAAACWgAAAAADWgAAAAADWgAAAAAAWgAAAAABWgAAAAABWgAAAAAD
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAVgAAAAAAVgAAAAAAVgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAVgAAAAAAVgAAAAAAXAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAHgAAAAADXAAAAAACHgAAAAABHgAAAAABHgAAAAAAXAAAAAACHgAAAAACXAAAAAADXAAAAAADXAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAHgAAAAACXAAAAAAAHgAAAAABHgAAAAACHgAAAAABXAAAAAADHgAAAAADXAAAAAADXAAAAAADXAAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAHgAAAAADXAAAAAADHgAAAAADHgAAAAACHgAAAAACXAAAAAACHgAAAAABXAAAAAABXAAAAAABXAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAHgAAAAABXAAAAAABHgAAAAAAHgAAAAAAHgAAAAABXAAAAAAAHgAAAAADXAAAAAABXAAAAAABXAAAAAADXAAAAAADXAAAAAAAXAAAAAADXAAAAAADXAAAAAADXAAAAAADXAAAAAACXAAAAAAAXAAAAAACXAAAAAADXAAAAAACXAAAAAACXAAAAAAAXAAAAAABXAAAAAABXAAAAAACXAAAAAAAXAAAAAADXAAAAAADXAAAAAABXAAAAAADXAAAAAAAXAAAAAABXAAAAAABXAAAAAACXAAAAAADXAAAAAADXAAAAAAAXAAAAAABXAAAAAABXAAAAAAD
           version: 6
         1,-1:
           ind: 1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAVAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAADWgAAAAADVAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAawAAAAAAawAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAVgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAADXAAAAAADVgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         1,0:
           ind: 1,0
-          tiles: HgAAAAACHgAAAAADVAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: HgAAAAACHgAAAAADVgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAawAAAAAAawAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAawAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,0:
           ind: 0,0
-          tiles: VAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAABWgAAAAAAHgAAAAADHgAAAAACegAAAAAAVAAAAAAAEQAAAAAAVAAAAAAAegAAAAAAWgAAAAADWgAAAAABTgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAHgAAAAABWgAAAAABHgAAAAAAHgAAAAAAegAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAegAAAAAAWgAAAAACWgAAAAABWgAAAAACWgAAAAACWgAAAAACTgAAAAAAegAAAAAAHgAAAAADWgAAAAACHgAAAAADHgAAAAAAegAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAegAAAAAAWgAAAAADWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAATgAAAAAAegAAAAAAHgAAAAADWgAAAAADHgAAAAACHgAAAAACegAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAegAAAAAAWgAAAAACWgAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAHgAAAAAAWgAAAAAAHgAAAAACHgAAAAAAegAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAegAAAAAAWgAAAAADWgAAAAAAVAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAVAAAAAAAHgAAAAABegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAVAAAAAAAVAAAAAAAHgAAAAADHgAAAAACHgAAAAADHgAAAAACegAAAAAAHgAAAAACHgAAAAABHgAAAAACHgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHgAAAAAAHgAAAAADHgAAAAAAHgAAAAABVAAAAAAAHgAAAAABHgAAAAADHgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAAAHgAAAAACegAAAAAAegAAAAAAVAAAAAAAVAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAABVAAAAAAAVAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: VgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABXAAAAAAAHgAAAAADHgAAAAACfAAAAAAAVgAAAAAAEQAAAAAAVgAAAAAAfAAAAAAAXAAAAAADXAAAAAABTgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAHgAAAAABXAAAAAABHgAAAAAAHgAAAAAAfAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfAAAAAAAXAAAAAACXAAAAAABXAAAAAACXAAAAAACXAAAAAACTgAAAAAAfAAAAAAAHgAAAAADXAAAAAACHgAAAAADHgAAAAAAfAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfAAAAAAAXAAAAAADXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAATgAAAAAAfAAAAAAAHgAAAAADXAAAAAADHgAAAAACHgAAAAACfAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfAAAAAAAXAAAAAACXAAAAAADTgAAAAAATgAAAAAATgAAAAAATgAAAAAAfAAAAAAAHgAAAAAAXAAAAAAAHgAAAAACHgAAAAAAfAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfAAAAAAAXAAAAAADXAAAAAAAVgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAVgAAAAAAHgAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAVgAAAAAAVgAAAAAAHgAAAAADHgAAAAACHgAAAAADHgAAAAACfAAAAAAAHgAAAAACHgAAAAABHgAAAAACHgAAAAACewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHgAAAAAAHgAAAAADHgAAAAAAHgAAAAABVgAAAAAAHgAAAAABHgAAAAADHgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAAAHgAAAAACfAAAAAAAfAAAAAAAVgAAAAAAVgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAABVgAAAAAAVgAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABVgAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVgAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -2,-1:
           ind: -2,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAWgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAWgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAVAAAAAAAHgAAAAACHgAAAAADWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAVAAAAAAAWgAAAAABWgAAAAAAWgAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVgAAAAAAawAAAAAAawAAAAAAawAAAAAAXAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAXAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAVgAAAAAAHgAAAAACHgAAAAADXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAVgAAAAAAXAAAAAABXAAAAAAAXAAAAAAC
           version: 6
         -2,0:
           ind: -2,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAVAAAAAAAHgAAAAADHgAAAAACWgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAWgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAWgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAVgAAAAAAHgAAAAADHgAAAAACXAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAXAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVgAAAAAAawAAAAAAawAAAAAAawAAAAAAXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAXAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAfAAAAAAAVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAawAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -7723,10 +7723,10 @@ entities:
       parent: 60
 - proto: VendingMachineCoffee
   entities:
-  - uid: 460
+  - uid: 458
     components:
     - type: Transform
-      pos: 5.5,0.5
+      pos: 5.5,1.5
       parent: 60
 - proto: VendingMachineDinnerware
   entities:
@@ -7737,10 +7737,10 @@ entities:
       parent: 60
 - proto: VendingMachineDonut
   entities:
-  - uid: 458
+  - uid: 460
     components:
     - type: Transform
-      pos: -6.5,0.5
+      pos: -6.5,1.5
       parent: 60
 - proto: VendingMachineWallMedical
   entities:
diff --git a/Resources/Maps/infiltrator.yml b/Resources/Maps/Shuttles/infiltrator.yml
similarity index 95%
rename from Resources/Maps/infiltrator.yml
rename to Resources/Maps/Shuttles/infiltrator.yml
index 4cd4312ea2..4e888ae05c 100644
--- a/Resources/Maps/infiltrator.yml
+++ b/Resources/Maps/Shuttles/infiltrator.yml
@@ -1,5671 +1,5674 @@
-meta:
-  format: 6
-  postmapinit: false
-tilemap:
-  0: Space
-  3: FloorArcadeRed
-  29: FloorDark
-  34: FloorDarkMono
-  38: FloorDarkPlastic
-  54: FloorGreenCircuit
-  77: FloorReinforced
-  84: FloorShuttleRed
-  85: FloorShuttleWhite
-  89: FloorSteel
-  100: FloorSteelMono
-  106: FloorTechMaint3
-  118: FloorWood
-  120: Lattice
-  121: Plating
-entities:
-- proto: ""
-  entities:
-  - uid: 1
-    components:
-    - type: MetaData
-      name: GX-13 Infiltrator
-    - type: Transform
-      pos: 0.64252126,4.1776605
-      parent: invalid
-    - type: MapGrid
-      chunks:
-        -1,-1:
-          ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAACHQAAAAABHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAagAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAHQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAHQAAAAACeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAHQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAABHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACVAAAAAAAHQAAAAACHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAACZAAAAAAAVQAAAAAAHQAAAAADHQAAAAAAHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAADVQAAAAAAZAAAAAABVAAAAAAAHQAAAAAAHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAADVAAAAAAAHQAAAAACHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        0,-1:
-          ind: 0,-1
-          tiles: HQAAAAABHQAAAAABHQAAAAABHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAagAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABVAAAAAAAdgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHQAAAAAAHQAAAAAAdgAAAAADdgAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAVAAAAAAAdgAAAAAAAwAAAAAAdgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADVAAAAAAAeQAAAAAAAwAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        -1,-2:
-          ind: -1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAANgAAAAAAIgAAAAAANgAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAANgAAAAAAIgAAAAAANgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAANgAAAAAAIgAAAAAANgAAAAAAVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAACHQAAAAAAHQAAAAADVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAACTQAAAAAAHQAAAAABVAAAAAAAeQAAAAAAeQAAAAAAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAVAAAAAAAeQAAAAAAHQAAAAAAHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAJgAAAAAAJgAAAAAAVAAAAAAAHQAAAAADHQAAAAAAHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAVAAAAAAAHQAAAAAAVAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAAAHQAAAAADHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAagAAAAAAHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAA
-          version: 6
-        0,-2:
-          ind: 0,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHQAAAAADHQAAAAABHQAAAAADHQAAAAABVAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHQAAAAACHQAAAAAAHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAACHQAAAAAAHQAAAAADHQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHQAAAAAAHQAAAAABHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACagAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-    - type: Broadphase
-    - type: Physics
-      bodyStatus: InAir
-      angularDamping: 0.05
-      linearDamping: 0.05
-      fixedRotation: False
-      bodyType: Dynamic
-    - type: Fixtures
-      fixtures: {}
-    - type: Gravity
-      gravityShakeSound: !type:SoundPathSpecifier
-        path: /Audio/Effects/alert.ogg
-    - type: GridAtmosphere
-      version: 2
-      data:
-        tiles:
-          -1,-4:
-            0: 65535
-          -1,-3:
-            0: 65535
-          -1,-2:
-            0: 65535
-          -1,-1:
-            0: 61439
-          0,-4:
-            0: 65535
-          0,-3:
-            0: 65535
-          0,-2:
-            0: 65535
-          0,-1:
-            0: 65535
-          1,-4:
-            0: 30591
-          1,-3:
-            0: 21879
-            1: 512
-          1,-2:
-            0: 30325
-            2: 256
-          1,-1:
-            0: 55
-          0,-5:
-            0: 65535
-          1,-5:
-            0: 65399
-          -1,-5:
-            0: 65535
-          -3,-4:
-            0: 12
-          -2,-4:
-            0: 61439
-          -2,-2:
-            0: 65516
-          -2,-1:
-            0: 2287
-          -2,-3:
-            0: 35054
-            1: 1536
-          -1,0:
-            0: 8
-          -3,-5:
-            0: 52224
-          -2,-8:
-            0: 65504
-          -2,-7:
-            0: 65535
-          -2,-6:
-            0: 65535
-          -2,-5:
-            0: 65535
-          -1,-8:
-            0: 65526
-          -1,-7:
-            0: 65535
-          -1,-6:
-            0: 65535
-          0,-8:
-            0: 65523
-          0,-7:
-            0: 61303
-            3: 4096
-            4: 136
-          0,-6:
-            3: 1
-            0: 65534
-          1,-8:
-            0: 30512
-          1,-7:
-            0: 30549
-            5: 34
-          1,-6:
-            0: 30583
-          -1,-9:
-            0: 26112
-          0,-9:
-            0: 13056
-          2,-4:
-            0: 1
-          2,-5:
-            0: 4352
-        uniqueMixes:
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.14996
-          moles:
-          - 20.078888
-          - 75.53487
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 20.619795
-          - 77.56971
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 6666.982
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        chunkSize: 4
-    - type: DecalGrid
-      chunkCollection:
-        version: 2
-        nodes:
-        - node:
-            color: '#FFFFFFFF'
-            id: Arrows
-          decals:
-            115: -6,-24
-        - node:
-            color: '#FFFFFFFF'
-            id: Bot
-          decals:
-            112: -6,-27
-            113: -6,-26
-            114: -6,-25
-        - node:
-            color: '#79150096'
-            id: Box
-          decals:
-            110: -6,-21
-            111: -5,-21
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerNe
-          decals:
-            10: 0,-4
-            43: 0,-9
-            51: 4,-20
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerNw
-          decals:
-            11: -2,-4
-            42: -2,-9
-            45: -2,-20
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerSe
-          decals:
-            36: 0,-14
-            50: 4,-22
-            76: 3,-18
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerSw
-          decals:
-            37: -2,-14
-            46: -2,-22
-            75: -5,-18
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineE
-          decals:
-            6: 0,-7
-            9: 0,-5
-            32: 0,-11
-            33: 0,-10
-            34: 0,-12
-            35: 0,-13
-            52: 4,-21
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineN
-          decals:
-            12: -1,-4
-            53: 3,-20
-            54: 2,-20
-            55: 1,-20
-            56: 0,-20
-            63: 0,-16
-            64: 1,-16
-            65: 2,-16
-            66: -2,-16
-            67: -3,-16
-            68: -4,-16
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineS
-          decals:
-            47: 0,-22
-            48: 1,-22
-            49: 2,-22
-            69: 2,-18
-            70: 1,-18
-            71: 0,-18
-            72: -2,-18
-            73: -3,-18
-            74: -4,-18
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineW
-          decals:
-            7: -2,-7
-            8: -2,-5
-            38: -2,-13
-            39: -2,-12
-            40: -2,-11
-            41: -2,-10
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteCornerNe
-          decals:
-            104: -5,-22
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteCornerNw
-          decals:
-            103: -7,-22
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteCornerSe
-          decals:
-            105: -5,-24
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteCornerSw
-          decals:
-            106: -7,-24
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteLineE
-          decals:
-            102: -5,-23
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteLineN
-          decals:
-            109: -6,-22
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteLineS
-          decals:
-            107: -6,-24
-        - node:
-            color: '#79150096'
-            id: BrickTileWhiteLineW
-          decals:
-            108: -7,-23
-        - node:
-            color: '#79150096'
-            id: Delivery
-          decals:
-            116: -1,-23
-        - node:
-            color: '#DE3A3A96'
-            id: DeliveryGreyscale
-          decals:
-            13: 1,-6
-            31: -3,-6
-            83: -1,-19
-            84: -3,-21
-            85: -1,-15
-            86: 4,-17
-            87: -6,-17
-            88: -5,-15
-            89: 3,-15
-            90: -1,-8
-        - node:
-            color: '#DE3A3A96'
-            id: HalfTileOverlayGreyscale
-          decals:
-            29: -4,-7
-        - node:
-            color: '#DE3A3A96'
-            id: HalfTileOverlayGreyscale180
-          decals:
-            25: -4,-4
-            26: -5,-4
-        - node:
-            color: '#DE3A3A96'
-            id: HalfTileOverlayGreyscale90
-          decals:
-            27: -6,-6
-            28: -6,-5
-        - node:
-            color: '#DE3A3A96'
-            id: MonoOverlay
-          decals:
-            23: -5,-6
-            24: -4,-5
-        - node:
-            color: '#DE3A3A96'
-            id: WarnCornerGreyscaleNE
-          decals:
-            81: 3,-16
-        - node:
-            color: '#DE3A3A96'
-            id: WarnCornerGreyscaleNW
-          decals:
-            80: -5,-16
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSmallNE
-          decals:
-            99: -7,-24
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSmallNW
-          decals:
-            98: -5,-24
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSmallSE
-          decals:
-            97: -7,-22
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSmallSW
-          decals:
-            101: -5,-22
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineE
-          decals:
-            3: -4,-23
-            4: -4,-24
-            5: -4,-25
-            95: -7,-23
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleE
-          decals:
-            78: 3,-17
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleN
-          decals:
-            44: -1,-9
-            59: -1,-20
-            82: -1,-16
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleS
-          decals:
-            57: -1,-22
-            60: 3,-22
-            77: -1,-18
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleW
-          decals:
-            58: -2,-21
-            79: -5,-17
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineN
-          decals:
-            91: -5,-28
-            92: -6,-28
-            93: -7,-28
-            100: -6,-22
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineS
-          decals:
-            94: -5,-23
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineW
-          decals:
-            96: -6,-24
-        - node:
-            angle: 1.5707963267948966 rad
-            color: '#FFFFFFFF'
-            id: WarningLine
-          decals:
-            0: -4,-22
-            1: -4,-21
-            2: -4,-20
-        - node:
-            color: '#FFFFFFFF'
-            id: WoodTrimThinEndN
-          decals:
-            62: 3,-4
-        - node:
-            color: '#FFFFFFFF'
-            id: WoodTrimThinEndS
-          decals:
-            61: 3,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo10
-          decals:
-            20: -2,-7
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo11
-          decals:
-            21: -1,-7
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo12
-          decals:
-            22: 0,-7
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo2
-          decals:
-            14: -2,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo3
-          decals:
-            15: -1,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo4
-          decals:
-            16: 0,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo5
-          decals:
-            30: -3,-6
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo6
-          decals:
-            17: -2,-6
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo7
-          decals:
-            18: -1,-6
-        - node:
-            color: '#FFFFFFFF'
-            id: syndlogo8
-          decals:
-            19: 0,-6
-    - type: IFF
-      color: '#FFC000FF'
-      flags: Hide
-    - type: OccluderTree
-    - type: Shuttle
-    - type: RadiationGridResistance
-    - type: GravityShake
-      shakeTimes: 10
-    - type: GasTileOverlay
-    - type: SpreaderGrid
-    - type: GridPathfinding
-- proto: AirlockExternalGlassShuttleSyndicateLocked
-  entities:
-  - uid: 8
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-16.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 13
-    - type: DeviceLinkSource
-      linkedPorts:
-        13:
-        - DoorStatus: DoorBolt
-  - uid: 10
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -9.5,-16.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 3
-    - type: DeviceLinkSource
-      linkedPorts:
-        3:
-        - DoorStatus: DoorBolt
-- proto: AirlockExternalSyndicateLocked
-  entities:
-  - uid: 2
-    components:
-    - type: Transform
-      pos: -0.5,-25.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 14
-    - type: DeviceLinkSource
-      linkedPorts:
-        14:
-        - DoorStatus: DoorBolt
-  - uid: 3
-    components:
-    - type: Transform
-      pos: -5.5,-16.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 10
-    - type: DeviceLinkSource
-      linkedPorts:
-        10:
-        - DoorStatus: DoorBolt
-  - uid: 7
-    components:
-    - type: Transform
-      pos: -4.5,-14.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 12
-    - type: DeviceLinkSource
-      linkedPorts:
-        12:
-        - DoorStatus: DoorBolt
-  - uid: 9
-    components:
-    - type: Transform
-      pos: 3.5,-14.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 22
-    - type: DeviceLinkSource
-      linkedPorts:
-        22:
-        - DoorStatus: DoorBolt
-  - uid: 12
-    components:
-    - type: Transform
-      pos: -4.5,-10.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 7
-    - type: DeviceLinkSource
-      linkedPorts:
-        7:
-        - DoorStatus: DoorBolt
-  - uid: 13
-    components:
-    - type: Transform
-      pos: 4.5,-16.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 8
-    - type: DeviceLinkSource
-      linkedPorts:
-        8:
-        - DoorStatus: DoorBolt
-  - uid: 14
-    components:
-    - type: Transform
-      pos: -0.5,-22.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        2:
-        - DoorStatus: DoorBolt
-  - uid: 22
-    components:
-    - type: Transform
-      pos: 3.5,-10.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 9
-    - type: DeviceLinkSource
-      linkedPorts:
-        9:
-        - DoorStatus: DoorBolt
-- proto: AirlockSyndicateGlassLocked
-  entities:
-  - uid: 4
-    components:
-    - type: Transform
-      pos: -0.5,-7.5
-      parent: 1
-  - uid: 5
-    components:
-    - type: Transform
-      pos: 3.5,-22.5
-      parent: 1
-  - uid: 6
-    components:
-    - type: Transform
-      pos: -0.5,-18.5
-      parent: 1
-  - uid: 17
-    components:
-    - type: Transform
-      pos: -2.5,-20.5
-      parent: 1
-- proto: AirlockSyndicateLocked
-  entities:
-  - uid: 15
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 1
-  - uid: 16
-    components:
-    - type: Transform
-      pos: 2.5,-5.5
-      parent: 1
-- proto: APCBasic
-  entities:
-  - uid: 18
-    components:
-    - type: Transform
-      pos: -3.5,-18.5
-      parent: 1
-  - uid: 19
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-8.5
-      parent: 1
-- proto: AtmosFixNitrogenMarker
-  entities:
-  - uid: 25
-    components:
-    - type: Transform
-      pos: 5.5,-26.5
-      parent: 1
-  - uid: 26
-    components:
-    - type: Transform
-      pos: 5.5,-27.5
-      parent: 1
-- proto: AtmosFixOxygenMarker
-  entities:
-  - uid: 27
-    components:
-    - type: Transform
-      pos: 3.5,-26.5
-      parent: 1
-  - uid: 28
-    components:
-    - type: Transform
-      pos: 3.5,-27.5
-      parent: 1
-- proto: BannerSyndicate
-  entities:
-  - uid: 29
-    components:
-    - type: Transform
-      pos: 2.5,-15.5
-      parent: 1
-  - uid: 30
-    components:
-    - type: Transform
-      pos: -3.5,-15.5
-      parent: 1
-- proto: Bed
-  entities:
-  - uid: 31
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 1
-- proto: BedsheetSyndie
-  entities:
-  - uid: 32
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 1
-- proto: BoxEncryptionKeySyndie
-  entities:
-  - uid: 34
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: BoxFlashbang
-  entities:
-  - uid: 42
-    components:
-    - type: Transform
-      pos: 0.49331844,-13.366474
-      parent: 1
-- proto: BoxHandcuff
-  entities:
-  - uid: 43
-    components:
-    - type: Transform
-      pos: 1.4510483,-2.399527
-      parent: 1
-- proto: Brutepack
-  entities:
-  - uid: 44
-    components:
-    - type: Transform
-      pos: -3.292087,-4.1600046
-      parent: 1
-  - uid: 45
-    components:
-    - type: Transform
-      pos: -3.354587,-4.4256296
-      parent: 1
-- proto: C4
-  entities:
-  - uid: 46
-    components:
-    - type: Transform
-      pos: 1.7857682,-12.631323
-      parent: 1
-  - uid: 47
-    components:
-    - type: Transform
-      pos: 1.5045182,-12.646948
-      parent: 1
-  - uid: 48
-    components:
-    - type: Transform
-      pos: 1.5982682,-12.646948
-      parent: 1
-  - uid: 49
-    components:
-    - type: Transform
-      pos: 1.4107682,-12.646948
-      parent: 1
-  - uid: 50
-    components:
-    - type: Transform
-      pos: 1.6920182,-12.631323
-      parent: 1
-- proto: CableApcExtension
-  entities:
-  - uid: 51
-    components:
-    - type: Transform
-      pos: -3.5,-18.5
-      parent: 1
-  - uid: 52
-    components:
-    - type: Transform
-      pos: -3.5,-17.5
-      parent: 1
-  - uid: 53
-    components:
-    - type: Transform
-      pos: -3.5,-16.5
-      parent: 1
-  - uid: 54
-    components:
-    - type: Transform
-      pos: -4.5,-16.5
-      parent: 1
-  - uid: 55
-    components:
-    - type: Transform
-      pos: -5.5,-16.5
-      parent: 1
-  - uid: 56
-    components:
-    - type: Transform
-      pos: -6.5,-16.5
-      parent: 1
-  - uid: 57
-    components:
-    - type: Transform
-      pos: -7.5,-16.5
-      parent: 1
-  - uid: 58
-    components:
-    - type: Transform
-      pos: -8.5,-16.5
-      parent: 1
-  - uid: 59
-    components:
-    - type: Transform
-      pos: -6.5,-15.5
-      parent: 1
-  - uid: 60
-    components:
-    - type: Transform
-      pos: -6.5,-17.5
-      parent: 1
-  - uid: 61
-    components:
-    - type: Transform
-      pos: -4.5,-15.5
-      parent: 1
-  - uid: 62
-    components:
-    - type: Transform
-      pos: -4.5,-14.5
-      parent: 1
-  - uid: 63
-    components:
-    - type: Transform
-      pos: -4.5,-13.5
-      parent: 1
-  - uid: 64
-    components:
-    - type: Transform
-      pos: -4.5,-12.5
-      parent: 1
-  - uid: 65
-    components:
-    - type: Transform
-      pos: -4.5,-11.5
-      parent: 1
-  - uid: 66
-    components:
-    - type: Transform
-      pos: -4.5,-10.5
-      parent: 1
-  - uid: 67
-    components:
-    - type: Transform
-      pos: -5.5,-12.5
-      parent: 1
-  - uid: 68
-    components:
-    - type: Transform
-      pos: -6.5,-12.5
-      parent: 1
-  - uid: 69
-    components:
-    - type: Transform
-      pos: -2.5,-16.5
-      parent: 1
-  - uid: 70
-    components:
-    - type: Transform
-      pos: -1.5,-16.5
-      parent: 1
-  - uid: 71
-    components:
-    - type: Transform
-      pos: -0.5,-16.5
-      parent: 1
-  - uid: 72
-    components:
-    - type: Transform
-      pos: 0.5,-16.5
-      parent: 1
-  - uid: 73
-    components:
-    - type: Transform
-      pos: 1.5,-16.5
-      parent: 1
-  - uid: 74
-    components:
-    - type: Transform
-      pos: 2.5,-16.5
-      parent: 1
-  - uid: 75
-    components:
-    - type: Transform
-      pos: 3.5,-16.5
-      parent: 1
-  - uid: 76
-    components:
-    - type: Transform
-      pos: 4.5,-16.5
-      parent: 1
-  - uid: 77
-    components:
-    - type: Transform
-      pos: 5.5,-16.5
-      parent: 1
-  - uid: 78
-    components:
-    - type: Transform
-      pos: 5.5,-15.5
-      parent: 1
-  - uid: 79
-    components:
-    - type: Transform
-      pos: 5.5,-17.5
-      parent: 1
-  - uid: 80
-    components:
-    - type: Transform
-      pos: 6.5,-16.5
-      parent: 1
-  - uid: 81
-    components:
-    - type: Transform
-      pos: 7.5,-16.5
-      parent: 1
-  - uid: 82
-    components:
-    - type: Transform
-      pos: 3.5,-15.5
-      parent: 1
-  - uid: 83
-    components:
-    - type: Transform
-      pos: 3.5,-14.5
-      parent: 1
-  - uid: 84
-    components:
-    - type: Transform
-      pos: 3.5,-13.5
-      parent: 1
-  - uid: 85
-    components:
-    - type: Transform
-      pos: 3.5,-12.5
-      parent: 1
-  - uid: 86
-    components:
-    - type: Transform
-      pos: 3.5,-11.5
-      parent: 1
-  - uid: 87
-    components:
-    - type: Transform
-      pos: 3.5,-11.5
-      parent: 1
-  - uid: 88
-    components:
-    - type: Transform
-      pos: 3.5,-10.5
-      parent: 1
-  - uid: 89
-    components:
-    - type: Transform
-      pos: 4.5,-12.5
-      parent: 1
-  - uid: 90
-    components:
-    - type: Transform
-      pos: 5.5,-12.5
-      parent: 1
-  - uid: 91
-    components:
-    - type: Transform
-      pos: -0.5,-6.5
-      parent: 1
-  - uid: 92
-    components:
-    - type: Transform
-      pos: -0.5,-7.5
-      parent: 1
-  - uid: 93
-    components:
-    - type: Transform
-      pos: -0.5,-8.5
-      parent: 1
-  - uid: 94
-    components:
-    - type: Transform
-      pos: -0.5,-9.5
-      parent: 1
-  - uid: 95
-    components:
-    - type: Transform
-      pos: -0.5,-10.5
-      parent: 1
-  - uid: 96
-    components:
-    - type: Transform
-      pos: -0.5,-11.5
-      parent: 1
-  - uid: 97
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 1
-  - uid: 98
-    components:
-    - type: Transform
-      pos: -0.5,-13.5
-      parent: 1
-  - uid: 99
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 1
-  - uid: 100
-    components:
-    - type: Transform
-      pos: -1.5,-12.5
-      parent: 1
-  - uid: 101
-    components:
-    - type: Transform
-      pos: 0.5,-12.5
-      parent: 1
-  - uid: 102
-    components:
-    - type: Transform
-      pos: -0.5,-5.5
-      parent: 1
-  - uid: 103
-    components:
-    - type: Transform
-      pos: 0.5,-5.5
-      parent: 1
-  - uid: 104
-    components:
-    - type: Transform
-      pos: 1.5,-5.5
-      parent: 1
-  - uid: 105
-    components:
-    - type: Transform
-      pos: 2.5,-5.5
-      parent: 1
-  - uid: 106
-    components:
-    - type: Transform
-      pos: 3.5,-5.5
-      parent: 1
-  - uid: 107
-    components:
-    - type: Transform
-      pos: 3.5,-4.5
-      parent: 1
-  - uid: 108
-    components:
-    - type: Transform
-      pos: -0.5,-4.5
-      parent: 1
-  - uid: 109
-    components:
-    - type: Transform
-      pos: -0.5,-3.5
-      parent: 1
-  - uid: 110
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 1
-  - uid: 111
-    components:
-    - type: Transform
-      pos: 0.5,-2.5
-      parent: 1
-  - uid: 112
-    components:
-    - type: Transform
-      pos: 1.5,-2.5
-      parent: 1
-  - uid: 113
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 1
-  - uid: 114
-    components:
-    - type: Transform
-      pos: -2.5,-2.5
-      parent: 1
-  - uid: 115
-    components:
-    - type: Transform
-      pos: -1.5,-4.5
-      parent: 1
-  - uid: 116
-    components:
-    - type: Transform
-      pos: -3.5,-4.5
-      parent: 1
-  - uid: 117
-    components:
-    - type: Transform
-      pos: -2.5,-4.5
-      parent: 1
-  - uid: 118
-    components:
-    - type: Transform
-      pos: -4.5,-4.5
-      parent: 1
-  - uid: 119
-    components:
-    - type: Transform
-      pos: -5.5,-4.5
-      parent: 1
-  - uid: 120
-    components:
-    - type: Transform
-      pos: -5.5,-5.5
-      parent: 1
-  - uid: 121
-    components:
-    - type: Transform
-      pos: -5.5,-6.5
-      parent: 1
-  - uid: 122
-    components:
-    - type: Transform
-      pos: -5.5,-3.5
-      parent: 1
-  - uid: 123
-    components:
-    - type: Transform
-      pos: 4.5,-4.5
-      parent: 1
-  - uid: 124
-    components:
-    - type: Transform
-      pos: 4.5,-3.5
-      parent: 1
-  - uid: 125
-    components:
-    - type: Transform
-      pos: 3.5,-6.5
-      parent: 1
-  - uid: 126
-    components:
-    - type: Transform
-      pos: -0.5,-17.5
-      parent: 1
-  - uid: 127
-    components:
-    - type: Transform
-      pos: -3.5,-20.5
-      parent: 1
-  - uid: 128
-    components:
-    - type: Transform
-      pos: -3.5,-19.5
-      parent: 1
-  - uid: 129
-    components:
-    - type: Transform
-      pos: -3.5,-21.5
-      parent: 1
-  - uid: 130
-    components:
-    - type: Transform
-      pos: -4.5,-21.5
-      parent: 1
-  - uid: 131
-    components:
-    - type: Transform
-      pos: -4.5,-22.5
-      parent: 1
-  - uid: 132
-    components:
-    - type: Transform
-      pos: -4.5,-23.5
-      parent: 1
-  - uid: 133
-    components:
-    - type: Transform
-      pos: -4.5,-24.5
-      parent: 1
-  - uid: 134
-    components:
-    - type: Transform
-      pos: -4.5,-25.5
-      parent: 1
-  - uid: 135
-    components:
-    - type: Transform
-      pos: -4.5,-25.5
-      parent: 1
-  - uid: 136
-    components:
-    - type: Transform
-      pos: -4.5,-26.5
-      parent: 1
-  - uid: 137
-    components:
-    - type: Transform
-      pos: -4.5,-27.5
-      parent: 1
-  - uid: 138
-    components:
-    - type: Transform
-      pos: -5.5,-27.5
-      parent: 1
-  - uid: 139
-    components:
-    - type: Transform
-      pos: -6.5,-27.5
-      parent: 1
-  - uid: 140
-    components:
-    - type: Transform
-      pos: -6.5,-26.5
-      parent: 1
-  - uid: 141
-    components:
-    - type: Transform
-      pos: -6.5,-25.5
-      parent: 1
-  - uid: 142
-    components:
-    - type: Transform
-      pos: -6.5,-24.5
-      parent: 1
-  - uid: 143
-    components:
-    - type: Transform
-      pos: -6.5,-23.5
-      parent: 1
-  - uid: 144
-    components:
-    - type: Transform
-      pos: -6.5,-22.5
-      parent: 1
-  - uid: 145
-    components:
-    - type: Transform
-      pos: -2.5,-20.5
-      parent: 1
-  - uid: 146
-    components:
-    - type: Transform
-      pos: -1.5,-20.5
-      parent: 1
-  - uid: 147
-    components:
-    - type: Transform
-      pos: -0.5,-20.5
-      parent: 1
-  - uid: 148
-    components:
-    - type: Transform
-      pos: -0.5,-21.5
-      parent: 1
-  - uid: 149
-    components:
-    - type: Transform
-      pos: -0.5,-23.5
-      parent: 1
-  - uid: 150
-    components:
-    - type: Transform
-      pos: -0.5,-22.5
-      parent: 1
-  - uid: 151
-    components:
-    - type: Transform
-      pos: -0.5,-24.5
-      parent: 1
-  - uid: 152
-    components:
-    - type: Transform
-      pos: -0.5,-25.5
-      parent: 1
-  - uid: 153
-    components:
-    - type: Transform
-      pos: -0.5,-19.5
-      parent: 1
-  - uid: 154
-    components:
-    - type: Transform
-      pos: 0.5,-20.5
-      parent: 1
-  - uid: 155
-    components:
-    - type: Transform
-      pos: 1.5,-20.5
-      parent: 1
-  - uid: 156
-    components:
-    - type: Transform
-      pos: 2.5,-20.5
-      parent: 1
-  - uid: 157
-    components:
-    - type: Transform
-      pos: 3.5,-20.5
-      parent: 1
-  - uid: 158
-    components:
-    - type: Transform
-      pos: 4.5,-20.5
-      parent: 1
-  - uid: 159
-    components:
-    - type: Transform
-      pos: 3.5,-21.5
-      parent: 1
-  - uid: 160
-    components:
-    - type: Transform
-      pos: 3.5,-22.5
-      parent: 1
-  - uid: 161
-    components:
-    - type: Transform
-      pos: 3.5,-23.5
-      parent: 1
-  - uid: 162
-    components:
-    - type: Transform
-      pos: 3.5,-24.5
-      parent: 1
-  - uid: 163
-    components:
-    - type: Transform
-      pos: 3.5,-25.5
-      parent: 1
-  - uid: 164
-    components:
-    - type: Transform
-      pos: 3.5,-26.5
-      parent: 1
-  - uid: 165
-    components:
-    - type: Transform
-      pos: 3.5,-27.5
-      parent: 1
-  - uid: 166
-    components:
-    - type: Transform
-      pos: 4.5,-27.5
-      parent: 1
-  - uid: 167
-    components:
-    - type: Transform
-      pos: 5.5,-27.5
-      parent: 1
-  - uid: 168
-    components:
-    - type: Transform
-      pos: 5.5,-26.5
-      parent: 1
-  - uid: 169
-    components:
-    - type: Transform
-      pos: 5.5,-25.5
-      parent: 1
-  - uid: 170
-    components:
-    - type: Transform
-      pos: 5.5,-24.5
-      parent: 1
-  - uid: 171
-    components:
-    - type: Transform
-      pos: 5.5,-23.5
-      parent: 1
-  - uid: 172
-    components:
-    - type: Transform
-      pos: 0.5,-8.5
-      parent: 1
-  - uid: 173
-    components:
-    - type: Transform
-      pos: 1.5,-26.5
-      parent: 1
-  - uid: 174
-    components:
-    - type: Transform
-      pos: 1.5,-8.5
-      parent: 1
-  - uid: 175
-    components:
-    - type: Transform
-      pos: -0.5,-26.5
-      parent: 1
-  - uid: 176
-    components:
-    - type: Transform
-      pos: -1.5,-26.5
-      parent: 1
-  - uid: 177
-    components:
-    - type: Transform
-      pos: 0.5,-26.5
-      parent: 1
-  - uid: 178
-    components:
-    - type: Transform
-      pos: -2.5,-26.5
-      parent: 1
-  - uid: 179
-    components:
-    - type: Transform
-      pos: -2.5,-27.5
-      parent: 1
-  - uid: 180
-    components:
-    - type: Transform
-      pos: 1.5,-27.5
-      parent: 1
-  - uid: 181
-    components:
-    - type: Transform
-      pos: -6.5,-28.5
-      parent: 1
-  - uid: 182
-    components:
-    - type: Transform
-      pos: -6.5,-29.5
-      parent: 1
-  - uid: 183
-    components:
-    - type: Transform
-      pos: -2.5,-28.5
-      parent: 1
-  - uid: 184
-    components:
-    - type: Transform
-      pos: -2.5,-29.5
-      parent: 1
-  - uid: 185
-    components:
-    - type: Transform
-      pos: -2.5,-30.5
-      parent: 1
-  - uid: 186
-    components:
-    - type: Transform
-      pos: -3.5,-30.5
-      parent: 1
-  - uid: 187
-    components:
-    - type: Transform
-      pos: -4.5,-30.5
-      parent: 1
-  - uid: 188
-    components:
-    - type: Transform
-      pos: -5.5,-30.5
-      parent: 1
-  - uid: 189
-    components:
-    - type: Transform
-      pos: 1.5,-28.5
-      parent: 1
-  - uid: 190
-    components:
-    - type: Transform
-      pos: 1.5,-29.5
-      parent: 1
-  - uid: 191
-    components:
-    - type: Transform
-      pos: 1.5,-30.5
-      parent: 1
-  - uid: 192
-    components:
-    - type: Transform
-      pos: 2.5,-30.5
-      parent: 1
-  - uid: 193
-    components:
-    - type: Transform
-      pos: 3.5,-30.5
-      parent: 1
-  - uid: 194
-    components:
-    - type: Transform
-      pos: 4.5,-30.5
-      parent: 1
-  - uid: 195
-    components:
-    - type: Transform
-      pos: 5.5,-28.5
-      parent: 1
-  - uid: 196
-    components:
-    - type: Transform
-      pos: 5.5,-29.5
-      parent: 1
-- proto: CableHV
-  entities:
-  - uid: 197
-    components:
-    - type: Transform
-      pos: -2.5,-21.5
-      parent: 1
-  - uid: 198
-    components:
-    - type: Transform
-      pos: -4.5,-26.5
-      parent: 1
-  - uid: 199
-    components:
-    - type: Transform
-      pos: -4.5,-27.5
-      parent: 1
-  - uid: 200
-    components:
-    - type: Transform
-      pos: -5.5,-27.5
-      parent: 1
-  - uid: 201
-    components:
-    - type: Transform
-      pos: -6.5,-27.5
-      parent: 1
-  - uid: 202
-    components:
-    - type: Transform
-      pos: -5.5,-23.5
-      parent: 1
-  - uid: 203
-    components:
-    - type: Transform
-      pos: -5.5,-22.5
-      parent: 1
-  - uid: 204
-    components:
-    - type: Transform
-      pos: -5.5,-20.5
-      parent: 1
-  - uid: 205
-    components:
-    - type: Transform
-      pos: -4.5,-20.5
-      parent: 1
-  - uid: 206
-    components:
-    - type: Transform
-      pos: -5.5,-19.5
-      parent: 1
-  - uid: 207
-    components:
-    - type: Transform
-      pos: -4.5,-19.5
-      parent: 1
-  - uid: 208
-    components:
-    - type: Transform
-      pos: -3.5,-19.5
-      parent: 1
-  - uid: 209
-    components:
-    - type: Transform
-      pos: -5.5,-21.5
-      parent: 1
-  - uid: 210
-    components:
-    - type: Transform
-      pos: -6.5,-26.5
-      parent: 1
-  - uid: 211
-    components:
-    - type: Transform
-      pos: -6.5,-25.5
-      parent: 1
-  - uid: 212
-    components:
-    - type: Transform
-      pos: -6.5,-24.5
-      parent: 1
-  - uid: 213
-    components:
-    - type: Transform
-      pos: -4.5,-23.5
-      parent: 1
-  - uid: 214
-    components:
-    - type: Transform
-      pos: -2.5,-20.5
-      parent: 1
-  - uid: 215
-    components:
-    - type: Transform
-      pos: -2.5,-19.5
-      parent: 1
-  - uid: 216
-    components:
-    - type: Transform
-      pos: -4.5,-25.5
-      parent: 1
-  - uid: 217
-    components:
-    - type: Transform
-      pos: -6.5,-23.5
-      parent: 1
-  - uid: 218
-    components:
-    - type: Transform
-      pos: -6.5,-20.5
-      parent: 1
-  - uid: 219
-    components:
-    - type: Transform
-      pos: -4.5,-24.5
-      parent: 1
-  - uid: 220
-    components:
-    - type: Transform
-      pos: -5.5,-18.5
-      parent: 1
-  - uid: 221
-    components:
-    - type: Transform
-      pos: -4.5,-18.5
-      parent: 1
-  - uid: 222
-    components:
-    - type: Transform
-      pos: -3.5,-18.5
-      parent: 1
-  - uid: 223
-    components:
-    - type: Transform
-      pos: -3.5,-21.5
-      parent: 1
-  - uid: 224
-    components:
-    - type: Transform
-      pos: -4.5,-21.5
-      parent: 1
-- proto: CableMV
-  entities:
-  - uid: 225
-    components:
-    - type: Transform
-      pos: -3.5,-19.5
-      parent: 1
-  - uid: 226
-    components:
-    - type: Transform
-      pos: -3.5,-18.5
-      parent: 1
-  - uid: 227
-    components:
-    - type: Transform
-      pos: -3.5,-17.5
-      parent: 1
-  - uid: 228
-    components:
-    - type: Transform
-      pos: -3.5,-16.5
-      parent: 1
-  - uid: 229
-    components:
-    - type: Transform
-      pos: -2.5,-16.5
-      parent: 1
-  - uid: 230
-    components:
-    - type: Transform
-      pos: -0.5,-16.5
-      parent: 1
-  - uid: 231
-    components:
-    - type: Transform
-      pos: -1.5,-16.5
-      parent: 1
-  - uid: 232
-    components:
-    - type: Transform
-      pos: -0.5,-15.5
-      parent: 1
-  - uid: 233
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 1
-  - uid: 234
-    components:
-    - type: Transform
-      pos: -0.5,-13.5
-      parent: 1
-  - uid: 235
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 1
-  - uid: 236
-    components:
-    - type: Transform
-      pos: -0.5,-11.5
-      parent: 1
-  - uid: 237
-    components:
-    - type: Transform
-      pos: -0.5,-10.5
-      parent: 1
-  - uid: 238
-    components:
-    - type: Transform
-      pos: -0.5,-9.5
-      parent: 1
-  - uid: 239
-    components:
-    - type: Transform
-      pos: -0.5,-8.5
-      parent: 1
-  - uid: 240
-    components:
-    - type: Transform
-      pos: -3.5,-20.5
-      parent: 1
-  - uid: 241
-    components:
-    - type: Transform
-      pos: -3.5,-21.5
-      parent: 1
-  - uid: 242
-    components:
-    - type: Transform
-      pos: -4.5,-21.5
-      parent: 1
-  - uid: 243
-    components:
-    - type: Transform
-      pos: -4.5,-22.5
-      parent: 1
-  - uid: 244
-    components:
-    - type: Transform
-      pos: -4.5,-23.5
-      parent: 1
-  - uid: 245
-    components:
-    - type: Transform
-      pos: -4.5,-24.5
-      parent: 1
-  - uid: 246
-    components:
-    - type: Transform
-      pos: -4.5,-25.5
-      parent: 1
-  - uid: 247
-    components:
-    - type: Transform
-      pos: -4.5,-26.5
-      parent: 1
-  - uid: 248
-    components:
-    - type: Transform
-      pos: -4.5,-27.5
-      parent: 1
-  - uid: 249
-    components:
-    - type: Transform
-      pos: 1.5,-8.5
-      parent: 1
-  - uid: 250
-    components:
-    - type: Transform
-      pos: 0.5,-8.5
-      parent: 1
-- proto: CableTerminal
-  entities:
-  - uid: 251
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-20.5
-      parent: 1
-    - type: Physics
-      canCollide: False
-    - type: Fixtures
-      fixtures: {}
-  - uid: 252
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-20.5
-      parent: 1
-    - type: Physics
-      canCollide: False
-    - type: Fixtures
-      fixtures: {}
-- proto: Carpet
-  entities:
-  - uid: 253
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-5.5
-      parent: 1
-  - uid: 254
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-4.5
-      parent: 1
-- proto: Catwalk
-  entities:
-  - uid: 255
-    components:
-    - type: Transform
-      pos: -2.5,-26.5
-      parent: 1
-  - uid: 256
-    components:
-    - type: Transform
-      pos: -2.5,-28.5
-      parent: 1
-  - uid: 257
-    components:
-    - type: Transform
-      pos: -8.5,-16.5
-      parent: 1
-  - uid: 258
-    components:
-    - type: Transform
-      pos: -1.5,-16.5
-      parent: 1
-  - uid: 259
-    components:
-    - type: Transform
-      pos: -2.5,-16.5
-      parent: 1
-  - uid: 260
-    components:
-    - type: Transform
-      pos: 4.5,-24.5
-      parent: 1
-  - uid: 261
-    components:
-    - type: Transform
-      pos: 5.5,-24.5
-      parent: 1
-  - uid: 262
-    components:
-    - type: Transform
-      pos: -6.5,-16.5
-      parent: 1
-  - uid: 263
-    components:
-    - type: Transform
-      pos: -7.5,-16.5
-      parent: 1
-  - uid: 264
-    components:
-    - type: Transform
-      pos: -4.5,-13.5
-      parent: 1
-  - uid: 265
-    components:
-    - type: Transform
-      pos: -4.5,-12.5
-      parent: 1
-  - uid: 266
-    components:
-    - type: Transform
-      pos: -4.5,-11.5
-      parent: 1
-  - uid: 267
-    components:
-    - type: Transform
-      pos: 3.5,-13.5
-      parent: 1
-  - uid: 268
-    components:
-    - type: Transform
-      pos: 3.5,-12.5
-      parent: 1
-  - uid: 269
-    components:
-    - type: Transform
-      pos: 3.5,-11.5
-      parent: 1
-  - uid: 270
-    components:
-    - type: Transform
-      pos: 5.5,-16.5
-      parent: 1
-  - uid: 271
-    components:
-    - type: Transform
-      pos: 6.5,-16.5
-      parent: 1
-  - uid: 272
-    components:
-    - type: Transform
-      pos: -0.5,-24.5
-      parent: 1
-  - uid: 273
-    components:
-    - type: Transform
-      pos: -0.5,-23.5
-      parent: 1
-  - uid: 274
-    components:
-    - type: Transform
-      pos: -0.5,-16.5
-      parent: 1
-  - uid: 275
-    components:
-    - type: Transform
-      pos: 5.5,-9.5
-      parent: 1
-  - uid: 276
-    components:
-    - type: Transform
-      pos: 3.5,-9.5
-      parent: 1
-  - uid: 277
-    components:
-    - type: Transform
-      pos: 0.5,-16.5
-      parent: 1
-  - uid: 278
-    components:
-    - type: Transform
-      pos: 0.5,-26.5
-      parent: 1
-  - uid: 279
-    components:
-    - type: Transform
-      pos: 1.5,-27.5
-      parent: 1
-  - uid: 280
-    components:
-    - type: Transform
-      pos: -2.5,-27.5
-      parent: 1
-  - uid: 281
-    components:
-    - type: Transform
-      pos: -2.5,-29.5
-      parent: 1
-  - uid: 282
-    components:
-    - type: Transform
-      pos: 1.5,-26.5
-      parent: 1
-  - uid: 283
-    components:
-    - type: Transform
-      pos: 4.5,-9.5
-      parent: 1
-  - uid: 284
-    components:
-    - type: Transform
-      pos: -0.5,-26.5
-      parent: 1
-  - uid: 285
-    components:
-    - type: Transform
-      pos: 1.5,-28.5
-      parent: 1
-  - uid: 286
-    components:
-    - type: Transform
-      pos: 1.5,-29.5
-      parent: 1
-  - uid: 287
-    components:
-    - type: Transform
-      pos: -1.5,-26.5
-      parent: 1
-  - uid: 288
-    components:
-    - type: Transform
-      pos: -3.5,-9.5
-      parent: 1
-  - uid: 289
-    components:
-    - type: Transform
-      pos: 1.5,-16.5
-      parent: 1
-  - uid: 290
-    components:
-    - type: Transform
-      pos: 2.5,-9.5
-      parent: 1
-  - uid: 291
-    components:
-    - type: Transform
-      pos: -6.5,-9.5
-      parent: 1
-  - uid: 292
-    components:
-    - type: Transform
-      pos: -5.5,-9.5
-      parent: 1
-  - uid: 293
-    components:
-    - type: Transform
-      pos: -4.5,-9.5
-      parent: 1
-  - uid: 294
-    components:
-    - type: Transform
-      pos: 7.5,-16.5
-      parent: 1
-  - uid: 295
-    components:
-    - type: Transform
-      pos: -0.5,-13.5
-      parent: 1
-  - uid: 296
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 1
-  - uid: 297
-    components:
-    - type: Transform
-      pos: -0.5,-11.5
-      parent: 1
-- proto: Chair
-  entities:
-  - uid: 298
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-21.5
-      parent: 1
-  - uid: 299
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-21.5
-      parent: 1
-- proto: ChairOfficeDark
-  entities:
-  - uid: 300
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-3.5
-      parent: 1
-- proto: ChairPilotSeat
-  entities:
-  - uid: 301
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-21.5
-      parent: 1
-  - uid: 302
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-8.5
-      parent: 1
-  - uid: 303
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-9.5
-      parent: 1
-  - uid: 304
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-10.5
-      parent: 1
-  - uid: 305
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-8.5
-      parent: 1
-  - uid: 306
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-10.5
-      parent: 1
-  - uid: 307
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-9.5
-      parent: 1
-  - uid: 308
-    components:
-    - type: Transform
-      pos: -2.5,-15.5
-      parent: 1
-  - uid: 309
-    components:
-    - type: Transform
-      pos: -1.5,-15.5
-      parent: 1
-  - uid: 310
-    components:
-    - type: Transform
-      pos: 0.5,-15.5
-      parent: 1
-  - uid: 311
-    components:
-    - type: Transform
-      pos: 1.5,-15.5
-      parent: 1
-  - uid: 312
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-3.5
-      parent: 1
-- proto: CigPackSyndicate
-  entities:
-  - uid: 313
-    components:
-    - type: Transform
-      pos: -3.5658307,-17.516623
-      parent: 1
-- proto: ClothingBackpackDuffelSyndicateFilledMedical
-  entities:
-  - uid: 314
-    components:
-    - type: Transform
-      pos: -3.5044222,-6.293252
-      parent: 1
-- proto: ClothingHeadHatSyndie
-  entities:
-  - uid: 315
-    components:
-    - type: Transform
-      pos: -3.1200604,-17.289778
-      parent: 1
-- proto: ClothingHeadHatSyndieMAA
-  entities:
-  - uid: 35
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingHeadPyjamaSyndicateRed
-  entities:
-  - uid: 36
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingHeadsetAltSyndicate
-  entities:
-  - uid: 316
-    components:
-    - type: Transform
-      pos: 1.3157192,-13.513277
-      parent: 1
-- proto: ClothingMaskGasSyndicate
-  entities:
-  - uid: 317
-    components:
-    - type: Transform
-      pos: 0.94071925,-13.482027
-      parent: 1
-- proto: ClothingNeckMantleHOS
-  entities:
-  - uid: 37
-    components:
-    - type: MetaData
-      desc: Looted from a fallen enemy, the commander earned this in battle.
-      name: commander mantle
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingOuterCoatSyndieCap
-  entities:
-  - uid: 38
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingUniformJumpskirtSyndieFormalDress
-  entities:
-  - uid: 39
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingUniformJumpsuitPyjamaSyndicateRed
-  entities:
-  - uid: 40
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingUniformJumpsuitSyndieFormal
-  entities:
-  - uid: 41
-    components:
-    - type: Transform
-      parent: 33
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ComfyChair
-  entities:
-  - uid: 318
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-4.5
-      parent: 1
-- proto: computerBodyScanner
-  entities:
-  - uid: 319
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-5.5
-      parent: 1
-- proto: ComputerIFFSyndicate
-  entities:
-  - uid: 320
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-3.5
-      parent: 1
-- proto: ComputerPowerMonitoring
-  entities:
-  - uid: 321
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-21.5
-      parent: 1
-- proto: ComputerRadar
-  entities:
-  - uid: 322
-    components:
-    - type: Transform
-      pos: 0.5,-2.5
-      parent: 1
-- proto: ComputerShuttleSyndie
-  entities:
-  - uid: 323
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 1
-- proto: CrowbarRed
-  entities:
-  - uid: 324
-    components:
-    - type: Transform
-      pos: -3.492848,-22.485775
-      parent: 1
-- proto: DisposalBend
-  entities:
-  - uid: 325
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-6.5
-      parent: 1
-- proto: DisposalJunction
-  entities:
-  - uid: 326
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-19.5
-      parent: 1
-- proto: DisposalPipe
-  entities:
-  - uid: 327
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-6.5
-      parent: 1
-  - uid: 328
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-19.5
-      parent: 1
-  - uid: 329
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-19.5
-      parent: 1
-  - uid: 330
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-19.5
-      parent: 1
-  - uid: 331
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-19.5
-      parent: 1
-  - uid: 332
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-19.5
-      parent: 1
-  - uid: 333
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-19.5
-      parent: 1
-  - uid: 334
-    components:
-    - type: Transform
-      pos: -0.5,-18.5
-      parent: 1
-  - uid: 335
-    components:
-    - type: Transform
-      pos: -0.5,-17.5
-      parent: 1
-  - uid: 336
-    components:
-    - type: Transform
-      pos: -0.5,-16.5
-      parent: 1
-  - uid: 337
-    components:
-    - type: Transform
-      pos: -0.5,-15.5
-      parent: 1
-  - uid: 338
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 1
-  - uid: 339
-    components:
-    - type: Transform
-      pos: -0.5,-13.5
-      parent: 1
-  - uid: 340
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 1
-  - uid: 341
-    components:
-    - type: Transform
-      pos: -0.5,-11.5
-      parent: 1
-  - uid: 342
-    components:
-    - type: Transform
-      pos: -0.5,-10.5
-      parent: 1
-  - uid: 343
-    components:
-    - type: Transform
-      pos: -0.5,-9.5
-      parent: 1
-  - uid: 344
-    components:
-    - type: Transform
-      pos: -0.5,-8.5
-      parent: 1
-  - uid: 345
-    components:
-    - type: Transform
-      pos: -0.5,-7.5
-      parent: 1
-- proto: DisposalTrunk
-  entities:
-  - uid: 346
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-6.5
-      parent: 1
-  - uid: 347
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-19.5
-      parent: 1
-  - uid: 348
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-19.5
-      parent: 1
-- proto: DisposalUnit
-  entities:
-  - uid: 349
-    components:
-    - type: Transform
-      pos: 1.5,-6.5
-      parent: 1
-  - uid: 350
-    components:
-    - type: Transform
-      pos: 0.5,-19.5
-      parent: 1
-- proto: DoubleEmergencyOxygenTankFilled
-  entities:
-  - uid: 351
-    components:
-    - type: Transform
-      pos: -1.6924903,-23.407444
-      parent: 1
-  - uid: 352
-    components:
-    - type: Transform
-      pos: -1.4112403,-23.458082
-      parent: 1
-  - uid: 353
-    components:
-    - type: Transform
-      pos: 5.390987,-17.346693
-      parent: 1
-  - uid: 354
-    components:
-    - type: Transform
-      pos: -6.6334953,-17.346693
-      parent: 1
-- proto: DrinkGlass
-  entities:
-  - uid: 355
-    components:
-    - type: Transform
-      pos: 2.0779252,-19.21155
-      parent: 1
-  - uid: 356
-    components:
-    - type: Transform
-      pos: 2.3123002,-19.21155
-      parent: 1
-- proto: DrinkMugDog
-  entities:
-  - uid: 357
-    components:
-    - type: Transform
-      pos: 2.2843437,-19.542192
-      parent: 1
-- proto: DrinkMugMetal
-  entities:
-  - uid: 358
-    components:
-    - type: Transform
-      pos: 2.0968437,-19.526567
-      parent: 1
-- proto: DrinkMugRed
-  entities:
-  - uid: 359
-    components:
-    - type: Transform
-      pos: 1.9918958,-17.588755
-      parent: 1
-- proto: DrinkVacuumFlask
-  entities:
-  - uid: 360
-    components:
-    - type: Transform
-      pos: 5.6435027,-21.180143
-      parent: 1
-  - uid: 361
-    components:
-    - type: Transform
-      pos: 5.7372527,-21.398893
-      parent: 1
-- proto: ExtendedEmergencyOxygenTankFilled
-  entities:
-  - uid: 362
-    components:
-    - type: Transform
-      pos: -5.678572,-12.319441
-      parent: 1
-  - uid: 363
-    components:
-    - type: Transform
-      pos: 4.305803,-12.272566
-      parent: 1
-- proto: FireAxeFlaming
-  entities:
-  - uid: 23
-    components:
-    - type: Transform
-      pos: -1.5018963,-3.4569345
-      parent: 1
-- proto: FoodBoxDonkpocketPizza
-  entities:
-  - uid: 364
-    components:
-    - type: Transform
-      pos: 2.7185502,-19.320925
-      parent: 1
-- proto: FoodBoxDonut
-  entities:
-  - uid: 365
-    components:
-    - type: Transform
-      pos: 5.5401826,-21.187487
-      parent: 1
-- proto: FoodPizzaDonkpocket
-  entities:
-  - uid: 366
-    components:
-    - type: Transform
-      pos: 1.4776825,-21.296862
-      parent: 1
-- proto: FoodSnackSyndi
-  entities:
-  - uid: 367
-    components:
-    - type: Transform
-      pos: 1.5361897,-17.367903
-      parent: 1
-- proto: GasMinerNitrogen
-  entities:
-  - uid: 368
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-27.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasMinerOxygen
-  entities:
-  - uid: 369
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-27.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasMixer
-  entities:
-  - uid: 370
-    components:
-    - type: MetaData
-      name: O2+N2 mixer
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-24.5
-      parent: 1
-    - type: GasMixer
-      inletTwoConcentration: 0.78
-      inletOneConcentration: 0.22
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-- proto: GasPassiveVent
-  entities:
-  - uid: 371
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-26.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 372
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-26.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 373
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-19.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasPipeBend
-  entities:
-  - uid: 374
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 375
-    components:
-    - type: Transform
-      pos: 5.5,-24.5
-      parent: 1
-  - uid: 376
-    components:
-    - type: Transform
-      pos: 3.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 377
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 378
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 379
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 380
-    components:
-    - type: Transform
-      pos: 0.5,-8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 381
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 382
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 383
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-21.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-- proto: GasPipeFourway
-  entities:
-  - uid: 384
-    components:
-    - type: Transform
-      pos: 3.5,-23.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 385
-    components:
-    - type: Transform
-      pos: -0.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 386
-    components:
-    - type: Transform
-      pos: -0.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 387
-    components:
-    - type: Transform
-      pos: 0.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-- proto: GasPipeStraight
-  entities:
-  - uid: 388
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-25.5
-      parent: 1
-  - uid: 389
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-25.5
-      parent: 1
-  - uid: 390
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-24.5
-      parent: 1
-  - uid: 391
-    components:
-    - type: Transform
-      pos: 3.5,-22.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 392
-    components:
-    - type: Transform
-      pos: 3.5,-21.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 393
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 394
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 395
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 396
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 397
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 398
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 399
-    components:
-    - type: Transform
-      pos: -0.5,-19.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 400
-    components:
-    - type: Transform
-      pos: -0.5,-18.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 401
-    components:
-    - type: Transform
-      pos: -0.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 402
-    components:
-    - type: Transform
-      pos: -0.5,-15.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 403
-    components:
-    - type: Transform
-      pos: -0.5,-14.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 404
-    components:
-    - type: Transform
-      pos: -0.5,-13.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 405
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 406
-    components:
-    - type: Transform
-      pos: -0.5,-10.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 407
-    components:
-    - type: Transform
-      pos: -0.5,-9.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 408
-    components:
-    - type: Transform
-      pos: -0.5,-8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 409
-    components:
-    - type: Transform
-      pos: -0.5,-7.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 410
-    components:
-    - type: Transform
-      pos: -0.5,-6.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 411
-    components:
-    - type: Transform
-      pos: 0.5,-18.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 412
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 413
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 414
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 415
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 416
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 417
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 418
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-19.5
-      parent: 1
-  - uid: 419
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-19.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 420
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-19.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 421
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-6.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 422
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 423
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 424
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 425
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 426
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 427
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-17.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 428
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-16.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 429
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-15.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 430
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-14.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 431
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-13.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 432
-    components:
-    - type: Transform
-      pos: 0.5,-11.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 433
-    components:
-    - type: Transform
-      pos: 0.5,-10.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 434
-    components:
-    - type: Transform
-      pos: 0.5,-9.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 435
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 436
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-7.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 437
-    components:
-    - type: Transform
-      pos: 0.5,-20.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 438
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-21.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 439
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-21.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 440
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-21.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 441
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 442
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-- proto: GasPipeTJunction
-  entities:
-  - uid: 443
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-11.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 444
-    components:
-    - type: Transform
-      pos: 2.5,-19.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 445
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-19.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 446
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-12.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-- proto: GasPort
-  entities:
-  - uid: 447
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-23.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-- proto: GasPressurePump
-  entities:
-  - uid: 448
-    components:
-    - type: MetaData
-      name: waste pump
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-19.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-- proto: GasVentPump
-  entities:
-  - uid: 449
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-11.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 450
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-21.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 451
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-23.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 452
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-21.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 453
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-16.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 454
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-16.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-  - uid: 455
-    components:
-    - type: Transform
-      pos: 0.5,-3.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#0335FCFF'
-- proto: GasVentScrubber
-  entities:
-  - uid: 456
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-12.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 457
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-17.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 458
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-20.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 459
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-17.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 460
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-21.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-  - uid: 461
-    components:
-    - type: Transform
-      pos: -0.5,-3.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-    - type: AtmosPipeColor
-      color: '#FF1212FF'
-- proto: GeneratorBasic15kW
-  entities:
-  - uid: 462
-    components:
-    - type: Transform
-      pos: -4.5,-26.5
-      parent: 1
-  - uid: 463
-    components:
-    - type: Transform
-      pos: -4.5,-25.5
-      parent: 1
-  - uid: 464
-    components:
-    - type: Transform
-      pos: -4.5,-24.5
-      parent: 1
-  - uid: 465
-    components:
-    - type: Transform
-      pos: -6.5,-24.5
-      parent: 1
-  - uid: 466
-    components:
-    - type: Transform
-      pos: -6.5,-25.5
-      parent: 1
-  - uid: 467
-    components:
-    - type: Transform
-      pos: -6.5,-26.5
-      parent: 1
-- proto: GeneratorWallmountAPU
-  entities:
-  - uid: 468
-    components:
-    - type: Transform
-      pos: -6.5,-20.5
-      parent: 1
-- proto: GravityGeneratorMini
-  entities:
-  - uid: 469
-    components:
-    - type: Transform
-      pos: -5.5,-22.5
-      parent: 1
-- proto: Grille
-  entities:
-  - uid: 470
-    components:
-    - type: Transform
-      pos: 2.5,-12.5
-      parent: 1
-  - uid: 471
-    components:
-    - type: Transform
-      pos: -3.5,-12.5
-      parent: 1
-  - uid: 472
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-7.5
-      parent: 1
-  - uid: 473
-    components:
-    - type: Transform
-      pos: -2.5,-1.5
-      parent: 1
-  - uid: 474
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 475
-    components:
-    - type: Transform
-      pos: -4.5,-2.5
-      parent: 1
-  - uid: 476
-    components:
-    - type: Transform
-      pos: -6.5,-4.5
-      parent: 1
-  - uid: 477
-    components:
-    - type: Transform
-      pos: 3.5,-2.5
-      parent: 1
-  - uid: 478
-    components:
-    - type: Transform
-      pos: -1.5,-1.5
-      parent: 1
-  - uid: 479
-    components:
-    - type: Transform
-      pos: 5.5,-4.5
-      parent: 1
-  - uid: 480
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 1
-  - uid: 481
-    components:
-    - type: Transform
-      pos: 1.5,-9.5
-      parent: 1
-  - uid: 482
-    components:
-    - type: Transform
-      pos: -2.5,-9.5
-      parent: 1
-  - uid: 483
-    components:
-    - type: Transform
-      pos: 1.5,-1.5
-      parent: 1
-  - uid: 484
-    components:
-    - type: Transform
-      pos: -2.5,-21.5
-      parent: 1
-  - uid: 485
-    components:
-    - type: Transform
-      pos: -2.5,-19.5
-      parent: 1
-  - uid: 486
-    components:
-    - type: Transform
-      pos: 2.5,-22.5
-      parent: 1
-  - uid: 487
-    components:
-    - type: Transform
-      pos: 4.5,-22.5
-      parent: 1
-  - uid: 488
-    components:
-    - type: Transform
-      pos: -1.5,-18.5
-      parent: 1
-  - uid: 489
-    components:
-    - type: Transform
-      pos: 0.5,-7.5
-      parent: 1
-  - uid: 490
-    components:
-    - type: Transform
-      pos: 3.5,-25.5
-      parent: 1
-  - uid: 491
-    components:
-    - type: Transform
-      pos: 5.5,-25.5
-      parent: 1
-  - uid: 492
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-19.5
-      parent: 1
-  - uid: 493
-    components:
-    - type: Transform
-      pos: 0.5,-18.5
-      parent: 1
-- proto: Gyroscope
-  entities:
-  - uid: 494
-    components:
-    - type: Transform
-      pos: -5.5,-13.5
-      parent: 1
-  - uid: 495
-    components:
-    - type: Transform
-      pos: 4.5,-13.5
-      parent: 1
-- proto: HospitalCurtainsOpen
-  entities:
-  - uid: 496
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 1
-- proto: KitchenMicrowave
-  entities:
-  - uid: 497
-    components:
-    - type: Transform
-      pos: 3.5,-19.5
-      parent: 1
-- proto: KnifePlastic
-  entities:
-  - uid: 498
-    components:
-    - type: Transform
-      pos: 5.3509636,-21.445768
-      parent: 1
-- proto: Lamp
-  entities:
-  - uid: 499
-    components:
-    - type: Transform
-      pos: -1.483297,-2.2444057
-      parent: 1
-- proto: LockerSyndicatePersonal
-  entities:
-  - uid: 33
-    components:
-    - type: Transform
-      pos: 4.5,-5.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 37
-          - 39
-          - 36
-          - 40
-          - 41
-          - 38
-          - 35
-          - 34
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-- proto: MedicalBed
-  entities:
-  - uid: 500
-    components:
-    - type: Transform
-      pos: -4.5,-3.5
-      parent: 1
-- proto: MedkitCombatFilled
-  entities:
-  - uid: 501
-    components:
-    - type: Transform
-      pos: -3.401462,-3.5350046
-      parent: 1
-  - uid: 502
-    components:
-    - type: Transform
-      pos: -3.557712,-3.4256296
-      parent: 1
-- proto: Mirror
-  entities:
-  - uid: 503
-    components:
-    - type: Transform
-      pos: 4.5,-3.5
-      parent: 1
-- proto: Multitool
-  entities:
-  - uid: 504
-    components:
-    - type: Transform
-      pos: -3.383473,-22.548275
-      parent: 1
-- proto: NitrogenTankFilled
-  entities:
-  - uid: 505
-    components:
-    - type: Transform
-      pos: 4.633928,-12.616316
-      parent: 1
-  - uid: 506
-    components:
-    - type: Transform
-      pos: -5.397322,-12.569441
-      parent: 1
-  - uid: 507
-    components:
-    - type: Transform
-      pos: -6.3522453,-17.549818
-      parent: 1
-  - uid: 508
-    components:
-    - type: Transform
-      pos: 5.6633797,-17.565443
-      parent: 1
-- proto: NuclearBombUnanchored
-  entities:
-  - uid: 509
-    components:
-    - type: Transform
-      pos: -2.5,-12.5
-      parent: 1
-- proto: NukeCodePaper
-  entities:
-  - uid: 510
-    components:
-    - type: Transform
-      pos: -2.5286522,-11.44479
-      parent: 1
-- proto: Ointment
-  entities:
-  - uid: 511
-    components:
-    - type: Transform
-      pos: -3.651462,-4.5193796
-      parent: 1
-  - uid: 512
-    components:
-    - type: Transform
-      pos: -3.667087,-4.2225046
-      parent: 1
-- proto: OperatingTable
-  entities:
-  - uid: 513
-    components:
-    - type: Transform
-      pos: -5.5,-4.5
-      parent: 1
-- proto: OxygenCanister
-  entities:
-  - uid: 514
-    components:
-    - type: Transform
-      pos: -1.5,-24.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: OxygenTankFilled
-  entities:
-  - uid: 515
-    components:
-    - type: Transform
-      pos: -5.600447,-12.569441
-      parent: 1
-  - uid: 516
-    components:
-    - type: Transform
-      pos: 4.399553,-12.522566
-      parent: 1
-  - uid: 517
-    components:
-    - type: Transform
-      pos: 5.5227547,-17.440443
-      parent: 1
-  - uid: 518
-    components:
-    - type: Transform
-      pos: -6.4928703,-17.440443
-      parent: 1
-- proto: PinpointerNuclear
-  entities:
-  - uid: 519
-    components:
-    - type: Transform
-      pos: -2.4942985,-13.37949
-      parent: 1
-- proto: PlasmaReinforcedWindowDirectional
-  entities:
-  - uid: 520
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-4.5
-      parent: 1
-  - uid: 521
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-6.5
-      parent: 1
-  - uid: 522
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-3.5
-      parent: 1
-- proto: PlushieNuke
-  entities:
-  - uid: 523
-    components:
-    - type: Transform
-      pos: -2.4227936,-2.3320491
-      parent: 1
-- proto: PosterContrabandC20r
-  entities:
-  - uid: 524
-    components:
-    - type: Transform
-      pos: 1.5,-14.5
-      parent: 1
-- proto: PosterContrabandCC64KAd
-  entities:
-  - uid: 525
-    components:
-    - type: Transform
-      pos: -5.5,-18.5
-      parent: 1
-- proto: PosterContrabandCybersun600
-  entities:
-  - uid: 526
-    components:
-    - type: Transform
-      pos: 2.5,-6.5
-      parent: 1
-- proto: PosterContrabandDonk
-  entities:
-  - uid: 527
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-18.5
-      parent: 1
-- proto: PosterContrabandDonutCorp
-  entities:
-  - uid: 528
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-22.5
-      parent: 1
-- proto: PosterContrabandEnergySwords
-  entities:
-  - uid: 529
-    components:
-    - type: Transform
-      pos: 2.5,-18.5
-      parent: 1
-- proto: PosterContrabandEnlistGorlex
-  entities:
-  - uid: 530
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-13.5
-      parent: 1
-- proto: PosterContrabandFreeSyndicateEncryptionKey
-  entities:
-  - uid: 531
-    components:
-    - type: Transform
-      pos: -2.5,-8.5
-      parent: 1
-- proto: PosterContrabandInterdyne
-  entities:
-  - uid: 532
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-6.5
-      parent: 1
-- proto: PosterContrabandKosmicheskayaStantsiya
-  entities:
-  - uid: 533
-    components:
-    - type: Transform
-      pos: -2.5,-22.5
-      parent: 1
-- proto: PosterContrabandMoth
-  entities:
-  - uid: 534
-    components:
-    - type: Transform
-      pos: -2.5,-14.5
-      parent: 1
-  - uid: 535
-    components:
-    - type: Transform
-      pos: 2.5,-3.5
-      parent: 1
-- proto: PosterContrabandNuclearDeviceInformational
-  entities:
-  - uid: 536
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-13.5
-      parent: 1
-  - uid: 537
-    components:
-    - type: Transform
-      pos: 0.5,-14.5
-      parent: 1
-- proto: PosterContrabandSyndicatePistol
-  entities:
-  - uid: 538
-    components:
-    - type: Transform
-      pos: 1.5,-10.5
-      parent: 1
-- proto: PosterContrabandSyndicateRecruitment
-  entities:
-  - uid: 539
-    components:
-    - type: Transform
-      pos: -1.5,-14.5
-      parent: 1
-- proto: PosterContrabandWaffleCorp
-  entities:
-  - uid: 540
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-23.5
-      parent: 1
-- proto: Poweredlight
-  entities:
-  - uid: 541
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-8.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 542
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-4.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 543
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-23.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 544
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-26.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 545
-    components:
-    - type: Transform
-      pos: -4.5,-19.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 546
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-13.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 547
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-27.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 548
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-27.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 549
-    components:
-    - type: Transform
-      pos: 2.5,-15.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 550
-    components:
-    - type: Transform
-      pos: -3.5,-15.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 551
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-5.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 552
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-2.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 553
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-6.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-- proto: PoweredSmallLight
-  entities:
-  - uid: 554
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-13.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 555
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-21.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 556
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-5.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 557
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-24.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 558
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-13.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 559
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-24.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 560
-    components:
-    - type: Transform
-      pos: -6.5,-15.5
-      parent: 1
-  - uid: 561
-    components:
-    - type: Transform
-      pos: 5.5,-15.5
-      parent: 1
-  - uid: 562
-    components:
-    - type: Transform
-      pos: 2.5,-19.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 563
-    components:
-    - type: Transform
-      pos: -1.5,-26.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 564
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-9.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-  - uid: 565
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-9.5
-      parent: 1
-    - type: ApcPowerReceiver
-      powerLoad: 0
-- proto: Rack
-  entities:
-  - uid: 566
-    components:
-    - type: Transform
-      pos: -3.5,-22.5
-      parent: 1
-  - uid: 567
-    components:
-    - type: Transform
-      pos: 5.5,-23.5
-      parent: 1
-  - uid: 568
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-12.5
-      parent: 1
-  - uid: 569
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-12.5
-      parent: 1
-  - uid: 570
-    components:
-    - type: Transform
-      pos: -1.5,-23.5
-      parent: 1
-  - uid: 571
-    components:
-    - type: Transform
-      pos: -6.5,-17.5
-      parent: 1
-  - uid: 572
-    components:
-    - type: Transform
-      pos: 5.5,-17.5
-      parent: 1
-- proto: ReinforcedPlasmaWindow
-  entities:
-  - uid: 573
-    components:
-    - type: Transform
-      pos: 3.5,-2.5
-      parent: 1
-  - uid: 574
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-19.5
-      parent: 1
-  - uid: 575
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 576
-    components:
-    - type: Transform
-      pos: -6.5,-4.5
-      parent: 1
-  - uid: 577
-    components:
-    - type: Transform
-      pos: -2.5,-1.5
-      parent: 1
-  - uid: 578
-    components:
-    - type: Transform
-      pos: -4.5,-2.5
-      parent: 1
-  - uid: 579
-    components:
-    - type: Transform
-      pos: 5.5,-4.5
-      parent: 1
-  - uid: 580
-    components:
-    - type: Transform
-      pos: -1.5,-1.5
-      parent: 1
-  - uid: 581
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 1
-  - uid: 582
-    components:
-    - type: Transform
-      pos: 1.5,-1.5
-      parent: 1
-  - uid: 583
-    components:
-    - type: Transform
-      pos: -1.5,-7.5
-      parent: 1
-  - uid: 584
-    components:
-    - type: Transform
-      pos: 4.5,-22.5
-      parent: 1
-  - uid: 585
-    components:
-    - type: Transform
-      pos: 2.5,-22.5
-      parent: 1
-  - uid: 586
-    components:
-    - type: Transform
-      pos: -2.5,-21.5
-      parent: 1
-  - uid: 587
-    components:
-    - type: Transform
-      pos: -2.5,-19.5
-      parent: 1
-  - uid: 588
-    components:
-    - type: Transform
-      pos: -2.5,-9.5
-      parent: 1
-  - uid: 589
-    components:
-    - type: Transform
-      pos: 1.5,-9.5
-      parent: 1
-  - uid: 590
-    components:
-    - type: Transform
-      pos: 0.5,-18.5
-      parent: 1
-  - uid: 591
-    components:
-    - type: Transform
-      pos: 3.5,-25.5
-      parent: 1
-  - uid: 592
-    components:
-    - type: Transform
-      pos: 5.5,-25.5
-      parent: 1
-  - uid: 593
-    components:
-    - type: Transform
-      pos: 2.5,-12.5
-      parent: 1
-  - uid: 594
-    components:
-    - type: Transform
-      pos: -3.5,-12.5
-      parent: 1
-  - uid: 595
-    components:
-    - type: Transform
-      pos: 0.5,-7.5
-      parent: 1
-  - uid: 596
-    components:
-    - type: Transform
-      pos: -1.5,-18.5
-      parent: 1
-- proto: ShuttersNormalOpen
-  entities:
-  - uid: 597
-    components:
-    - type: Transform
-      pos: -6.5,-4.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-  - uid: 598
-    components:
-    - type: Transform
-      pos: 5.5,-4.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 20
-  - uid: 599
-    components:
-    - type: Transform
-      pos: 1.5,-9.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 609
-  - uid: 600
-    components:
-    - type: Transform
-      pos: -2.5,-9.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 609
-  - uid: 601
-    components:
-    - type: Transform
-      pos: -4.5,-2.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-  - uid: 602
-    components:
-    - type: Transform
-      pos: 3.5,-2.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 20
-  - uid: 603
-    components:
-    - type: Transform
-      pos: 1.5,-1.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-  - uid: 604
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-  - uid: 605
-    components:
-    - type: Transform
-      pos: 5.5,-19.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 611
-  - uid: 606
-    components:
-    - type: Transform
-      pos: -1.5,-1.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-  - uid: 607
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-  - uid: 608
-    components:
-    - type: Transform
-      pos: -2.5,-1.5
-      parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 21
-- proto: SignalButton
-  entities:
-  - uid: 609
-    components:
-    - type: Transform
-      pos: -2.5,-10.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        600:
-        - Pressed: Toggle
-        599:
-        - Pressed: Toggle
-  - uid: 611
-    components:
-    - type: Transform
-      pos: 5.5,-20.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        605:
-        - Pressed: Toggle
-- proto: SignalButtonDirectional
-  entities:
-  - uid: 20
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-4.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        602:
-        - Pressed: Toggle
-        598:
-        - Pressed: Toggle
-  - uid: 21
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-7.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        597:
-        - Pressed: Toggle
-        601:
-        - Pressed: Toggle
-        608:
-        - Pressed: Toggle
-        606:
-        - Pressed: Toggle
-        604:
-        - Pressed: Toggle
-        607:
-        - Pressed: Toggle
-        603:
-        - Pressed: Toggle
-- proto: SignDirectionalEvac
-  entities:
-  - uid: 613
-    components:
-    - type: Transform
-      pos: 0.5,-22.5
-      parent: 1
-  - uid: 614
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-15.5
-      parent: 1
-  - uid: 615
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-14.5
-      parent: 1
-  - uid: 616
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-14.5
-      parent: 1
-  - uid: 617
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-15.5
-      parent: 1
-- proto: SignElectricalMed
-  entities:
-  - uid: 618
-    components:
-    - type: Transform
-      pos: -2.5,-18.5
-      parent: 1
-- proto: SignNosmoking
-  entities:
-  - uid: 619
-    components:
-    - type: Transform
-      pos: 5.5,-22.5
-      parent: 1
-- proto: SignSecureSmallRed
-  entities:
-  - uid: 620
-    components:
-    - type: Transform
-      pos: -3.5,-11.5
-      parent: 1
-  - uid: 621
-    components:
-    - type: Transform
-      pos: 4.5,-17.5
-      parent: 1
-  - uid: 622
-    components:
-    - type: Transform
-      pos: 2.5,-11.5
-      parent: 1
-- proto: SMESBasic
-  entities:
-  - uid: 623
-    components:
-    - type: Transform
-      pos: -5.5,-19.5
-      parent: 1
-  - uid: 624
-    components:
-    - type: Transform
-      pos: -4.5,-19.5
-      parent: 1
-- proto: SoapSyndie
-  entities:
-  - uid: 625
-    components:
-    - type: Transform
-      pos: 2.4424396,-17.430403
-      parent: 1
-- proto: soda_dispenser
-  entities:
-  - uid: 626
-    components:
-    - type: Transform
-      pos: 1.5,-19.5
-      parent: 1
-- proto: StorageCanister
-  entities:
-  - uid: 627
-    components:
-    - type: Transform
-      pos: 2.5,-23.5
-      parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: SubstationBasic
-  entities:
-  - uid: 628
-    components:
-    - type: Transform
-      pos: -3.5,-19.5
-      parent: 1
-- proto: SuitStorageEVASyndicate
-  entities:
-  - uid: 629
-    components:
-    - type: Transform
-      pos: 0.5,-24.5
-      parent: 1
-  - uid: 630
-    components:
-    - type: Transform
-      pos: 0.5,-23.5
-      parent: 1
-  - uid: 631
-    components:
-    - type: Transform
-      pos: 3.5,-17.5
-      parent: 1
-  - uid: 632
-    components:
-    - type: Transform
-      pos: -4.5,-17.5
-      parent: 1
-- proto: SyndieMiniBomb
-  entities:
-  - uid: 633
-    components:
-    - type: Transform
-      pos: 1.4127003,-11.973867
-      parent: 1
-  - uid: 634
-    components:
-    - type: Transform
-      pos: 1.6939503,-11.973867
-      parent: 1
-- proto: SyringeInaprovaline
-  entities:
-  - uid: 635
-    components:
-    - type: Transform
-      pos: -3.510837,-4.3787546
-      parent: 1
-  - uid: 636
-    components:
-    - type: Transform
-      pos: -3.510837,-4.0193796
-      parent: 1
-- proto: Table
-  entities:
-  - uid: 637
-    components:
-    - type: Transform
-      pos: 5.5,-21.5
-      parent: 1
-  - uid: 638
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-21.5
-      parent: 1
-  - uid: 639
-    components:
-    - type: Transform
-      pos: 3.5,-19.5
-      parent: 1
-  - uid: 640
-    components:
-    - type: Transform
-      pos: 2.5,-19.5
-      parent: 1
-  - uid: 641
-    components:
-    - type: Transform
-      pos: 1.5,-19.5
-      parent: 1
-- proto: TablePlasmaGlass
-  entities:
-  - uid: 642
-    components:
-    - type: Transform
-      pos: -3.5,-4.5
-      parent: 1
-  - uid: 643
-    components:
-    - type: Transform
-      pos: -3.5,-6.5
-      parent: 1
-  - uid: 644
-    components:
-    - type: Transform
-      pos: -3.5,-3.5
-      parent: 1
-- proto: TableReinforced
-  entities:
-  - uid: 645
-    components:
-    - type: Transform
-      pos: -2.5,-11.5
-      parent: 1
-  - uid: 646
-    components:
-    - type: Transform
-      pos: -2.5,-13.5
-      parent: 1
-  - uid: 647
-    components:
-    - type: Transform
-      pos: -1.5,-3.5
-      parent: 1
-  - uid: 648
-    components:
-    - type: Transform
-      pos: -2.5,-2.5
-      parent: 1
-  - uid: 649
-    components:
-    - type: Transform
-      pos: 0.5,-13.5
-      parent: 1
-  - uid: 650
-    components:
-    - type: Transform
-      pos: 1.5,-13.5
-      parent: 1
-  - uid: 651
-    components:
-    - type: Transform
-      pos: 1.5,-12.5
-      parent: 1
-  - uid: 652
-    components:
-    - type: Transform
-      pos: 1.5,-11.5
-      parent: 1
-  - uid: 653
-    components:
-    - type: Transform
-      pos: 2.5,-17.5
-      parent: 1
-  - uid: 654
-    components:
-    - type: Transform
-      pos: 1.5,-17.5
-      parent: 1
-  - uid: 655
-    components:
-    - type: Transform
-      pos: -2.5,-17.5
-      parent: 1
-  - uid: 656
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-2.5
-      parent: 1
-  - uid: 657
-    components:
-    - type: Transform
-      pos: -3.5,-17.5
-      parent: 1
-  - uid: 658
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-2.5
-      parent: 1
-- proto: Thruster
-  entities:
-  - uid: 659
-    components:
-    - type: Transform
-      pos: -6.5,-2.5
-      parent: 1
-  - uid: 660
-    components:
-    - type: Transform
-      pos: 5.5,-2.5
-      parent: 1
-  - uid: 661
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-7.5
-      parent: 1
-  - uid: 662
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-7.5
-      parent: 1
-  - uid: 663
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-13.5
-      parent: 1
-  - uid: 664
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-13.5
-      parent: 1
-  - uid: 665
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-30.5
-      parent: 1
-  - uid: 666
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-30.5
-      parent: 1
-  - uid: 667
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-30.5
-      parent: 1
-  - uid: 668
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-30.5
-      parent: 1
-- proto: ToolboxSyndicate
-  entities:
-  - uid: 669
-    components:
-    - type: Transform
-      pos: -2.5731854,-17.414778
-      parent: 1
-- proto: ToolboxSyndicateFilled
-  entities:
-  - uid: 670
-    components:
-    - type: Transform
-      pos: 1.5034143,-11.298322
-      parent: 1
-- proto: VendingMachineTankDispenserEVA
-  entities:
-  - uid: 671
-    components:
-    - type: Transform
-      pos: 5.5,-15.5
-      parent: 1
-  - uid: 672
-    components:
-    - type: MetaData
-      name: tank dispenser
-    - type: Transform
-      pos: 2.5,-24.5
-      parent: 1
-  - uid: 673
-    components:
-    - type: Transform
-      pos: -6.5,-15.5
-      parent: 1
-- proto: VendingMachineYouTool
-  entities:
-  - uid: 674
-    components:
-    - type: Transform
-      pos: -3.5,-24.5
-      parent: 1
-- proto: WallPlastitanium
-  entities:
-  - uid: 11
-    components:
-    - type: Transform
-      pos: -1.5,-25.5
-      parent: 1
-  - uid: 675
-    components:
-    - type: Transform
-      pos: 2.5,-2.5
-      parent: 1
-  - uid: 676
-    components:
-    - type: Transform
-      pos: 4.5,-3.5
-      parent: 1
-  - uid: 677
-    components:
-    - type: Transform
-      pos: -3.5,-11.5
-      parent: 1
-  - uid: 678
-    components:
-    - type: Transform
-      pos: 2.5,-14.5
-      parent: 1
-  - uid: 679
-    components:
-    - type: Transform
-      pos: 4.5,-14.5
-      parent: 1
-  - uid: 680
-    components:
-    - type: Transform
-      pos: -2.5,-14.5
-      parent: 1
-  - uid: 681
-    components:
-    - type: Transform
-      pos: 2.5,-18.5
-      parent: 1
-  - uid: 682
-    components:
-    - type: Transform
-      pos: 1.5,-25.5
-      parent: 1
-  - uid: 683
-    components:
-    - type: Transform
-      pos: 1.5,-18.5
-      parent: 1
-  - uid: 684
-    components:
-    - type: Transform
-      pos: 7.5,-17.5
-      parent: 1
-  - uid: 685
-    components:
-    - type: Transform
-      pos: -3.5,-26.5
-      parent: 1
-  - uid: 686
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-7.5
-      parent: 1
-  - uid: 687
-    components:
-    - type: Transform
-      pos: 2.5,-13.5
-      parent: 1
-  - uid: 688
-    components:
-    - type: Transform
-      pos: -3.5,-28.5
-      parent: 1
-  - uid: 689
-    components:
-    - type: Transform
-      pos: 2.5,-10.5
-      parent: 1
-  - uid: 690
-    components:
-    - type: Transform
-      pos: 4.5,-18.5
-      parent: 1
-  - uid: 691
-    components:
-    - type: Transform
-      pos: -2.5,-10.5
-      parent: 1
-  - uid: 692
-    components:
-    - type: Transform
-      pos: -3.5,-10.5
-      parent: 1
-  - uid: 693
-    components:
-    - type: Transform
-      pos: -6.5,-11.5
-      parent: 1
-  - uid: 694
-    components:
-    - type: Transform
-      pos: 4.5,-10.5
-      parent: 1
-  - uid: 695
-    components:
-    - type: Transform
-      pos: 4.5,-2.5
-      parent: 1
-  - uid: 696
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-7.5
-      parent: 1
-  - uid: 697
-    components:
-    - type: Transform
-      pos: -6.5,-6.5
-      parent: 1
-  - uid: 698
-    components:
-    - type: Transform
-      pos: -5.5,-6.5
-      parent: 1
-  - uid: 699
-    components:
-    - type: Transform
-      pos: 4.5,-6.5
-      parent: 1
-  - uid: 700
-    components:
-    - type: Transform
-      pos: -6.5,-5.5
-      parent: 1
-  - uid: 701
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-8.5
-      parent: 1
-  - uid: 702
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-7.5
-      parent: 1
-  - uid: 703
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-8.5
-      parent: 1
-  - uid: 704
-    components:
-    - type: Transform
-      pos: 2.5,-11.5
-      parent: 1
-  - uid: 705
-    components:
-    - type: Transform
-      pos: 5.5,-18.5
-      parent: 1
-  - uid: 706
-    components:
-    - type: Transform
-      pos: -8.5,-15.5
-      parent: 1
-  - uid: 707
-    components:
-    - type: Transform
-      pos: -8.5,-17.5
-      parent: 1
-  - uid: 708
-    components:
-    - type: Transform
-      pos: -7.5,-17.5
-      parent: 1
-  - uid: 709
-    components:
-    - type: Transform
-      pos: -5.5,-10.5
-      parent: 1
-  - uid: 710
-    components:
-    - type: Transform
-      pos: -3.5,-13.5
-      parent: 1
-  - uid: 711
-    components:
-    - type: Transform
-      pos: 3.5,-18.5
-      parent: 1
-  - uid: 712
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-6.5
-      parent: 1
-  - uid: 713
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-7.5
-      parent: 1
-  - uid: 714
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-8.5
-      parent: 1
-  - uid: 715
-    components:
-    - type: Transform
-      pos: 5.5,-14.5
-      parent: 1
-  - uid: 716
-    components:
-    - type: Transform
-      pos: 7.5,-15.5
-      parent: 1
-  - uid: 717
-    components:
-    - type: Transform
-      pos: -6.5,-19.5
-      parent: 1
-  - uid: 718
-    components:
-    - type: Transform
-      pos: -6.5,-18.5
-      parent: 1
-  - uid: 719
-    components:
-    - type: Transform
-      pos: -3.5,-25.5
-      parent: 1
-  - uid: 720
-    components:
-    - type: Transform
-      pos: 2.5,-25.5
-      parent: 1
-  - uid: 721
-    components:
-    - type: Transform
-      pos: 2.5,-27.5
-      parent: 1
-  - uid: 722
-    components:
-    - type: Transform
-      pos: 4.5,-17.5
-      parent: 1
-  - uid: 723
-    components:
-    - type: Transform
-      pos: -7.5,-21.5
-      parent: 1
-  - uid: 724
-    components:
-    - type: Transform
-      pos: -7.5,-27.5
-      parent: 1
-  - uid: 725
-    components:
-    - type: Transform
-      pos: -7.5,-24.5
-      parent: 1
-  - uid: 726
-    components:
-    - type: Transform
-      pos: 6.5,-21.5
-      parent: 1
-  - uid: 727
-    components:
-    - type: Transform
-      pos: 6.5,-24.5
-      parent: 1
-  - uid: 728
-    components:
-    - type: Transform
-      pos: 6.5,-26.5
-      parent: 1
-  - uid: 729
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-3.5
-      parent: 1
-  - uid: 730
-    components:
-    - type: Transform
-      pos: 1.5,-10.5
-      parent: 1
-  - uid: 731
-    components:
-    - type: Transform
-      pos: -3.5,-27.5
-      parent: 1
-  - uid: 732
-    components:
-    - type: Transform
-      pos: -6.5,-12.5
-      parent: 1
-  - uid: 733
-    components:
-    - type: Transform
-      pos: 5.5,-12.5
-      parent: 1
-  - uid: 734
-    components:
-    - type: Transform
-      pos: 5.5,-11.5
-      parent: 1
-  - uid: 735
-    components:
-    - type: Transform
-      pos: -5.5,-11.5
-      parent: 1
-  - uid: 736
-    components:
-    - type: Transform
-      pos: -6.5,-20.5
-      parent: 1
-  - uid: 737
-    components:
-    - type: Transform
-      pos: 0.5,-14.5
-      parent: 1
-  - uid: 738
-    components:
-    - type: Transform
-      pos: -1.5,-14.5
-      parent: 1
-  - uid: 739
-    components:
-    - type: Transform
-      pos: 5.5,-20.5
-      parent: 1
-  - uid: 740
-    components:
-    - type: Transform
-      pos: -5.5,-14.5
-      parent: 1
-  - uid: 741
-    components:
-    - type: Transform
-      pos: 6.5,-17.5
-      parent: 1
-  - uid: 742
-    components:
-    - type: Transform
-      pos: -3.5,-14.5
-      parent: 1
-  - uid: 743
-    components:
-    - type: Transform
-      pos: -2.5,-18.5
-      parent: 1
-  - uid: 744
-    components:
-    - type: Transform
-      pos: 2.5,-26.5
-      parent: 1
-  - uid: 745
-    components:
-    - type: Transform
-      pos: 2.5,-28.5
-      parent: 1
-  - uid: 746
-    components:
-    - type: Transform
-      pos: 6.5,-25.5
-      parent: 1
-  - uid: 747
-    components:
-    - type: Transform
-      pos: 6.5,-22.5
-      parent: 1
-  - uid: 748
-    components:
-    - type: Transform
-      pos: -7.5,-23.5
-      parent: 1
-  - uid: 749
-    components:
-    - type: Transform
-      pos: -7.5,-26.5
-      parent: 1
-  - uid: 750
-    components:
-    - type: Transform
-      pos: -7.5,-22.5
-      parent: 1
-  - uid: 751
-    components:
-    - type: Transform
-      pos: -7.5,-20.5
-      parent: 1
-  - uid: 752
-    components:
-    - type: Transform
-      pos: 4.5,-15.5
-      parent: 1
-  - uid: 753
-    components:
-    - type: Transform
-      pos: 6.5,-28.5
-      parent: 1
-  - uid: 754
-    components:
-    - type: Transform
-      pos: 6.5,-27.5
-      parent: 1
-  - uid: 755
-    components:
-    - type: Transform
-      pos: 6.5,-23.5
-      parent: 1
-  - uid: 756
-    components:
-    - type: Transform
-      pos: 6.5,-20.5
-      parent: 1
-  - uid: 757
-    components:
-    - type: Transform
-      pos: -7.5,-25.5
-      parent: 1
-  - uid: 758
-    components:
-    - type: Transform
-      pos: -7.5,-28.5
-      parent: 1
-  - uid: 759
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-15.5
-      parent: 1
-  - uid: 760
-    components:
-    - type: Transform
-      pos: -5.5,-18.5
-      parent: 1
-  - uid: 761
-    components:
-    - type: Transform
-      pos: -5.5,-3.5
-      parent: 1
-  - uid: 762
-    components:
-    - type: Transform
-      pos: 5.5,-5.5
-      parent: 1
-  - uid: 763
-    components:
-    - type: Transform
-      pos: -3.5,-2.5
-      parent: 1
-  - uid: 764
-    components:
-    - type: Transform
-      pos: -6.5,-3.5
-      parent: 1
-  - uid: 765
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-7.5
-      parent: 1
-  - uid: 766
-    components:
-    - type: Transform
-      pos: -3.5,-18.5
-      parent: 1
-  - uid: 767
-    components:
-    - type: Transform
-      pos: -3.5,-1.5
-      parent: 1
-  - uid: 768
-    components:
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 1
-  - uid: 769
-    components:
-    - type: Transform
-      pos: -6.5,-14.5
-      parent: 1
-  - uid: 770
-    components:
-    - type: Transform
-      pos: -5.5,-2.5
-      parent: 1
-  - uid: 771
-    components:
-    - type: Transform
-      pos: 5.5,-6.5
-      parent: 1
-  - uid: 772
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-7.5
-      parent: 1
-  - uid: 773
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-8.5
-      parent: 1
-  - uid: 774
-    components:
-    - type: Transform
-      pos: 4.5,-11.5
-      parent: 1
-  - uid: 775
-    components:
-    - type: Transform
-      pos: -6.5,-13.5
-      parent: 1
-  - uid: 776
-    components:
-    - type: Transform
-      pos: -3.5,-30.5
-      parent: 1
-  - uid: 777
-    components:
-    - type: Transform
-      pos: 6.5,-15.5
-      parent: 1
-  - uid: 778
-    components:
-    - type: Transform
-      pos: 5.5,-13.5
-      parent: 1
-  - uid: 779
-    components:
-    - type: Transform
-      pos: -7.5,-15.5
-      parent: 1
-  - uid: 780
-    components:
-    - type: Transform
-      pos: 1.5,-14.5
-      parent: 1
-  - uid: 781
-    components:
-    - type: Transform
-      pos: -4.5,-18.5
-      parent: 1
-  - uid: 782
-    components:
-    - type: Transform
-      pos: -2.5,-25.5
-      parent: 1
-  - uid: 783
-    components:
-    - type: Transform
-      pos: 0.5,-25.5
-      parent: 1
-  - uid: 785
-    components:
-    - type: Transform
-      pos: -1.5,-22.5
-      parent: 1
-  - uid: 786
-    components:
-    - type: Transform
-      pos: 0.5,-22.5
-      parent: 1
-  - uid: 787
-    components:
-    - type: Transform
-      pos: 1.5,-24.5
-      parent: 1
-  - uid: 788
-    components:
-    - type: Transform
-      pos: 1.5,-23.5
-      parent: 1
-  - uid: 789
-    components:
-    - type: Transform
-      pos: 1.5,-22.5
-      parent: 1
-  - uid: 790
-    components:
-    - type: Transform
-      pos: -2.5,-24.5
-      parent: 1
-  - uid: 791
-    components:
-    - type: Transform
-      pos: -2.5,-23.5
-      parent: 1
-  - uid: 792
-    components:
-    - type: Transform
-      pos: -2.5,-22.5
-      parent: 1
-  - uid: 793
-    components:
-    - type: Transform
-      pos: 5.5,-22.5
-      parent: 1
-  - uid: 794
-    components:
-    - type: Transform
-      pos: -7.5,-14.5
-      parent: 1
-  - uid: 795
-    components:
-    - type: Transform
-      pos: -7.5,-18.5
-      parent: 1
-  - uid: 796
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-28.5
-      parent: 1
-  - uid: 797
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-28.5
-      parent: 1
-  - uid: 798
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-28.5
-      parent: 1
-  - uid: 799
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-28.5
-      parent: 1
-  - uid: 800
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-28.5
-      parent: 1
-  - uid: 801
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-28.5
-      parent: 1
-  - uid: 802
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-6.5
-      parent: 1
-  - uid: 803
-    components:
-    - type: Transform
-      pos: 4.5,-27.5
-      parent: 1
-  - uid: 804
-    components:
-    - type: Transform
-      pos: 4.5,-26.5
-      parent: 1
-  - uid: 805
-    components:
-    - type: Transform
-      pos: 4.5,-25.5
-      parent: 1
-  - uid: 806
-    components:
-    - type: Transform
-      pos: 2.5,-4.5
-      parent: 1
-  - uid: 807
-    components:
-    - type: Transform
-      pos: 3.5,-6.5
-      parent: 1
-  - uid: 808
-    components:
-    - type: Transform
-      pos: 2.5,-30.5
-      parent: 1
-  - uid: 809
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-17.5
-      parent: 1
-  - uid: 810
-    components:
-    - type: Transform
-      pos: 3.5,-29.5
-      parent: 1
-  - uid: 811
-    components:
-    - type: Transform
-      pos: -5.5,-29.5
-      parent: 1
-  - uid: 812
-    components:
-    - type: Transform
-      pos: 4.5,-29.5
-      parent: 1
-  - uid: 813
-    components:
-    - type: Transform
-      pos: -4.5,-29.5
-      parent: 1
-  - uid: 814
-    components:
-    - type: Transform
-      pos: 5.5,-29.5
-      parent: 1
-  - uid: 815
-    components:
-    - type: Transform
-      pos: -3.5,-29.5
-      parent: 1
-  - uid: 816
-    components:
-    - type: Transform
-      pos: 2.5,-29.5
-      parent: 1
-  - uid: 817
-    components:
-    - type: Transform
-      pos: 6.5,-14.5
-      parent: 1
-  - uid: 818
-    components:
-    - type: Transform
-      pos: 6.5,-18.5
-      parent: 1
-  - uid: 819
-    components:
-    - type: Transform
-      pos: 5.5,-3.5
-      parent: 1
-  - uid: 820
-    components:
-    - type: Transform
-      pos: -6.5,-29.5
-      parent: 1
-  - uid: 821
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-30.5
-      parent: 1
-  - uid: 822
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-30.5
-      parent: 1
-  - uid: 823
-    components:
-    - type: Transform
-      pos: 8.5,-15.5
-      parent: 1
-  - uid: 824
-    components:
-    - type: Transform
-      pos: 8.5,-17.5
-      parent: 1
-  - uid: 825
-    components:
-    - type: Transform
-      pos: -9.5,-17.5
-      parent: 1
-  - uid: 826
-    components:
-    - type: Transform
-      pos: -9.5,-15.5
-      parent: 1
-- proto: WarningN2
-  entities:
-  - uid: 827
-    components:
-    - type: Transform
-      pos: 4.5,-25.5
-      parent: 1
-- proto: WarningO2
-  entities:
-  - uid: 828
-    components:
-    - type: Transform
-      pos: 2.5,-25.5
-      parent: 1
-- proto: WarningWaste
-  entities:
-  - uid: 829
-    components:
-    - type: Transform
-      pos: 4.5,-18.5
-      parent: 1
-- proto: WaterCooler
-  entities:
-  - uid: 830
-    components:
-    - type: Transform
-      pos: 0.5,-17.5
-      parent: 1
-- proto: WeaponTurretSyndicate
-  entities:
-  - uid: 24
-    components:
-    - type: Transform
-      pos: -2.5,-6.5
-      parent: 1
-  - uid: 610
-    components:
-    - type: Transform
-      pos: -1.5,-19.5
-      parent: 1
-- proto: WindoorSecure
-  entities:
-  - uid: 831
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-5.5
-      parent: 1
-- proto: Wrench
-  entities:
-  - uid: 832
-    components:
-    - type: Transform
-      pos: 5.4749,-23.512577
-      parent: 1
-  - uid: 833
-    components:
-    - type: Transform
-      pos: 5.63115,-23.481327
-      parent: 1
-  - uid: 834
-    components:
-    - type: Transform
-      pos: 1.6061028,-13.284962
-      parent: 1
-...
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  3: FloorArcadeRed
+  29: FloorDark
+  34: FloorDarkMono
+  38: FloorDarkPlastic
+  54: FloorGreenCircuit
+  77: FloorReinforced
+  84: FloorShuttleRed
+  85: FloorShuttleWhite
+  89: FloorSteel
+  100: FloorSteelMono
+  106: FloorTechMaint3
+  118: FloorWood
+  120: Lattice
+  121: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: GX-13 Infiltrator
+    - type: Tag
+      tags:
+      - Syndicate
+    - type: Transform
+      pos: 0.64252126,4.1776605
+      parent: invalid
+    - type: MapGrid
+      chunks:
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAACHQAAAAABHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAagAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAHQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAHQAAAAACeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAHQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAABHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACVAAAAAAAHQAAAAACHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAACZAAAAAAAVQAAAAAAHQAAAAADHQAAAAAAHQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAADVQAAAAAAZAAAAAABVAAAAAAAHQAAAAAAHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAADVAAAAAAAHQAAAAACHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: HQAAAAABHQAAAAABHQAAAAABHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAagAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABVAAAAAAAdgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHQAAAAAAHQAAAAAAdgAAAAADdgAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAVAAAAAAAdgAAAAAAAwAAAAAAdgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADVAAAAAAAeQAAAAAAAwAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVAAAAAAAVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,-2:
+          ind: -1,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAANgAAAAAAIgAAAAAANgAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAANgAAAAAAIgAAAAAANgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAANgAAAAAAIgAAAAAANgAAAAAAVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAACHQAAAAAAHQAAAAADVAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAACTQAAAAAAHQAAAAABVAAAAAAAeQAAAAAAeQAAAAAAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAVAAAAAAAeQAAAAAAHQAAAAAAHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAJgAAAAAAJgAAAAAAVAAAAAAAHQAAAAADHQAAAAAAHQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAVAAAAAAAHQAAAAAAVAAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAAAHQAAAAADHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAagAAAAAAHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAA
+          version: 6
+        0,-2:
+          ind: 0,-2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHQAAAAADHQAAAAABHQAAAAADHQAAAAABVAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAADHQAAAAACHQAAAAAAHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAACHQAAAAAAHQAAAAADHQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAABHQAAAAAAHQAAAAABHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACagAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+    - type: Broadphase
+    - type: Physics
+      bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+    - type: Fixtures
+      fixtures: {}
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          -1,-4:
+            0: 65535
+          -1,-3:
+            0: 65535
+          -1,-2:
+            0: 65535
+          -1,-1:
+            0: 61439
+          0,-4:
+            0: 65535
+          0,-3:
+            0: 65535
+          0,-2:
+            0: 65535
+          0,-1:
+            0: 65535
+          1,-4:
+            0: 30591
+          1,-3:
+            0: 21879
+            1: 512
+          1,-2:
+            0: 30325
+            2: 256
+          1,-1:
+            0: 55
+          0,-5:
+            0: 65535
+          1,-5:
+            0: 65399
+          -1,-5:
+            0: 65535
+          -3,-4:
+            0: 12
+          -2,-4:
+            0: 61439
+          -2,-2:
+            0: 65516
+          -2,-1:
+            0: 2287
+          -2,-3:
+            0: 35054
+            1: 1536
+          -1,0:
+            0: 8
+          -3,-5:
+            0: 52224
+          -2,-8:
+            0: 65504
+          -2,-7:
+            0: 65535
+          -2,-6:
+            0: 65535
+          -2,-5:
+            0: 65535
+          -1,-8:
+            0: 65526
+          -1,-7:
+            0: 65535
+          -1,-6:
+            0: 65535
+          0,-8:
+            0: 65523
+          0,-7:
+            0: 61303
+            3: 4096
+            4: 136
+          0,-6:
+            3: 1
+            0: 65534
+          1,-8:
+            0: 30512
+          1,-7:
+            0: 30549
+            5: 34
+          1,-6:
+            0: 30583
+          -1,-9:
+            0: 26112
+          0,-9:
+            0: 13056
+          2,-4:
+            0: 1
+          2,-5:
+            0: 4352
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.14996
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 20.619795
+          - 77.56971
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 6666.982
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 6666.982
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            115: -6,-24
+        - node:
+            color: '#FFFFFFFF'
+            id: Bot
+          decals:
+            112: -6,-27
+            113: -6,-26
+            114: -6,-25
+        - node:
+            color: '#79150096'
+            id: Box
+          decals:
+            110: -6,-21
+            111: -5,-21
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerNe
+          decals:
+            10: 0,-4
+            43: 0,-9
+            51: 4,-20
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerNw
+          decals:
+            11: -2,-4
+            42: -2,-9
+            45: -2,-20
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerSe
+          decals:
+            36: 0,-14
+            50: 4,-22
+            76: 3,-18
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelCornerSw
+          decals:
+            37: -2,-14
+            46: -2,-22
+            75: -5,-18
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineE
+          decals:
+            6: 0,-7
+            9: 0,-5
+            32: 0,-11
+            33: 0,-10
+            34: 0,-12
+            35: 0,-13
+            52: 4,-21
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineN
+          decals:
+            12: -1,-4
+            53: 3,-20
+            54: 2,-20
+            55: 1,-20
+            56: 0,-20
+            63: 0,-16
+            64: 1,-16
+            65: 2,-16
+            66: -2,-16
+            67: -3,-16
+            68: -4,-16
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineS
+          decals:
+            47: 0,-22
+            48: 1,-22
+            49: 2,-22
+            69: 2,-18
+            70: 1,-18
+            71: 0,-18
+            72: -2,-18
+            73: -3,-18
+            74: -4,-18
+        - node:
+            color: '#DE3A3A96'
+            id: BrickTileSteelLineW
+          decals:
+            7: -2,-7
+            8: -2,-5
+            38: -2,-13
+            39: -2,-12
+            40: -2,-11
+            41: -2,-10
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteCornerNe
+          decals:
+            104: -5,-22
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteCornerNw
+          decals:
+            103: -7,-22
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteCornerSe
+          decals:
+            105: -5,-24
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteCornerSw
+          decals:
+            106: -7,-24
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteLineE
+          decals:
+            102: -5,-23
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteLineN
+          decals:
+            109: -6,-22
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteLineS
+          decals:
+            107: -6,-24
+        - node:
+            color: '#79150096'
+            id: BrickTileWhiteLineW
+          decals:
+            108: -7,-23
+        - node:
+            color: '#79150096'
+            id: Delivery
+          decals:
+            116: -1,-23
+        - node:
+            color: '#DE3A3A96'
+            id: DeliveryGreyscale
+          decals:
+            13: 1,-6
+            31: -3,-6
+            83: -1,-19
+            84: -3,-21
+            85: -1,-15
+            86: 4,-17
+            87: -6,-17
+            88: -5,-15
+            89: 3,-15
+            90: -1,-8
+        - node:
+            color: '#DE3A3A96'
+            id: HalfTileOverlayGreyscale
+          decals:
+            29: -4,-7
+        - node:
+            color: '#DE3A3A96'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            25: -4,-4
+            26: -5,-4
+        - node:
+            color: '#DE3A3A96'
+            id: HalfTileOverlayGreyscale90
+          decals:
+            27: -6,-6
+            28: -6,-5
+        - node:
+            color: '#DE3A3A96'
+            id: MonoOverlay
+          decals:
+            23: -5,-6
+            24: -4,-5
+        - node:
+            color: '#DE3A3A96'
+            id: WarnCornerGreyscaleNE
+          decals:
+            81: 3,-16
+        - node:
+            color: '#DE3A3A96'
+            id: WarnCornerGreyscaleNW
+          decals:
+            80: -5,-16
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallNE
+          decals:
+            99: -7,-24
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallNW
+          decals:
+            98: -5,-24
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallSE
+          decals:
+            97: -7,-22
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnCornerSmallSW
+          decals:
+            101: -5,-22
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineE
+          decals:
+            3: -4,-23
+            4: -4,-24
+            5: -4,-25
+            95: -7,-23
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleE
+          decals:
+            78: 3,-17
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleN
+          decals:
+            44: -1,-9
+            59: -1,-20
+            82: -1,-16
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleS
+          decals:
+            57: -1,-22
+            60: 3,-22
+            77: -1,-18
+        - node:
+            color: '#DE3A3A96'
+            id: WarnLineGreyscaleW
+          decals:
+            58: -2,-21
+            79: -5,-17
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineN
+          decals:
+            91: -5,-28
+            92: -6,-28
+            93: -7,-28
+            100: -6,-22
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineS
+          decals:
+            94: -5,-23
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineW
+          decals:
+            96: -6,-24
+        - node:
+            angle: 1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: WarningLine
+          decals:
+            0: -4,-22
+            1: -4,-21
+            2: -4,-20
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinEndN
+          decals:
+            62: 3,-4
+        - node:
+            color: '#FFFFFFFF'
+            id: WoodTrimThinEndS
+          decals:
+            61: 3,-5
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo10
+          decals:
+            20: -2,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo11
+          decals:
+            21: -1,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo12
+          decals:
+            22: 0,-7
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo2
+          decals:
+            14: -2,-5
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo3
+          decals:
+            15: -1,-5
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo4
+          decals:
+            16: 0,-5
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo5
+          decals:
+            30: -3,-6
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo6
+          decals:
+            17: -2,-6
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo7
+          decals:
+            18: -1,-6
+        - node:
+            color: '#FFFFFFFF'
+            id: syndlogo8
+          decals:
+            19: 0,-6
+    - type: IFF
+      color: '#FFC000FF'
+      flags: Hide
+    - type: OccluderTree
+    - type: Shuttle
+    - type: RadiationGridResistance
+    - type: GravityShake
+      shakeTimes: 10
+    - type: GasTileOverlay
+    - type: SpreaderGrid
+    - type: GridPathfinding
+- proto: AirlockExternalGlassShuttleSyndicateLocked
+  entities:
+  - uid: 8
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-16.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 13
+    - type: DeviceLinkSource
+      linkedPorts:
+        13:
+        - DoorStatus: DoorBolt
+  - uid: 10
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-16.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 3
+    - type: DeviceLinkSource
+      linkedPorts:
+        3:
+        - DoorStatus: DoorBolt
+- proto: AirlockExternalSyndicateLocked
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      pos: -0.5,-25.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 14
+    - type: DeviceLinkSource
+      linkedPorts:
+        14:
+        - DoorStatus: DoorBolt
+  - uid: 3
+    components:
+    - type: Transform
+      pos: -5.5,-16.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 10
+    - type: DeviceLinkSource
+      linkedPorts:
+        10:
+        - DoorStatus: DoorBolt
+  - uid: 7
+    components:
+    - type: Transform
+      pos: -4.5,-14.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 12
+    - type: DeviceLinkSource
+      linkedPorts:
+        12:
+        - DoorStatus: DoorBolt
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 3.5,-14.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 22
+    - type: DeviceLinkSource
+      linkedPorts:
+        22:
+        - DoorStatus: DoorBolt
+  - uid: 12
+    components:
+    - type: Transform
+      pos: -4.5,-10.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 7
+    - type: DeviceLinkSource
+      linkedPorts:
+        7:
+        - DoorStatus: DoorBolt
+  - uid: 13
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 8
+    - type: DeviceLinkSource
+      linkedPorts:
+        8:
+        - DoorStatus: DoorBolt
+  - uid: 14
+    components:
+    - type: Transform
+      pos: -0.5,-22.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        2:
+        - DoorStatus: DoorBolt
+  - uid: 22
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 9
+    - type: DeviceLinkSource
+      linkedPorts:
+        9:
+        - DoorStatus: DoorBolt
+- proto: AirlockSyndicateGlassLocked
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 1
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 3.5,-22.5
+      parent: 1
+  - uid: 6
+    components:
+    - type: Transform
+      pos: -0.5,-18.5
+      parent: 1
+  - uid: 17
+    components:
+    - type: Transform
+      pos: -2.5,-20.5
+      parent: 1
+- proto: AirlockSyndicateLocked
+  entities:
+  - uid: 15
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+- proto: APCBasic
+  entities:
+  - uid: 18
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 1
+  - uid: 19
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-8.5
+      parent: 1
+- proto: AtmosFixNitrogenMarker
+  entities:
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 5.5,-26.5
+      parent: 1
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 5.5,-27.5
+      parent: 1
+- proto: AtmosFixOxygenMarker
+  entities:
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 3.5,-26.5
+      parent: 1
+  - uid: 28
+    components:
+    - type: Transform
+      pos: 3.5,-27.5
+      parent: 1
+- proto: BannerSyndicate
+  entities:
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 2.5,-15.5
+      parent: 1
+  - uid: 30
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 1
+- proto: Bed
+  entities:
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+- proto: BedsheetSyndie
+  entities:
+  - uid: 32
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+- proto: BoxEncryptionKeySyndie
+  entities:
+  - uid: 34
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: BoxFlashbang
+  entities:
+  - uid: 42
+    components:
+    - type: Transform
+      pos: 0.49331844,-13.366474
+      parent: 1
+- proto: BoxHandcuff
+  entities:
+  - uid: 43
+    components:
+    - type: Transform
+      pos: 1.4510483,-2.399527
+      parent: 1
+- proto: Brutepack
+  entities:
+  - uid: 44
+    components:
+    - type: Transform
+      pos: -3.292087,-4.1600046
+      parent: 1
+  - uid: 45
+    components:
+    - type: Transform
+      pos: -3.354587,-4.4256296
+      parent: 1
+- proto: C4
+  entities:
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 1.7857682,-12.631323
+      parent: 1
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 1.5045182,-12.646948
+      parent: 1
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 1.5982682,-12.646948
+      parent: 1
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 1.4107682,-12.646948
+      parent: 1
+  - uid: 50
+    components:
+    - type: Transform
+      pos: 1.6920182,-12.631323
+      parent: 1
+- proto: CableApcExtension
+  entities:
+  - uid: 51
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 1
+  - uid: 52
+    components:
+    - type: Transform
+      pos: -3.5,-17.5
+      parent: 1
+  - uid: 53
+    components:
+    - type: Transform
+      pos: -3.5,-16.5
+      parent: 1
+  - uid: 54
+    components:
+    - type: Transform
+      pos: -4.5,-16.5
+      parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      pos: -5.5,-16.5
+      parent: 1
+  - uid: 56
+    components:
+    - type: Transform
+      pos: -6.5,-16.5
+      parent: 1
+  - uid: 57
+    components:
+    - type: Transform
+      pos: -7.5,-16.5
+      parent: 1
+  - uid: 58
+    components:
+    - type: Transform
+      pos: -8.5,-16.5
+      parent: 1
+  - uid: 59
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 1
+  - uid: 60
+    components:
+    - type: Transform
+      pos: -6.5,-17.5
+      parent: 1
+  - uid: 61
+    components:
+    - type: Transform
+      pos: -4.5,-15.5
+      parent: 1
+  - uid: 62
+    components:
+    - type: Transform
+      pos: -4.5,-14.5
+      parent: 1
+  - uid: 63
+    components:
+    - type: Transform
+      pos: -4.5,-13.5
+      parent: 1
+  - uid: 64
+    components:
+    - type: Transform
+      pos: -4.5,-12.5
+      parent: 1
+  - uid: 65
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 1
+  - uid: 66
+    components:
+    - type: Transform
+      pos: -4.5,-10.5
+      parent: 1
+  - uid: 67
+    components:
+    - type: Transform
+      pos: -5.5,-12.5
+      parent: 1
+  - uid: 68
+    components:
+    - type: Transform
+      pos: -6.5,-12.5
+      parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 1
+  - uid: 70
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 1
+  - uid: 71
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 0.5,-16.5
+      parent: 1
+  - uid: 73
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 1
+  - uid: 74
+    components:
+    - type: Transform
+      pos: 2.5,-16.5
+      parent: 1
+  - uid: 75
+    components:
+    - type: Transform
+      pos: 3.5,-16.5
+      parent: 1
+  - uid: 76
+    components:
+    - type: Transform
+      pos: 4.5,-16.5
+      parent: 1
+  - uid: 77
+    components:
+    - type: Transform
+      pos: 5.5,-16.5
+      parent: 1
+  - uid: 78
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 79
+    components:
+    - type: Transform
+      pos: 5.5,-17.5
+      parent: 1
+  - uid: 80
+    components:
+    - type: Transform
+      pos: 6.5,-16.5
+      parent: 1
+  - uid: 81
+    components:
+    - type: Transform
+      pos: 7.5,-16.5
+      parent: 1
+  - uid: 82
+    components:
+    - type: Transform
+      pos: 3.5,-15.5
+      parent: 1
+  - uid: 83
+    components:
+    - type: Transform
+      pos: 3.5,-14.5
+      parent: 1
+  - uid: 84
+    components:
+    - type: Transform
+      pos: 3.5,-13.5
+      parent: 1
+  - uid: 85
+    components:
+    - type: Transform
+      pos: 3.5,-12.5
+      parent: 1
+  - uid: 86
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 1
+  - uid: 87
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 1
+  - uid: 88
+    components:
+    - type: Transform
+      pos: 3.5,-10.5
+      parent: 1
+  - uid: 89
+    components:
+    - type: Transform
+      pos: 4.5,-12.5
+      parent: 1
+  - uid: 90
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 1
+  - uid: 91
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 1
+  - uid: 92
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 1
+  - uid: 93
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 94
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+  - uid: 95
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+  - uid: 96
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 1
+  - uid: 97
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+  - uid: 98
+    components:
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+  - uid: 99
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 100
+    components:
+    - type: Transform
+      pos: -1.5,-12.5
+      parent: 1
+  - uid: 101
+    components:
+    - type: Transform
+      pos: 0.5,-12.5
+      parent: 1
+  - uid: 102
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 1
+  - uid: 103
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 1
+  - uid: 104
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 1
+  - uid: 105
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 106
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 1
+  - uid: 107
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 1
+  - uid: 108
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 1
+  - uid: 109
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
+  - uid: 110
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 111
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 112
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 113
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 1
+  - uid: 114
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 1
+  - uid: 115
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 1
+  - uid: 116
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 1
+  - uid: 117
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 1
+  - uid: 118
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 1
+  - uid: 119
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 1
+  - uid: 120
+    components:
+    - type: Transform
+      pos: -5.5,-5.5
+      parent: 1
+  - uid: 121
+    components:
+    - type: Transform
+      pos: -5.5,-6.5
+      parent: 1
+  - uid: 122
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 123
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 1
+  - uid: 124
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 125
+    components:
+    - type: Transform
+      pos: 3.5,-6.5
+      parent: 1
+  - uid: 126
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 1
+  - uid: 127
+    components:
+    - type: Transform
+      pos: -3.5,-20.5
+      parent: 1
+  - uid: 128
+    components:
+    - type: Transform
+      pos: -3.5,-19.5
+      parent: 1
+  - uid: 129
+    components:
+    - type: Transform
+      pos: -3.5,-21.5
+      parent: 1
+  - uid: 130
+    components:
+    - type: Transform
+      pos: -4.5,-21.5
+      parent: 1
+  - uid: 131
+    components:
+    - type: Transform
+      pos: -4.5,-22.5
+      parent: 1
+  - uid: 132
+    components:
+    - type: Transform
+      pos: -4.5,-23.5
+      parent: 1
+  - uid: 133
+    components:
+    - type: Transform
+      pos: -4.5,-24.5
+      parent: 1
+  - uid: 134
+    components:
+    - type: Transform
+      pos: -4.5,-25.5
+      parent: 1
+  - uid: 135
+    components:
+    - type: Transform
+      pos: -4.5,-25.5
+      parent: 1
+  - uid: 136
+    components:
+    - type: Transform
+      pos: -4.5,-26.5
+      parent: 1
+  - uid: 137
+    components:
+    - type: Transform
+      pos: -4.5,-27.5
+      parent: 1
+  - uid: 138
+    components:
+    - type: Transform
+      pos: -5.5,-27.5
+      parent: 1
+  - uid: 139
+    components:
+    - type: Transform
+      pos: -6.5,-27.5
+      parent: 1
+  - uid: 140
+    components:
+    - type: Transform
+      pos: -6.5,-26.5
+      parent: 1
+  - uid: 141
+    components:
+    - type: Transform
+      pos: -6.5,-25.5
+      parent: 1
+  - uid: 142
+    components:
+    - type: Transform
+      pos: -6.5,-24.5
+      parent: 1
+  - uid: 143
+    components:
+    - type: Transform
+      pos: -6.5,-23.5
+      parent: 1
+  - uid: 144
+    components:
+    - type: Transform
+      pos: -6.5,-22.5
+      parent: 1
+  - uid: 145
+    components:
+    - type: Transform
+      pos: -2.5,-20.5
+      parent: 1
+  - uid: 146
+    components:
+    - type: Transform
+      pos: -1.5,-20.5
+      parent: 1
+  - uid: 147
+    components:
+    - type: Transform
+      pos: -0.5,-20.5
+      parent: 1
+  - uid: 148
+    components:
+    - type: Transform
+      pos: -0.5,-21.5
+      parent: 1
+  - uid: 149
+    components:
+    - type: Transform
+      pos: -0.5,-23.5
+      parent: 1
+  - uid: 150
+    components:
+    - type: Transform
+      pos: -0.5,-22.5
+      parent: 1
+  - uid: 151
+    components:
+    - type: Transform
+      pos: -0.5,-24.5
+      parent: 1
+  - uid: 152
+    components:
+    - type: Transform
+      pos: -0.5,-25.5
+      parent: 1
+  - uid: 153
+    components:
+    - type: Transform
+      pos: -0.5,-19.5
+      parent: 1
+  - uid: 154
+    components:
+    - type: Transform
+      pos: 0.5,-20.5
+      parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      pos: 1.5,-20.5
+      parent: 1
+  - uid: 156
+    components:
+    - type: Transform
+      pos: 2.5,-20.5
+      parent: 1
+  - uid: 157
+    components:
+    - type: Transform
+      pos: 3.5,-20.5
+      parent: 1
+  - uid: 158
+    components:
+    - type: Transform
+      pos: 4.5,-20.5
+      parent: 1
+  - uid: 159
+    components:
+    - type: Transform
+      pos: 3.5,-21.5
+      parent: 1
+  - uid: 160
+    components:
+    - type: Transform
+      pos: 3.5,-22.5
+      parent: 1
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 3.5,-23.5
+      parent: 1
+  - uid: 162
+    components:
+    - type: Transform
+      pos: 3.5,-24.5
+      parent: 1
+  - uid: 163
+    components:
+    - type: Transform
+      pos: 3.5,-25.5
+      parent: 1
+  - uid: 164
+    components:
+    - type: Transform
+      pos: 3.5,-26.5
+      parent: 1
+  - uid: 165
+    components:
+    - type: Transform
+      pos: 3.5,-27.5
+      parent: 1
+  - uid: 166
+    components:
+    - type: Transform
+      pos: 4.5,-27.5
+      parent: 1
+  - uid: 167
+    components:
+    - type: Transform
+      pos: 5.5,-27.5
+      parent: 1
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 5.5,-26.5
+      parent: 1
+  - uid: 169
+    components:
+    - type: Transform
+      pos: 5.5,-25.5
+      parent: 1
+  - uid: 170
+    components:
+    - type: Transform
+      pos: 5.5,-24.5
+      parent: 1
+  - uid: 171
+    components:
+    - type: Transform
+      pos: 5.5,-23.5
+      parent: 1
+  - uid: 172
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+  - uid: 173
+    components:
+    - type: Transform
+      pos: 1.5,-26.5
+      parent: 1
+  - uid: 174
+    components:
+    - type: Transform
+      pos: 1.5,-8.5
+      parent: 1
+  - uid: 175
+    components:
+    - type: Transform
+      pos: -0.5,-26.5
+      parent: 1
+  - uid: 176
+    components:
+    - type: Transform
+      pos: -1.5,-26.5
+      parent: 1
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 0.5,-26.5
+      parent: 1
+  - uid: 178
+    components:
+    - type: Transform
+      pos: -2.5,-26.5
+      parent: 1
+  - uid: 179
+    components:
+    - type: Transform
+      pos: -2.5,-27.5
+      parent: 1
+  - uid: 180
+    components:
+    - type: Transform
+      pos: 1.5,-27.5
+      parent: 1
+  - uid: 181
+    components:
+    - type: Transform
+      pos: -6.5,-28.5
+      parent: 1
+  - uid: 182
+    components:
+    - type: Transform
+      pos: -6.5,-29.5
+      parent: 1
+  - uid: 183
+    components:
+    - type: Transform
+      pos: -2.5,-28.5
+      parent: 1
+  - uid: 184
+    components:
+    - type: Transform
+      pos: -2.5,-29.5
+      parent: 1
+  - uid: 185
+    components:
+    - type: Transform
+      pos: -2.5,-30.5
+      parent: 1
+  - uid: 186
+    components:
+    - type: Transform
+      pos: -3.5,-30.5
+      parent: 1
+  - uid: 187
+    components:
+    - type: Transform
+      pos: -4.5,-30.5
+      parent: 1
+  - uid: 188
+    components:
+    - type: Transform
+      pos: -5.5,-30.5
+      parent: 1
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 1.5,-28.5
+      parent: 1
+  - uid: 190
+    components:
+    - type: Transform
+      pos: 1.5,-29.5
+      parent: 1
+  - uid: 191
+    components:
+    - type: Transform
+      pos: 1.5,-30.5
+      parent: 1
+  - uid: 192
+    components:
+    - type: Transform
+      pos: 2.5,-30.5
+      parent: 1
+  - uid: 193
+    components:
+    - type: Transform
+      pos: 3.5,-30.5
+      parent: 1
+  - uid: 194
+    components:
+    - type: Transform
+      pos: 4.5,-30.5
+      parent: 1
+  - uid: 195
+    components:
+    - type: Transform
+      pos: 5.5,-28.5
+      parent: 1
+  - uid: 196
+    components:
+    - type: Transform
+      pos: 5.5,-29.5
+      parent: 1
+- proto: CableHV
+  entities:
+  - uid: 197
+    components:
+    - type: Transform
+      pos: -2.5,-21.5
+      parent: 1
+  - uid: 198
+    components:
+    - type: Transform
+      pos: -4.5,-26.5
+      parent: 1
+  - uid: 199
+    components:
+    - type: Transform
+      pos: -4.5,-27.5
+      parent: 1
+  - uid: 200
+    components:
+    - type: Transform
+      pos: -5.5,-27.5
+      parent: 1
+  - uid: 201
+    components:
+    - type: Transform
+      pos: -6.5,-27.5
+      parent: 1
+  - uid: 202
+    components:
+    - type: Transform
+      pos: -5.5,-23.5
+      parent: 1
+  - uid: 203
+    components:
+    - type: Transform
+      pos: -5.5,-22.5
+      parent: 1
+  - uid: 204
+    components:
+    - type: Transform
+      pos: -5.5,-20.5
+      parent: 1
+  - uid: 205
+    components:
+    - type: Transform
+      pos: -4.5,-20.5
+      parent: 1
+  - uid: 206
+    components:
+    - type: Transform
+      pos: -5.5,-19.5
+      parent: 1
+  - uid: 207
+    components:
+    - type: Transform
+      pos: -4.5,-19.5
+      parent: 1
+  - uid: 208
+    components:
+    - type: Transform
+      pos: -3.5,-19.5
+      parent: 1
+  - uid: 209
+    components:
+    - type: Transform
+      pos: -5.5,-21.5
+      parent: 1
+  - uid: 210
+    components:
+    - type: Transform
+      pos: -6.5,-26.5
+      parent: 1
+  - uid: 211
+    components:
+    - type: Transform
+      pos: -6.5,-25.5
+      parent: 1
+  - uid: 212
+    components:
+    - type: Transform
+      pos: -6.5,-24.5
+      parent: 1
+  - uid: 213
+    components:
+    - type: Transform
+      pos: -4.5,-23.5
+      parent: 1
+  - uid: 214
+    components:
+    - type: Transform
+      pos: -2.5,-20.5
+      parent: 1
+  - uid: 215
+    components:
+    - type: Transform
+      pos: -2.5,-19.5
+      parent: 1
+  - uid: 216
+    components:
+    - type: Transform
+      pos: -4.5,-25.5
+      parent: 1
+  - uid: 217
+    components:
+    - type: Transform
+      pos: -6.5,-23.5
+      parent: 1
+  - uid: 218
+    components:
+    - type: Transform
+      pos: -6.5,-20.5
+      parent: 1
+  - uid: 219
+    components:
+    - type: Transform
+      pos: -4.5,-24.5
+      parent: 1
+  - uid: 220
+    components:
+    - type: Transform
+      pos: -5.5,-18.5
+      parent: 1
+  - uid: 221
+    components:
+    - type: Transform
+      pos: -4.5,-18.5
+      parent: 1
+  - uid: 222
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 1
+  - uid: 223
+    components:
+    - type: Transform
+      pos: -3.5,-21.5
+      parent: 1
+  - uid: 224
+    components:
+    - type: Transform
+      pos: -4.5,-21.5
+      parent: 1
+- proto: CableMV
+  entities:
+  - uid: 225
+    components:
+    - type: Transform
+      pos: -3.5,-19.5
+      parent: 1
+  - uid: 226
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 1
+  - uid: 227
+    components:
+    - type: Transform
+      pos: -3.5,-17.5
+      parent: 1
+  - uid: 228
+    components:
+    - type: Transform
+      pos: -3.5,-16.5
+      parent: 1
+  - uid: 229
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 1
+  - uid: 230
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+  - uid: 231
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 1
+  - uid: 232
+    components:
+    - type: Transform
+      pos: -0.5,-15.5
+      parent: 1
+  - uid: 233
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 234
+    components:
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+  - uid: 235
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+  - uid: 236
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 1
+  - uid: 237
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+  - uid: 238
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+  - uid: 239
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 240
+    components:
+    - type: Transform
+      pos: -3.5,-20.5
+      parent: 1
+  - uid: 241
+    components:
+    - type: Transform
+      pos: -3.5,-21.5
+      parent: 1
+  - uid: 242
+    components:
+    - type: Transform
+      pos: -4.5,-21.5
+      parent: 1
+  - uid: 243
+    components:
+    - type: Transform
+      pos: -4.5,-22.5
+      parent: 1
+  - uid: 244
+    components:
+    - type: Transform
+      pos: -4.5,-23.5
+      parent: 1
+  - uid: 245
+    components:
+    - type: Transform
+      pos: -4.5,-24.5
+      parent: 1
+  - uid: 246
+    components:
+    - type: Transform
+      pos: -4.5,-25.5
+      parent: 1
+  - uid: 247
+    components:
+    - type: Transform
+      pos: -4.5,-26.5
+      parent: 1
+  - uid: 248
+    components:
+    - type: Transform
+      pos: -4.5,-27.5
+      parent: 1
+  - uid: 249
+    components:
+    - type: Transform
+      pos: 1.5,-8.5
+      parent: 1
+  - uid: 250
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+- proto: CableTerminal
+  entities:
+  - uid: 251
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-20.5
+      parent: 1
+    - type: Physics
+      canCollide: False
+    - type: Fixtures
+      fixtures: {}
+  - uid: 252
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-20.5
+      parent: 1
+    - type: Physics
+      canCollide: False
+    - type: Fixtures
+      fixtures: {}
+- proto: Carpet
+  entities:
+  - uid: 253
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-5.5
+      parent: 1
+  - uid: 254
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-4.5
+      parent: 1
+- proto: Catwalk
+  entities:
+  - uid: 255
+    components:
+    - type: Transform
+      pos: -2.5,-26.5
+      parent: 1
+  - uid: 256
+    components:
+    - type: Transform
+      pos: -2.5,-28.5
+      parent: 1
+  - uid: 257
+    components:
+    - type: Transform
+      pos: -8.5,-16.5
+      parent: 1
+  - uid: 258
+    components:
+    - type: Transform
+      pos: -1.5,-16.5
+      parent: 1
+  - uid: 259
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 1
+  - uid: 260
+    components:
+    - type: Transform
+      pos: 4.5,-24.5
+      parent: 1
+  - uid: 261
+    components:
+    - type: Transform
+      pos: 5.5,-24.5
+      parent: 1
+  - uid: 262
+    components:
+    - type: Transform
+      pos: -6.5,-16.5
+      parent: 1
+  - uid: 263
+    components:
+    - type: Transform
+      pos: -7.5,-16.5
+      parent: 1
+  - uid: 264
+    components:
+    - type: Transform
+      pos: -4.5,-13.5
+      parent: 1
+  - uid: 265
+    components:
+    - type: Transform
+      pos: -4.5,-12.5
+      parent: 1
+  - uid: 266
+    components:
+    - type: Transform
+      pos: -4.5,-11.5
+      parent: 1
+  - uid: 267
+    components:
+    - type: Transform
+      pos: 3.5,-13.5
+      parent: 1
+  - uid: 268
+    components:
+    - type: Transform
+      pos: 3.5,-12.5
+      parent: 1
+  - uid: 269
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 1
+  - uid: 270
+    components:
+    - type: Transform
+      pos: 5.5,-16.5
+      parent: 1
+  - uid: 271
+    components:
+    - type: Transform
+      pos: 6.5,-16.5
+      parent: 1
+  - uid: 272
+    components:
+    - type: Transform
+      pos: -0.5,-24.5
+      parent: 1
+  - uid: 273
+    components:
+    - type: Transform
+      pos: -0.5,-23.5
+      parent: 1
+  - uid: 274
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+  - uid: 275
+    components:
+    - type: Transform
+      pos: 5.5,-9.5
+      parent: 1
+  - uid: 276
+    components:
+    - type: Transform
+      pos: 3.5,-9.5
+      parent: 1
+  - uid: 277
+    components:
+    - type: Transform
+      pos: 0.5,-16.5
+      parent: 1
+  - uid: 278
+    components:
+    - type: Transform
+      pos: 0.5,-26.5
+      parent: 1
+  - uid: 279
+    components:
+    - type: Transform
+      pos: 1.5,-27.5
+      parent: 1
+  - uid: 280
+    components:
+    - type: Transform
+      pos: -2.5,-27.5
+      parent: 1
+  - uid: 281
+    components:
+    - type: Transform
+      pos: -2.5,-29.5
+      parent: 1
+  - uid: 282
+    components:
+    - type: Transform
+      pos: 1.5,-26.5
+      parent: 1
+  - uid: 283
+    components:
+    - type: Transform
+      pos: 4.5,-9.5
+      parent: 1
+  - uid: 284
+    components:
+    - type: Transform
+      pos: -0.5,-26.5
+      parent: 1
+  - uid: 285
+    components:
+    - type: Transform
+      pos: 1.5,-28.5
+      parent: 1
+  - uid: 286
+    components:
+    - type: Transform
+      pos: 1.5,-29.5
+      parent: 1
+  - uid: 287
+    components:
+    - type: Transform
+      pos: -1.5,-26.5
+      parent: 1
+  - uid: 288
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 1
+  - uid: 289
+    components:
+    - type: Transform
+      pos: 1.5,-16.5
+      parent: 1
+  - uid: 290
+    components:
+    - type: Transform
+      pos: 2.5,-9.5
+      parent: 1
+  - uid: 291
+    components:
+    - type: Transform
+      pos: -6.5,-9.5
+      parent: 1
+  - uid: 292
+    components:
+    - type: Transform
+      pos: -5.5,-9.5
+      parent: 1
+  - uid: 293
+    components:
+    - type: Transform
+      pos: -4.5,-9.5
+      parent: 1
+  - uid: 294
+    components:
+    - type: Transform
+      pos: 7.5,-16.5
+      parent: 1
+  - uid: 295
+    components:
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+  - uid: 296
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+  - uid: 297
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 1
+- proto: Chair
+  entities:
+  - uid: 298
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-21.5
+      parent: 1
+  - uid: 299
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-21.5
+      parent: 1
+- proto: ChairOfficeDark
+  entities:
+  - uid: 300
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-3.5
+      parent: 1
+- proto: ChairPilotSeat
+  entities:
+  - uid: 301
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-21.5
+      parent: 1
+  - uid: 302
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-8.5
+      parent: 1
+  - uid: 303
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-9.5
+      parent: 1
+  - uid: 304
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-10.5
+      parent: 1
+  - uid: 305
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-8.5
+      parent: 1
+  - uid: 306
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-10.5
+      parent: 1
+  - uid: 307
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-9.5
+      parent: 1
+  - uid: 308
+    components:
+    - type: Transform
+      pos: -2.5,-15.5
+      parent: 1
+  - uid: 309
+    components:
+    - type: Transform
+      pos: -1.5,-15.5
+      parent: 1
+  - uid: 310
+    components:
+    - type: Transform
+      pos: 0.5,-15.5
+      parent: 1
+  - uid: 311
+    components:
+    - type: Transform
+      pos: 1.5,-15.5
+      parent: 1
+  - uid: 312
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-3.5
+      parent: 1
+- proto: CigPackSyndicate
+  entities:
+  - uid: 313
+    components:
+    - type: Transform
+      pos: -3.5658307,-17.516623
+      parent: 1
+- proto: ClothingBackpackDuffelSyndicateFilledMedical
+  entities:
+  - uid: 314
+    components:
+    - type: Transform
+      pos: -3.5044222,-6.293252
+      parent: 1
+- proto: ClothingHeadHatSyndie
+  entities:
+  - uid: 315
+    components:
+    - type: Transform
+      pos: -3.1200604,-17.289778
+      parent: 1
+- proto: ClothingHeadHatSyndieMAA
+  entities:
+  - uid: 35
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingHeadPyjamaSyndicateRed
+  entities:
+  - uid: 36
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingHeadsetAltSyndicate
+  entities:
+  - uid: 316
+    components:
+    - type: Transform
+      pos: 1.3157192,-13.513277
+      parent: 1
+- proto: ClothingMaskGasSyndicate
+  entities:
+  - uid: 317
+    components:
+    - type: Transform
+      pos: 0.94071925,-13.482027
+      parent: 1
+- proto: ClothingNeckMantleHOS
+  entities:
+  - uid: 37
+    components:
+    - type: MetaData
+      desc: Looted from a fallen enemy, the commander earned this in battle.
+      name: commander mantle
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingOuterCoatSyndieCap
+  entities:
+  - uid: 38
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingUniformJumpskirtSyndieFormalDress
+  entities:
+  - uid: 39
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingUniformJumpsuitPyjamaSyndicateRed
+  entities:
+  - uid: 40
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ClothingUniformJumpsuitSyndieFormal
+  entities:
+  - uid: 41
+    components:
+    - type: Transform
+      parent: 33
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: ComfyChair
+  entities:
+  - uid: 318
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-4.5
+      parent: 1
+- proto: computerBodyScanner
+  entities:
+  - uid: 319
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-5.5
+      parent: 1
+- proto: ComputerIFFSyndicate
+  entities:
+  - uid: 320
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-3.5
+      parent: 1
+- proto: ComputerPowerMonitoring
+  entities:
+  - uid: 321
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-21.5
+      parent: 1
+- proto: ComputerRadar
+  entities:
+  - uid: 322
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+- proto: ComputerShuttleSyndie
+  entities:
+  - uid: 323
+    components:
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 1
+- proto: CrowbarRed
+  entities:
+  - uid: 324
+    components:
+    - type: Transform
+      pos: -3.492848,-22.485775
+      parent: 1
+- proto: DisposalBend
+  entities:
+  - uid: 325
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-6.5
+      parent: 1
+- proto: DisposalJunction
+  entities:
+  - uid: 326
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-19.5
+      parent: 1
+- proto: DisposalPipe
+  entities:
+  - uid: 327
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-6.5
+      parent: 1
+  - uid: 328
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-19.5
+      parent: 1
+  - uid: 329
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-19.5
+      parent: 1
+  - uid: 330
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-19.5
+      parent: 1
+  - uid: 331
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-19.5
+      parent: 1
+  - uid: 332
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-19.5
+      parent: 1
+  - uid: 333
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-19.5
+      parent: 1
+  - uid: 334
+    components:
+    - type: Transform
+      pos: -0.5,-18.5
+      parent: 1
+  - uid: 335
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 1
+  - uid: 336
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+  - uid: 337
+    components:
+    - type: Transform
+      pos: -0.5,-15.5
+      parent: 1
+  - uid: 338
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+  - uid: 339
+    components:
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+  - uid: 340
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+  - uid: 341
+    components:
+    - type: Transform
+      pos: -0.5,-11.5
+      parent: 1
+  - uid: 342
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+  - uid: 343
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+  - uid: 344
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 345
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 1
+- proto: DisposalTrunk
+  entities:
+  - uid: 346
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-6.5
+      parent: 1
+  - uid: 347
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-19.5
+      parent: 1
+  - uid: 348
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-19.5
+      parent: 1
+- proto: DisposalUnit
+  entities:
+  - uid: 349
+    components:
+    - type: Transform
+      pos: 1.5,-6.5
+      parent: 1
+  - uid: 350
+    components:
+    - type: Transform
+      pos: 0.5,-19.5
+      parent: 1
+- proto: DoubleEmergencyOxygenTankFilled
+  entities:
+  - uid: 351
+    components:
+    - type: Transform
+      pos: -1.6924903,-23.407444
+      parent: 1
+  - uid: 352
+    components:
+    - type: Transform
+      pos: -1.4112403,-23.458082
+      parent: 1
+  - uid: 353
+    components:
+    - type: Transform
+      pos: 5.390987,-17.346693
+      parent: 1
+  - uid: 354
+    components:
+    - type: Transform
+      pos: -6.6334953,-17.346693
+      parent: 1
+- proto: DrinkGlass
+  entities:
+  - uid: 355
+    components:
+    - type: Transform
+      pos: 2.0779252,-19.21155
+      parent: 1
+  - uid: 356
+    components:
+    - type: Transform
+      pos: 2.3123002,-19.21155
+      parent: 1
+- proto: DrinkMugDog
+  entities:
+  - uid: 357
+    components:
+    - type: Transform
+      pos: 2.2843437,-19.542192
+      parent: 1
+- proto: DrinkMugMetal
+  entities:
+  - uid: 358
+    components:
+    - type: Transform
+      pos: 2.0968437,-19.526567
+      parent: 1
+- proto: DrinkMugRed
+  entities:
+  - uid: 359
+    components:
+    - type: Transform
+      pos: 1.9918958,-17.588755
+      parent: 1
+- proto: DrinkVacuumFlask
+  entities:
+  - uid: 360
+    components:
+    - type: Transform
+      pos: 5.6435027,-21.180143
+      parent: 1
+  - uid: 361
+    components:
+    - type: Transform
+      pos: 5.7372527,-21.398893
+      parent: 1
+- proto: ExtendedEmergencyOxygenTankFilled
+  entities:
+  - uid: 362
+    components:
+    - type: Transform
+      pos: -5.678572,-12.319441
+      parent: 1
+  - uid: 363
+    components:
+    - type: Transform
+      pos: 4.305803,-12.272566
+      parent: 1
+- proto: FireAxeFlaming
+  entities:
+  - uid: 23
+    components:
+    - type: Transform
+      pos: -1.5018963,-3.4569345
+      parent: 1
+- proto: FoodBoxDonkpocketPizza
+  entities:
+  - uid: 364
+    components:
+    - type: Transform
+      pos: 2.7185502,-19.320925
+      parent: 1
+- proto: FoodBoxDonut
+  entities:
+  - uid: 365
+    components:
+    - type: Transform
+      pos: 5.5401826,-21.187487
+      parent: 1
+- proto: FoodPizzaDonkpocket
+  entities:
+  - uid: 366
+    components:
+    - type: Transform
+      pos: 1.4776825,-21.296862
+      parent: 1
+- proto: FoodSnackSyndi
+  entities:
+  - uid: 367
+    components:
+    - type: Transform
+      pos: 1.5361897,-17.367903
+      parent: 1
+- proto: GasMinerNitrogen
+  entities:
+  - uid: 368
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-27.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: GasMinerOxygen
+  entities:
+  - uid: 369
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-27.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: GasMixer
+  entities:
+  - uid: 370
+    components:
+    - type: MetaData
+      name: O2+N2 mixer
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-24.5
+      parent: 1
+    - type: GasMixer
+      inletTwoConcentration: 0.78
+      inletOneConcentration: 0.22
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+- proto: GasPassiveVent
+  entities:
+  - uid: 371
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-26.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 372
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-26.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+  - uid: 373
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-19.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: GasPipeBend
+  entities:
+  - uid: 374
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 375
+    components:
+    - type: Transform
+      pos: 5.5,-24.5
+      parent: 1
+  - uid: 376
+    components:
+    - type: Transform
+      pos: 3.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 377
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 378
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 379
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 380
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 381
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 382
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 383
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPipeFourway
+  entities:
+  - uid: 384
+    components:
+    - type: Transform
+      pos: 3.5,-23.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 385
+    components:
+    - type: Transform
+      pos: -0.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 386
+    components:
+    - type: Transform
+      pos: -0.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 387
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPipeStraight
+  entities:
+  - uid: 388
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-25.5
+      parent: 1
+  - uid: 389
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-25.5
+      parent: 1
+  - uid: 390
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-24.5
+      parent: 1
+  - uid: 391
+    components:
+    - type: Transform
+      pos: 3.5,-22.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 392
+    components:
+    - type: Transform
+      pos: 3.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 393
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 394
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 395
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 396
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 397
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 398
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 399
+    components:
+    - type: Transform
+      pos: -0.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 400
+    components:
+    - type: Transform
+      pos: -0.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 401
+    components:
+    - type: Transform
+      pos: -0.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 402
+    components:
+    - type: Transform
+      pos: -0.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 403
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 404
+    components:
+    - type: Transform
+      pos: -0.5,-13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 405
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 406
+    components:
+    - type: Transform
+      pos: -0.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 407
+    components:
+    - type: Transform
+      pos: -0.5,-9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 408
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 409
+    components:
+    - type: Transform
+      pos: -0.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 410
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 411
+    components:
+    - type: Transform
+      pos: 0.5,-18.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 412
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 413
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 414
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 415
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 416
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 417
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 418
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-19.5
+      parent: 1
+  - uid: 419
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 420
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 421
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 422
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 423
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 424
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 425
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 426
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 427
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-17.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 428
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-16.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 429
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-15.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 430
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 431
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 432
+    components:
+    - type: Transform
+      pos: 0.5,-11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 433
+    components:
+    - type: Transform
+      pos: 0.5,-10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 434
+    components:
+    - type: Transform
+      pos: 0.5,-9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 435
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 436
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 437
+    components:
+    - type: Transform
+      pos: 0.5,-20.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 438
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 439
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 440
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-21.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 441
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 442
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+- proto: GasPipeTJunction
+  entities:
+  - uid: 443
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 444
+    components:
+    - type: Transform
+      pos: 2.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 445
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-19.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 446
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasPort
+  entities:
+  - uid: 447
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-23.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+- proto: GasPressurePump
+  entities:
+  - uid: 448
+    components:
+    - type: MetaData
+      name: waste pump
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-19.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GasVentPump
+  entities:
+  - uid: 449
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-11.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 450
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-21.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 451
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-23.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 452
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-21.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 453
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-16.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 454
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-16.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+  - uid: 455
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#0335FCFF'
+- proto: GasVentScrubber
+  entities:
+  - uid: 456
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-12.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 457
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-17.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 458
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-20.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 459
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-17.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 460
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-21.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+  - uid: 461
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+    - type: AtmosPipeColor
+      color: '#FF1212FF'
+- proto: GeneratorBasic15kW
+  entities:
+  - uid: 462
+    components:
+    - type: Transform
+      pos: -4.5,-26.5
+      parent: 1
+  - uid: 463
+    components:
+    - type: Transform
+      pos: -4.5,-25.5
+      parent: 1
+  - uid: 464
+    components:
+    - type: Transform
+      pos: -4.5,-24.5
+      parent: 1
+  - uid: 465
+    components:
+    - type: Transform
+      pos: -6.5,-24.5
+      parent: 1
+  - uid: 466
+    components:
+    - type: Transform
+      pos: -6.5,-25.5
+      parent: 1
+  - uid: 467
+    components:
+    - type: Transform
+      pos: -6.5,-26.5
+      parent: 1
+- proto: GeneratorWallmountAPU
+  entities:
+  - uid: 468
+    components:
+    - type: Transform
+      pos: -6.5,-20.5
+      parent: 1
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 469
+    components:
+    - type: Transform
+      pos: -5.5,-22.5
+      parent: 1
+- proto: Grille
+  entities:
+  - uid: 470
+    components:
+    - type: Transform
+      pos: 2.5,-12.5
+      parent: 1
+  - uid: 471
+    components:
+    - type: Transform
+      pos: -3.5,-12.5
+      parent: 1
+  - uid: 472
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-7.5
+      parent: 1
+  - uid: 473
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 1
+  - uid: 474
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+  - uid: 475
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 1
+  - uid: 476
+    components:
+    - type: Transform
+      pos: -6.5,-4.5
+      parent: 1
+  - uid: 477
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 478
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 1
+  - uid: 479
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+  - uid: 480
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 481
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 482
+    components:
+    - type: Transform
+      pos: -2.5,-9.5
+      parent: 1
+  - uid: 483
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 484
+    components:
+    - type: Transform
+      pos: -2.5,-21.5
+      parent: 1
+  - uid: 485
+    components:
+    - type: Transform
+      pos: -2.5,-19.5
+      parent: 1
+  - uid: 486
+    components:
+    - type: Transform
+      pos: 2.5,-22.5
+      parent: 1
+  - uid: 487
+    components:
+    - type: Transform
+      pos: 4.5,-22.5
+      parent: 1
+  - uid: 488
+    components:
+    - type: Transform
+      pos: -1.5,-18.5
+      parent: 1
+  - uid: 489
+    components:
+    - type: Transform
+      pos: 0.5,-7.5
+      parent: 1
+  - uid: 490
+    components:
+    - type: Transform
+      pos: 3.5,-25.5
+      parent: 1
+  - uid: 491
+    components:
+    - type: Transform
+      pos: 5.5,-25.5
+      parent: 1
+  - uid: 492
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-19.5
+      parent: 1
+  - uid: 493
+    components:
+    - type: Transform
+      pos: 0.5,-18.5
+      parent: 1
+- proto: Gyroscope
+  entities:
+  - uid: 494
+    components:
+    - type: Transform
+      pos: -5.5,-13.5
+      parent: 1
+  - uid: 495
+    components:
+    - type: Transform
+      pos: 4.5,-13.5
+      parent: 1
+- proto: HospitalCurtainsOpen
+  entities:
+  - uid: 496
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+- proto: KitchenMicrowave
+  entities:
+  - uid: 497
+    components:
+    - type: Transform
+      pos: 3.5,-19.5
+      parent: 1
+- proto: KnifePlastic
+  entities:
+  - uid: 498
+    components:
+    - type: Transform
+      pos: 5.3509636,-21.445768
+      parent: 1
+- proto: Lamp
+  entities:
+  - uid: 499
+    components:
+    - type: Transform
+      pos: -1.483297,-2.2444057
+      parent: 1
+- proto: LockerSyndicatePersonal
+  entities:
+  - uid: 33
+    components:
+    - type: Transform
+      pos: 4.5,-5.5
+      parent: 1
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.1496
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 37
+          - 39
+          - 36
+          - 40
+          - 41
+          - 38
+          - 35
+          - 34
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+- proto: MedicalBed
+  entities:
+  - uid: 500
+    components:
+    - type: Transform
+      pos: -4.5,-3.5
+      parent: 1
+- proto: MedkitCombatFilled
+  entities:
+  - uid: 501
+    components:
+    - type: Transform
+      pos: -3.401462,-3.5350046
+      parent: 1
+  - uid: 502
+    components:
+    - type: Transform
+      pos: -3.557712,-3.4256296
+      parent: 1
+- proto: Mirror
+  entities:
+  - uid: 503
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+- proto: Multitool
+  entities:
+  - uid: 504
+    components:
+    - type: Transform
+      pos: -3.383473,-22.548275
+      parent: 1
+- proto: NitrogenTankFilled
+  entities:
+  - uid: 505
+    components:
+    - type: Transform
+      pos: 4.633928,-12.616316
+      parent: 1
+  - uid: 506
+    components:
+    - type: Transform
+      pos: -5.397322,-12.569441
+      parent: 1
+  - uid: 507
+    components:
+    - type: Transform
+      pos: -6.3522453,-17.549818
+      parent: 1
+  - uid: 508
+    components:
+    - type: Transform
+      pos: 5.6633797,-17.565443
+      parent: 1
+- proto: NuclearBombUnanchored
+  entities:
+  - uid: 509
+    components:
+    - type: Transform
+      pos: -2.5,-12.5
+      parent: 1
+- proto: NukeCodePaper
+  entities:
+  - uid: 510
+    components:
+    - type: Transform
+      pos: -2.5286522,-11.44479
+      parent: 1
+- proto: Ointment
+  entities:
+  - uid: 511
+    components:
+    - type: Transform
+      pos: -3.651462,-4.5193796
+      parent: 1
+  - uid: 512
+    components:
+    - type: Transform
+      pos: -3.667087,-4.2225046
+      parent: 1
+- proto: OperatingTable
+  entities:
+  - uid: 513
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 1
+- proto: OxygenCanister
+  entities:
+  - uid: 514
+    components:
+    - type: Transform
+      pos: -1.5,-24.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: OxygenTankFilled
+  entities:
+  - uid: 515
+    components:
+    - type: Transform
+      pos: -5.600447,-12.569441
+      parent: 1
+  - uid: 516
+    components:
+    - type: Transform
+      pos: 4.399553,-12.522566
+      parent: 1
+  - uid: 517
+    components:
+    - type: Transform
+      pos: 5.5227547,-17.440443
+      parent: 1
+  - uid: 518
+    components:
+    - type: Transform
+      pos: -6.4928703,-17.440443
+      parent: 1
+- proto: PinpointerNuclear
+  entities:
+  - uid: 519
+    components:
+    - type: Transform
+      pos: -2.4942985,-13.37949
+      parent: 1
+- proto: PlasmaReinforcedWindowDirectional
+  entities:
+  - uid: 520
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-4.5
+      parent: 1
+  - uid: 521
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-6.5
+      parent: 1
+  - uid: 522
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-3.5
+      parent: 1
+- proto: PlushieNuke
+  entities:
+  - uid: 523
+    components:
+    - type: Transform
+      pos: -2.4227936,-2.3320491
+      parent: 1
+- proto: PosterContrabandC20r
+  entities:
+  - uid: 524
+    components:
+    - type: Transform
+      pos: 1.5,-14.5
+      parent: 1
+- proto: PosterContrabandCC64KAd
+  entities:
+  - uid: 525
+    components:
+    - type: Transform
+      pos: -5.5,-18.5
+      parent: 1
+- proto: PosterContrabandCybersun600
+  entities:
+  - uid: 526
+    components:
+    - type: Transform
+      pos: 2.5,-6.5
+      parent: 1
+- proto: PosterContrabandDonk
+  entities:
+  - uid: 527
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-18.5
+      parent: 1
+- proto: PosterContrabandDonutCorp
+  entities:
+  - uid: 528
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-22.5
+      parent: 1
+- proto: PosterContrabandEnergySwords
+  entities:
+  - uid: 529
+    components:
+    - type: Transform
+      pos: 2.5,-18.5
+      parent: 1
+- proto: PosterContrabandEnlistGorlex
+  entities:
+  - uid: 530
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-13.5
+      parent: 1
+- proto: PosterContrabandFreeSyndicateEncryptionKey
+  entities:
+  - uid: 531
+    components:
+    - type: Transform
+      pos: -2.5,-8.5
+      parent: 1
+- proto: PosterContrabandInterdyne
+  entities:
+  - uid: 532
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-6.5
+      parent: 1
+- proto: PosterContrabandKosmicheskayaStantsiya
+  entities:
+  - uid: 533
+    components:
+    - type: Transform
+      pos: -2.5,-22.5
+      parent: 1
+- proto: PosterContrabandMoth
+  entities:
+  - uid: 534
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 1
+  - uid: 535
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 1
+- proto: PosterContrabandNuclearDeviceInformational
+  entities:
+  - uid: 536
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-13.5
+      parent: 1
+  - uid: 537
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 1
+- proto: PosterContrabandSyndicatePistol
+  entities:
+  - uid: 538
+    components:
+    - type: Transform
+      pos: 1.5,-10.5
+      parent: 1
+- proto: PosterContrabandSyndicateRecruitment
+  entities:
+  - uid: 539
+    components:
+    - type: Transform
+      pos: -1.5,-14.5
+      parent: 1
+- proto: PosterContrabandWaffleCorp
+  entities:
+  - uid: 540
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-23.5
+      parent: 1
+- proto: Poweredlight
+  entities:
+  - uid: 541
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-8.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 542
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-4.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 543
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-23.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 544
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-26.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 545
+    components:
+    - type: Transform
+      pos: -4.5,-19.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 546
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-13.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 547
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-27.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 548
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-27.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 549
+    components:
+    - type: Transform
+      pos: 2.5,-15.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 550
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 551
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-5.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 552
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 553
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-6.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+- proto: PoweredSmallLight
+  entities:
+  - uid: 554
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-13.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 555
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-21.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 556
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-5.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 557
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-24.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 558
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-13.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 559
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-24.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 560
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 1
+  - uid: 561
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 562
+    components:
+    - type: Transform
+      pos: 2.5,-19.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 563
+    components:
+    - type: Transform
+      pos: -1.5,-26.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 564
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-9.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+  - uid: 565
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-9.5
+      parent: 1
+    - type: ApcPowerReceiver
+      powerLoad: 0
+- proto: Rack
+  entities:
+  - uid: 566
+    components:
+    - type: Transform
+      pos: -3.5,-22.5
+      parent: 1
+  - uid: 567
+    components:
+    - type: Transform
+      pos: 5.5,-23.5
+      parent: 1
+  - uid: 568
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-12.5
+      parent: 1
+  - uid: 569
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-12.5
+      parent: 1
+  - uid: 570
+    components:
+    - type: Transform
+      pos: -1.5,-23.5
+      parent: 1
+  - uid: 571
+    components:
+    - type: Transform
+      pos: -6.5,-17.5
+      parent: 1
+  - uid: 572
+    components:
+    - type: Transform
+      pos: 5.5,-17.5
+      parent: 1
+- proto: ReinforcedPlasmaWindow
+  entities:
+  - uid: 573
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 574
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-19.5
+      parent: 1
+  - uid: 575
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+  - uid: 576
+    components:
+    - type: Transform
+      pos: -6.5,-4.5
+      parent: 1
+  - uid: 577
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 1
+  - uid: 578
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 1
+  - uid: 579
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+  - uid: 580
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 1
+  - uid: 581
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 582
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 583
+    components:
+    - type: Transform
+      pos: -1.5,-7.5
+      parent: 1
+  - uid: 584
+    components:
+    - type: Transform
+      pos: 4.5,-22.5
+      parent: 1
+  - uid: 585
+    components:
+    - type: Transform
+      pos: 2.5,-22.5
+      parent: 1
+  - uid: 586
+    components:
+    - type: Transform
+      pos: -2.5,-21.5
+      parent: 1
+  - uid: 587
+    components:
+    - type: Transform
+      pos: -2.5,-19.5
+      parent: 1
+  - uid: 588
+    components:
+    - type: Transform
+      pos: -2.5,-9.5
+      parent: 1
+  - uid: 589
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 1
+  - uid: 590
+    components:
+    - type: Transform
+      pos: 0.5,-18.5
+      parent: 1
+  - uid: 591
+    components:
+    - type: Transform
+      pos: 3.5,-25.5
+      parent: 1
+  - uid: 592
+    components:
+    - type: Transform
+      pos: 5.5,-25.5
+      parent: 1
+  - uid: 593
+    components:
+    - type: Transform
+      pos: 2.5,-12.5
+      parent: 1
+  - uid: 594
+    components:
+    - type: Transform
+      pos: -3.5,-12.5
+      parent: 1
+  - uid: 595
+    components:
+    - type: Transform
+      pos: 0.5,-7.5
+      parent: 1
+  - uid: 596
+    components:
+    - type: Transform
+      pos: -1.5,-18.5
+      parent: 1
+- proto: ShuttersNormalOpen
+  entities:
+  - uid: 597
+    components:
+    - type: Transform
+      pos: -6.5,-4.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+  - uid: 598
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 20
+  - uid: 599
+    components:
+    - type: Transform
+      pos: 1.5,-9.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 609
+  - uid: 600
+    components:
+    - type: Transform
+      pos: -2.5,-9.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 609
+  - uid: 601
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+  - uid: 602
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 20
+  - uid: 603
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+  - uid: 604
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+  - uid: 605
+    components:
+    - type: Transform
+      pos: 5.5,-19.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 611
+  - uid: 606
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+  - uid: 607
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+  - uid: 608
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 21
+- proto: SignalButton
+  entities:
+  - uid: 609
+    components:
+    - type: Transform
+      pos: -2.5,-10.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        600:
+        - Pressed: Toggle
+        599:
+        - Pressed: Toggle
+  - uid: 611
+    components:
+    - type: Transform
+      pos: 5.5,-20.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        605:
+        - Pressed: Toggle
+- proto: SignalButtonDirectional
+  entities:
+  - uid: 20
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-4.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        602:
+        - Pressed: Toggle
+        598:
+        - Pressed: Toggle
+  - uid: 21
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-7.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        597:
+        - Pressed: Toggle
+        601:
+        - Pressed: Toggle
+        608:
+        - Pressed: Toggle
+        606:
+        - Pressed: Toggle
+        604:
+        - Pressed: Toggle
+        607:
+        - Pressed: Toggle
+        603:
+        - Pressed: Toggle
+- proto: SignDirectionalEvac
+  entities:
+  - uid: 613
+    components:
+    - type: Transform
+      pos: 0.5,-22.5
+      parent: 1
+  - uid: 614
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-15.5
+      parent: 1
+  - uid: 615
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-14.5
+      parent: 1
+  - uid: 616
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-14.5
+      parent: 1
+  - uid: 617
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-15.5
+      parent: 1
+- proto: SignElectricalMed
+  entities:
+  - uid: 618
+    components:
+    - type: Transform
+      pos: -2.5,-18.5
+      parent: 1
+- proto: SignNosmoking
+  entities:
+  - uid: 619
+    components:
+    - type: Transform
+      pos: 5.5,-22.5
+      parent: 1
+- proto: SignSecureSmallRed
+  entities:
+  - uid: 620
+    components:
+    - type: Transform
+      pos: -3.5,-11.5
+      parent: 1
+  - uid: 621
+    components:
+    - type: Transform
+      pos: 4.5,-17.5
+      parent: 1
+  - uid: 622
+    components:
+    - type: Transform
+      pos: 2.5,-11.5
+      parent: 1
+- proto: SMESBasic
+  entities:
+  - uid: 623
+    components:
+    - type: Transform
+      pos: -5.5,-19.5
+      parent: 1
+  - uid: 624
+    components:
+    - type: Transform
+      pos: -4.5,-19.5
+      parent: 1
+- proto: SoapSyndie
+  entities:
+  - uid: 625
+    components:
+    - type: Transform
+      pos: 2.4424396,-17.430403
+      parent: 1
+- proto: soda_dispenser
+  entities:
+  - uid: 626
+    components:
+    - type: Transform
+      pos: 1.5,-19.5
+      parent: 1
+- proto: StorageCanister
+  entities:
+  - uid: 627
+    components:
+    - type: Transform
+      pos: 2.5,-23.5
+      parent: 1
+    - type: AtmosDevice
+      joinedGrid: 1
+- proto: SubstationBasic
+  entities:
+  - uid: 628
+    components:
+    - type: Transform
+      pos: -3.5,-19.5
+      parent: 1
+- proto: SuitStorageEVASyndicate
+  entities:
+  - uid: 629
+    components:
+    - type: Transform
+      pos: 0.5,-24.5
+      parent: 1
+  - uid: 630
+    components:
+    - type: Transform
+      pos: 0.5,-23.5
+      parent: 1
+  - uid: 631
+    components:
+    - type: Transform
+      pos: 3.5,-17.5
+      parent: 1
+  - uid: 632
+    components:
+    - type: Transform
+      pos: -4.5,-17.5
+      parent: 1
+- proto: SyndieMiniBomb
+  entities:
+  - uid: 633
+    components:
+    - type: Transform
+      pos: 1.4127003,-11.973867
+      parent: 1
+  - uid: 634
+    components:
+    - type: Transform
+      pos: 1.6939503,-11.973867
+      parent: 1
+- proto: SyringeInaprovaline
+  entities:
+  - uid: 635
+    components:
+    - type: Transform
+      pos: -3.510837,-4.3787546
+      parent: 1
+  - uid: 636
+    components:
+    - type: Transform
+      pos: -3.510837,-4.0193796
+      parent: 1
+- proto: Table
+  entities:
+  - uid: 637
+    components:
+    - type: Transform
+      pos: 5.5,-21.5
+      parent: 1
+  - uid: 638
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-21.5
+      parent: 1
+  - uid: 639
+    components:
+    - type: Transform
+      pos: 3.5,-19.5
+      parent: 1
+  - uid: 640
+    components:
+    - type: Transform
+      pos: 2.5,-19.5
+      parent: 1
+  - uid: 641
+    components:
+    - type: Transform
+      pos: 1.5,-19.5
+      parent: 1
+- proto: TablePlasmaGlass
+  entities:
+  - uid: 642
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 1
+  - uid: 643
+    components:
+    - type: Transform
+      pos: -3.5,-6.5
+      parent: 1
+  - uid: 644
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 1
+- proto: TableReinforced
+  entities:
+  - uid: 645
+    components:
+    - type: Transform
+      pos: -2.5,-11.5
+      parent: 1
+  - uid: 646
+    components:
+    - type: Transform
+      pos: -2.5,-13.5
+      parent: 1
+  - uid: 647
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 1
+  - uid: 648
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 1
+  - uid: 649
+    components:
+    - type: Transform
+      pos: 0.5,-13.5
+      parent: 1
+  - uid: 650
+    components:
+    - type: Transform
+      pos: 1.5,-13.5
+      parent: 1
+  - uid: 651
+    components:
+    - type: Transform
+      pos: 1.5,-12.5
+      parent: 1
+  - uid: 652
+    components:
+    - type: Transform
+      pos: 1.5,-11.5
+      parent: 1
+  - uid: 653
+    components:
+    - type: Transform
+      pos: 2.5,-17.5
+      parent: 1
+  - uid: 654
+    components:
+    - type: Transform
+      pos: 1.5,-17.5
+      parent: 1
+  - uid: 655
+    components:
+    - type: Transform
+      pos: -2.5,-17.5
+      parent: 1
+  - uid: 656
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 657
+    components:
+    - type: Transform
+      pos: -3.5,-17.5
+      parent: 1
+  - uid: 658
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-2.5
+      parent: 1
+- proto: Thruster
+  entities:
+  - uid: 659
+    components:
+    - type: Transform
+      pos: -6.5,-2.5
+      parent: 1
+  - uid: 660
+    components:
+    - type: Transform
+      pos: 5.5,-2.5
+      parent: 1
+  - uid: 661
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-7.5
+      parent: 1
+  - uid: 662
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-7.5
+      parent: 1
+  - uid: 663
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-13.5
+      parent: 1
+  - uid: 664
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-13.5
+      parent: 1
+  - uid: 665
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-30.5
+      parent: 1
+  - uid: 666
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-30.5
+      parent: 1
+  - uid: 667
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-30.5
+      parent: 1
+  - uid: 668
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-30.5
+      parent: 1
+- proto: ToolboxSyndicate
+  entities:
+  - uid: 669
+    components:
+    - type: Transform
+      pos: -2.5731854,-17.414778
+      parent: 1
+- proto: ToolboxSyndicateFilled
+  entities:
+  - uid: 670
+    components:
+    - type: Transform
+      pos: 1.5034143,-11.298322
+      parent: 1
+- proto: VendingMachineTankDispenserEVA
+  entities:
+  - uid: 671
+    components:
+    - type: Transform
+      pos: 5.5,-15.5
+      parent: 1
+  - uid: 672
+    components:
+    - type: MetaData
+      name: tank dispenser
+    - type: Transform
+      pos: 2.5,-24.5
+      parent: 1
+  - uid: 673
+    components:
+    - type: Transform
+      pos: -6.5,-15.5
+      parent: 1
+- proto: VendingMachineYouTool
+  entities:
+  - uid: 674
+    components:
+    - type: Transform
+      pos: -3.5,-24.5
+      parent: 1
+- proto: WallPlastitanium
+  entities:
+  - uid: 11
+    components:
+    - type: Transform
+      pos: -1.5,-25.5
+      parent: 1
+  - uid: 675
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 676
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 677
+    components:
+    - type: Transform
+      pos: -3.5,-11.5
+      parent: 1
+  - uid: 678
+    components:
+    - type: Transform
+      pos: 2.5,-14.5
+      parent: 1
+  - uid: 679
+    components:
+    - type: Transform
+      pos: 4.5,-14.5
+      parent: 1
+  - uid: 680
+    components:
+    - type: Transform
+      pos: -2.5,-14.5
+      parent: 1
+  - uid: 681
+    components:
+    - type: Transform
+      pos: 2.5,-18.5
+      parent: 1
+  - uid: 682
+    components:
+    - type: Transform
+      pos: 1.5,-25.5
+      parent: 1
+  - uid: 683
+    components:
+    - type: Transform
+      pos: 1.5,-18.5
+      parent: 1
+  - uid: 684
+    components:
+    - type: Transform
+      pos: 7.5,-17.5
+      parent: 1
+  - uid: 685
+    components:
+    - type: Transform
+      pos: -3.5,-26.5
+      parent: 1
+  - uid: 686
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-7.5
+      parent: 1
+  - uid: 687
+    components:
+    - type: Transform
+      pos: 2.5,-13.5
+      parent: 1
+  - uid: 688
+    components:
+    - type: Transform
+      pos: -3.5,-28.5
+      parent: 1
+  - uid: 689
+    components:
+    - type: Transform
+      pos: 2.5,-10.5
+      parent: 1
+  - uid: 690
+    components:
+    - type: Transform
+      pos: 4.5,-18.5
+      parent: 1
+  - uid: 691
+    components:
+    - type: Transform
+      pos: -2.5,-10.5
+      parent: 1
+  - uid: 692
+    components:
+    - type: Transform
+      pos: -3.5,-10.5
+      parent: 1
+  - uid: 693
+    components:
+    - type: Transform
+      pos: -6.5,-11.5
+      parent: 1
+  - uid: 694
+    components:
+    - type: Transform
+      pos: 4.5,-10.5
+      parent: 1
+  - uid: 695
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 1
+  - uid: 696
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-7.5
+      parent: 1
+  - uid: 697
+    components:
+    - type: Transform
+      pos: -6.5,-6.5
+      parent: 1
+  - uid: 698
+    components:
+    - type: Transform
+      pos: -5.5,-6.5
+      parent: 1
+  - uid: 699
+    components:
+    - type: Transform
+      pos: 4.5,-6.5
+      parent: 1
+  - uid: 700
+    components:
+    - type: Transform
+      pos: -6.5,-5.5
+      parent: 1
+  - uid: 701
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-8.5
+      parent: 1
+  - uid: 702
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-7.5
+      parent: 1
+  - uid: 703
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-8.5
+      parent: 1
+  - uid: 704
+    components:
+    - type: Transform
+      pos: 2.5,-11.5
+      parent: 1
+  - uid: 705
+    components:
+    - type: Transform
+      pos: 5.5,-18.5
+      parent: 1
+  - uid: 706
+    components:
+    - type: Transform
+      pos: -8.5,-15.5
+      parent: 1
+  - uid: 707
+    components:
+    - type: Transform
+      pos: -8.5,-17.5
+      parent: 1
+  - uid: 708
+    components:
+    - type: Transform
+      pos: -7.5,-17.5
+      parent: 1
+  - uid: 709
+    components:
+    - type: Transform
+      pos: -5.5,-10.5
+      parent: 1
+  - uid: 710
+    components:
+    - type: Transform
+      pos: -3.5,-13.5
+      parent: 1
+  - uid: 711
+    components:
+    - type: Transform
+      pos: 3.5,-18.5
+      parent: 1
+  - uid: 712
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-6.5
+      parent: 1
+  - uid: 713
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-7.5
+      parent: 1
+  - uid: 714
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-8.5
+      parent: 1
+  - uid: 715
+    components:
+    - type: Transform
+      pos: 5.5,-14.5
+      parent: 1
+  - uid: 716
+    components:
+    - type: Transform
+      pos: 7.5,-15.5
+      parent: 1
+  - uid: 717
+    components:
+    - type: Transform
+      pos: -6.5,-19.5
+      parent: 1
+  - uid: 718
+    components:
+    - type: Transform
+      pos: -6.5,-18.5
+      parent: 1
+  - uid: 719
+    components:
+    - type: Transform
+      pos: -3.5,-25.5
+      parent: 1
+  - uid: 720
+    components:
+    - type: Transform
+      pos: 2.5,-25.5
+      parent: 1
+  - uid: 721
+    components:
+    - type: Transform
+      pos: 2.5,-27.5
+      parent: 1
+  - uid: 722
+    components:
+    - type: Transform
+      pos: 4.5,-17.5
+      parent: 1
+  - uid: 723
+    components:
+    - type: Transform
+      pos: -7.5,-21.5
+      parent: 1
+  - uid: 724
+    components:
+    - type: Transform
+      pos: -7.5,-27.5
+      parent: 1
+  - uid: 725
+    components:
+    - type: Transform
+      pos: -7.5,-24.5
+      parent: 1
+  - uid: 726
+    components:
+    - type: Transform
+      pos: 6.5,-21.5
+      parent: 1
+  - uid: 727
+    components:
+    - type: Transform
+      pos: 6.5,-24.5
+      parent: 1
+  - uid: 728
+    components:
+    - type: Transform
+      pos: 6.5,-26.5
+      parent: 1
+  - uid: 729
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-3.5
+      parent: 1
+  - uid: 730
+    components:
+    - type: Transform
+      pos: 1.5,-10.5
+      parent: 1
+  - uid: 731
+    components:
+    - type: Transform
+      pos: -3.5,-27.5
+      parent: 1
+  - uid: 732
+    components:
+    - type: Transform
+      pos: -6.5,-12.5
+      parent: 1
+  - uid: 733
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 1
+  - uid: 734
+    components:
+    - type: Transform
+      pos: 5.5,-11.5
+      parent: 1
+  - uid: 735
+    components:
+    - type: Transform
+      pos: -5.5,-11.5
+      parent: 1
+  - uid: 736
+    components:
+    - type: Transform
+      pos: -6.5,-20.5
+      parent: 1
+  - uid: 737
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 1
+  - uid: 738
+    components:
+    - type: Transform
+      pos: -1.5,-14.5
+      parent: 1
+  - uid: 739
+    components:
+    - type: Transform
+      pos: 5.5,-20.5
+      parent: 1
+  - uid: 740
+    components:
+    - type: Transform
+      pos: -5.5,-14.5
+      parent: 1
+  - uid: 741
+    components:
+    - type: Transform
+      pos: 6.5,-17.5
+      parent: 1
+  - uid: 742
+    components:
+    - type: Transform
+      pos: -3.5,-14.5
+      parent: 1
+  - uid: 743
+    components:
+    - type: Transform
+      pos: -2.5,-18.5
+      parent: 1
+  - uid: 744
+    components:
+    - type: Transform
+      pos: 2.5,-26.5
+      parent: 1
+  - uid: 745
+    components:
+    - type: Transform
+      pos: 2.5,-28.5
+      parent: 1
+  - uid: 746
+    components:
+    - type: Transform
+      pos: 6.5,-25.5
+      parent: 1
+  - uid: 747
+    components:
+    - type: Transform
+      pos: 6.5,-22.5
+      parent: 1
+  - uid: 748
+    components:
+    - type: Transform
+      pos: -7.5,-23.5
+      parent: 1
+  - uid: 749
+    components:
+    - type: Transform
+      pos: -7.5,-26.5
+      parent: 1
+  - uid: 750
+    components:
+    - type: Transform
+      pos: -7.5,-22.5
+      parent: 1
+  - uid: 751
+    components:
+    - type: Transform
+      pos: -7.5,-20.5
+      parent: 1
+  - uid: 752
+    components:
+    - type: Transform
+      pos: 4.5,-15.5
+      parent: 1
+  - uid: 753
+    components:
+    - type: Transform
+      pos: 6.5,-28.5
+      parent: 1
+  - uid: 754
+    components:
+    - type: Transform
+      pos: 6.5,-27.5
+      parent: 1
+  - uid: 755
+    components:
+    - type: Transform
+      pos: 6.5,-23.5
+      parent: 1
+  - uid: 756
+    components:
+    - type: Transform
+      pos: 6.5,-20.5
+      parent: 1
+  - uid: 757
+    components:
+    - type: Transform
+      pos: -7.5,-25.5
+      parent: 1
+  - uid: 758
+    components:
+    - type: Transform
+      pos: -7.5,-28.5
+      parent: 1
+  - uid: 759
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-15.5
+      parent: 1
+  - uid: 760
+    components:
+    - type: Transform
+      pos: -5.5,-18.5
+      parent: 1
+  - uid: 761
+    components:
+    - type: Transform
+      pos: -5.5,-3.5
+      parent: 1
+  - uid: 762
+    components:
+    - type: Transform
+      pos: 5.5,-5.5
+      parent: 1
+  - uid: 763
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 1
+  - uid: 764
+    components:
+    - type: Transform
+      pos: -6.5,-3.5
+      parent: 1
+  - uid: 765
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-7.5
+      parent: 1
+  - uid: 766
+    components:
+    - type: Transform
+      pos: -3.5,-18.5
+      parent: 1
+  - uid: 767
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 1
+  - uid: 768
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+  - uid: 769
+    components:
+    - type: Transform
+      pos: -6.5,-14.5
+      parent: 1
+  - uid: 770
+    components:
+    - type: Transform
+      pos: -5.5,-2.5
+      parent: 1
+  - uid: 771
+    components:
+    - type: Transform
+      pos: 5.5,-6.5
+      parent: 1
+  - uid: 772
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-7.5
+      parent: 1
+  - uid: 773
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-8.5
+      parent: 1
+  - uid: 774
+    components:
+    - type: Transform
+      pos: 4.5,-11.5
+      parent: 1
+  - uid: 775
+    components:
+    - type: Transform
+      pos: -6.5,-13.5
+      parent: 1
+  - uid: 776
+    components:
+    - type: Transform
+      pos: -3.5,-30.5
+      parent: 1
+  - uid: 777
+    components:
+    - type: Transform
+      pos: 6.5,-15.5
+      parent: 1
+  - uid: 778
+    components:
+    - type: Transform
+      pos: 5.5,-13.5
+      parent: 1
+  - uid: 779
+    components:
+    - type: Transform
+      pos: -7.5,-15.5
+      parent: 1
+  - uid: 780
+    components:
+    - type: Transform
+      pos: 1.5,-14.5
+      parent: 1
+  - uid: 781
+    components:
+    - type: Transform
+      pos: -4.5,-18.5
+      parent: 1
+  - uid: 782
+    components:
+    - type: Transform
+      pos: -2.5,-25.5
+      parent: 1
+  - uid: 783
+    components:
+    - type: Transform
+      pos: 0.5,-25.5
+      parent: 1
+  - uid: 785
+    components:
+    - type: Transform
+      pos: -1.5,-22.5
+      parent: 1
+  - uid: 786
+    components:
+    - type: Transform
+      pos: 0.5,-22.5
+      parent: 1
+  - uid: 787
+    components:
+    - type: Transform
+      pos: 1.5,-24.5
+      parent: 1
+  - uid: 788
+    components:
+    - type: Transform
+      pos: 1.5,-23.5
+      parent: 1
+  - uid: 789
+    components:
+    - type: Transform
+      pos: 1.5,-22.5
+      parent: 1
+  - uid: 790
+    components:
+    - type: Transform
+      pos: -2.5,-24.5
+      parent: 1
+  - uid: 791
+    components:
+    - type: Transform
+      pos: -2.5,-23.5
+      parent: 1
+  - uid: 792
+    components:
+    - type: Transform
+      pos: -2.5,-22.5
+      parent: 1
+  - uid: 793
+    components:
+    - type: Transform
+      pos: 5.5,-22.5
+      parent: 1
+  - uid: 794
+    components:
+    - type: Transform
+      pos: -7.5,-14.5
+      parent: 1
+  - uid: 795
+    components:
+    - type: Transform
+      pos: -7.5,-18.5
+      parent: 1
+  - uid: 796
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-28.5
+      parent: 1
+  - uid: 797
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-28.5
+      parent: 1
+  - uid: 798
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-28.5
+      parent: 1
+  - uid: 799
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-28.5
+      parent: 1
+  - uid: 800
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-28.5
+      parent: 1
+  - uid: 801
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-28.5
+      parent: 1
+  - uid: 802
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-6.5
+      parent: 1
+  - uid: 803
+    components:
+    - type: Transform
+      pos: 4.5,-27.5
+      parent: 1
+  - uid: 804
+    components:
+    - type: Transform
+      pos: 4.5,-26.5
+      parent: 1
+  - uid: 805
+    components:
+    - type: Transform
+      pos: 4.5,-25.5
+      parent: 1
+  - uid: 806
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 807
+    components:
+    - type: Transform
+      pos: 3.5,-6.5
+      parent: 1
+  - uid: 808
+    components:
+    - type: Transform
+      pos: 2.5,-30.5
+      parent: 1
+  - uid: 809
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-17.5
+      parent: 1
+  - uid: 810
+    components:
+    - type: Transform
+      pos: 3.5,-29.5
+      parent: 1
+  - uid: 811
+    components:
+    - type: Transform
+      pos: -5.5,-29.5
+      parent: 1
+  - uid: 812
+    components:
+    - type: Transform
+      pos: 4.5,-29.5
+      parent: 1
+  - uid: 813
+    components:
+    - type: Transform
+      pos: -4.5,-29.5
+      parent: 1
+  - uid: 814
+    components:
+    - type: Transform
+      pos: 5.5,-29.5
+      parent: 1
+  - uid: 815
+    components:
+    - type: Transform
+      pos: -3.5,-29.5
+      parent: 1
+  - uid: 816
+    components:
+    - type: Transform
+      pos: 2.5,-29.5
+      parent: 1
+  - uid: 817
+    components:
+    - type: Transform
+      pos: 6.5,-14.5
+      parent: 1
+  - uid: 818
+    components:
+    - type: Transform
+      pos: 6.5,-18.5
+      parent: 1
+  - uid: 819
+    components:
+    - type: Transform
+      pos: 5.5,-3.5
+      parent: 1
+  - uid: 820
+    components:
+    - type: Transform
+      pos: -6.5,-29.5
+      parent: 1
+  - uid: 821
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -6.5,-30.5
+      parent: 1
+  - uid: 822
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-30.5
+      parent: 1
+  - uid: 823
+    components:
+    - type: Transform
+      pos: 8.5,-15.5
+      parent: 1
+  - uid: 824
+    components:
+    - type: Transform
+      pos: 8.5,-17.5
+      parent: 1
+  - uid: 825
+    components:
+    - type: Transform
+      pos: -9.5,-17.5
+      parent: 1
+  - uid: 826
+    components:
+    - type: Transform
+      pos: -9.5,-15.5
+      parent: 1
+- proto: WarningN2
+  entities:
+  - uid: 827
+    components:
+    - type: Transform
+      pos: 4.5,-25.5
+      parent: 1
+- proto: WarningO2
+  entities:
+  - uid: 828
+    components:
+    - type: Transform
+      pos: 2.5,-25.5
+      parent: 1
+- proto: WarningWaste
+  entities:
+  - uid: 829
+    components:
+    - type: Transform
+      pos: 4.5,-18.5
+      parent: 1
+- proto: WaterCooler
+  entities:
+  - uid: 830
+    components:
+    - type: Transform
+      pos: 0.5,-17.5
+      parent: 1
+- proto: WeaponTurretSyndicate
+  entities:
+  - uid: 24
+    components:
+    - type: Transform
+      pos: -2.5,-6.5
+      parent: 1
+  - uid: 610
+    components:
+    - type: Transform
+      pos: -1.5,-19.5
+      parent: 1
+- proto: WindoorSecure
+  entities:
+  - uid: 831
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-5.5
+      parent: 1
+- proto: Wrench
+  entities:
+  - uid: 832
+    components:
+    - type: Transform
+      pos: 5.4749,-23.512577
+      parent: 1
+  - uid: 833
+    components:
+    - type: Transform
+      pos: 5.63115,-23.481327
+      parent: 1
+  - uid: 834
+    components:
+    - type: Transform
+      pos: 1.6061028,-13.284962
+      parent: 1
+...
diff --git a/Resources/Maps/Shuttles/trading_outpost.yml b/Resources/Maps/Shuttles/trading_outpost.yml
index 56d16dc90d..a10f070bd2 100644
--- a/Resources/Maps/Shuttles/trading_outpost.yml
+++ b/Resources/Maps/Shuttles/trading_outpost.yml
@@ -3,296 +3,227 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
-  26: FloorDark
-  30: FloorDarkMini
-  31: FloorDarkMono
-  34: FloorDarkPavementVertical
-  46: FloorGrassJungle
-  91: FloorSteelMono
-  92: FloorSteelOffset
-  96: FloorTechMaint2
-  97: FloorTechMaint3
-  109: FloorWood
-  110: FloorWoodTile
-  111: Lattice
-  112: Plating
+  29: FloorDark
+  34: FloorDarkMono
+  37: FloorDarkPavementVertical
+  49: FloorGrassJungle
+  64: FloorMetalDiamond
+  77: FloorReinforced
+  89: FloorSteel
+  100: FloorSteelMono
+  104: FloorTechMaint
+  105: FloorTechMaint2
+  118: FloorWood
+  119: FloorWoodTile
+  120: Lattice
+  121: Plating
 entities:
 - proto: ""
   entities:
-  - uid: 1
-    components:
-    - name: map 20
-      type: MetaData
-    - type: Transform
-    - type: Map
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
-    - type: LoadedMap
   - uid: 2
     components:
-    - name: grid
-      type: MetaData
-    - pos: -2.9375,-1.625
-      parent: 1
-      type: Transform
-    - chunks:
+    - type: MetaData
+      name: Automated Trade Station
+    - type: Transform
+      pos: -2.9375,-1.625
+      parent: invalid
+    - type: MapGrid
+      chunks:
         0,0:
           ind: 0,0
-          tiles: XAAAAAAAHwAAAAAAHwAAAAAAHwAAAAABXAAAAAAAcAAAAAAAXAAAAAAAHwAAAAADHwAAAAADHwAAAAADXAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAHwAAAAADIgAAAAABcAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAHwAAAAADcAAAAAAAHwAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAHwAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAbgAAAAACbgAAAAADbgAAAAADLgAAAAAALgAAAAAALgAAAAAAbgAAAAAAbgAAAAABbgAAAAADbQAAAAADcAAAAAAAHwAAAAACcAAAAAAAAAAAAAAAAAAAAAAAbQAAAAAAbgAAAAADbgAAAAAAbgAAAAADbQAAAAADbQAAAAABbQAAAAADbgAAAAABbgAAAAABbgAAAAACbQAAAAAAHwAAAAAAIgAAAAACcAAAAAAAAAAAAAAAAAAAAAAAbQAAAAACbQAAAAABbQAAAAABbQAAAAABbQAAAAABbQAAAAAAbQAAAAADbQAAAAADbQAAAAAAbQAAAAACbQAAAAACcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: WQAAAAABWQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAABWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAADWQAAAAACWQAAAAADWQAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABWQAAAAADWQAAAAAAIgAAAAABJQAAAAADeQAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAAAIgAAAAABIgAAAAAAIgAAAAAAIgAAAAACIgAAAAABIgAAAAAAIgAAAAAAIgAAAAABIgAAAAACeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAdwAAAAABdwAAAAADdwAAAAACMQAAAAAAMQAAAAAAMQAAAAAAdwAAAAADdwAAAAABdwAAAAABdgAAAAACeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAdgAAAAADdwAAAAABdwAAAAADdwAAAAADdgAAAAADdgAAAAACdgAAAAADdwAAAAAAdwAAAAABdwAAAAAAdgAAAAACIgAAAAADJQAAAAACeQAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAdgAAAAABdgAAAAACdgAAAAABdgAAAAAAdgAAAAACdgAAAAAAdgAAAAAAdgAAAAABdgAAAAADdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: HgAAAAAAHgAAAAAAHgAAAAADHgAAAAAAGgAAAAACcAAAAAAAcAAAAAAAGgAAAAABGgAAAAAAGgAAAAABHwAAAAACcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAHwAAAAADYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAHwAAAAABcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAXAAAAAAAcAAAAAAAXAAAAAAAHwAAAAABHwAAAAADHwAAAAABXAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAHwAAAAACHwAAAAADHwAAAAABYAAAAAAAcAAAAAAAYAAAAAAAHwAAAAAAHwAAAAACHwAAAAADXAAAAAAAcAAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAHwAAAAAAHwAAAAACHwAAAAABYAAAAAAAcAAAAAAAYAAAAAAAHwAAAAAAHwAAAAABHwAAAAABXAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAADYQAAAAADYQAAAAADYAAAAAAAcAAAAAAAYAAAAAAAYQAAAAACYQAAAAADWwAAAAACWwAAAAADcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAHwAAAAADHwAAAAACHwAAAAABYAAAAAAAcAAAAAAAYAAAAAAAHwAAAAAAHwAAAAACHwAAAAACXAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAHwAAAAABHwAAAAAAHwAAAAABYAAAAAAAcAAAAAAAYAAAAAAAHwAAAAADHwAAAAAAHwAAAAACXAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAHwAAAAABHwAAAAAAHwAAAAADYAAAAAAAcAAAAAAAYAAAAAAAHwAAAAAAHwAAAAABHwAAAAAAXAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAACYQAAAAACYQAAAAABYAAAAAAAcAAAAAAAYAAAAAAAYQAAAAABYQAAAAADWwAAAAABWwAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAHwAAAAAAHwAAAAACHwAAAAADYAAAAAAAcAAAAAAAYAAAAAAAHwAAAAAAHwAAAAABHwAAAAAAXAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAHwAAAAADHwAAAAADHwAAAAAAYAAAAAAAcAAAAAAAYAAAAAAAHwAAAAABHwAAAAADHwAAAAAAXAAAAAAAcAAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAA
+          tiles: eQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAIgAAAAAAeQAAAAAAeQAAAAAAIgAAAAABIgAAAAABHQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAABIgAAAAACIgAAAAAAIgAAAAAAIgAAAAABIgAAAAABIgAAAAACIgAAAAAAIgAAAAACeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAACWQAAAAADWQAAAAACWQAAAAADWQAAAAAAWQAAAAACWQAAAAABWQAAAAABeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAADWQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAACZAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAWQAAAAADWQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAAAWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAWQAAAAABaQAAAAAAaQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaQAAAAAAaQAAAAAAWQAAAAAAZAAAAAACeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAACWQAAAAAAaQAAAAAAaQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaQAAAAAAaQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAWQAAAAAAaQAAAAAAaQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaQAAAAAAaQAAAAAAWQAAAAABZAAAAAACeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAAAWQAAAAADTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAWQAAAAABWQAAAAACTQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAZAAAAAACWQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAWQAAAAADZAAAAAADeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAIgAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAHwAAAAACcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAHwAAAAACcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAHwAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAIgAAAAACHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJQAAAAACIgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJQAAAAADIgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAcAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAA
           version: 6
         0,-2:
           ind: 0,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAHgAAAAABHgAAAAABHgAAAAAAGgAAAAABGgAAAAADGgAAAAACGgAAAAABGgAAAAACGgAAAAACcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAABGgAAAAABGgAAAAAAGgAAAAADGgAAAAACGgAAAAABGgAAAAABHwAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAIgAAAAABIgAAAAACHQAAAAACHQAAAAADHQAAAAABHQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAHQAAAAABHQAAAAACHQAAAAABIgAAAAADIgAAAAADHQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-2:
           ind: -1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAA
           version: 6
-      type: MapGrid
     - type: Broadphase
-    - bodyStatus: InAir
+    - type: Physics
+      bodyStatus: InAir
       angularDamping: 0.05
       linearDamping: 0.05
       fixedRotation: False
       bodyType: Dynamic
-      type: Physics
-    - fixtures: {}
-      type: Fixtures
+    - type: Fixtures
+      fixtures: {}
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
     - type: GridPathfinding
-    - gravityShakeSound: !type:SoundPathSpecifier
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg
-      type: Gravity
-    - chunkCollection:
+    - type: DecalGrid
+      chunkCollection:
         version: 2
         nodes:
         - node:
+            angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
-            id: Bot
-          decals:
-            29: 0,2
-            30: 10,2
-            31: 1,-12
-            32: 9,-12
-            33: 10,-16
-            34: 10,-17
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineE
-          decals:
-            10: 3,-18
-            11: 3,-17
-            12: 3,-16
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineN
-          decals:
-            86: 2,-12
-            87: 3,-12
-            88: 4,-12
-            89: 5,-12
-            90: 6,-12
-            91: 7,-12
-            92: 8,-12
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineS
-          decals:
-            93: 1,2
-            94: 2,2
-            95: 3,2
-            96: 4,2
-            97: 5,2
-            98: 6,2
-            99: 7,2
-            100: 8,2
-            101: 9,2
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelCornerNe
-          decals:
-            52: 4,-1
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelCornerNw
-          decals:
-            51: 6,-1
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelCornerSe
+            id: Arrows
           decals:
-            69: 4,-9
+            71: 12,-6
+            72: 12,-4
         - node:
+            angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
-            id: BrickTileSteelCornerSw
+            id: Arrows
           decals:
-            50: 6,-9
+            69: -2,-4
+            70: -2,-6
         - node:
             color: '#FFFFFFFF'
-            id: BrickTileSteelLineE
+            id: Bot
           decals:
-            4: 1,-3
-            5: 1,-7
-            53: 4,-8
-            54: 4,-7
-            55: 4,-6
-            56: 4,-5
-            57: 4,-4
-            58: 4,-2
-            59: 4,-3
+            19: 0,2
+            20: 10,2
+            21: 9,-12
+            25: 4,-16
+            28: 0,-6
+            29: 0,-4
+            30: 0,-1
+            31: 0,-9
+            32: 10,-9
+            33: 10,-6
+            34: 10,-4
+            35: 10,-1
+            50: 4,-5
+            51: 6,-5
+            61: 1,-12
         - node:
             color: '#FFFFFFFF'
-            id: BrickTileSteelLineN
+            id: Box
           decals:
-            0: 4,-10
-            1: 6,-10
-            6: 3,-12
-            7: 2,-12
-            8: 7,-12
-            9: 8,-12
-            46: 0,-8
-            47: 0,-4
-            48: 10,-4
-            49: 10,-8
+            26: 4,-18
+            27: 5,-18
         - node:
             color: '#FFFFFFFF'
-            id: BrickTileSteelLineS
+            id: BrickTileDarkLineE
           decals:
-            42: 0,-6
-            43: 0,-2
-            44: 10,-2
-            45: 10,-6
-            70: 4,0
-            79: 2,2
-            80: 3,2
-            81: 4,2
-            82: 5,2
-            83: 6,2
-            84: 8,2
-            85: 7,2
+            0: 3,-18
+            1: 3,-17
+            2: 3,-16
+            58: 8,-6
+            59: 8,-5
+            60: 8,-4
+            62: 3,-6
+            63: 3,-5
+            64: 3,-4
         - node:
             color: '#FFFFFFFF'
-            id: BrickTileSteelLineW
+            id: BrickTileDarkLineW
           decals:
-            2: 9,-7
-            3: 9,-3
-            60: 6,-2
-            61: 6,-3
-            62: 6,-4
-            63: 6,-5
-            64: 6,-5
-            65: 6,-6
-            66: 6,-7
-            67: 6,-8
-            68: 6,-8
+            52: 2,-6
+            53: 2,-5
+            54: 2,-4
+            55: 7,-6
+            56: 7,-5
+            57: 7,-4
         - node:
             color: '#FFFFFFFF'
             id: BushCOne
           decals:
-            36: 6,4
+            23: 6,4
         - node:
             color: '#FFFFFFFF'
             id: BushCTwo
           decals:
-            35: 4,4
+            22: 4,4
         - node:
             color: '#FFFFFFFF'
             id: Bushi2
           decals:
-            37: 5,4
+            24: 5,4
         - node:
             angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            38: 9,-7
-            39: 9,-3
+            65: 9,-7
+            66: 9,-3
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            40: 1,-7
-            41: 1,-3
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineE
-          decals:
-            73: 3,-7
-            74: 3,-3
+            67: 1,-7
+            68: 1,-3
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
           decals:
-            75: 4,0
-            76: 6,0
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineS
-          decals:
-            71: 7,-7
-            72: 7,-3
+            43: 8,1
+            44: 7,1
+            45: 6,1
+            46: 5,1
+            47: 4,1
+            48: 3,1
+            49: 2,1
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
           decals:
-            77: 4,-10
-            78: 6,-10
+            36: 2,-11
+            37: 3,-11
+            38: 4,-11
+            39: 5,-11
+            40: 6,-11
+            41: 7,-11
+            42: 8,-11
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerSe
           decals:
-            27: 0,6
-            28: 6,6
+            17: 0,6
+            18: 6,6
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerSw
           decals:
-            25: 4,6
-            26: 10,6
+            15: 4,6
+            16: 10,6
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineE
           decals:
-            19: 0,4
-            20: 0,5
-            21: 6,5
+            9: 0,4
+            10: 0,5
+            11: 6,5
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineS
           decals:
-            13: 1,6
-            14: 2,6
-            15: 3,6
-            16: 7,6
-            17: 9,6
-            18: 8,6
+            3: 1,6
+            4: 2,6
+            5: 3,6
+            6: 7,6
+            7: 9,6
+            8: 8,6
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineW
           decals:
-            22: 4,5
-            23: 10,4
-            24: 10,5
-      type: DecalGrid
-    - version: 2
+            12: 4,5
+            13: 10,4
+            14: 10,5
+    - type: GridAtmosphere
+      version: 2
       data:
         tiles:
           0,0:
@@ -317,6 +248,7 @@ entities:
             0: 65535
           2,2:
             0: 30583
+            1: 128
           2,3:
             0: 3
           3,0:
@@ -348,37 +280,74 @@ entities:
           2,-1:
             0: 65535
           3,-2:
-            0: 13105
-            1: 2
+            0: 13107
           3,-1:
-            0: 4403
-            1: 8704
+            0: 13107
           -1,0:
             0: 61166
           -1,1:
             0: 52974
           -1,-2:
-            0: 61164
-            1: 2
+            0: 61166
           -1,-1:
-            0: 52462
-            1: 8704
+            0: 61166
           -1,-4:
             0: 34952
+            1: 8738
           -1,-3:
-            0: 51336
-            1: 8192
+            0: 59528
+            1: 38
           0,-5:
             0: 65520
+            1: 9
           1,-5:
             0: 65520
+            1: 8
           2,-5:
             0: 65392
+            1: 140
           -1,-5:
             0: 34816
+            1: 8938
           3,-3:
-            0: 4096
+            0: 12288
+            1: 35
+          3,2:
+            1: 16
+          3,-4:
+            1: 8738
+          -1,2:
+            1: 192
+          0,-8:
+            1: 12288
+          0,-7:
+            1: 61936
+          0,-6:
+            1: 61937
+          1,-7:
+            1: 53456
+          1,-6:
+            1: 53456
+          2,-7:
+            1: 64760
+          2,-6:
+            1: 64764
+          2,-8:
+            1: 57344
+          3,-7:
+            1: 8739
+          3,-6:
+            1: 562
+          3,-5:
+            1: 8754
+          3,-8:
             1: 8192
+          -1,-8:
+            1: 40960
+          -1,-7:
+            1: 43694
+          -1,-6:
+            1: 35562
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -411,27 +380,18 @@ entities:
           - 0
           - 0
         chunkSize: 4
-      type: GridAtmosphere
     - type: GasTileOverlay
     - type: RadiationGridResistance
 - proto: AirAlarm
   entities:
   - uid: 802
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -0.5,-4.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 793
-      - 411
-      - 400
-      - 410
-      - 402
-      - 790
-      - 789
-      type: DeviceNetwork
-    - devices:
+    - type: DeviceList
+      devices:
       - 793
       - 411
       - 400
@@ -439,23 +399,16 @@ entities:
       - 402
       - 790
       - 789
-      type: DeviceList
+    - type: AtmosDevice
+      joinedGrid: 2
   - uid: 803
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 11.5,-4.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 794
-      - 402
-      - 410
-      - 400
-      - 411
-      - 789
-      - 790
-      type: DeviceNetwork
-    - devices:
+    - type: DeviceList
+      devices:
       - 794
       - 402
       - 410
@@ -463,23 +416,16 @@ entities:
       - 411
       - 789
       - 790
-      type: DeviceList
+    - type: AtmosDevice
+      joinedGrid: 2
   - uid: 805
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 11.5,4.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 796
-      - 409
-      - 403
-      - 401
-      - 408
-      - 783
-      - 782
-      type: DeviceNetwork
-    - devices:
+    - type: DeviceList
+      devices:
       - 796
       - 409
       - 403
@@ -487,23 +433,16 @@ entities:
       - 408
       - 783
       - 782
-      type: DeviceList
+    - type: AtmosDevice
+      joinedGrid: 2
   - uid: 806
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -0.5,4.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 795
-      - 408
-      - 401
-      - 403
-      - 409
-      - 783
-      - 782
-      type: DeviceNetwork
-    - devices:
+    - type: DeviceList
+      devices:
       - 795
       - 408
       - 401
@@ -511,3464 +450,4492 @@ entities:
       - 409
       - 783
       - 782
-      type: DeviceList
+    - type: AtmosDevice
+      joinedGrid: 2
 - proto: AirCanister
   entities:
   - uid: 387
     components:
-    - pos: 4.5,-15.5
+    - type: Transform
+      anchored: True
+      pos: 4.5,-15.5
       parent: 2
-      type: Transform
-- proto: AirlockCargoGlassLocked
+    - type: Physics
+      bodyType: Static
+    - type: AtmosDevice
+      joinedGrid: 2
+- proto: AirlockCargo
   entities:
-  - uid: 248
+  - uid: 1
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,5.5
+    - type: Transform
+      pos: 11.5,1.5
       parent: 2
-      type: Transform
-  - uid: 249
+  - uid: 22
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 11.5,5.5
+    - type: Transform
+      pos: -0.5,1.5
       parent: 2
-      type: Transform
-- proto: AirlockCargoLocked
+- proto: AirlockCargoGlass
   entities:
-  - uid: 246
+  - uid: 248
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,1.5
+    - type: Transform
+      pos: 11.5,5.5
       parent: 2
-      type: Transform
-  - uid: 247
+  - uid: 249
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 11.5,1.5
+    - type: Transform
+      pos: -0.5,5.5
       parent: 2
-      type: Transform
 - proto: AirlockExternalGlass
   entities:
   - uid: 582
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -0.5,-5.5
       parent: 2
-      type: Transform
   - uid: 583
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -0.5,-3.5
       parent: 2
-      type: Transform
   - uid: 584
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 11.5,-5.5
       parent: 2
-      type: Transform
   - uid: 585
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 11.5,-3.5
       parent: 2
-      type: Transform
-- proto: AirlockGlassShuttle
+- proto: AirlockExternalGlassShuttleLocked
   entities:
-  - uid: 586
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -2.5,-5.5
-      parent: 2
-      type: Transform
-  - uid: 587
+  - uid: 313
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,-3.5
       parent: 2
-      type: Transform
-  - uid: 588
+  - uid: 560
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 13.5,-5.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-5.5
       parent: 2
-      type: Transform
-  - uid: 589
+  - uid: 562
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 13.5,-3.5
       parent: 2
-      type: Transform
+  - uid: 563
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-5.5
+      parent: 2
 - proto: AirSensor
   entities:
   - uid: 793
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 0.5,-4.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 802
-      type: DeviceNetwork
   - uid: 794
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 10.5,-4.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 803
-      type: DeviceNetwork
   - uid: 795
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 0.5,4.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 806
-      type: DeviceNetwork
   - uid: 796
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 10.5,4.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 805
-      type: DeviceNetwork
-- proto: APCBasic
+- proto: AlwaysPoweredWallLight
   entities:
-  - uid: 596
+  - uid: 541
+    components:
+    - type: Transform
+      pos: 3.5,-19.5
+      parent: 2
+  - uid: 576
     components:
-    - pos: 1.5,-14.5
+    - type: Transform
+      pos: 7.5,-19.5
       parent: 2
-      type: Transform
+- proto: APCBasic
+  entities:
   - uid: 597
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -0.5,0.5
       parent: 2
-      type: Transform
+  - uid: 944
+    components:
+    - type: Transform
+      pos: 2.5,-14.5
+      parent: 2
+- proto: AtmosDeviceFanTiny
+  entities:
+  - uid: 947
+    components:
+    - type: Transform
+      pos: 13.5,-5.5
+      parent: 2
+  - uid: 948
+    components:
+    - type: Transform
+      pos: 13.5,-3.5
+      parent: 2
+  - uid: 949
+    components:
+    - type: Transform
+      pos: 13.5,-2.5
+      parent: 2
+  - uid: 950
+    components:
+    - type: Transform
+      pos: 13.5,-6.5
+      parent: 2
+  - uid: 951
+    components:
+    - type: Transform
+      pos: -2.5,-6.5
+      parent: 2
+  - uid: 952
+    components:
+    - type: Transform
+      pos: -2.5,-5.5
+      parent: 2
+  - uid: 953
+    components:
+    - type: Transform
+      pos: -2.5,-3.5
+      parent: 2
+  - uid: 954
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 2
+- proto: BoxFolderClipboard
+  entities:
+  - uid: 779
+    components:
+    - type: Transform
+      pos: 9.622929,-17.072632
+      parent: 2
 - proto: CableApcExtension
   entities:
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 1.5,-4.5
+      parent: 2
   - uid: 222
     components:
-    - pos: 11.5,1.5
+    - type: Transform
+      pos: 11.5,1.5
       parent: 2
-      type: Transform
   - uid: 260
     components:
-    - pos: 12.5,1.5
+    - type: Transform
+      pos: 12.5,1.5
+      parent: 2
+  - uid: 276
+    components:
+    - type: Transform
+      pos: 7.5,-4.5
       parent: 2
-      type: Transform
   - uid: 283
     components:
-    - pos: 6.5,5.5
+    - type: Transform
+      pos: 6.5,5.5
       parent: 2
-      type: Transform
   - uid: 305
     components:
-    - pos: 12.5,5.5
+    - type: Transform
+      pos: 12.5,5.5
       parent: 2
-      type: Transform
   - uid: 308
     components:
-    - pos: -0.5,1.5
+    - type: Transform
+      pos: -0.5,1.5
       parent: 2
-      type: Transform
   - uid: 309
     components:
-    - pos: -1.5,1.5
+    - type: Transform
+      pos: -1.5,1.5
       parent: 2
-      type: Transform
   - uid: 310
     components:
-    - pos: 8.5,5.5
+    - type: Transform
+      pos: 8.5,5.5
       parent: 2
-      type: Transform
   - uid: 319
     components:
-    - pos: -1.5,5.5
+    - type: Transform
+      pos: -1.5,5.5
       parent: 2
-      type: Transform
   - uid: 320
     components:
-    - pos: 2.5,5.5
+    - type: Transform
+      pos: 2.5,5.5
       parent: 2
-      type: Transform
   - uid: 324
     components:
-    - pos: -1.5,2.5
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 2
+  - uid: 542
+    components:
+    - type: Transform
+      pos: 4.5,-4.5
+      parent: 2
+  - uid: 575
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 2
+  - uid: 577
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
       parent: 2
-      type: Transform
   - uid: 638
     components:
-    - pos: 1.5,-14.5
+    - type: Transform
+      pos: 1.5,-14.5
       parent: 2
-      type: Transform
   - uid: 639
     components:
-    - pos: 1.5,-15.5
+    - type: Transform
+      pos: 1.5,-15.5
       parent: 2
-      type: Transform
   - uid: 640
     components:
-    - pos: 2.5,-17.5
+    - type: Transform
+      pos: 2.5,-17.5
       parent: 2
-      type: Transform
   - uid: 641
     components:
-    - pos: 2.5,-16.5
+    - type: Transform
+      pos: 2.5,-16.5
       parent: 2
-      type: Transform
   - uid: 642
     components:
-    - pos: 3.5,-16.5
+    - type: Transform
+      pos: 3.5,-16.5
       parent: 2
-      type: Transform
   - uid: 643
     components:
-    - pos: 4.5,-16.5
+    - type: Transform
+      pos: 4.5,-16.5
       parent: 2
-      type: Transform
   - uid: 644
     components:
-    - pos: 5.5,-16.5
+    - type: Transform
+      pos: 5.5,-16.5
       parent: 2
-      type: Transform
   - uid: 645
     components:
-    - pos: 6.5,-16.5
+    - type: Transform
+      pos: 6.5,-16.5
       parent: 2
-      type: Transform
   - uid: 646
     components:
-    - pos: 7.5,-16.5
+    - type: Transform
+      pos: 7.5,-16.5
       parent: 2
-      type: Transform
   - uid: 647
     components:
-    - pos: 8.5,-16.5
+    - type: Transform
+      pos: 8.5,-16.5
       parent: 2
-      type: Transform
   - uid: 648
     components:
-    - pos: 9.5,-16.5
-      parent: 2
-      type: Transform
-  - uid: 649
-    components:
-    - pos: 10.5,-16.5
-      parent: 2
-      type: Transform
-  - uid: 650
-    components:
-    - pos: 10.5,-15.5
+    - type: Transform
+      pos: 9.5,-16.5
       parent: 2
-      type: Transform
   - uid: 651
     components:
-    - pos: 8.5,-15.5
+    - type: Transform
+      pos: 8.5,-15.5
       parent: 2
-      type: Transform
   - uid: 652
     components:
-    - pos: 8.5,-14.5
+    - type: Transform
+      pos: 8.5,-14.5
       parent: 2
-      type: Transform
   - uid: 653
     components:
-    - pos: 8.5,-13.5
+    - type: Transform
+      pos: 8.5,-13.5
       parent: 2
-      type: Transform
   - uid: 654
     components:
-    - pos: 2.5,-13.5
+    - type: Transform
+      pos: 2.5,-13.5
       parent: 2
-      type: Transform
   - uid: 655
     components:
-    - pos: 2.5,-14.5
+    - type: Transform
+      pos: 2.5,-14.5
       parent: 2
-      type: Transform
   - uid: 656
     components:
-    - pos: 2.5,-15.5
+    - type: Transform
+      pos: 2.5,-15.5
       parent: 2
-      type: Transform
   - uid: 657
     components:
-    - pos: 2.5,-12.5
+    - type: Transform
+      pos: 2.5,-12.5
       parent: 2
-      type: Transform
   - uid: 658
     components:
-    - pos: 8.5,-12.5
+    - type: Transform
+      pos: 8.5,-12.5
       parent: 2
-      type: Transform
   - uid: 659
     components:
-    - pos: 1.5,-17.5
+    - type: Transform
+      pos: 1.5,-17.5
       parent: 2
-      type: Transform
   - uid: 660
     components:
-    - pos: -0.5,0.5
-      parent: 2
-      type: Transform
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 2
   - uid: 661
     components:
-    - pos: 0.5,0.5
+    - type: Transform
+      pos: 0.5,0.5
       parent: 2
-      type: Transform
   - uid: 662
     components:
-    - pos: 0.5,-0.5
+    - type: Transform
+      pos: 0.5,-0.5
       parent: 2
-      type: Transform
   - uid: 663
     components:
-    - pos: 0.5,2.5
+    - type: Transform
+      pos: 0.5,2.5
       parent: 2
-      type: Transform
   - uid: 664
     components:
-    - pos: 1.5,2.5
+    - type: Transform
+      pos: 1.5,2.5
       parent: 2
-      type: Transform
   - uid: 665
     components:
-    - pos: 2.5,2.5
+    - type: Transform
+      pos: 2.5,2.5
       parent: 2
-      type: Transform
   - uid: 666
     components:
-    - pos: 3.5,2.5
+    - type: Transform
+      pos: 3.5,2.5
       parent: 2
-      type: Transform
   - uid: 667
     components:
-    - pos: 5.5,2.5
+    - type: Transform
+      pos: 5.5,2.5
       parent: 2
-      type: Transform
   - uid: 668
     components:
-    - pos: 4.5,2.5
+    - type: Transform
+      pos: 4.5,2.5
       parent: 2
-      type: Transform
   - uid: 669
     components:
-    - pos: 6.5,2.5
+    - type: Transform
+      pos: 6.5,2.5
       parent: 2
-      type: Transform
   - uid: 670
     components:
-    - pos: 7.5,2.5
+    - type: Transform
+      pos: 7.5,2.5
       parent: 2
-      type: Transform
   - uid: 671
     components:
-    - pos: 8.5,2.5
+    - type: Transform
+      pos: 8.5,2.5
       parent: 2
-      type: Transform
   - uid: 672
     components:
-    - pos: 9.5,2.5
+    - type: Transform
+      pos: 9.5,2.5
       parent: 2
-      type: Transform
   - uid: 673
     components:
-    - pos: 0.5,-1.5
+    - type: Transform
+      pos: 0.5,-1.5
       parent: 2
-      type: Transform
   - uid: 674
     components:
-    - pos: 0.5,1.5
+    - type: Transform
+      pos: 0.5,1.5
       parent: 2
-      type: Transform
   - uid: 675
     components:
-    - pos: 10.5,2.5
+    - type: Transform
+      pos: 10.5,2.5
       parent: 2
-      type: Transform
   - uid: 676
     components:
-    - pos: 10.5,1.5
+    - type: Transform
+      pos: 10.5,1.5
       parent: 2
-      type: Transform
   - uid: 677
     components:
-    - pos: 10.5,0.5
+    - type: Transform
+      pos: 10.5,0.5
       parent: 2
-      type: Transform
   - uid: 678
     components:
-    - pos: 10.5,-0.5
+    - type: Transform
+      pos: 10.5,-0.5
       parent: 2
-      type: Transform
   - uid: 679
     components:
-    - pos: 10.5,-1.5
+    - type: Transform
+      pos: 10.5,-1.5
       parent: 2
-      type: Transform
   - uid: 680
     components:
-    - pos: 10.5,-2.5
+    - type: Transform
+      pos: 10.5,-2.5
       parent: 2
-      type: Transform
   - uid: 681
     components:
-    - pos: 10.5,-3.5
+    - type: Transform
+      pos: 10.5,-3.5
       parent: 2
-      type: Transform
   - uid: 682
     components:
-    - pos: 10.5,-4.5
+    - type: Transform
+      pos: 10.5,-4.5
       parent: 2
-      type: Transform
   - uid: 683
     components:
-    - pos: 10.5,-5.5
+    - type: Transform
+      pos: 10.5,-5.5
       parent: 2
-      type: Transform
   - uid: 684
     components:
-    - pos: 10.5,-6.5
+    - type: Transform
+      pos: 10.5,-6.5
       parent: 2
-      type: Transform
   - uid: 685
     components:
-    - pos: 10.5,-7.5
+    - type: Transform
+      pos: 10.5,-7.5
       parent: 2
-      type: Transform
   - uid: 686
     components:
-    - pos: 10.5,-8.5
+    - type: Transform
+      pos: 10.5,-8.5
       parent: 2
-      type: Transform
   - uid: 687
     components:
-    - pos: 10.5,-9.5
+    - type: Transform
+      pos: 10.5,-9.5
       parent: 2
-      type: Transform
   - uid: 688
     components:
-    - pos: 10.5,-10.5
+    - type: Transform
+      pos: 10.5,-10.5
       parent: 2
-      type: Transform
   - uid: 689
     components:
-    - pos: 9.5,-10.5
+    - type: Transform
+      pos: 9.5,-10.5
       parent: 2
-      type: Transform
   - uid: 690
     components:
-    - pos: 8.5,-10.5
+    - type: Transform
+      pos: 8.5,-10.5
       parent: 2
-      type: Transform
   - uid: 691
     components:
-    - pos: 7.5,-10.5
+    - type: Transform
+      pos: 7.5,-10.5
       parent: 2
-      type: Transform
   - uid: 692
     components:
-    - pos: 6.5,-10.5
+    - type: Transform
+      pos: 6.5,-10.5
       parent: 2
-      type: Transform
   - uid: 693
     components:
-    - pos: 5.5,-10.5
+    - type: Transform
+      pos: 5.5,-10.5
       parent: 2
-      type: Transform
   - uid: 694
     components:
-    - pos: 4.5,-10.5
+    - type: Transform
+      pos: 4.5,-10.5
       parent: 2
-      type: Transform
   - uid: 695
     components:
-    - pos: 3.5,-10.5
+    - type: Transform
+      pos: 3.5,-10.5
       parent: 2
-      type: Transform
   - uid: 696
     components:
-    - pos: 2.5,-10.5
+    - type: Transform
+      pos: 2.5,-10.5
       parent: 2
-      type: Transform
   - uid: 697
     components:
-    - pos: 1.5,-10.5
+    - type: Transform
+      pos: 1.5,-10.5
       parent: 2
-      type: Transform
   - uid: 698
     components:
-    - pos: 0.5,-10.5
+    - type: Transform
+      pos: 0.5,-10.5
       parent: 2
-      type: Transform
   - uid: 699
     components:
-    - pos: 0.5,-9.5
+    - type: Transform
+      pos: 0.5,-9.5
       parent: 2
-      type: Transform
   - uid: 700
     components:
-    - pos: 0.5,-8.5
+    - type: Transform
+      pos: 0.5,-8.5
       parent: 2
-      type: Transform
   - uid: 701
     components:
-    - pos: 0.5,-7.5
+    - type: Transform
+      pos: 0.5,-7.5
       parent: 2
-      type: Transform
   - uid: 702
     components:
-    - pos: 0.5,-6.5
+    - type: Transform
+      pos: 0.5,-6.5
       parent: 2
-      type: Transform
   - uid: 703
     components:
-    - pos: 0.5,-5.5
+    - type: Transform
+      pos: 0.5,-5.5
       parent: 2
-      type: Transform
   - uid: 704
     components:
-    - pos: 0.5,-4.5
+    - type: Transform
+      pos: 0.5,-4.5
       parent: 2
-      type: Transform
   - uid: 705
     components:
-    - pos: 0.5,-3.5
+    - type: Transform
+      pos: 0.5,-3.5
       parent: 2
-      type: Transform
   - uid: 706
     components:
-    - pos: 0.5,-2.5
+    - type: Transform
+      pos: 0.5,-2.5
       parent: 2
-      type: Transform
   - uid: 707
     components:
-    - pos: 1.5,-0.5
+    - type: Transform
+      pos: 1.5,-0.5
       parent: 2
-      type: Transform
   - uid: 708
     components:
-    - pos: 2.5,-0.5
+    - type: Transform
+      pos: 2.5,-0.5
       parent: 2
-      type: Transform
   - uid: 709
     components:
-    - pos: 3.5,-0.5
+    - type: Transform
+      pos: 3.5,-0.5
       parent: 2
-      type: Transform
   - uid: 710
     components:
-    - pos: 4.5,-0.5
+    - type: Transform
+      pos: 4.5,-0.5
       parent: 2
-      type: Transform
   - uid: 711
     components:
-    - pos: 4.5,-8.5
+    - type: Transform
+      pos: 4.5,-8.5
       parent: 2
-      type: Transform
   - uid: 712
     components:
-    - pos: 3.5,-8.5
+    - type: Transform
+      pos: 3.5,-8.5
       parent: 2
-      type: Transform
   - uid: 713
     components:
-    - pos: 2.5,-8.5
+    - type: Transform
+      pos: 2.5,-8.5
       parent: 2
-      type: Transform
   - uid: 714
     components:
-    - pos: 1.5,-8.5
+    - type: Transform
+      pos: 1.5,-8.5
       parent: 2
-      type: Transform
   - uid: 715
     components:
-    - pos: 6.5,-8.5
+    - type: Transform
+      pos: 6.5,-8.5
       parent: 2
-      type: Transform
   - uid: 716
     components:
-    - pos: 7.5,-8.5
+    - type: Transform
+      pos: 7.5,-8.5
       parent: 2
-      type: Transform
   - uid: 717
     components:
-    - pos: 8.5,-8.5
+    - type: Transform
+      pos: 8.5,-8.5
       parent: 2
-      type: Transform
   - uid: 718
     components:
-    - pos: 9.5,-8.5
+    - type: Transform
+      pos: 9.5,-8.5
       parent: 2
-      type: Transform
   - uid: 719
     components:
-    - pos: 9.5,-0.5
+    - type: Transform
+      pos: 9.5,-0.5
       parent: 2
-      type: Transform
   - uid: 720
     components:
-    - pos: 8.5,-0.5
+    - type: Transform
+      pos: 8.5,-0.5
       parent: 2
-      type: Transform
   - uid: 721
     components:
-    - pos: 7.5,-0.5
+    - type: Transform
+      pos: 7.5,-0.5
       parent: 2
-      type: Transform
   - uid: 722
     components:
-    - pos: 6.5,-0.5
+    - type: Transform
+      pos: 6.5,-0.5
       parent: 2
-      type: Transform
   - uid: 723
     components:
-    - pos: 11.5,-3.5
+    - type: Transform
+      pos: 11.5,-3.5
       parent: 2
-      type: Transform
   - uid: 724
     components:
-    - pos: 12.5,-3.5
+    - type: Transform
+      pos: 12.5,-3.5
       parent: 2
-      type: Transform
   - uid: 725
     components:
-    - pos: 13.5,-3.5
+    - type: Transform
+      pos: 13.5,-3.5
       parent: 2
-      type: Transform
   - uid: 726
     components:
-    - pos: 13.5,-5.5
+    - type: Transform
+      pos: 13.5,-5.5
       parent: 2
-      type: Transform
   - uid: 727
     components:
-    - pos: 12.5,-5.5
+    - type: Transform
+      pos: 12.5,-5.5
       parent: 2
-      type: Transform
   - uid: 728
     components:
-    - pos: 11.5,-5.5
+    - type: Transform
+      pos: 11.5,-5.5
       parent: 2
-      type: Transform
   - uid: 729
     components:
-    - pos: -0.5,-5.5
+    - type: Transform
+      pos: -0.5,-5.5
       parent: 2
-      type: Transform
   - uid: 730
     components:
-    - pos: -1.5,-5.5
+    - type: Transform
+      pos: -1.5,-5.5
       parent: 2
-      type: Transform
   - uid: 731
     components:
-    - pos: -2.5,-5.5
+    - type: Transform
+      pos: -2.5,-5.5
       parent: 2
-      type: Transform
   - uid: 732
     components:
-    - pos: -0.5,-3.5
+    - type: Transform
+      pos: -0.5,-3.5
       parent: 2
-      type: Transform
   - uid: 733
     components:
-    - pos: -1.5,-3.5
+    - type: Transform
+      pos: -1.5,-3.5
       parent: 2
-      type: Transform
   - uid: 734
     components:
-    - pos: -2.5,-3.5
+    - type: Transform
+      pos: -2.5,-3.5
+      parent: 2
+  - uid: 736
+    components:
+    - type: Transform
+      pos: 9.5,-4.5
       parent: 2
-      type: Transform
   - uid: 739
     components:
-    - pos: 7.5,5.5
+    - type: Transform
+      pos: 7.5,5.5
       parent: 2
-      type: Transform
   - uid: 740
     components:
-    - pos: 5.5,5.5
+    - type: Transform
+      pos: 5.5,5.5
       parent: 2
-      type: Transform
   - uid: 741
     components:
-    - pos: 4.5,5.5
+    - type: Transform
+      pos: 4.5,5.5
       parent: 2
-      type: Transform
   - uid: 742
     components:
-    - pos: 3.5,5.5
+    - type: Transform
+      pos: 3.5,5.5
       parent: 2
-      type: Transform
   - uid: 744
     components:
-    - pos: 1.5,5.5
+    - type: Transform
+      pos: 1.5,5.5
       parent: 2
-      type: Transform
   - uid: 745
     components:
-    - pos: 0.5,5.5
+    - type: Transform
+      pos: 0.5,5.5
       parent: 2
-      type: Transform
   - uid: 747
     components:
-    - pos: 9.5,5.5
+    - type: Transform
+      pos: 9.5,5.5
       parent: 2
-      type: Transform
   - uid: 748
     components:
-    - pos: 10.5,5.5
+    - type: Transform
+      pos: 10.5,5.5
       parent: 2
-      type: Transform
   - uid: 749
     components:
-    - pos: 11.5,5.5
+    - type: Transform
+      pos: 11.5,5.5
       parent: 2
-      type: Transform
   - uid: 751
     components:
-    - pos: 12.5,4.5
+    - type: Transform
+      pos: 12.5,4.5
       parent: 2
-      type: Transform
   - uid: 752
     components:
-    - pos: 12.5,3.5
+    - type: Transform
+      pos: 12.5,3.5
       parent: 2
-      type: Transform
   - uid: 753
     components:
-    - pos: 12.5,2.5
+    - type: Transform
+      pos: 12.5,2.5
       parent: 2
-      type: Transform
   - uid: 757
     components:
-    - pos: -1.5,3.5
+    - type: Transform
+      pos: -1.5,3.5
       parent: 2
-      type: Transform
   - uid: 758
     components:
-    - pos: -1.5,4.5
+    - type: Transform
+      pos: -1.5,4.5
       parent: 2
-      type: Transform
   - uid: 760
     components:
-    - pos: -0.5,5.5
+    - type: Transform
+      pos: -0.5,5.5
       parent: 2
-      type: Transform
-- proto: CableHV
-  entities:
-  - uid: 591
+  - uid: 804
     components:
-    - pos: 2.5,-17.5
+    - type: Transform
+      pos: 6.5,-4.5
       parent: 2
-      type: Transform
-  - uid: 592
+  - uid: 819
     components:
-    - pos: 1.5,-17.5
+    - type: Transform
+      pos: 8.5,-4.5
       parent: 2
-      type: Transform
-  - uid: 593
+  - uid: 855
     components:
-    - pos: 3.5,-17.5
+    - type: Transform
+      pos: 3.5,-4.5
       parent: 2
-      type: Transform
-  - uid: 594
+- proto: CableHV
+  entities:
+  - uid: 53
     components:
-    - pos: 3.5,-16.5
+    - type: Transform
+      pos: 11.5,-21.5
       parent: 2
-      type: Transform
-  - uid: 595
+  - uid: 62
     components:
-    - pos: 3.5,-15.5
+    - type: Transform
+      pos: 8.5,-20.5
       parent: 2
-      type: Transform
-- proto: CableMV
-  entities:
-  - uid: 599
+  - uid: 63
     components:
-    - pos: 3.5,-15.5
+    - type: Transform
+      pos: 10.5,-20.5
       parent: 2
-      type: Transform
-  - uid: 600
+  - uid: 64
     components:
-    - pos: 2.5,-15.5
+    - type: Transform
+      pos: 9.5,-20.5
       parent: 2
-      type: Transform
-  - uid: 601
+  - uid: 190
     components:
-    - pos: -0.5,0.5
+    - type: Transform
+      pos: 11.5,-20.5
       parent: 2
-      type: Transform
-  - uid: 602
+  - uid: 191
     components:
-    - pos: 1.5,-14.5
+    - type: Transform
+      pos: 11.5,-22.5
       parent: 2
-      type: Transform
-  - uid: 603
+  - uid: 267
     components:
-    - pos: 2.5,-14.5
+    - type: Transform
+      pos: 11.5,-23.5
       parent: 2
-      type: Transform
-  - uid: 604
+  - uid: 273
     components:
-    - pos: 2.5,-13.5
+    - type: Transform
+      pos: -0.5,-17.5
       parent: 2
-      type: Transform
-  - uid: 605
+  - uid: 274
     components:
-    - pos: 2.5,-12.5
+    - type: Transform
+      pos: -0.5,-20.5
       parent: 2
-      type: Transform
-  - uid: 606
+  - uid: 275
     components:
-    - pos: 2.5,-11.5
+    - type: Transform
+      pos: -0.5,-21.5
       parent: 2
-      type: Transform
-  - uid: 607
+  - uid: 278
     components:
-    - pos: 1.5,1.5
+    - type: Transform
+      pos: -0.5,-26.5
       parent: 2
-      type: Transform
-  - uid: 608
+  - uid: 383
     components:
-    - pos: 2.5,1.5
+    - type: Transform
+      pos: 11.5,-15.5
       parent: 2
-      type: Transform
-  - uid: 609
+  - uid: 392
     components:
-    - pos: 2.5,0.5
+    - type: Transform
+      pos: 11.5,-18.5
       parent: 2
-      type: Transform
-  - uid: 610
+  - uid: 591
     components:
-    - pos: 2.5,-0.5
+    - type: Transform
+      pos: 2.5,-17.5
       parent: 2
-      type: Transform
-  - uid: 611
+  - uid: 592
     components:
-    - pos: 2.5,-1.5
+    - type: Transform
+      pos: 1.5,-17.5
       parent: 2
-      type: Transform
-  - uid: 612
+  - uid: 593
     components:
-    - pos: 2.5,-2.5
+    - type: Transform
+      pos: 3.5,-17.5
       parent: 2
-      type: Transform
-  - uid: 613
+  - uid: 594
     components:
-    - pos: 2.5,-3.5
+    - type: Transform
+      pos: 3.5,-16.5
       parent: 2
-      type: Transform
-  - uid: 614
+  - uid: 595
     components:
-    - pos: 2.5,-4.5
+    - type: Transform
+      pos: 3.5,-15.5
       parent: 2
-      type: Transform
-  - uid: 615
+  - uid: 623
     components:
-    - pos: 2.5,-5.5
+    - type: Transform
+      pos: 11.5,-17.5
       parent: 2
-      type: Transform
-  - uid: 616
+  - uid: 735
     components:
-    - pos: 2.5,-6.5
+    - type: Transform
+      pos: 11.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 617
+  - uid: 738
     components:
-    - pos: 2.5,-7.5
+    - type: Transform
+      pos: -0.5,-19.5
       parent: 2
-      type: Transform
-  - uid: 618
+  - uid: 743
     components:
-    - pos: 2.5,-8.5
+    - type: Transform
+      pos: -0.5,-22.5
       parent: 2
-      type: Transform
-  - uid: 619
+  - uid: 746
     components:
-    - pos: 2.5,-9.5
+    - type: Transform
+      pos: -0.5,-25.5
       parent: 2
-      type: Transform
-  - uid: 620
+  - uid: 763
     components:
-    - pos: 2.5,-10.5
+    - type: Transform
+      pos: 11.5,-24.5
       parent: 2
-      type: Transform
-  - uid: 621
+  - uid: 764
     components:
-    - pos: 0.5,1.5
+    - type: Transform
+      pos: 11.5,-25.5
       parent: 2
-      type: Transform
-  - uid: 622
+  - uid: 765
     components:
-    - pos: -0.5,1.5
+    - type: Transform
+      pos: 11.5,-26.5
       parent: 2
-      type: Transform
-  - uid: 628
+  - uid: 778
     components:
-    - pos: -0.5,5.5
+    - type: Transform
+      pos: 1.5,-16.5
       parent: 2
-      type: Transform
-  - uid: 629
+  - uid: 780
     components:
-    - pos: 0.5,5.5
+    - type: Transform
+      pos: 0.5,-16.5
       parent: 2
-      type: Transform
-  - uid: 630
+  - uid: 781
     components:
-    - pos: 1.5,5.5
+    - type: Transform
+      pos: 11.5,-14.5
       parent: 2
-      type: Transform
-  - uid: 633
+  - uid: 784
     components:
-    - pos: 6.5,6.5
+    - type: Transform
+      pos: -0.5,-15.5
       parent: 2
-      type: Transform
-  - uid: 634
+  - uid: 785
     components:
-    - pos: 6.5,5.5
-      parent: 2
-      type: Transform
-  - uid: 635
-    components:
-    - pos: 5.5,5.5
+    - type: Transform
+      pos: 11.5,-16.5
       parent: 2
-      type: Transform
-  - uid: 636
+  - uid: 800
     components:
-    - pos: 4.5,5.5
+    - type: Transform
+      pos: -0.5,-16.5
       parent: 2
-      type: Transform
-  - uid: 637
+  - uid: 801
     components:
-    - pos: 3.5,5.5
+    - type: Transform
+      pos: -0.5,-14.5
       parent: 2
-      type: Transform
-- proto: CableTerminal
-  entities:
-  - uid: 590
+  - uid: 817
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,-17.5
+    - type: Transform
+      pos: -0.5,-24.5
       parent: 2
-      type: Transform
-- proto: CargoPallet
-  entities:
-  - uid: 20
+  - uid: 818
     components:
-    - pos: 7.5,0.5
+    - type: Transform
+      pos: -0.5,-23.5
       parent: 2
-      type: Transform
-  - uid: 21
+  - uid: 824
     components:
-    - pos: 8.5,0.5
+    - type: Transform
+      pos: -0.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 22
+  - uid: 825
     components:
-    - pos: 9.5,0.5
+    - type: Transform
+      pos: -0.5,-18.5
       parent: 2
-      type: Transform
-  - uid: 23
+  - uid: 828
     components:
-    - pos: 9.5,-0.5
+    - type: Transform
+      pos: 10.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 24
+  - uid: 829
     components:
-    - pos: 8.5,-0.5
+    - type: Transform
+      pos: 9.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 25
+  - uid: 830
     components:
-    - pos: 7.5,-0.5
+    - type: Transform
+      pos: 8.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 26
+  - uid: 831
     components:
-    - pos: 7.5,-1.5
+    - type: Transform
+      pos: 7.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 27
+  - uid: 832
     components:
-    - pos: 8.5,-1.5
+    - type: Transform
+      pos: 6.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 28
+  - uid: 833
     components:
-    - pos: 9.5,-1.5
+    - type: Transform
+      pos: 5.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 29
+  - uid: 834
     components:
-    - pos: 9.5,-8.5
+    - type: Transform
+      pos: 4.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 30
+  - uid: 835
     components:
-    - pos: 8.5,-8.5
+    - type: Transform
+      pos: 3.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 31
+  - uid: 836
     components:
-    - pos: 7.5,-8.5
+    - type: Transform
+      pos: 2.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 32
+  - uid: 837
     components:
-    - pos: 2.5,-7.5
+    - type: Transform
+      pos: 1.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 33
+  - uid: 838
     components:
-    - pos: 7.5,-7.5
+    - type: Transform
+      pos: 0.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 34
+  - uid: 902
     components:
-    - pos: 1.5,-8.5
+    - type: Transform
+      pos: 10.5,-22.5
       parent: 2
-      type: Transform
-  - uid: 35
+  - uid: 904
     components:
-    - pos: 8.5,-7.5
+    - type: Transform
+      pos: 11.5,-19.5
       parent: 2
-      type: Transform
-  - uid: 36
+  - uid: 905
     components:
-    - pos: 1.5,-7.5
+    - type: Transform
+      pos: 7.5,-20.5
       parent: 2
-      type: Transform
-  - uid: 37
+  - uid: 906
     components:
-    - pos: 9.5,-7.5
+    - type: Transform
+      pos: 6.5,-20.5
       parent: 2
-      type: Transform
-  - uid: 38
+  - uid: 910
     components:
-    - pos: 7.5,-3.5
+    - type: Transform
+      pos: 9.5,-22.5
       parent: 2
-      type: Transform
-  - uid: 39
+  - uid: 911
     components:
-    - pos: 7.5,-4.5
+    - type: Transform
+      pos: 8.5,-22.5
       parent: 2
-      type: Transform
-  - uid: 40
+  - uid: 912
     components:
-    - pos: 7.5,-5.5
+    - type: Transform
+      pos: 7.5,-22.5
       parent: 2
-      type: Transform
-  - uid: 41
+  - uid: 913
     components:
-    - pos: 8.5,-5.5
+    - type: Transform
+      pos: 6.5,-22.5
       parent: 2
-      type: Transform
-  - uid: 42
+  - uid: 914
     components:
-    - pos: 8.5,-3.5
+    - type: Transform
+      pos: 4.5,-20.5
       parent: 2
-      type: Transform
-  - uid: 43
+  - uid: 915
     components:
-    - pos: 8.5,-4.5
+    - type: Transform
+      pos: 3.5,-20.5
       parent: 2
-      type: Transform
-  - uid: 44
+  - uid: 916
     components:
-    - pos: 9.5,-3.5
+    - type: Transform
+      pos: 2.5,-20.5
       parent: 2
-      type: Transform
-  - uid: 45
+  - uid: 917
     components:
-    - pos: 9.5,-4.5
+    - type: Transform
+      pos: 1.5,-20.5
       parent: 2
-      type: Transform
-  - uid: 46
+  - uid: 918
     components:
-    - pos: 9.5,-5.5
+    - type: Transform
+      pos: 0.5,-20.5
       parent: 2
-      type: Transform
-  - uid: 47
+  - uid: 919
     components:
-    - pos: 9.5,-9.5
+    - type: Transform
+      pos: 0.5,-22.5
       parent: 2
-      type: Transform
-  - uid: 48
+  - uid: 920
     components:
-    - pos: 8.5,-9.5
+    - type: Transform
+      pos: 1.5,-22.5
       parent: 2
-      type: Transform
-  - uid: 49
+  - uid: 921
     components:
-    - pos: 7.5,-9.5
+    - type: Transform
+      pos: 2.5,-22.5
       parent: 2
-      type: Transform
-  - uid: 50
+  - uid: 922
     components:
-    - pos: 3.5,-7.5
+    - type: Transform
+      pos: 3.5,-22.5
       parent: 2
-      type: Transform
-  - uid: 51
+  - uid: 923
     components:
-    - pos: 3.5,-9.5
+    - type: Transform
+      pos: 4.5,-22.5
       parent: 2
-      type: Transform
-  - uid: 52
+  - uid: 924
     components:
-    - pos: 3.5,-8.5
+    - type: Transform
+      pos: 4.5,-24.5
       parent: 2
-      type: Transform
-  - uid: 53
+  - uid: 925
     components:
-    - pos: 3.5,-3.5
+    - type: Transform
+      pos: 3.5,-24.5
       parent: 2
-      type: Transform
-  - uid: 54
+  - uid: 926
     components:
-    - pos: 3.5,-5.5
+    - type: Transform
+      pos: 2.5,-24.5
       parent: 2
-      type: Transform
-  - uid: 55
+  - uid: 927
     components:
-    - pos: 3.5,-4.5
+    - type: Transform
+      pos: 1.5,-24.5
       parent: 2
-      type: Transform
-  - uid: 56
+  - uid: 928
     components:
-    - pos: 3.5,-1.5
+    - type: Transform
+      pos: 0.5,-24.5
       parent: 2
-      type: Transform
-  - uid: 57
+  - uid: 929
     components:
-    - pos: 2.5,-8.5
+    - type: Transform
+      pos: 0.5,-26.5
       parent: 2
-      type: Transform
-  - uid: 58
+  - uid: 930
     components:
-    - pos: 3.5,-0.5
+    - type: Transform
+      pos: 1.5,-26.5
       parent: 2
-      type: Transform
-  - uid: 59
+  - uid: 931
     components:
-    - pos: 3.5,0.5
+    - type: Transform
+      pos: 2.5,-26.5
       parent: 2
-      type: Transform
-  - uid: 60
+  - uid: 932
     components:
-    - pos: 1.5,-9.5
+    - type: Transform
+      pos: 3.5,-26.5
       parent: 2
-      type: Transform
-  - uid: 61
+  - uid: 933
     components:
-    - pos: 2.5,-9.5
+    - type: Transform
+      pos: 4.5,-26.5
       parent: 2
-      type: Transform
-  - uid: 62
+  - uid: 934
     components:
-    - pos: 2.5,-5.5
+    - type: Transform
+      pos: 6.5,-26.5
       parent: 2
-      type: Transform
-  - uid: 63
+  - uid: 935
     components:
-    - pos: 1.5,-5.5
+    - type: Transform
+      pos: 7.5,-26.5
       parent: 2
-      type: Transform
-  - uid: 64
+  - uid: 936
     components:
-    - pos: 1.5,-4.5
+    - type: Transform
+      pos: 9.5,-26.5
       parent: 2
-      type: Transform
-  - uid: 65
+  - uid: 937
     components:
-    - pos: 2.5,-4.5
+    - type: Transform
+      pos: 8.5,-26.5
       parent: 2
-      type: Transform
-  - uid: 66
+  - uid: 938
     components:
-    - pos: 2.5,-3.5
+    - type: Transform
+      pos: 10.5,-26.5
       parent: 2
-      type: Transform
-  - uid: 67
+  - uid: 939
     components:
-    - pos: 1.5,-3.5
+    - type: Transform
+      pos: 6.5,-24.5
       parent: 2
-      type: Transform
-  - uid: 68
+  - uid: 940
     components:
-    - pos: 2.5,-1.5
+    - type: Transform
+      pos: 7.5,-24.5
       parent: 2
-      type: Transform
-  - uid: 69
+  - uid: 941
     components:
-    - pos: 1.5,-1.5
+    - type: Transform
+      pos: 8.5,-24.5
       parent: 2
-      type: Transform
-  - uid: 70
+  - uid: 942
     components:
-    - pos: 1.5,-0.5
+    - type: Transform
+      pos: 9.5,-24.5
       parent: 2
-      type: Transform
-  - uid: 71
+  - uid: 943
     components:
-    - pos: 2.5,-0.5
+    - type: Transform
+      pos: 10.5,-24.5
       parent: 2
-      type: Transform
-  - uid: 72
+- proto: CableMV
+  entities:
+  - uid: 599
     components:
-    - pos: 2.5,0.5
+    - type: Transform
+      pos: 3.5,-15.5
       parent: 2
-      type: Transform
-  - uid: 73
+  - uid: 600
     components:
-    - pos: 1.5,0.5
+    - type: Transform
+      pos: 2.5,-15.5
       parent: 2
-      type: Transform
-- proto: CarpetBlack
-  entities:
-  - uid: 265
+  - uid: 601
     components:
-    - pos: 3.5,5.5
+    - type: Transform
+      pos: -0.5,0.5
       parent: 2
-      type: Transform
-  - uid: 266
+  - uid: 602
     components:
-    - pos: 3.5,6.5
+    - type: Transform
+      pos: 1.5,-14.5
       parent: 2
-      type: Transform
-  - uid: 267
+  - uid: 603
     components:
-    - pos: 4.5,6.5
+    - type: Transform
+      pos: 2.5,-14.5
       parent: 2
-      type: Transform
-  - uid: 268
+  - uid: 604
     components:
-    - pos: 5.5,6.5
+    - type: Transform
+      pos: 2.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 269
+  - uid: 605
     components:
-    - pos: 6.5,6.5
+    - type: Transform
+      pos: 2.5,-12.5
       parent: 2
-      type: Transform
-  - uid: 270
+  - uid: 606
     components:
-    - pos: 7.5,6.5
+    - type: Transform
+      pos: 2.5,-11.5
       parent: 2
-      type: Transform
-  - uid: 271
+  - uid: 607
     components:
-    - pos: 7.5,5.5
+    - type: Transform
+      pos: 1.5,1.5
       parent: 2
-      type: Transform
-  - uid: 272
+  - uid: 608
     components:
-    - pos: 6.5,5.5
+    - type: Transform
+      pos: 2.5,1.5
       parent: 2
-      type: Transform
-  - uid: 273
+  - uid: 609
     components:
-    - pos: 5.5,5.5
+    - type: Transform
+      pos: 2.5,0.5
       parent: 2
-      type: Transform
-  - uid: 274
+  - uid: 610
     components:
-    - pos: 4.5,5.5
+    - type: Transform
+      pos: 2.5,-0.5
       parent: 2
-      type: Transform
-  - uid: 275
+  - uid: 611
     components:
-    - pos: 1.5,5.5
+    - type: Transform
+      pos: 2.5,-1.5
       parent: 2
-      type: Transform
-  - uid: 276
+  - uid: 612
     components:
-    - pos: 1.5,6.5
+    - type: Transform
+      pos: 2.5,-2.5
       parent: 2
-      type: Transform
-  - uid: 277
+  - uid: 613
     components:
-    - pos: 0.5,6.5
+    - type: Transform
+      pos: 2.5,-3.5
       parent: 2
-      type: Transform
-  - uid: 278
+  - uid: 614
     components:
-    - pos: 0.5,5.5
+    - type: Transform
+      pos: 2.5,-4.5
       parent: 2
-      type: Transform
-  - uid: 279
+  - uid: 615
     components:
-    - pos: 9.5,6.5
+    - type: Transform
+      pos: 2.5,-5.5
       parent: 2
-      type: Transform
-  - uid: 280
+  - uid: 616
     components:
-    - pos: 9.5,5.5
+    - type: Transform
+      pos: 2.5,-6.5
       parent: 2
-      type: Transform
-  - uid: 281
+  - uid: 617
     components:
-    - pos: 10.5,5.5
+    - type: Transform
+      pos: 2.5,-7.5
       parent: 2
-      type: Transform
-  - uid: 282
+  - uid: 618
     components:
-    - pos: 10.5,6.5
+    - type: Transform
+      pos: 2.5,-8.5
       parent: 2
-      type: Transform
-- proto: CarpetOrange
-  entities:
-  - uid: 374
+  - uid: 619
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 9.5,-15.5
+    - type: Transform
+      pos: 2.5,-9.5
       parent: 2
-      type: Transform
-  - uid: 375
+  - uid: 620
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 8.5,-15.5
+    - type: Transform
+      pos: 2.5,-10.5
       parent: 2
-      type: Transform
-  - uid: 376
+  - uid: 621
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,-15.5
+    - type: Transform
+      pos: 0.5,1.5
       parent: 2
-      type: Transform
-  - uid: 377
+  - uid: 622
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,-16.5
+    - type: Transform
+      pos: -0.5,1.5
       parent: 2
-      type: Transform
-  - uid: 378
+  - uid: 628
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 8.5,-16.5
+    - type: Transform
+      pos: -0.5,5.5
       parent: 2
-      type: Transform
-  - uid: 379
+  - uid: 629
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 9.5,-16.5
+    - type: Transform
+      pos: 0.5,5.5
       parent: 2
-      type: Transform
-- proto: Catwalk
-  entities:
-  - uid: 294
+  - uid: 630
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 12.5,4.5
+    - type: Transform
+      pos: 1.5,5.5
       parent: 2
-      type: Transform
-  - uid: 295
+  - uid: 633
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 12.5,3.5
+    - type: Transform
+      pos: 6.5,6.5
       parent: 2
-      type: Transform
-  - uid: 296
+  - uid: 634
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 12.5,2.5
+    - type: Transform
+      pos: 6.5,5.5
       parent: 2
-      type: Transform
-  - uid: 297
+  - uid: 635
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,4.5
+    - type: Transform
+      pos: 5.5,5.5
       parent: 2
-      type: Transform
-  - uid: 298
+  - uid: 636
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,3.5
+    - type: Transform
+      pos: 4.5,5.5
       parent: 2
-      type: Transform
-  - uid: 299
+  - uid: 637
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,2.5
+    - type: Transform
+      pos: 3.5,5.5
       parent: 2
-      type: Transform
-  - uid: 313
+- proto: CableTerminal
+  entities:
+  - uid: 590
     components:
-    - pos: -1.5,-3.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-17.5
       parent: 2
-      type: Transform
-  - uid: 560
+- proto: CargoPallet
+  entities:
+  - uid: 20
     components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,-5.5
+    - type: Transform
+      pos: 7.5,0.5
       parent: 2
-      type: Transform
-  - uid: 562
+  - uid: 21
     components:
-    - rot: 3.141592653589793 rad
-      pos: 12.5,-3.5
+    - type: Transform
+      pos: 8.5,0.5
       parent: 2
-      type: Transform
-  - uid: 563
+  - uid: 24
     components:
-    - rot: 3.141592653589793 rad
-      pos: 12.5,-5.5
+    - type: Transform
+      pos: 8.5,-0.5
       parent: 2
-      type: Transform
-- proto: Chair
-  entities:
-  - uid: 94
+  - uid: 25
     components:
-    - rot: 3.141592653589793 rad
-      pos: 7.5,-11.5
+    - type: Transform
+      pos: 7.5,-0.5
       parent: 2
-      type: Transform
-  - uid: 99
+  - uid: 26
     components:
-    - rot: 3.141592653589793 rad
-      pos: 3.5,-11.5
+    - type: Transform
+      pos: 7.5,-1.5
       parent: 2
-      type: Transform
-  - uid: 138
+  - uid: 27
     components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,-11.5
+    - type: Transform
+      pos: 8.5,-1.5
       parent: 2
-      type: Transform
-  - uid: 143
+  - uid: 30
     components:
-    - rot: 3.141592653589793 rad
-      pos: 6.5,-11.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,0.5
       parent: 2
-      type: Transform
-  - uid: 226
+  - uid: 32
     components:
-    - pos: 8.5,2.5
+    - type: Transform
+      pos: 2.5,-7.5
       parent: 2
-      type: Transform
-  - uid: 227
+  - uid: 34
     components:
-    - pos: 7.5,2.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-7.5
       parent: 2
-      type: Transform
-  - uid: 394
+  - uid: 35
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-11.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-7.5
       parent: 2
-      type: Transform
-  - uid: 395
+  - uid: 36
     components:
-    - rot: 3.141592653589793 rad
-      pos: 8.5,-11.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-1.5
       parent: 2
-      type: Transform
-  - uid: 396
+  - uid: 37
     components:
-    - pos: 2.5,2.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-9.5
       parent: 2
-      type: Transform
-  - uid: 405
+  - uid: 39
     components:
-    - pos: 3.5,2.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-8.5
       parent: 2
-      type: Transform
-  - uid: 406
+  - uid: 41
     components:
-    - pos: 4.5,2.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-8.5
       parent: 2
-      type: Transform
-  - uid: 407
+  - uid: 42
     components:
-    - pos: 6.5,2.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-8.5
       parent: 2
-      type: Transform
-- proto: ChairPilotSeat
-  entities:
-  - uid: 372
+  - uid: 43
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 10.5,-16.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-9.5
       parent: 2
-      type: Transform
-  - uid: 373
+  - uid: 44
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 10.5,-15.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-0.5
       parent: 2
-      type: Transform
-- proto: ChairWood
-  entities:
-  - uid: 253
+  - uid: 45
     components:
-    - pos: 2.5,5.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-8.5
       parent: 2
-      type: Transform
-  - uid: 254
+  - uid: 46
     components:
-    - pos: 7.5,5.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-6.5
       parent: 2
-      type: Transform
-  - uid: 255
+  - uid: 47
     components:
-    - pos: 3.5,5.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-9.5
       parent: 2
-      type: Transform
-  - uid: 258
+  - uid: 48
     components:
-    - pos: 1.5,5.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-7.5
       parent: 2
-      type: Transform
-  - uid: 263
+  - uid: 49
     components:
-    - pos: 8.5,5.5
+    - type: Transform
+      pos: 7.5,-9.5
       parent: 2
-      type: Transform
-  - uid: 264
+  - uid: 50
     components:
-    - pos: 9.5,5.5
+    - type: Transform
+      pos: 3.5,-7.5
       parent: 2
-      type: Transform
-- proto: ClosetEmergencyFilledRandom
-  entities:
-  - uid: 354
+  - uid: 51
     components:
-    - pos: 0.5,2.5
+    - type: Transform
+      pos: 3.5,-9.5
       parent: 2
-      type: Transform
-- proto: ClosetFireFilled
-  entities:
-  - uid: 355
+  - uid: 52
     components:
-    - pos: 10.5,2.5
+    - type: Transform
+      pos: 3.5,-8.5
       parent: 2
-      type: Transform
-- proto: ConveyorBelt
-  entities:
-  - uid: 81
+  - uid: 54
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,-2.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-7.5
       parent: 2
-      type: Transform
-    - links:
-      - 365
-      type: DeviceLinkSink
-  - uid: 82
+  - uid: 55
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,-6.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-2.5
       parent: 2
-      type: Transform
-    - links:
-      - 366
-      type: DeviceLinkSink
-  - uid: 108
+  - uid: 56
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 12.5,-2.5
+    - type: Transform
+      pos: 3.5,-1.5
       parent: 2
-      type: Transform
-    - links:
-      - 393
-      type: DeviceLinkSink
-  - uid: 110
+  - uid: 57
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -2.5,-2.5
+    - type: Transform
+      pos: 2.5,-8.5
       parent: 2
-      type: Transform
-    - links:
-      - 365
-      type: DeviceLinkSink
-  - uid: 329
+  - uid: 58
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,-6.5
+    - type: Transform
+      pos: 3.5,-0.5
       parent: 2
-      type: Transform
-    - links:
-      - 366
-      type: DeviceLinkSink
-  - uid: 330
+  - uid: 59
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 13.5,-6.5
+    - type: Transform
+      pos: 3.5,0.5
       parent: 2
-      type: Transform
-    - links:
-      - 404
-      type: DeviceLinkSink
-  - uid: 331
+  - uid: 60
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 11.5,-6.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-0.5
       parent: 2
-      type: Transform
-    - links:
-      - 404
-      type: DeviceLinkSink
-  - uid: 335
+  - uid: 61
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 12.5,-6.5
+    - type: Transform
+      pos: 2.5,-9.5
       parent: 2
-      type: Transform
-    - links:
-      - 404
-      type: DeviceLinkSink
-  - uid: 337
+  - uid: 66
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 11.5,-2.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-2.5
       parent: 2
-      type: Transform
-    - links:
-      - 393
-      type: DeviceLinkSink
-  - uid: 338
+  - uid: 67
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -2.5,-6.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-2.5
       parent: 2
-      type: Transform
-    - links:
-      - 366
-      type: DeviceLinkSink
-  - uid: 339
+  - uid: 68
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,-2.5
+    - type: Transform
+      pos: 2.5,-1.5
       parent: 2
-      type: Transform
-    - links:
-      - 365
-      type: DeviceLinkSink
-  - uid: 340
+  - uid: 69
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 13.5,-2.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-2.5
       parent: 2
-      type: Transform
-    - links:
-      - 393
-      type: DeviceLinkSink
-  - uid: 359
+  - uid: 70
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 10.5,-2.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-2.5
       parent: 2
-      type: Transform
-    - links:
-      - 393
-      type: DeviceLinkSink
-  - uid: 362
+  - uid: 71
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 10.5,-6.5
+    - type: Transform
+      pos: 2.5,-0.5
       parent: 2
-      type: Transform
-    - links:
-      - 404
-      type: DeviceLinkSink
-  - uid: 363
+  - uid: 72
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,-2.5
+    - type: Transform
+      pos: 2.5,0.5
       parent: 2
-      type: Transform
-    - links:
-      - 365
-      type: DeviceLinkSink
-  - uid: 364
+  - uid: 73
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,-6.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-6.5
       parent: 2
-      type: Transform
-    - links:
-      - 366
-      type: DeviceLinkSink
-- proto: ExtinguisherCabinetFilled
-  entities:
-  - uid: 360
+  - uid: 183
     components:
-    - rot: 3.141592653589793 rad
-      pos: 5.5,0.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-6.5
       parent: 2
-      type: Transform
-  - uid: 361
+  - uid: 900
     components:
-    - rot: 3.141592653589793 rad
-      pos: 5.5,-9.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-6.5
       parent: 2
-      type: Transform
-- proto: Firelock
-  entities:
-  - uid: 789
+  - uid: 901
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -0.5,1.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-6.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 803
-      - 802
-      type: DeviceNetwork
-  - uid: 790
+  - uid: 903
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 11.5,1.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,0.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 803
-      - 802
-      type: DeviceNetwork
-- proto: FirelockEdge
-  entities:
-  - uid: 786
+  - uid: 907
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,-16.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-6.5
       parent: 2
-      type: Transform
-- proto: FirelockGlass
-  entities:
-  - uid: 782
+  - uid: 908
     components:
-    - rot: 3.141592653589793 rad
-      pos: 11.5,5.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-2.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 806
-      - 805
-      type: DeviceNetwork
-  - uid: 783
+  - uid: 909
     components:
-    - rot: 3.141592653589793 rad
-      pos: -0.5,5.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-1.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 806
-      - 805
-      type: DeviceNetwork
-- proto: GasOutletInjector
+- proto: CarpetBlack
   entities:
-  - uid: 386
+  - uid: 33
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 5.5,-15.5
-      parent: 2
-      type: Transform
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,5.5
+      parent: 2
+  - uid: 65
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,5.5
+      parent: 2
+  - uid: 199
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,6.5
+      parent: 2
+  - uid: 200
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,5.5
+      parent: 2
+  - uid: 201
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,5.5
+      parent: 2
+  - uid: 211
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,6.5
+      parent: 2
+  - uid: 212
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,6.5
+      parent: 2
+  - uid: 213
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,6.5
+      parent: 2
+  - uid: 214
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,5.5
+      parent: 2
+  - uid: 215
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,6.5
+      parent: 2
+  - uid: 221
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,6.5
+      parent: 2
+  - uid: 246
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,6.5
+      parent: 2
+  - uid: 247
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,5.5
+      parent: 2
+  - uid: 265
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,6.5
+      parent: 2
+  - uid: 266
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,6.5
+      parent: 2
+  - uid: 268
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,5.5
+      parent: 2
+  - uid: 269
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,5.5
+      parent: 2
+  - uid: 270
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,5.5
+      parent: 2
+  - uid: 271
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,6.5
+      parent: 2
+- proto: Catwalk
+  entities:
+  - uid: 294
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,4.5
+      parent: 2
+  - uid: 295
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,3.5
+      parent: 2
+  - uid: 296
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,2.5
+      parent: 2
+  - uid: 297
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,4.5
+      parent: 2
+  - uid: 298
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,3.5
+      parent: 2
+  - uid: 299
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,2.5
+      parent: 2
+  - uid: 528
+    components:
+    - type: Transform
+      pos: 0.5,-24.5
+      parent: 2
+  - uid: 529
+    components:
+    - type: Transform
+      pos: 2.5,-26.5
+      parent: 2
+  - uid: 533
+    components:
+    - type: Transform
+      pos: 3.5,-22.5
+      parent: 2
+  - uid: 538
+    components:
+    - type: Transform
+      pos: 0.5,-20.5
+      parent: 2
+  - uid: 539
+    components:
+    - type: Transform
+      pos: 9.5,-20.5
+      parent: 2
+  - uid: 540
+    components:
+    - type: Transform
+      pos: 9.5,-22.5
+      parent: 2
+  - uid: 543
+    components:
+    - type: Transform
+      pos: 8.5,-22.5
+      parent: 2
+  - uid: 544
+    components:
+    - type: Transform
+      pos: 9.5,-24.5
+      parent: 2
+  - uid: 552
+    components:
+    - type: Transform
+      pos: 2.5,-24.5
+      parent: 2
+  - uid: 554
+    components:
+    - type: Transform
+      pos: 7.5,-26.5
+      parent: 2
+  - uid: 557
+    components:
+    - type: Transform
+      pos: 3.5,-26.5
+      parent: 2
+  - uid: 559
+    components:
+    - type: Transform
+      pos: 0.5,-26.5
+      parent: 2
+  - uid: 571
+    components:
+    - type: Transform
+      pos: 8.5,-20.5
+      parent: 2
+  - uid: 573
+    components:
+    - type: Transform
+      pos: 10.5,-20.5
+      parent: 2
+  - uid: 578
+    components:
+    - type: Transform
+      pos: 9.5,-26.5
+      parent: 2
+  - uid: 579
+    components:
+    - type: Transform
+      pos: 10.5,-24.5
+      parent: 2
+  - uid: 586
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-3.5
+      parent: 2
+  - uid: 587
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-5.5
+      parent: 2
+  - uid: 588
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-5.5
+      parent: 2
+  - uid: 589
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,-3.5
+      parent: 2
+  - uid: 596
+    components:
+    - type: Transform
+      pos: 7.5,-24.5
+      parent: 2
+  - uid: 598
+    components:
+    - type: Transform
+      pos: 7.5,-22.5
+      parent: 2
+  - uid: 759
+    components:
+    - type: Transform
+      pos: 3.5,-24.5
+      parent: 2
+  - uid: 761
+    components:
+    - type: Transform
+      pos: 1.5,-22.5
+      parent: 2
+  - uid: 762
+    components:
+    - type: Transform
+      pos: 2.5,-20.5
+      parent: 2
+  - uid: 840
+    components:
+    - type: Transform
+      pos: 3.5,-20.5
+      parent: 2
+  - uid: 841
+    components:
+    - type: Transform
+      pos: 1.5,-24.5
+      parent: 2
+  - uid: 846
+    components:
+    - type: Transform
+      pos: 1.5,-26.5
+      parent: 2
+  - uid: 848
+    components:
+    - type: Transform
+      pos: 4.5,-26.5
+      parent: 2
+  - uid: 849
+    components:
+    - type: Transform
+      pos: 0.5,-22.5
+      parent: 2
+  - uid: 850
+    components:
+    - type: Transform
+      pos: 2.5,-22.5
+      parent: 2
+  - uid: 856
+    components:
+    - type: Transform
+      pos: 6.5,-26.5
+      parent: 2
+  - uid: 857
+    components:
+    - type: Transform
+      pos: 10.5,-22.5
+      parent: 2
+  - uid: 858
+    components:
+    - type: Transform
+      pos: 6.5,-20.5
+      parent: 2
+  - uid: 859
+    components:
+    - type: Transform
+      pos: 1.5,-20.5
+      parent: 2
+  - uid: 860
+    components:
+    - type: Transform
+      pos: 4.5,-20.5
+      parent: 2
+  - uid: 861
+    components:
+    - type: Transform
+      pos: 7.5,-20.5
+      parent: 2
+  - uid: 863
+    components:
+    - type: Transform
+      pos: 8.5,-24.5
+      parent: 2
+  - uid: 864
+    components:
+    - type: Transform
+      pos: 8.5,-26.5
+      parent: 2
+  - uid: 865
+    components:
+    - type: Transform
+      pos: 10.5,-26.5
+      parent: 2
+  - uid: 956
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-3.5
+      parent: 2
+  - uid: 957
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-5.5
+      parent: 2
+  - uid: 958
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-5.5
+      parent: 2
+  - uid: 959
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-3.5
+      parent: 2
+- proto: Chair
+  entities:
+  - uid: 38
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-4.5
+      parent: 2
+  - uid: 40
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-4.5
+      parent: 2
+  - uid: 94
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-11.5
+      parent: 2
+  - uid: 99
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-11.5
+      parent: 2
+  - uid: 138
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-11.5
+      parent: 2
+  - uid: 143
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-11.5
+      parent: 2
+  - uid: 226
+    components:
+    - type: Transform
+      pos: 8.5,2.5
+      parent: 2
+  - uid: 227
+    components:
+    - type: Transform
+      pos: 7.5,2.5
+      parent: 2
+  - uid: 394
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-11.5
+      parent: 2
+  - uid: 395
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-11.5
+      parent: 2
+  - uid: 396
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 2
+  - uid: 405
+    components:
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 2
+  - uid: 406
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 2
+  - uid: 407
+    components:
+    - type: Transform
+      pos: 6.5,2.5
+      parent: 2
+- proto: ChairPilotSeat
+  entities:
+  - uid: 767
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-16.5
+      parent: 2
+  - uid: 768
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-16.5
+      parent: 2
+- proto: ChairWood
+  entities:
+  - uid: 253
+    components:
+    - type: Transform
+      pos: 2.5,5.5
+      parent: 2
+  - uid: 254
+    components:
+    - type: Transform
+      pos: 7.5,5.5
+      parent: 2
+  - uid: 255
+    components:
+    - type: Transform
+      pos: 3.5,5.5
+      parent: 2
+  - uid: 258
+    components:
+    - type: Transform
+      pos: 1.5,5.5
+      parent: 2
+  - uid: 263
+    components:
+    - type: Transform
+      pos: 8.5,5.5
+      parent: 2
+  - uid: 264
+    components:
+    - type: Transform
+      pos: 9.5,5.5
+      parent: 2
+- proto: ClosetEmergencyFilledRandom
+  entities:
+  - uid: 354
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 2
+- proto: ClosetFireFilled
+  entities:
+  - uid: 355
+    components:
+    - type: Transform
+      pos: 10.5,2.5
+      parent: 2
+- proto: ComputerPalletConsole
+  entities:
+  - uid: 894
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-4.5
+      parent: 2
+  - uid: 895
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-4.5
+      parent: 2
+- proto: ComputerPowerMonitoring
+  entities:
+  - uid: 766
+    components:
+    - type: Transform
+      pos: 7.5,-15.5
+      parent: 2
+- proto: ComputerSolarControl
+  entities:
+  - uid: 772
+    components:
+    - type: Transform
+      pos: 8.5,-15.5
+      parent: 2
+- proto: ConveyorBelt
+  entities:
+  - uid: 81
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-2.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 365
+  - uid: 82
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-6.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 366
+  - uid: 108
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-2.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 393
+  - uid: 110
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-2.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 365
+  - uid: 329
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-6.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 366
+  - uid: 330
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-6.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 404
+  - uid: 331
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-6.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 404
+  - uid: 335
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-6.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 404
+  - uid: 337
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-2.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 393
+  - uid: 338
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-6.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 366
+  - uid: 339
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-2.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 365
+  - uid: 340
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,-2.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 393
+  - uid: 359
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-2.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 393
+  - uid: 362
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-6.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 404
+  - uid: 363
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-2.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 365
+  - uid: 364
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-6.5
+      parent: 2
+    - type: DeviceLinkSink
+      links:
+      - 366
+- proto: ExtinguisherCabinetFilled
+  entities:
+  - uid: 360
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,0.5
+      parent: 2
+  - uid: 361
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-9.5
+      parent: 2
+- proto: Firelock
+  entities:
+  - uid: 789
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,1.5
+      parent: 2
+  - uid: 790
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,1.5
+      parent: 2
+- proto: FirelockEdge
+  entities:
+  - uid: 786
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-16.5
+      parent: 2
+- proto: FirelockGlass
+  entities:
+  - uid: 782
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,5.5
+      parent: 2
+  - uid: 783
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,5.5
+      parent: 2
+- proto: GasOutletInjector
+  entities:
+  - uid: 386
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-15.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
 - proto: GasPassiveVent
   entities:
   - uid: 397
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 6.5,-15.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-15.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+  - uid: 414
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-13.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+- proto: GasPipeBend
+  entities:
+  - uid: 316
+    components:
+    - type: Transform
+      pos: 7.5,6.5
+      parent: 2
+  - uid: 317
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,4.5
+      parent: 2
+  - uid: 318
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,4.5
+      parent: 2
+  - uid: 322
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,6.5
+      parent: 2
+  - uid: 434
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-17.5
+      parent: 2
+  - uid: 457
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-11.5
+      parent: 2
+  - uid: 458
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-8.5
       parent: 2
-      type: Transform
-  - uid: 414
+  - uid: 475
     components:
-    - rot: 3.141592653589793 rad
-      pos: 5.5,-13.5
+    - type: Transform
+      pos: 3.5,-8.5
       parent: 2
-      type: Transform
-- proto: GasPipeBend
+  - uid: 476
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-10.5
+      parent: 2
+  - uid: 486
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 2
+  - uid: 487
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,1.5
+      parent: 2
+  - uid: 488
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,5.5
+      parent: 2
+  - uid: 489
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,1.5
+      parent: 2
+  - uid: 490
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,1.5
+      parent: 2
+  - uid: 491
+    components:
+    - type: Transform
+      pos: 12.5,5.5
+      parent: 2
+  - uid: 512
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,4.5
+      parent: 2
+  - uid: 520
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,4.5
+      parent: 2
+  - uid: 522
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,5.5
+      parent: 2
+- proto: GasPipeStraight
   entities:
-  - uid: 316
+  - uid: 223
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,6.5
+      parent: 2
+  - uid: 241
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,6.5
+      parent: 2
+  - uid: 250
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,6.5
+      parent: 2
+  - uid: 284
+    components:
+    - type: Transform
+      pos: 7.5,5.5
+      parent: 2
+  - uid: 321
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,5.5
+      parent: 2
+  - uid: 323
+    components:
+    - type: Transform
+      pos: 3.5,5.5
+      parent: 2
+  - uid: 417
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-14.5
+      parent: 2
+  - uid: 418
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-13.5
+      parent: 2
+  - uid: 419
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-12.5
+      parent: 2
+  - uid: 420
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-11.5
+      parent: 2
+  - uid: 421
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-16.5
+      parent: 2
+  - uid: 422
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-16.5
+      parent: 2
+  - uid: 423
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-16.5
+      parent: 2
+  - uid: 424
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-16.5
+      parent: 2
+  - uid: 425
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-16.5
+      parent: 2
+  - uid: 426
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-16.5
+      parent: 2
+  - uid: 428
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-15.5
+      parent: 2
+  - uid: 430
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-14.5
+      parent: 2
+  - uid: 431
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-13.5
+      parent: 2
+  - uid: 432
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-12.5
+      parent: 2
+  - uid: 435
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-16.5
+      parent: 2
+  - uid: 436
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-17.5
+      parent: 2
+  - uid: 437
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-17.5
+      parent: 2
+  - uid: 438
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-17.5
+      parent: 2
+  - uid: 439
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,-17.5
+      parent: 2
+  - uid: 442
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-0.5
+      parent: 2
+  - uid: 443
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-1.5
+      parent: 2
+  - uid: 444
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-2.5
+      parent: 2
+  - uid: 445
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-3.5
+      parent: 2
+  - uid: 446
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-4.5
+      parent: 2
+  - uid: 447
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-5.5
+      parent: 2
+  - uid: 448
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-6.5
+      parent: 2
+  - uid: 449
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-7.5
+      parent: 2
+  - uid: 450
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-8.5
+      parent: 2
+  - uid: 451
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-9.5
+      parent: 2
+  - uid: 452
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-10.5
+      parent: 2
+  - uid: 453
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-11.5
+      parent: 2
+  - uid: 454
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-11.5
+      parent: 2
+  - uid: 455
+    components:
+    - type: Transform
+      pos: 5.5,-12.5
+      parent: 2
+  - uid: 456
     components:
-    - pos: 7.5,6.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-11.5
       parent: 2
-      type: Transform
-  - uid: 317
+  - uid: 459
     components:
-    - rot: 3.141592653589793 rad
-      pos: 7.5,4.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-8.5
       parent: 2
-      type: Transform
-  - uid: 318
+  - uid: 460
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 3.5,4.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-8.5
       parent: 2
-      type: Transform
-  - uid: 322
+  - uid: 461
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,6.5
+    - type: Transform
+      pos: 7.5,-10.5
       parent: 2
-      type: Transform
-  - uid: 434
+  - uid: 462
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-17.5
+    - type: Transform
+      pos: 7.5,-9.5
       parent: 2
-      type: Transform
-  - uid: 457
+  - uid: 464
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,-11.5
+    - type: Transform
+      pos: 8.5,-9.5
       parent: 2
-      type: Transform
-  - uid: 458
+  - uid: 465
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 7.5,-8.5
+    - type: Transform
+      pos: 8.5,-8.5
       parent: 2
-      type: Transform
-  - uid: 475
+  - uid: 466
     components:
-    - pos: 3.5,-8.5
+    - type: Transform
+      pos: 8.5,-7.5
       parent: 2
-      type: Transform
-  - uid: 476
+  - uid: 467
     components:
-    - rot: 3.141592653589793 rad
-      pos: 3.5,-10.5
+    - type: Transform
+      pos: 8.5,-6.5
       parent: 2
-      type: Transform
-  - uid: 486
+  - uid: 468
     components:
-    - pos: 2.5,1.5
+    - type: Transform
+      pos: 8.5,-5.5
       parent: 2
-      type: Transform
-  - uid: 487
+  - uid: 469
     components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,1.5
+    - type: Transform
+      pos: 8.5,-4.5
       parent: 2
-      type: Transform
-  - uid: 488
+  - uid: 470
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,5.5
+    - type: Transform
+      pos: 8.5,-3.5
       parent: 2
-      type: Transform
-  - uid: 489
+  - uid: 471
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 8.5,1.5
+    - type: Transform
+      pos: 8.5,-2.5
       parent: 2
-      type: Transform
-  - uid: 490
+  - uid: 472
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 12.5,1.5
+    - type: Transform
+      pos: 8.5,-1.5
       parent: 2
-      type: Transform
-  - uid: 491
+  - uid: 473
     components:
-    - pos: 12.5,5.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,-0.5
       parent: 2
-      type: Transform
-  - uid: 512
+  - uid: 477
     components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,4.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-8.5
       parent: 2
-      type: Transform
-  - uid: 520
+  - uid: 478
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 9.5,4.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-8.5
       parent: 2
-      type: Transform
-  - uid: 522
+  - uid: 479
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,5.5
+    - type: Transform
+      pos: 3.5,-9.5
       parent: 2
-      type: Transform
-- proto: GasPipeStraight
-  entities:
-  - uid: 223
+  - uid: 480
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 5.5,6.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-10.5
       parent: 2
-      type: Transform
-  - uid: 241
+  - uid: 481
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.5,6.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-10.5
       parent: 2
-      type: Transform
-  - uid: 250
+  - uid: 482
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,6.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-10.5
       parent: 2
-      type: Transform
-  - uid: 284
+  - uid: 483
     components:
-    - pos: 7.5,5.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-10.5
       parent: 2
-      type: Transform
-  - uid: 321
+  - uid: 484
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,0.5
       parent: 2
-      type: Transform
-  - uid: 323
+  - uid: 485
     components:
-    - pos: 3.5,5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,0.5
       parent: 2
-      type: Transform
-  - uid: 417
+  - uid: 492
     components:
-    - rot: 3.141592653589793 rad
-      pos: 8.5,-14.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,1.5
       parent: 2
-      type: Transform
-  - uid: 418
+  - uid: 493
     components:
-    - rot: 3.141592653589793 rad
-      pos: 8.5,-13.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,1.5
       parent: 2
-      type: Transform
-  - uid: 419
+  - uid: 494
     components:
-    - rot: 3.141592653589793 rad
-      pos: 8.5,-12.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,1.5
       parent: 2
-      type: Transform
-  - uid: 420
+  - uid: 495
     components:
-    - rot: 3.141592653589793 rad
-      pos: 8.5,-11.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,1.5
       parent: 2
-      type: Transform
-  - uid: 421
+  - uid: 496
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,-16.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,1.5
       parent: 2
-      type: Transform
-  - uid: 422
+  - uid: 497
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.5,-16.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,1.5
       parent: 2
-      type: Transform
-  - uid: 423
+  - uid: 498
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 5.5,-16.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,2.5
       parent: 2
-      type: Transform
-  - uid: 424
+  - uid: 499
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,-16.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,3.5
       parent: 2
-      type: Transform
-  - uid: 425
+  - uid: 500
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 3.5,-16.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,4.5
       parent: 2
-      type: Transform
-  - uid: 426
+  - uid: 501
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,-16.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,5.5
       parent: 2
-      type: Transform
-  - uid: 428
+  - uid: 502
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 7.5,-15.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,5.5
       parent: 2
-      type: Transform
-  - uid: 430
+  - uid: 503
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-14.5
+    - type: Transform
+      pos: 12.5,4.5
       parent: 2
-      type: Transform
-  - uid: 431
+  - uid: 504
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-13.5
+    - type: Transform
+      pos: 12.5,3.5
       parent: 2
-      type: Transform
-  - uid: 432
+  - uid: 505
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-12.5
+    - type: Transform
+      pos: 12.5,2.5
       parent: 2
-      type: Transform
-  - uid: 435
+  - uid: 506
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-16.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,5.5
       parent: 2
-      type: Transform
-  - uid: 436
+  - uid: 507
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,-17.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,5.5
       parent: 2
-      type: Transform
-  - uid: 437
+  - uid: 508
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,-17.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,5.5
       parent: 2
-      type: Transform
-  - uid: 438
+  - uid: 511
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 5.5,-17.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,5.5
       parent: 2
-      type: Transform
-  - uid: 439
+  - uid: 513
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 6.5,-17.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,4.5
       parent: 2
-      type: Transform
-  - uid: 442
+  - uid: 519
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,-0.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,4.5
       parent: 2
-      type: Transform
-  - uid: 443
+  - uid: 521
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-1.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,5.5
       parent: 2
-      type: Transform
-  - uid: 444
+  - uid: 523
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-2.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,5.5
       parent: 2
-      type: Transform
-  - uid: 445
+  - uid: 524
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-3.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,5.5
       parent: 2
-      type: Transform
-  - uid: 446
+  - uid: 525
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-4.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,5.5
       parent: 2
-      type: Transform
-  - uid: 447
+  - uid: 526
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-5.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,5.5
       parent: 2
-      type: Transform
-  - uid: 448
+- proto: GasPipeTJunction
+  entities:
+  - uid: 415
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-6.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-16.5
       parent: 2
-      type: Transform
-  - uid: 449
+  - uid: 416
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-7.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-15.5
       parent: 2
-      type: Transform
-  - uid: 450
+  - uid: 429
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-8.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-15.5
       parent: 2
-      type: Transform
-  - uid: 451
+  - uid: 433
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-9.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-11.5
       parent: 2
-      type: Transform
-  - uid: 452
+  - uid: 440
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-10.5
+    - type: Transform
+      pos: 5.5,-11.5
       parent: 2
-      type: Transform
-  - uid: 453
+  - uid: 441
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,-11.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-0.5
       parent: 2
-      type: Transform
-  - uid: 454
+  - uid: 463
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,-11.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,-10.5
       parent: 2
-      type: Transform
-  - uid: 455
+  - uid: 474
     components:
-    - pos: 5.5,-12.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-0.5
       parent: 2
-      type: Transform
-  - uid: 456
+  - uid: 509
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.5,-11.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,5.5
       parent: 2
-      type: Transform
-  - uid: 459
+  - uid: 510
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 8.5,-8.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,5.5
       parent: 2
-      type: Transform
-  - uid: 460
+- proto: GasPort
+  entities:
+  - uid: 427
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 9.5,-8.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-15.5
       parent: 2
-      type: Transform
-  - uid: 461
+    - type: AtmosDevice
+      joinedGrid: 2
+- proto: GasVentPump
+  entities:
+  - uid: 398
     components:
-    - pos: 7.5,-10.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-17.5
       parent: 2
-      type: Transform
-  - uid: 462
+    - type: AtmosDevice
+      joinedGrid: 2
+  - uid: 400
     components:
-    - pos: 7.5,-9.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-8.5
       parent: 2
-      type: Transform
-  - uid: 464
+    - type: AtmosDevice
+      joinedGrid: 2
+  - uid: 401
     components:
-    - pos: 8.5,-9.5
+    - type: Transform
+      pos: 2.5,6.5
       parent: 2
-      type: Transform
-  - uid: 465
+    - type: AtmosDevice
+      joinedGrid: 2
+  - uid: 402
     components:
-    - pos: 8.5,-8.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-0.5
       parent: 2
-      type: Transform
-  - uid: 466
+    - type: AtmosDevice
+      joinedGrid: 2
+  - uid: 403
     components:
-    - pos: 8.5,-7.5
+    - type: Transform
+      pos: 8.5,6.5
       parent: 2
-      type: Transform
-  - uid: 467
+    - type: AtmosDevice
+      joinedGrid: 2
+  - uid: 412
     components:
-    - pos: 8.5,-6.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-16.5
       parent: 2
-      type: Transform
-  - uid: 468
+    - type: AtmosDevice
+      joinedGrid: 2
+- proto: GasVentScrubber
+  entities:
+  - uid: 399
     components:
-    - pos: 8.5,-5.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-15.5
       parent: 2
-      type: Transform
-  - uid: 469
+    - type: AtmosDevice
+      joinedGrid: 2
+  - uid: 408
     components:
-    - pos: 8.5,-4.5
+    - type: Transform
+      pos: 1.5,6.5
       parent: 2
-      type: Transform
-  - uid: 470
+    - type: AtmosDevice
+      joinedGrid: 2
+  - uid: 409
     components:
-    - pos: 8.5,-3.5
+    - type: Transform
+      pos: 9.5,6.5
       parent: 2
-      type: Transform
-  - uid: 471
+    - type: AtmosDevice
+      joinedGrid: 2
+  - uid: 410
     components:
-    - pos: 8.5,-2.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-8.5
       parent: 2
-      type: Transform
-  - uid: 472
+    - type: AtmosDevice
+      joinedGrid: 2
+  - uid: 411
     components:
-    - pos: 8.5,-1.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-0.5
       parent: 2
-      type: Transform
-  - uid: 473
+    - type: AtmosDevice
+      joinedGrid: 2
+  - uid: 413
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 9.5,-0.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-17.5
       parent: 2
-      type: Transform
-  - uid: 477
+    - type: AtmosDevice
+      joinedGrid: 2
+- proto: GeneratorRTG
+  entities:
+  - uid: 367
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,-8.5
+    - type: Transform
+      pos: 1.5,-17.5
       parent: 2
-      type: Transform
-  - uid: 478
+  - uid: 368
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,-8.5
+    - type: Transform
+      pos: 2.5,-17.5
       parent: 2
-      type: Transform
-  - uid: 479
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 279
     components:
-    - pos: 3.5,-9.5
+    - type: Transform
+      pos: 1.5,-16.5
       parent: 2
-      type: Transform
-  - uid: 480
+- proto: Grille
+  entities:
+  - uid: 14
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,-10.5
+    - type: Transform
+      pos: 5.5,-1.5
       parent: 2
-      type: Transform
-  - uid: 481
+  - uid: 15
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.5,-10.5
+    - type: Transform
+      pos: 5.5,-2.5
       parent: 2
-      type: Transform
-  - uid: 482
+  - uid: 16
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 5.5,-10.5
+    - type: Transform
+      pos: 5.5,-3.5
       parent: 2
-      type: Transform
-  - uid: 483
+  - uid: 17
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,-10.5
+    - type: Transform
+      pos: 5.5,-4.5
       parent: 2
-      type: Transform
-  - uid: 484
+  - uid: 18
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,0.5
+    - type: Transform
+      pos: 5.5,-5.5
       parent: 2
-      type: Transform
-  - uid: 485
+  - uid: 19
     components:
-    - rot: 3.141592653589793 rad
-      pos: 8.5,0.5
+    - type: Transform
+      pos: 5.5,-6.5
       parent: 2
-      type: Transform
-  - uid: 492
+  - uid: 75
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 9.5,1.5
+    - type: Transform
+      pos: 5.5,-7.5
       parent: 2
-      type: Transform
-  - uid: 493
+  - uid: 146
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 10.5,1.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,3.5
       parent: 2
-      type: Transform
-  - uid: 494
+  - uid: 147
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 11.5,1.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,3.5
       parent: 2
-      type: Transform
-  - uid: 495
+  - uid: 148
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,1.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,3.5
       parent: 2
-      type: Transform
-  - uid: 496
+  - uid: 149
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 0.5,1.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,3.5
       parent: 2
-      type: Transform
-  - uid: 497
+  - uid: 150
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -0.5,1.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,3.5
       parent: 2
-      type: Transform
-  - uid: 498
+  - uid: 151
     components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,2.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,3.5
       parent: 2
-      type: Transform
-  - uid: 499
+  - uid: 153
     components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,3.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,5.5
       parent: 2
-      type: Transform
-  - uid: 500
+  - uid: 162
     components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,4.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,3.5
       parent: 2
-      type: Transform
-  - uid: 501
+  - uid: 163
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,2.5
       parent: 2
-      type: Transform
-  - uid: 502
+  - uid: 164
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,1.5
       parent: 2
-      type: Transform
-  - uid: 503
+  - uid: 166
     components:
-    - pos: 12.5,4.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,0.5
       parent: 2
-      type: Transform
-  - uid: 504
+  - uid: 167
     components:
-    - pos: 12.5,3.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,0.5
       parent: 2
-      type: Transform
-  - uid: 505
+  - uid: 168
     components:
-    - pos: 12.5,2.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,4.5
       parent: 2
-      type: Transform
-  - uid: 506
+  - uid: 169
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 11.5,5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,1.5
       parent: 2
-      type: Transform
-  - uid: 507
+  - uid: 170
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 10.5,5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,2.5
       parent: 2
-      type: Transform
-  - uid: 508
+  - uid: 171
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 9.5,5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,3.5
       parent: 2
-      type: Transform
-  - uid: 511
+  - uid: 194
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 0.5,5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 513
+  - uid: 195
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,4.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 519
+  - uid: 196
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 8.5,4.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 521
+  - uid: 197
     components:
-    - rot: 3.141592653589793 rad
-      pos: 9.5,5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 523
+  - uid: 224
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,5.5
+    - type: Transform
+      pos: 8.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 524
+  - uid: 225
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,5.5
+    - type: Transform
+      pos: 2.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 525
+  - uid: 228
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 5.5,5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,4.5
       parent: 2
-      type: Transform
-  - uid: 526
+  - uid: 229
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 6.5,5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,5.5
       parent: 2
-      type: Transform
-- proto: GasPipeTJunction
-  entities:
-  - uid: 415
+  - uid: 272
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 8.5,-16.5
+    - type: Transform
+      pos: 10.5,-28.5
       parent: 2
-      type: Transform
-  - uid: 416
+  - uid: 282
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 8.5,-15.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-11.5
       parent: 2
-      type: Transform
-  - uid: 429
+  - uid: 286
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,-15.5
+    - type: Transform
+      pos: -2.5,-24.5
       parent: 2
-      type: Transform
-  - uid: 433
+  - uid: 291
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,-11.5
+    - type: Transform
+      pos: -2.5,-28.5
       parent: 2
-      type: Transform
-  - uid: 440
+  - uid: 303
     components:
-    - pos: 5.5,-11.5
+    - type: Transform
+      pos: 4.5,7.5
       parent: 2
-      type: Transform
-  - uid: 441
+  - uid: 304
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,-0.5
+    - type: Transform
+      pos: 3.5,7.5
       parent: 2
-      type: Transform
-  - uid: 463
+  - uid: 306
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 8.5,-10.5
+    - type: Transform
+      pos: 6.5,7.5
       parent: 2
-      type: Transform
-  - uid: 474
+  - uid: 307
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 8.5,-0.5
+    - type: Transform
+      pos: 5.5,7.5
       parent: 2
-      type: Transform
-  - uid: 509
+  - uid: 312
     components:
-    - rot: 3.141592653589793 rad
-      pos: 8.5,5.5
+    - type: Transform
+      pos: 7.5,7.5
       parent: 2
-      type: Transform
-  - uid: 510
+  - uid: 349
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,5.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-1.5
       parent: 2
-      type: Transform
-- proto: GasPort
-  entities:
-  - uid: 427
+  - uid: 350
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,-15.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-7.5
       parent: 2
-      type: Transform
-- proto: GasVentPump
-  entities:
-  - uid: 398
+  - uid: 351
     components:
-    - rot: 3.141592653589793 rad
-      pos: 8.5,-17.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-7.5
       parent: 2
-      type: Transform
-  - uid: 400
+  - uid: 352
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,-8.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-1.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 803
-      - 802
-      type: DeviceNetwork
-  - uid: 401
+  - uid: 373
     components:
-    - pos: 2.5,6.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-12.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 806
-      - 805
-      type: DeviceNetwork
-  - uid: 402
+  - uid: 379
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 10.5,-0.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-19.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 803
-      - 802
-      type: DeviceNetwork
-  - uid: 403
+  - uid: 514
     components:
-    - pos: 8.5,6.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-16.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 806
-      - 805
-      type: DeviceNetwork
-  - uid: 412
+  - uid: 516
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,-16.5
+    - type: Transform
+      pos: 13.5,-27.5
       parent: 2
-      type: Transform
-- proto: GasVentScrubber
-  entities:
-  - uid: 399
+  - uid: 527
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,-15.5
+    - type: Transform
+      pos: -0.5,-28.5
       parent: 2
-      type: Transform
-  - uid: 408
+  - uid: 556
     components:
-    - pos: 1.5,6.5
+    - type: Transform
+      pos: 13.5,-21.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 806
-      - 805
-      type: DeviceNetwork
-  - uid: 409
+  - uid: 569
     components:
-    - pos: 9.5,6.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-4.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 806
-      - 805
-      type: DeviceNetwork
-  - uid: 410
+  - uid: 570
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 10.5,-8.5
+    - type: Transform
+      pos: 13.5,-24.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 803
-      - 802
-      type: DeviceNetwork
-  - uid: 411
+  - uid: 572
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,-0.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,-4.5
       parent: 2
-      type: Transform
-    - ShutdownSubscribers:
-      - 803
-      - 802
-      type: DeviceNetwork
-  - uid: 413
+  - uid: 624
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,-17.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-19.5
       parent: 2
-      type: Transform
-- proto: GeneratorRTG
-  entities:
-  - uid: 367
+  - uid: 625
     components:
-    - pos: 1.5,-17.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-14.5
       parent: 2
-      type: Transform
-  - uid: 368
+  - uid: 626
     components:
-    - pos: 2.5,-17.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-11.5
       parent: 2
-      type: Transform
-- proto: GravityGeneratorMini
-  entities:
-  - uid: 382
+  - uid: 627
     components:
-    - pos: 0.5,-16.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-12.5
       parent: 2
-      type: Transform
-- proto: Grille
-  entities:
-  - uid: 14
+  - uid: 737
     components:
-    - pos: 5.5,-1.5
+    - type: Transform
+      pos: 9.5,-28.5
       parent: 2
-      type: Transform
-  - uid: 15
+  - uid: 750
     components:
-    - pos: 5.5,-2.5
+    - type: Transform
+      pos: -2.5,-27.5
       parent: 2
-      type: Transform
-  - uid: 16
+  - uid: 787
     components:
-    - pos: 5.5,-3.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-18.5
       parent: 2
-      type: Transform
-  - uid: 17
+  - uid: 788
     components:
-    - pos: 5.5,-4.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-10.5
       parent: 2
-      type: Transform
-  - uid: 18
+  - uid: 791
     components:
-    - pos: 5.5,-5.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-10.5
       parent: 2
-      type: Transform
-  - uid: 19
+  - uid: 792
     components:
-    - pos: 5.5,-6.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-16.5
       parent: 2
-      type: Transform
-  - uid: 75
+  - uid: 798
     components:
-    - pos: 5.5,-7.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-17.5
       parent: 2
-      type: Transform
-  - uid: 146
+  - uid: 814
     components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,3.5
+    - type: Transform
+      pos: 13.5,-28.5
       parent: 2
-      type: Transform
-  - uid: 147
+  - uid: 820
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,3.5
+    - type: Transform
+      pos: -2.5,-25.5
       parent: 2
-      type: Transform
-  - uid: 148
+  - uid: 821
     components:
-    - rot: 3.141592653589793 rad
-      pos: 3.5,3.5
+    - type: Transform
+      pos: -2.5,-22.5
       parent: 2
-      type: Transform
-  - uid: 149
+  - uid: 823
     components:
-    - rot: 3.141592653589793 rad
-      pos: 7.5,3.5
+    - type: Transform
+      pos: 0.5,-28.5
       parent: 2
-      type: Transform
-  - uid: 150
+  - uid: 826
     components:
-    - rot: 3.141592653589793 rad
-      pos: 8.5,3.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-18.5
       parent: 2
-      type: Transform
-  - uid: 151
+  - uid: 827
     components:
-    - rot: 3.141592653589793 rad
-      pos: 9.5,3.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 13.5,-14.5
       parent: 2
-      type: Transform
-  - uid: 153
+  - uid: 847
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,5.5
+    - type: Transform
+      pos: 13.5,-26.5
       parent: 2
-      type: Transform
-  - uid: 162
+  - uid: 862
     components:
-    - rot: 3.141592653589793 rad
-      pos: 13.5,3.5
+    - type: Transform
+      pos: 13.5,-23.5
       parent: 2
-      type: Transform
-  - uid: 163
+  - uid: 876
     components:
-    - rot: 3.141592653589793 rad
-      pos: 13.5,2.5
+    - type: Transform
+      pos: -1.5,9.5
       parent: 2
-      type: Transform
-  - uid: 164
+  - uid: 877
     components:
-    - rot: 3.141592653589793 rad
-      pos: 13.5,1.5
+    - type: Transform
+      pos: -0.5,9.5
       parent: 2
-      type: Transform
-  - uid: 166
+  - uid: 878
     components:
-    - rot: 3.141592653589793 rad
-      pos: 12.5,0.5
+    - type: Transform
+      pos: 1.5,9.5
       parent: 2
-      type: Transform
-  - uid: 167
+  - uid: 879
     components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,0.5
+    - type: Transform
+      pos: 0.5,9.5
       parent: 2
-      type: Transform
-  - uid: 168
+  - uid: 880
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,4.5
+    - type: Transform
+      pos: 3.5,9.5
       parent: 2
-      type: Transform
-  - uid: 169
+  - uid: 881
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,1.5
+    - type: Transform
+      pos: 5.5,9.5
       parent: 2
-      type: Transform
-  - uid: 170
+  - uid: 882
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,2.5
+    - type: Transform
+      pos: 7.5,9.5
       parent: 2
-      type: Transform
-  - uid: 171
+  - uid: 883
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,3.5
+    - type: Transform
+      pos: 8.5,9.5
       parent: 2
-      type: Transform
-  - uid: 194
+  - uid: 884
     components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,-13.5
+    - type: Transform
+      pos: 10.5,9.5
       parent: 2
-      type: Transform
-  - uid: 195
+  - uid: 885
     components:
-    - rot: 3.141592653589793 rad
-      pos: 3.5,-13.5
+    - type: Transform
+      pos: 9.5,9.5
       parent: 2
-      type: Transform
-  - uid: 196
+  - uid: 886
     components:
-    - rot: 3.141592653589793 rad
-      pos: 7.5,-13.5
+    - type: Transform
+      pos: 12.5,9.5
       parent: 2
-      type: Transform
-  - uid: 197
+- proto: GrilleSpawner
+  entities:
+  - uid: 277
     components:
-    - rot: 3.141592653589793 rad
-      pos: 9.5,-13.5
+    - type: Transform
+      pos: 11.5,-28.5
       parent: 2
-      type: Transform
-  - uid: 224
+  - uid: 382
     components:
-    - pos: 8.5,-13.5
+    - type: Transform
+      pos: 13.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 225
+  - uid: 517
     components:
-    - pos: 2.5,-13.5
+    - type: Transform
+      pos: -2.5,-26.5
       parent: 2
-      type: Transform
-  - uid: 228
+  - uid: 631
     components:
-    - rot: 3.141592653589793 rad
-      pos: 13.5,4.5
+    - type: Transform
+      pos: -2.5,-15.5
       parent: 2
-      type: Transform
-  - uid: 229
+  - uid: 632
     components:
-    - rot: 3.141592653589793 rad
-      pos: 13.5,5.5
+    - type: Transform
+      pos: -2.5,-17.5
       parent: 2
-      type: Transform
-  - uid: 303
+  - uid: 754
     components:
-    - pos: 4.5,7.5
+    - type: Transform
+      pos: -2.5,-21.5
       parent: 2
-      type: Transform
-  - uid: 304
+  - uid: 755
     components:
-    - pos: 3.5,7.5
+    - type: Transform
+      pos: 13.5,-25.5
       parent: 2
-      type: Transform
-  - uid: 306
+  - uid: 756
     components:
-    - pos: 6.5,7.5
+    - type: Transform
+      pos: 13.5,-22.5
       parent: 2
-      type: Transform
-  - uid: 307
+  - uid: 797
     components:
-    - pos: 5.5,7.5
+    - type: Transform
+      pos: 13.5,-15.5
       parent: 2
-      type: Transform
-  - uid: 312
+  - uid: 799
     components:
-    - pos: 7.5,7.5
+    - type: Transform
+      pos: -2.5,-13.5
       parent: 2
-      type: Transform
-  - uid: 349
+  - uid: 815
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,-1.5
+    - type: Transform
+      pos: 1.5,-28.5
       parent: 2
-      type: Transform
-  - uid: 350
+  - uid: 822
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,-7.5
+    - type: Transform
+      pos: -2.5,-23.5
       parent: 2
-      type: Transform
-  - uid: 351
+  - uid: 887
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 12.5,-7.5
+    - type: Transform
+      pos: 2.5,9.5
       parent: 2
-      type: Transform
-  - uid: 352
+  - uid: 888
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 12.5,-1.5
+    - type: Transform
+      pos: 4.5,9.5
       parent: 2
-      type: Transform
-  - uid: 569
+  - uid: 889
     components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,-4.5
+    - type: Transform
+      pos: 6.5,9.5
       parent: 2
-      type: Transform
-  - uid: 572
+  - uid: 890
     components:
-    - rot: 3.141592653589793 rad
-      pos: 12.5,-4.5
+    - type: Transform
+      pos: 11.5,9.5
       parent: 2
-      type: Transform
 - proto: Gyroscope
   entities:
-  - uid: 383
+  - uid: 816
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 0.5,-15.5
+    - type: Transform
+      pos: 1.5,-15.5
+      parent: 2
+- proto: Lamp
+  entities:
+  - uid: 774
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.59808,-15.833403
       parent: 2
-      type: Transform
 - proto: LiquidNitrogenCanister
   entities:
   - uid: 385
     components:
-    - pos: 5.5,-17.5
+    - type: Transform
+      pos: 5.5,-17.5
       parent: 2
-      type: Transform
+    - type: AtmosDevice
+      joinedGrid: 2
 - proto: LiquidOxygenCanister
   entities:
   - uid: 384
     components:
-    - pos: 4.5,-17.5
+    - type: Transform
+      pos: 4.5,-17.5
+      parent: 2
+    - type: AtmosDevice
+      joinedGrid: 2
+- proto: Paper
+  entities:
+  - uid: 775
+    components:
+    - type: Transform
+      pos: 9.61031,-16.5917
+      parent: 2
+  - uid: 776
+    components:
+    - type: Transform
+      pos: 9.488004,-16.738466
+      parent: 2
+  - uid: 777
+    components:
+    - type: Transform
+      pos: 9.341236,-16.909695
       parent: 2
-      type: Transform
 - proto: PlasmaReinforcedWindowDirectional
   entities:
   - uid: 388
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,-15.5
       parent: 2
-      type: Transform
   - uid: 389
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 6.5,-15.5
       parent: 2
-      type: Transform
   - uid: 390
     components:
-    - pos: 6.5,-15.5
+    - type: Transform
+      pos: 6.5,-15.5
       parent: 2
-      type: Transform
   - uid: 391
     components:
-    - pos: 5.5,-15.5
+    - type: Transform
+      pos: 5.5,-15.5
       parent: 2
-      type: Transform
 - proto: PlasticFlapsAirtightClear
   entities:
   - uid: 84
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 13.5,-6.5
       parent: 2
-      type: Transform
   - uid: 86
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -0.5,-2.5
       parent: 2
-      type: Transform
   - uid: 112
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 11.5,-6.5
       parent: 2
-      type: Transform
   - uid: 328
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -2.5,-2.5
       parent: 2
-      type: Transform
   - uid: 332
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -0.5,-6.5
       parent: 2
-      type: Transform
   - uid: 333
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -2.5,-6.5
       parent: 2
-      type: Transform
   - uid: 334
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 13.5,-2.5
       parent: 2
-      type: Transform
   - uid: 336
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 11.5,-2.5
       parent: 2
-      type: Transform
 - proto: PottedPlantRandom
   entities:
   - uid: 139
     components:
-    - pos: 1.5,-11.5
+    - type: Transform
+      pos: 1.5,-11.5
       parent: 2
-      type: Transform
   - uid: 140
     components:
-    - pos: 9.5,-11.5
+    - type: Transform
+      pos: 9.5,-11.5
       parent: 2
-      type: Transform
   - uid: 218
     components:
-    - pos: 1.5,2.5
+    - type: Transform
+      pos: 1.5,2.5
       parent: 2
-      type: Transform
   - uid: 238
     components:
-    - pos: 9.5,2.5
+    - type: Transform
+      pos: 9.5,2.5
       parent: 2
-      type: Transform
   - uid: 314
     components:
-    - pos: 0.5,4.5
+    - type: Transform
+      pos: 0.5,4.5
       parent: 2
-      type: Transform
   - uid: 315
     components:
-    - pos: 10.5,4.5
+    - type: Transform
+      pos: 10.5,4.5
       parent: 2
-      type: Transform
-  - uid: 392
+- proto: PowerCellRecharger
+  entities:
+  - uid: 773
     components:
-    - pos: 9.5,-17.5
+    - type: Transform
+      pos: 9.5,-15.5
       parent: 2
-      type: Transform
 - proto: Poweredlight
   entities:
   - uid: 119
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 4.5,-0.5
       parent: 2
-      type: Transform
   - uid: 120
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 6.5,-0.5
       parent: 2
-      type: Transform
   - uid: 121
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 6.5,-8.5
       parent: 2
-      type: Transform
   - uid: 122
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 4.5,-8.5
       parent: 2
-      type: Transform
   - uid: 123
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 5.5,-11.5
       parent: 2
-      type: Transform
   - uid: 124
     components:
-    - pos: 5.5,2.5
+    - type: Transform
+      pos: 5.5,2.5
       parent: 2
-      type: Transform
   - uid: 216
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 2.5,-17.5
       parent: 2
-      type: Transform
   - uid: 219
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 8.5,-17.5
       parent: 2
-      type: Transform
   - uid: 231
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 0.5,6.5
       parent: 2
-      type: Transform
   - uid: 232
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 10.5,6.5
       parent: 2
-      type: Transform
   - uid: 233
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,3.5
       parent: 2
-      type: Transform
   - uid: 234
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 12.5,3.5
       parent: 2
-      type: Transform
 - proto: PoweredSmallLight
   entities:
   - uid: 259
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -1.5,-3.5
       parent: 2
-      type: Transform
   - uid: 574
     components:
-    - pos: -1.5,-5.5
+    - type: Transform
+      pos: -1.5,-5.5
       parent: 2
-      type: Transform
   - uid: 580
     components:
-    - pos: 12.5,-5.5
+    - type: Transform
+      pos: 12.5,-5.5
       parent: 2
-      type: Transform
   - uid: 581
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 12.5,-3.5
       parent: 2
-      type: Transform
 - proto: Railing
   entities:
-  - uid: 286
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,4.5
-      parent: 2
-      type: Transform
   - uid: 287
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 3.5,4.5
       parent: 2
-      type: Transform
   - uid: 288
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,4.5
       parent: 2
-      type: Transform
   - uid: 289
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 9.5,4.5
       parent: 2
-      type: Transform
+  - uid: 293
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,4.5
+      parent: 2
   - uid: 325
     components:
-    - pos: 6.5,5.5
+    - type: Transform
+      pos: 6.5,5.5
       parent: 2
-      type: Transform
   - uid: 326
     components:
-    - pos: 4.5,5.5
+    - type: Transform
+      pos: 4.5,5.5
       parent: 2
-      type: Transform
   - uid: 327
     components:
-    - pos: 5.5,5.5
+    - type: Transform
+      pos: 5.5,5.5
       parent: 2
-      type: Transform
 - proto: RailingCornerSmall
   entities:
   - uid: 290
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 3.5,5.5
       parent: 2
-      type: Transform
-  - uid: 291
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 9.5,5.5
-      parent: 2
-      type: Transform
   - uid: 292
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 7.5,5.5
       parent: 2
-      type: Transform
-  - uid: 293
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,5.5
-      parent: 2
-      type: Transform
 - proto: RandomPosterLegit
   entities:
   - uid: 518
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 3.5,-14.5
       parent: 2
-      type: Transform
   - uid: 545
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 0.5,3.5
       parent: 2
-      type: Transform
   - uid: 546
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 10.5,3.5
       parent: 2
-      type: Transform
   - uid: 547
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 10.5,-11.5
       parent: 2
-      type: Transform
   - uid: 548
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 0.5,-11.5
       parent: 2
-      type: Transform
   - uid: 549
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 9.5,7.5
       parent: 2
-      type: Transform
   - uid: 550
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 1.5,7.5
       parent: 2
-      type: Transform
   - uid: 551
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 7.5,-14.5
       parent: 2
-      type: Transform
 - proto: ReinforcedWindow
   entities:
   - uid: 3
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 13.5,4.5
       parent: 2
-      type: Transform
   - uid: 7
     components:
-    - pos: 5.5,-7.5
+    - type: Transform
+      pos: 5.5,-7.5
       parent: 2
-      type: Transform
   - uid: 8
     components:
-    - pos: 5.5,-1.5
+    - type: Transform
+      pos: 5.5,-1.5
       parent: 2
-      type: Transform
   - uid: 9
     components:
-    - pos: 5.5,-2.5
+    - type: Transform
+      pos: 5.5,-2.5
       parent: 2
-      type: Transform
   - uid: 10
     components:
-    - pos: 5.5,-3.5
+    - type: Transform
+      pos: 5.5,-3.5
       parent: 2
-      type: Transform
   - uid: 11
     components:
-    - pos: 5.5,-4.5
+    - type: Transform
+      pos: 5.5,-4.5
       parent: 2
-      type: Transform
   - uid: 12
     components:
-    - pos: 5.5,-5.5
+    - type: Transform
+      pos: 5.5,-5.5
       parent: 2
-      type: Transform
   - uid: 13
     components:
-    - pos: 5.5,-6.5
+    - type: Transform
+      pos: 5.5,-6.5
       parent: 2
-      type: Transform
   - uid: 77
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 7.5,-13.5
       parent: 2
-      type: Transform
   - uid: 100
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 1.5,-13.5
       parent: 2
-      type: Transform
   - uid: 127
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 9.5,3.5
       parent: 2
-      type: Transform
   - uid: 128
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 8.5,3.5
       parent: 2
-      type: Transform
   - uid: 129
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 7.5,3.5
       parent: 2
-      type: Transform
   - uid: 133
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 3.5,3.5
       parent: 2
-      type: Transform
   - uid: 134
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 2.5,3.5
       parent: 2
-      type: Transform
   - uid: 135
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 1.5,3.5
       parent: 2
-      type: Transform
   - uid: 142
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 9.5,-13.5
       parent: 2
-      type: Transform
   - uid: 152
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -1.5,0.5
       parent: 2
-      type: Transform
   - uid: 154
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -2.5,1.5
       parent: 2
-      type: Transform
   - uid: 155
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -2.5,3.5
       parent: 2
-      type: Transform
   - uid: 156
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -2.5,2.5
       parent: 2
-      type: Transform
   - uid: 157
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 12.5,0.5
       parent: 2
-      type: Transform
   - uid: 158
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 13.5,5.5
       parent: 2
-      type: Transform
   - uid: 159
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 13.5,1.5
       parent: 2
-      type: Transform
   - uid: 160
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 13.5,2.5
       parent: 2
-      type: Transform
   - uid: 161
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 13.5,3.5
       parent: 2
-      type: Transform
   - uid: 165
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -2.5,5.5
       parent: 2
-      type: Transform
   - uid: 182
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -2.5,4.5
       parent: 2
-      type: Transform
   - uid: 185
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 3.5,-13.5
       parent: 2
-      type: Transform
   - uid: 285
     components:
-    - pos: 3.5,7.5
+    - type: Transform
+      pos: 3.5,7.5
       parent: 2
-      type: Transform
   - uid: 300
     components:
-    - pos: 5.5,7.5
+    - type: Transform
+      pos: 5.5,7.5
       parent: 2
-      type: Transform
   - uid: 301
     components:
-    - pos: 6.5,7.5
+    - type: Transform
+      pos: 6.5,7.5
       parent: 2
-      type: Transform
   - uid: 302
     components:
-    - pos: 7.5,7.5
+    - type: Transform
+      pos: 7.5,7.5
       parent: 2
-      type: Transform
   - uid: 311
     components:
-    - pos: 4.5,7.5
+    - type: Transform
+      pos: 4.5,7.5
       parent: 2
-      type: Transform
   - uid: 353
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,-1.5
       parent: 2
-      type: Transform
   - uid: 356
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,-7.5
       parent: 2
-      type: Transform
   - uid: 357
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 12.5,-7.5
       parent: 2
-      type: Transform
   - uid: 358
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 12.5,-1.5
       parent: 2
-      type: Transform
   - uid: 555
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -1.5,-4.5
       parent: 2
-      type: Transform
   - uid: 558
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 12.5,-4.5
       parent: 2
-      type: Transform
 - proto: ShuttersNormalOpen
   entities:
   - uid: 808
     components:
-    - pos: 1.5,3.5
+    - type: Transform
+      pos: 1.5,3.5
       parent: 2
-      type: Transform
-    - links:
+    - type: DeviceLinkSink
+      links:
       - 807
-      type: DeviceLinkSink
   - uid: 809
     components:
-    - pos: 2.5,3.5
+    - type: Transform
+      pos: 2.5,3.5
       parent: 2
-      type: Transform
-    - links:
+    - type: DeviceLinkSink
+      links:
       - 807
-      type: DeviceLinkSink
   - uid: 810
     components:
-    - pos: 3.5,3.5
+    - type: Transform
+      pos: 3.5,3.5
       parent: 2
-      type: Transform
-    - links:
+    - type: DeviceLinkSink
+      links:
       - 807
-      type: DeviceLinkSink
   - uid: 811
     components:
-    - pos: 7.5,3.5
+    - type: Transform
+      pos: 7.5,3.5
       parent: 2
-      type: Transform
-    - links:
+    - type: DeviceLinkSink
+      links:
       - 807
-      type: DeviceLinkSink
   - uid: 812
     components:
-    - pos: 8.5,3.5
+    - type: Transform
+      pos: 8.5,3.5
       parent: 2
-      type: Transform
-    - links:
+    - type: DeviceLinkSink
+      links:
       - 807
-      type: DeviceLinkSink
   - uid: 813
     components:
-    - pos: 9.5,3.5
+    - type: Transform
+      pos: 9.5,3.5
       parent: 2
-      type: Transform
-    - links:
+    - type: DeviceLinkSink
+      links:
       - 807
-      type: DeviceLinkSink
 - proto: SignalButton
   entities:
   - uid: 807
     components:
-    - pos: 0.5,7.5
+    - type: MetaData
+      name: shutters button
+    - type: Transform
+      pos: 0.5,7.5
       parent: 2
-      type: Transform
-    - linkedPorts:
+    - type: DeviceLinkSource
+      linkedPorts:
         808:
         - Pressed: Toggle
         809:
@@ -3981,107 +4948,367 @@ entities:
         - Pressed: Toggle
         813:
         - Pressed: Toggle
-      type: DeviceLinkSource
 - proto: SignSecureMed
   entities:
   - uid: 144
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 5.5,-8.5
       parent: 2
-      type: Transform
   - uid: 145
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 5.5,-0.5
       parent: 2
-      type: Transform
+- proto: SignShipDock
+  entities:
+  - uid: 945
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 2
+  - uid: 946
+    components:
+    - type: Transform
+      pos: 13.5,-4.5
+      parent: 2
 - proto: SignSpace
   entities:
   - uid: 341
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -0.5,-1.5
       parent: 2
-      type: Transform
   - uid: 342
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 11.5,-1.5
       parent: 2
-      type: Transform
   - uid: 343
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 11.5,-7.5
       parent: 2
-      type: Transform
-  - uid: 344
+  - uid: 344
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-7.5
+      parent: 2
+- proto: SMESBasic
+  entities:
+  - uid: 380
+    components:
+    - type: Transform
+      pos: 3.5,-17.5
+      parent: 2
+- proto: SolarPanel
+  entities:
+  - uid: 280
+    components:
+    - type: Transform
+      pos: 3.5,-24.5
+      parent: 2
+  - uid: 281
+    components:
+    - type: Transform
+      pos: 1.5,-24.5
+      parent: 2
+  - uid: 530
+    components:
+    - type: Transform
+      pos: 6.5,-20.5
+      parent: 2
+  - uid: 531
+    components:
+    - type: Transform
+      pos: 8.5,-20.5
+      parent: 2
+  - uid: 532
+    components:
+    - type: Transform
+      pos: 10.5,-20.5
+      parent: 2
+  - uid: 534
+    components:
+    - type: Transform
+      pos: 0.5,-26.5
+      parent: 2
+  - uid: 535
+    components:
+    - type: Transform
+      pos: 9.5,-24.5
+      parent: 2
+  - uid: 536
+    components:
+    - type: Transform
+      pos: 10.5,-22.5
+      parent: 2
+  - uid: 537
+    components:
+    - type: Transform
+      pos: 7.5,-24.5
+      parent: 2
+  - uid: 561
+    components:
+    - type: Transform
+      pos: 9.5,-26.5
+      parent: 2
+  - uid: 564
+    components:
+    - type: Transform
+      pos: 7.5,-20.5
+      parent: 2
+  - uid: 565
+    components:
+    - type: Transform
+      pos: 6.5,-26.5
+      parent: 2
+  - uid: 566
+    components:
+    - type: Transform
+      pos: 10.5,-24.5
+      parent: 2
+  - uid: 567
+    components:
+    - type: Transform
+      pos: 1.5,-26.5
+      parent: 2
+  - uid: 568
+    components:
+    - type: Transform
+      pos: 7.5,-22.5
+      parent: 2
+  - uid: 649
+    components:
+    - type: Transform
+      pos: 4.5,-26.5
+      parent: 2
+  - uid: 650
+    components:
+    - type: Transform
+      pos: 2.5,-24.5
+      parent: 2
+  - uid: 839
+    components:
+    - type: Transform
+      pos: 8.5,-24.5
+      parent: 2
+  - uid: 842
+    components:
+    - type: Transform
+      pos: 10.5,-26.5
+      parent: 2
+  - uid: 843
+    components:
+    - type: Transform
+      pos: 7.5,-26.5
+      parent: 2
+  - uid: 844
+    components:
+    - type: Transform
+      pos: 8.5,-26.5
+      parent: 2
+  - uid: 845
+    components:
+    - type: Transform
+      pos: 9.5,-20.5
+      parent: 2
+  - uid: 851
+    components:
+    - type: Transform
+      pos: 2.5,-26.5
+      parent: 2
+  - uid: 852
+    components:
+    - type: Transform
+      pos: 3.5,-26.5
+      parent: 2
+  - uid: 853
+    components:
+    - type: Transform
+      pos: 9.5,-22.5
+      parent: 2
+  - uid: 854
+    components:
+    - type: Transform
+      pos: 8.5,-22.5
+      parent: 2
+  - uid: 866
+    components:
+    - type: Transform
+      pos: 0.5,-24.5
+      parent: 2
+  - uid: 867
+    components:
+    - type: Transform
+      pos: 3.5,-22.5
+      parent: 2
+  - uid: 868
+    components:
+    - type: Transform
+      pos: 1.5,-22.5
+      parent: 2
+  - uid: 869
+    components:
+    - type: Transform
+      pos: 2.5,-22.5
+      parent: 2
+  - uid: 870
+    components:
+    - type: Transform
+      pos: 0.5,-20.5
+      parent: 2
+  - uid: 871
+    components:
+    - type: Transform
+      pos: 2.5,-20.5
+      parent: 2
+  - uid: 872
+    components:
+    - type: Transform
+      pos: 3.5,-20.5
+      parent: 2
+  - uid: 873
+    components:
+    - type: Transform
+      pos: 4.5,-20.5
+      parent: 2
+  - uid: 891
+    components:
+    - type: Transform
+      pos: 0.5,-22.5
+      parent: 2
+  - uid: 892
+    components:
+    - type: Transform
+      pos: 1.5,-20.5
+      parent: 2
+- proto: SolarTracker
+  entities:
+  - uid: 198
+    components:
+    - type: Transform
+      pos: 4.5,-22.5
+      parent: 2
+  - uid: 874
+    components:
+    - type: Transform
+      pos: 6.5,-22.5
+      parent: 2
+  - uid: 875
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,-7.5
+    - type: Transform
+      pos: 4.5,-24.5
       parent: 2
-      type: Transform
-- proto: SMESBasic
-  entities:
-  - uid: 380
+  - uid: 893
     components:
-    - pos: 3.5,-17.5
+    - type: Transform
+      pos: 6.5,-24.5
       parent: 2
-      type: Transform
 - proto: SubstationBasic
   entities:
   - uid: 381
     components:
-    - pos: 3.5,-15.5
+    - type: Transform
+      pos: 3.5,-15.5
       parent: 2
-      type: Transform
 - proto: TableCounterWood
   entities:
   - uid: 251
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 2.5,4.5
       parent: 2
-      type: Transform
   - uid: 252
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 1.5,4.5
       parent: 2
-      type: Transform
   - uid: 256
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 3.5,4.5
       parent: 2
-      type: Transform
   - uid: 257
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 7.5,4.5
       parent: 2
-      type: Transform
   - uid: 261
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 9.5,4.5
       parent: 2
-      type: Transform
   - uid: 262
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 8.5,4.5
       parent: 2
-      type: Transform
+- proto: TableReinforced
+  entities:
+  - uid: 769
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-15.5
+      parent: 2
+  - uid: 770
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-16.5
+      parent: 2
+  - uid: 771
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,-17.5
+      parent: 2
+  - uid: 896
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-3.5
+      parent: 2
+  - uid: 897
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-5.5
+      parent: 2
+  - uid: 898
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-3.5
+      parent: 2
+  - uid: 899
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-5.5
+      parent: 2
 - proto: TwoWayLever
   entities:
   - uid: 365
     components:
-    - pos: 0.5,-3.5
+    - type: Transform
+      pos: 0.5,-3.5
       parent: 2
-      type: Transform
-    - linkedPorts:
+    - type: DeviceLinkSource
+      linkedPorts:
         363:
         - Left: Forward
         - Right: Reverse
@@ -4098,13 +5325,13 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-      type: DeviceLinkSource
   - uid: 366
     components:
-    - pos: 0.5,-5.5
+    - type: Transform
+      pos: 0.5,-5.5
       parent: 2
-      type: Transform
-    - linkedPorts:
+    - type: DeviceLinkSource
+      linkedPorts:
         364:
         - Left: Forward
         - Right: Reverse
@@ -4121,13 +5348,13 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-      type: DeviceLinkSource
   - uid: 393
     components:
-    - pos: 10.5,-3.5
+    - type: Transform
+      pos: 10.5,-3.5
       parent: 2
-      type: Transform
-    - linkedPorts:
+    - type: DeviceLinkSource
+      linkedPorts:
         359:
         - Left: Forward
         - Right: Reverse
@@ -4144,13 +5371,13 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-      type: DeviceLinkSource
   - uid: 404
     components:
-    - pos: 10.5,-5.5
+    - type: Transform
+      pos: 10.5,-5.5
       parent: 2
-      type: Transform
-    - linkedPorts:
+    - type: DeviceLinkSource
+      linkedPorts:
         362:
         - Left: Forward
         - Right: Reverse
@@ -4167,584 +5394,575 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-      type: DeviceLinkSource
 - proto: WallReinforced
   entities:
   - uid: 4
     components:
-    - pos: 5.5,0.5
+    - type: Transform
+      pos: 5.5,0.5
       parent: 2
-      type: Transform
   - uid: 5
     components:
-    - pos: 5.5,-0.5
+    - type: Transform
+      pos: 5.5,-0.5
       parent: 2
-      type: Transform
   - uid: 6
     components:
-    - pos: 5.5,-8.5
+    - type: Transform
+      pos: 5.5,-8.5
+      parent: 2
+  - uid: 28
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-15.5
+      parent: 2
+  - uid: 29
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-16.5
       parent: 2
-      type: Transform
   - uid: 74
     components:
-    - pos: 5.5,-9.5
+    - type: Transform
+      pos: 5.5,-9.5
       parent: 2
-      type: Transform
   - uid: 76
     components:
-    - pos: 11.5,2.5
+    - type: Transform
+      pos: 11.5,2.5
       parent: 2
-      type: Transform
   - uid: 78
     components:
-    - pos: 11.5,0.5
+    - type: Transform
+      pos: 11.5,0.5
       parent: 2
-      type: Transform
   - uid: 79
     components:
-    - pos: 11.5,-0.5
+    - type: Transform
+      pos: 11.5,-0.5
       parent: 2
-      type: Transform
   - uid: 80
     components:
-    - pos: 11.5,-1.5
+    - type: Transform
+      pos: 11.5,-1.5
       parent: 2
-      type: Transform
   - uid: 83
     components:
-    - pos: 11.5,-4.5
+    - type: Transform
+      pos: 11.5,-4.5
       parent: 2
-      type: Transform
   - uid: 85
     components:
-    - pos: 11.5,-7.5
+    - type: Transform
+      pos: 11.5,-7.5
       parent: 2
-      type: Transform
   - uid: 87
     components:
-    - pos: 11.5,-8.5
+    - type: Transform
+      pos: 11.5,-8.5
       parent: 2
-      type: Transform
   - uid: 88
     components:
-    - pos: 11.5,-9.5
+    - type: Transform
+      pos: 11.5,-9.5
       parent: 2
-      type: Transform
   - uid: 89
     components:
-    - pos: 11.5,-10.5
+    - type: Transform
+      pos: 11.5,-10.5
       parent: 2
-      type: Transform
   - uid: 90
     components:
-    - pos: 11.5,-11.5
+    - type: Transform
+      pos: 11.5,-11.5
       parent: 2
-      type: Transform
   - uid: 91
     components:
-    - pos: 10.5,-11.5
+    - type: Transform
+      pos: 10.5,-11.5
       parent: 2
-      type: Transform
   - uid: 92
     components:
-    - pos: 10.5,-12.5
+    - type: Transform
+      pos: 10.5,-12.5
       parent: 2
-      type: Transform
   - uid: 93
     components:
-    - pos: 9.5,-12.5
+    - type: Transform
+      pos: 9.5,-12.5
       parent: 2
-      type: Transform
   - uid: 95
     components:
-    - pos: 7.5,-12.5
+    - type: Transform
+      pos: 7.5,-12.5
       parent: 2
-      type: Transform
   - uid: 96
     components:
-    - pos: 6.5,-12.5
+    - type: Transform
+      pos: 6.5,-12.5
       parent: 2
-      type: Transform
   - uid: 97
     components:
-    - pos: 5.5,-12.5
+    - type: Transform
+      pos: 5.5,-12.5
       parent: 2
-      type: Transform
   - uid: 98
     components:
-    - pos: 4.5,-12.5
+    - type: Transform
+      pos: 4.5,-12.5
       parent: 2
-      type: Transform
   - uid: 101
     components:
-    - pos: 1.5,-12.5
+    - type: Transform
+      pos: 1.5,-12.5
       parent: 2
-      type: Transform
   - uid: 102
     components:
-    - pos: 0.5,-12.5
+    - type: Transform
+      pos: 0.5,-12.5
       parent: 2
-      type: Transform
   - uid: 103
     components:
-    - pos: 0.5,-11.5
+    - type: Transform
+      pos: 0.5,-11.5
       parent: 2
-      type: Transform
   - uid: 104
     components:
-    - pos: -0.5,-11.5
+    - type: Transform
+      pos: -0.5,-11.5
       parent: 2
-      type: Transform
   - uid: 105
     components:
-    - pos: -0.5,-10.5
+    - type: Transform
+      pos: -0.5,-10.5
       parent: 2
-      type: Transform
   - uid: 106
     components:
-    - pos: -0.5,-8.5
+    - type: Transform
+      pos: -0.5,-8.5
       parent: 2
-      type: Transform
   - uid: 107
     components:
-    - pos: -0.5,-7.5
+    - type: Transform
+      pos: -0.5,-7.5
       parent: 2
-      type: Transform
   - uid: 109
     components:
-    - pos: -0.5,-9.5
+    - type: Transform
+      pos: -0.5,-9.5
       parent: 2
-      type: Transform
   - uid: 111
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 13.5,-4.5
       parent: 2
-      type: Transform
   - uid: 113
     components:
-    - pos: -0.5,-4.5
+    - type: Transform
+      pos: -0.5,-4.5
       parent: 2
-      type: Transform
   - uid: 114
     components:
-    - pos: -0.5,-1.5
+    - type: Transform
+      pos: -0.5,-1.5
       parent: 2
-      type: Transform
   - uid: 115
     components:
-    - pos: -0.5,-0.5
+    - type: Transform
+      pos: -0.5,-0.5
       parent: 2
-      type: Transform
   - uid: 116
     components:
-    - pos: -0.5,0.5
+    - type: Transform
+      pos: -0.5,0.5
       parent: 2
-      type: Transform
   - uid: 117
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 3.5,-12.5
       parent: 2
-      type: Transform
   - uid: 118
     components:
-    - pos: -0.5,2.5
+    - type: Transform
+      pos: -0.5,2.5
       parent: 2
-      type: Transform
   - uid: 125
     components:
-    - pos: 11.5,3.5
+    - type: Transform
+      pos: 11.5,3.5
       parent: 2
-      type: Transform
   - uid: 126
     components:
-    - pos: 10.5,3.5
+    - type: Transform
+      pos: 10.5,3.5
       parent: 2
-      type: Transform
   - uid: 130
     components:
-    - pos: 6.5,3.5
+    - type: Transform
+      pos: 6.5,3.5
       parent: 2
-      type: Transform
   - uid: 131
     components:
-    - pos: 5.5,3.5
+    - type: Transform
+      pos: 5.5,3.5
       parent: 2
-      type: Transform
   - uid: 132
     components:
-    - pos: 4.5,3.5
+    - type: Transform
+      pos: 4.5,3.5
       parent: 2
-      type: Transform
   - uid: 136
     components:
-    - pos: 0.5,3.5
+    - type: Transform
+      pos: 0.5,3.5
       parent: 2
-      type: Transform
   - uid: 137
     components:
-    - pos: -0.5,3.5
+    - type: Transform
+      pos: -0.5,3.5
       parent: 2
-      type: Transform
   - uid: 141
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 3.5,-14.5
       parent: 2
-      type: Transform
   - uid: 172
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -2.5,0.5
       parent: 2
-      type: Transform
   - uid: 173
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 13.5,0.5
       parent: 2
-      type: Transform
   - uid: 174
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -0.5,4.5
       parent: 2
-      type: Transform
   - uid: 175
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 13.5,6.5
       parent: 2
-      type: Transform
   - uid: 176
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 12.5,6.5
       parent: 2
-      type: Transform
   - uid: 177
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 11.5,6.5
       parent: 2
-      type: Transform
   - uid: 178
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 11.5,4.5
       parent: 2
-      type: Transform
   - uid: 179
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -0.5,6.5
       parent: 2
-      type: Transform
   - uid: 180
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -1.5,6.5
       parent: 2
-      type: Transform
   - uid: 181
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -2.5,6.5
       parent: 2
-      type: Transform
-  - uid: 183
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,-14.5
-      parent: 2
-      type: Transform
   - uid: 184
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 1.5,-14.5
       parent: 2
-      type: Transform
   - uid: 186
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 4.5,-14.5
       parent: 2
-      type: Transform
   - uid: 187
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 5.5,-14.5
       parent: 2
-      type: Transform
   - uid: 188
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 6.5,-14.5
       parent: 2
-      type: Transform
   - uid: 189
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 7.5,-14.5
       parent: 2
-      type: Transform
-  - uid: 190
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 11.5,-14.5
-      parent: 2
-      type: Transform
-  - uid: 191
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 10.5,-14.5
-      parent: 2
-      type: Transform
   - uid: 192
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 9.5,-14.5
       parent: 2
-      type: Transform
   - uid: 193
     components:
-    - pos: 2.5,-12.5
-      parent: 2
-      type: Transform
-  - uid: 198
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -0.5,-14.5
-      parent: 2
-      type: Transform
-  - uid: 199
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -0.5,-15.5
-      parent: 2
-      type: Transform
-  - uid: 200
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -0.5,-16.5
-      parent: 2
-      type: Transform
-  - uid: 201
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -0.5,-17.5
+    - type: Transform
+      pos: 2.5,-12.5
       parent: 2
-      type: Transform
   - uid: 202
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 1.5,-18.5
       parent: 2
-      type: Transform
   - uid: 203
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 2.5,-18.5
       parent: 2
-      type: Transform
   - uid: 204
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 3.5,-18.5
       parent: 2
-      type: Transform
   - uid: 205
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 4.5,-18.5
       parent: 2
-      type: Transform
   - uid: 206
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 5.5,-18.5
       parent: 2
-      type: Transform
   - uid: 207
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 6.5,-18.5
       parent: 2
-      type: Transform
   - uid: 208
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 7.5,-18.5
       parent: 2
-      type: Transform
   - uid: 209
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 8.5,-18.5
       parent: 2
-      type: Transform
   - uid: 210
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 9.5,-18.5
       parent: 2
-      type: Transform
-  - uid: 211
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 10.5,-18.5
-      parent: 2
-      type: Transform
-  - uid: 212
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 10.5,-17.5
-      parent: 2
-      type: Transform
-  - uid: 213
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 11.5,-17.5
-      parent: 2
-      type: Transform
-  - uid: 214
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 11.5,-16.5
-      parent: 2
-      type: Transform
-  - uid: 215
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 11.5,-15.5
-      parent: 2
-      type: Transform
   - uid: 217
     components:
-    - pos: 8.5,-12.5
+    - type: Transform
+      pos: 8.5,-12.5
       parent: 2
-      type: Transform
   - uid: 220
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 0.5,-18.5
       parent: 2
-      type: Transform
-  - uid: 221
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,-17.5
-      parent: 2
-      type: Transform
   - uid: 230
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -0.5,7.5
       parent: 2
-      type: Transform
   - uid: 235
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 0.5,7.5
       parent: 2
-      type: Transform
   - uid: 236
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 1.5,7.5
       parent: 2
-      type: Transform
   - uid: 237
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 2.5,7.5
       parent: 2
-      type: Transform
   - uid: 239
     components:
-    - pos: 8.5,-14.5
+    - type: Transform
+      pos: 8.5,-14.5
       parent: 2
-      type: Transform
   - uid: 240
     components:
-    - pos: 2.5,-14.5
+    - type: Transform
+      pos: 2.5,-14.5
       parent: 2
-      type: Transform
   - uid: 242
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 8.5,7.5
       parent: 2
-      type: Transform
   - uid: 243
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 9.5,7.5
       parent: 2
-      type: Transform
   - uid: 244
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 10.5,7.5
       parent: 2
-      type: Transform
   - uid: 245
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 11.5,7.5
       parent: 2
-      type: Transform
   - uid: 345
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 13.5,-7.5
       parent: 2
-      type: Transform
   - uid: 346
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -2.5,-7.5
       parent: 2
-      type: Transform
   - uid: 347
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -2.5,-1.5
       parent: 2
-      type: Transform
   - uid: 348
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 13.5,-1.5
       parent: 2
-      type: Transform
+  - uid: 372
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-17.5
+      parent: 2
+  - uid: 374
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-14.5
+      parent: 2
+  - uid: 375
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-16.5
+      parent: 2
+  - uid: 376
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-15.5
+      parent: 2
+  - uid: 377
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-14.5
+      parent: 2
+  - uid: 378
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-18.5
+      parent: 2
+  - uid: 515
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-17.5
+      parent: 2
   - uid: 553
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -2.5,-4.5
       parent: 2
-      type: Transform
+- proto: WarpPoint
+  entities:
+  - uid: 955
+    components:
+    - type: Transform
+      pos: 5.5,-4.5
+      parent: 2
+    - type: WarpPoint
+      location: Automated Trade Station
 - proto: WindoorSecureEngineeringLocked
   entities:
   - uid: 371
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 3.5,-16.5
       parent: 2
-      type: Transform
 - proto: WindowReinforcedDirectional
   entities:
   - uid: 369
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 3.5,-15.5
       parent: 2
-      type: Transform
   - uid: 370
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 3.5,-17.5
       parent: 2
-      type: Transform
+- proto: Wrench
+  entities:
+  - uid: 23
+    components:
+    - type: Transform
+      pos: 4.301509,-15.756044
+      parent: 2
 ...
diff --git a/Resources/Maps/nukieplanet.yml b/Resources/Maps/nukieplanet.yml
deleted file mode 100644
index bbf2863215..0000000000
--- a/Resources/Maps/nukieplanet.yml
+++ /dev/null
@@ -1,17373 +0,0 @@
-meta:
-  format: 6
-  postmapinit: false
-tilemap:
-  0: Space
-  14: FloorBar
-  20: FloorCarpetClown
-  29: FloorDark
-  44: FloorFreezer
-  59: FloorIce
-  77: FloorReinforced
-  79: FloorRockVault
-  80: FloorShowroom
-  82: FloorShuttleOrange
-  84: FloorShuttleRed
-  87: FloorSnow
-  89: FloorSteel
-  104: FloorTechMaint
-  108: FloorWhite
-  118: FloorWood
-  120: Lattice
-  121: Plating
-entities:
-- proto: ""
-  entities:
-  - uid: 104
-    components:
-    - name: Syndicate Outpost
-      type: MetaData
-    - parent: 1295
-      type: Transform
-    - whitelist:
-        tags:
-        - Syndicate
-      type: FTLDestination
-    - chunks:
-        -1,-1:
-          ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAKVwAAAAAAeQAAAAAAHQAAAAACbAAAAAADbAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAHQAAAAABbAAAAAADWQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAHQAAAAAAbAAAAAACbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAADVwAAAAAEVwAAAAAAVwAAAAAEeQAAAAAAdgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAdgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAADgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAADgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAADgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAADgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAFVwAAAAAIeQAAAAAADgAAAAAB
-          version: 6
-        0,-1:
-          ind: 0,-1
-          tiles: bAAAAAAAbAAAAAADeQAAAAAAbAAAAAAAbAAAAAACbAAAAAACbAAAAAADbAAAAAABHQAAAAAAHQAAAAABHQAAAAABHQAAAAABHQAAAAABHQAAAAAAHQAAAAADHQAAAAACWQAAAAAAbAAAAAADbAAAAAADbAAAAAADbAAAAAACbAAAAAAAbAAAAAADbAAAAAADHQAAAAADVAAAAAAAHQAAAAACVAAAAAAAHQAAAAADVAAAAAAAHQAAAAADHQAAAAADbAAAAAAAbAAAAAACeQAAAAAAbAAAAAADbAAAAAACbAAAAAADbAAAAAACbAAAAAACHQAAAAADVAAAAAAAHQAAAAADVAAAAAAAHQAAAAABVAAAAAAAHQAAAAABHQAAAAAAHQAAAAABHQAAAAADHQAAAAAAWQAAAAADWQAAAAACWQAAAAADbAAAAAADbAAAAAACHQAAAAABHQAAAAAAHQAAAAAAHQAAAAABHQAAAAABHQAAAAABHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAACbAAAAAADbAAAAAACDgAAAAACHQAAAAADHQAAAAAAHQAAAAADHQAAAAADHQAAAAACHQAAAAAAHQAAAAADVwAAAAAAVwAAAAAAbAAAAAAAWQAAAAABWQAAAAAAWQAAAAAAbAAAAAACbAAAAAAAVwAAAAAAHQAAAAADHQAAAAADUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAADgAAAAABDgAAAAADDgAAAAACDgAAAAAADgAAAAADeQAAAAAAHQAAAAABeQAAAAAADgAAAAADDgAAAAACDgAAAAAADgAAAAACDgAAAAAAHQAAAAABHQAAAAADHQAAAAABVAAAAAAAVAAAAAAAdgAAAAACdgAAAAACdgAAAAADHQAAAAAAHQAAAAABHQAAAAABHQAAAAAAHQAAAAADHQAAAAACeQAAAAAAHQAAAAACHQAAAAACHQAAAAADHQAAAAABdgAAAAAAdgAAAAACdgAAAAACdgAAAAADdgAAAAADHQAAAAAAHQAAAAAAHQAAAAACHQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAADHQAAAAABHQAAAAACHQAAAAABdgAAAAAAdgAAAAABdgAAAAAAdgAAAAADdgAAAAADHQAAAAAAHQAAAAAAHQAAAAADHQAAAAAAHQAAAAABHQAAAAADeQAAAAAAHQAAAAACHQAAAAABHQAAAAABHQAAAAACDgAAAAACDgAAAAAADgAAAAACDgAAAAADDgAAAAACDgAAAAABDgAAAAACDgAAAAAADgAAAAAADgAAAAACDgAAAAADDgAAAAAADgAAAAABHQAAAAAAHQAAAAACHQAAAAACDgAAAAAADgAAAAABDgAAAAACDgAAAAAADgAAAAABDgAAAAABDgAAAAADDgAAAAAADgAAAAAALAAAAAAALAAAAAAALAAAAAAADgAAAAACdgAAAAAAdgAAAAADdgAAAAABDgAAAAACDgAAAAACDgAAAAAADgAAAAAADgAAAAADDgAAAAAADgAAAAAAVAAAAAAADgAAAAACLAAAAAAALAAAAAAALAAAAAAADgAAAAADdgAAAAABdgAAAAABdgAAAAADDgAAAAADDgAAAAABDgAAAAADDgAAAAACDgAAAAADDgAAAAAADgAAAAAAVAAAAAAADgAAAAAAUAAAAAAALAAAAAAADgAAAAAADgAAAAACHQAAAAAAHQAAAAACeQAAAAAADgAAAAACDgAAAAACDgAAAAACDgAAAAAADgAAAAADDgAAAAABDgAAAAACVAAAAAAADgAAAAADUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAADgAAAAAADgAAAAADDgAAAAACDgAAAAACDgAAAAACDgAAAAABDgAAAAABDgAAAAAADgAAAAACUAAAAAAAUAAAAAAALAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAA
-          version: 6
-        0,0:
-          ind: 0,0
-          tiles: HQAAAAADHQAAAAACHQAAAAACDgAAAAAADgAAAAABDgAAAAABDgAAAAABDgAAAAACDgAAAAADUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAVwAAAAAGeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACeQAAAAAADgAAAAAADgAAAAABDgAAAAABDgAAAAACDgAAAAABDgAAAAAADgAAAAACDgAAAAACVwAAAAAAVwAAAAADVwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAATwAAAAAAeQAAAAAAVwAAAAAAVwAAAAAHVwAAAAAAVwAAAAAAVwAAAAACVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAABVwAAAAAAeQAAAAAATwAAAAAAeQAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAABVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAATwAAAAAATwAAAAAAVwAAAAAFVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAMVwAAAAAAVwAAAAAFVwAAAAAAVwAAAAAAVwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAIVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAOwAAAAAAVwAAAAAIVwAAAAAAVwAAAAACVwAAAAAAVwAAAAAAVwAAAAADVwAAAAAAVwAAAAAAVwAAAAAFVwAAAAAIVwAAAAAAVwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAKVwAAAAABVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAHVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAADVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAADVwAAAAAJVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAIVwAAAAAAVwAAAAAAVwAAAAADVwAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAIVwAAAAAAVwAAAAAGVwAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAMVwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAAVwAAAAADVwAAAAAAVwAAAAAHVwAAAAAAVwAAAAACVwAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAABVwAAAAAJVwAAAAAAVwAAAAAFTwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAFVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAHVwAAAAAHVwAAAAAKVwAAAAAFVwAAAAAAVwAAAAALVwAAAAAA
-          version: 6
-        -1,0:
-          ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAMVwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAAVwAAAAAKVwAAAAAIVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAFVwAAAAAKVwAAAAAAVwAAAAAEVwAAAAAAVwAAAAAGHQAAAAADHQAAAAADHQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAALVwAAAAAAVwAAAAAAVwAAAAAKVwAAAAAIeQAAAAAAHQAAAAABHQAAAAACHQAAAAACHQAAAAADHQAAAAACHQAAAAACVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAHQAAAAABHQAAAAABVwAAAAAJVwAAAAAAVwAAAAAAVwAAAAALVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAABVwAAAAAGTwAAAAAAHQAAAAABHQAAAAAAeQAAAAAAeQAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAIVwAAAAADVwAAAAAATwAAAAAATwAAAAAATwAAAAAAeQAAAAAAeQAAAAAATwAAAAAATwAAAAAATwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAFeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAATwAAAAAATwAAAAAATwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAEVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAMVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAATwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAMVwAAAAAAVwAAAAABVwAAAAAAVwAAAAAAVwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAIVwAAAAAAVwAAAAAGVwAAAAAAVwAAAAAIVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAABVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAKTwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAJVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAABVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAA
-          version: 6
-        1,-1:
-          ind: 1,-1
-          tiles: HQAAAAADHQAAAAADHQAAAAACHQAAAAACHQAAAAAATQAAAAAATQAAAAAATQAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAACeQAAAAAAVwAAAAAAVwAAAAABVwAAAAACHQAAAAADHQAAAAADHQAAAAADHQAAAAAAHQAAAAADTQAAAAAATQAAAAAATQAAAAAAHQAAAAADHQAAAAACHQAAAAADHQAAAAACeQAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAHQAAAAABHQAAAAADHQAAAAAAHQAAAAABHQAAAAACHQAAAAAAHQAAAAADHQAAAAADHQAAAAAAHQAAAAADHQAAAAABHQAAAAACeQAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAHQAAAAADHQAAAAAAHQAAAAAAHQAAAAADHQAAAAADHQAAAAABHQAAAAACHQAAAAADHQAAAAADHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAVwAAAAAMVwAAAAAHVwAAAAAAHQAAAAABHQAAAAAAHQAAAAADHQAAAAABHQAAAAACHQAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAABVwAAAAAAVwAAAAADVwAAAAAAVwAAAAACVwAAAAAAAAAAAAAAHQAAAAAAHQAAAAABHQAAAAABHQAAAAADHQAAAAABHQAAAAABHQAAAAABHQAAAAADHQAAAAABHQAAAAACVwAAAAAFVwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAHQAAAAADHQAAAAABVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAHQAAAAACHQAAAAACHQAAAAACVwAAAAAAVwAAAAADVwAAAAAAVwAAAAAAVwAAAAACAAAAAAAAeQAAAAAAHQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAHQAAAAADHQAAAAADHQAAAAACVwAAAAAETwAAAAAAVwAAAAAEVwAAAAAAVwAAAAAAAAAAAAAAHQAAAAAAHQAAAAABVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAHQAAAAACHQAAAAADHQAAAAACVwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAHQAAAAACVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAHQAAAAAAHQAAAAADHQAAAAACVwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAJVwAAAAAAeQAAAAAAHQAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAVAAAAAAAHQAAAAAAHQAAAAABHQAAAAADVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAHQAAAAABHQAAAAADHQAAAAAAHQAAAAAAHQAAAAABHQAAAAAAHQAAAAACHQAAAAABHQAAAAABVwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAACHQAAAAADHQAAAAADHQAAAAACHQAAAAAAHQAAAAADVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAJVwAAAAAAVwAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAABHQAAAAADHQAAAAAAHQAAAAABVwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAGeQAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAEVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAVwAAAAAATwAAAAAAVwAAAAAEVwAAAAAAVwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAEVwAAAAAAVwAAAAAA
-          version: 6
-        0,-2:
-          ind: 0,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAKVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAACVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAFVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAADVwAAAAAAVwAAAAAAVwAAAAALVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAADVwAAAAAAVwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAGVwAAAAAAVwAAAAAAVwAAAAACVwAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAVwAAAAAAVwAAAAAHVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAVwAAAAAAVwAAAAAGVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAVwAAAAAKVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAVwAAAAAAbAAAAAAAbAAAAAADbAAAAAADbAAAAAADbAAAAAAAeQAAAAAAaAAAAAAAWQAAAAACWQAAAAADWQAAAAABWQAAAAABWQAAAAADeQAAAAAAHQAAAAAAHQAAAAABVwAAAAAAbAAAAAABbAAAAAABbAAAAAADbAAAAAADbAAAAAAAaAAAAAAAaAAAAAAAWQAAAAADWQAAAAAAWQAAAAABWQAAAAABWQAAAAAAeQAAAAAA
-          version: 6
-        -1,-2:
-          ind: -1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAEVwAAAAAAVwAAAAAAVwAAAAAEVwAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAFVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAEVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAFVwAAAAAAVwAAAAAFVwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAGVwAAAAAAVwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAALVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAFVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAKVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAEVwAAAAAAVwAAAAAAVwAAAAAEVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAHQAAAAABHQAAAAAAHQAAAAAC
-          version: 6
-        -1,1:
-          ind: -1,1
-          tiles: VwAAAAAIVwAAAAAAVwAAAAALVwAAAAAAVwAAAAADVwAAAAAMVwAAAAAAVwAAAAAAVwAAAAAKVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAJVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAADVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAMVwAAAAAEVwAAAAAAVwAAAAAAVwAAAAAGVwAAAAAAVwAAAAAFVwAAAAADVwAAAAAEVwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAEVwAAAAAHVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAEFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAFTwAAAAAATwAAAAAATwAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAVwAAAAAAVwAAAAAKVwAAAAAAVwAAAAACVwAAAAAAVwAAAAADTwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAFVwAAAAAMVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAKFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAVwAAAAAEVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAADVwAAAAAAVwAAAAABVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAFVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAVwAAAAACVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAALVwAAAAAHVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAMVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAKVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAKAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAKVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        0,1:
-          ind: 0,1
-          tiles: VwAAAAAAVwAAAAAEVwAAAAAEVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAACVwAAAAAAVwAAAAAJVwAAAAAAVwAAAAAAVwAAAAAHVwAAAAAAVwAAAAAJVwAAAAAGVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAADVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAKVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAIVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAIVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAHVwAAAAAAVwAAAAAAVwAAAAALVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAATwAAAAAAVwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAIVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAABVwAAAAALVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAACVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAFVwAAAAAAVwAAAAAAVwAAAAAMVwAAAAAIVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAJVwAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAGVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAKVwAAAAACVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAIVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAADVwAAAAAJVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAA
-          version: 6
-        1,1:
-          ind: 1,1
-          tiles: VwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAKVwAAAAAMVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAIVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAEVwAAAAAAVwAAAAAAVwAAAAAEVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAGVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAMVwAAAAAAVwAAAAAAVwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAJVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAJVwAAAAAAVwAAAAABVwAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAJVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        1,0:
-          ind: 1,0
-          tiles: VwAAAAAATwAAAAAATwAAAAAAVwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAALVwAAAAALVwAAAAAAVwAAAAAMVwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAMVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAACVwAAAAAAVwAAAAAAVwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAMVwAAAAAAVwAAAAAAVwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAAVwAAAAACVwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAFVwAAAAAFVwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAVwAAAAADVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAACOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAHAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAVwAAAAAAVwAAAAAKVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAADVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAADVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAADVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAEVwAAAAAHVwAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAEVwAAAAAJVwAAAAAAVwAAAAAHVwAAAAAAVwAAAAACVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAACVwAAAAAAVwAAAAAJVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAKVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAHVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAABVwAAAAAATwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        1,-2:
-          ind: 1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAIVwAAAAAAVwAAAAAAVwAAAAABVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAFVwAAAAABVwAAAAAAVwAAAAAAAAAAAAAAVwAAAAAAVwAAAAADVwAAAAAAVwAAAAAAVwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAVwAAAAAMVwAAAAAAVwAAAAALVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAKVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAFVwAAAAAAVwAAAAADVwAAAAAAVwAAAAAEVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAACVwAAAAAMVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAaAAAAAAAHQAAAAACHQAAAAADHQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAABaAAAAAAAeQAAAAAAVwAAAAAAVwAAAAAAVwAAAAAJeQAAAAAAaAAAAAAAHQAAAAADHQAAAAACHQAAAAADHQAAAAACHQAAAAACHQAAAAADHQAAAAABHQAAAAABHQAAAAABaAAAAAAAeQAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAaAAAAAAAHQAAAAAAHQAAAAABHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAADHQAAAAACaAAAAAAAeQAAAAAAVwAAAAALVwAAAAAAVwAAAAAAVwAAAAAEHQAAAAACHQAAAAACHQAAAAABHQAAAAABTQAAAAAATQAAAAAATQAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAAAeQAAAAAAVwAAAAAAVwAAAAAAVwAAAAAD
-          version: 6
-        -2,0:
-          ind: -2,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAEVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAHVwAAAAAAVwAAAAABTwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAFVwAAAAAATwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAETwAAAAAATwAAAAAATwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAALVwAAAAAAVwAAAAALVwAAAAABVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAACVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAIVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAALVwAAAAAAVwAAAAAAVwAAAAABVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAEVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAA
-          version: 6
-        -2,1:
-          ind: -2,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAJVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAJVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAJVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAATwAAAAAAVwAAAAAAFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAATwAAAAAAVwAAAAAKFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAJVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAHVwAAAAAKVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAGVwAAAAAJVwAAAAALVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAALVwAAAAAIVwAAAAAAVwAAAAAIVwAAAAAAVwAAAAAAVwAAAAAGFAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAADVwAAAAAEVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAFVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAEVwAAAAAAVwAAAAAMVwAAAAACVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAEVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAIVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAFVwAAAAAFVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAA
-          version: 6
-        -2,-2:
-          ind: -2,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        2,0:
-          ind: 2,0
-          tiles: TwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        2,-1:
-          ind: 2,-1
-          tiles: TwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAAAVwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAAAVwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        2,-2:
-          ind: 2,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAIVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        -2,2:
-          ind: -2,2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        -3,-2:
-          ind: -3,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        0,2:
-          ind: 0,2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAVwAAAAAFVwAAAAAEVwAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        1,2:
-          ind: 1,2
-          tiles: VwAAAAAAVwAAAAAFVwAAAAACVwAAAAAJVwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        -3,0:
-          ind: -3,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-      type: MapGrid
-    - type: Broadphase
-    - bodyStatus: InAir
-      angularDamping: 0.05
-      linearDamping: 0.05
-      fixedRotation: False
-      bodyType: Dynamic
-      type: Physics
-    - fixtures: {}
-      type: Fixtures
-    - gravityShakeSound: !type:SoundPathSpecifier
-        path: /Audio/Effects/alert.ogg
-      type: Gravity
-    - chunkCollection:
-        version: 2
-        nodes:
-        - node:
-            angle: -3.141592653589793 rad
-            color: '#FFFFFFFF'
-            id: Arrows
-          decals:
-            311: 27,-15
-        - node:
-            color: '#FFFFFFFF'
-            id: Arrows
-          decals:
-            309: 18,-19
-            310: 26,-19
-        - node:
-            color: '#FFFFFFFF'
-            id: Basalt1
-          decals:
-            368: 26.834131,4.97881
-        - node:
-            color: '#FFFFFFFF'
-            id: Bot
-          decals:
-            295: 21,-16
-            296: 22,-15
-            297: 23,-16
-            302: 22,-17
-            303: 17,-19
-            304: 27,-19
-        - node:
-            color: '#FFFFFFFF'
-            id: BotLeft
-          decals:
-            194: 5,-11
-            195: 4,-11
-            300: 23,-15
-            301: 21,-17
-            305: 27,-18
-            306: 17,-20
-        - node:
-            color: '#FFFFFFFF'
-            id: BotRight
-          decals:
-            298: 23,-17
-            299: 21,-15
-            307: 27,-20
-            308: 17,-18
-        - node:
-            color: '#FFFFFFFF'
-            id: Box
-          decals:
-            206: 12,-22
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineN
-          decals:
-            326: 2,-1
-            327: 1,-1
-            328: 0,-1
-        - node:
-            color: '#52B4E996'
-            id: BrickTileSteelBox
-          decals:
-            238: -3,-15
-            239: -2,-17
-            240: 1,-17
-            241: 1,-13
-            242: -2,-13
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerNe
-          decals:
-            143: 15,-12
-            149: 10,-11
-            186: 5,-11
-            332: 10,-7
-            339: 15,-7
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerNw
-          decals:
-            150: 9,-11
-            187: 3,-11
-            340: 12,-7
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerSe
-          decals:
-            141: 15,-15
-            188: 5,-13
-            259: 27,-17
-            264: 26,-20
-            329: 10,-9
-            342: 15,-9
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelCornerSw
-          decals:
-            127: 14,-15
-            138: 9,-13
-            189: 3,-13
-            256: 17,-17
-            263: 18,-20
-            335: 5,-9
-            341: 12,-9
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelEndS
-          decals:
-            125: 10,-15
-            126: 12,-15
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelInnerNe
-          decals:
-            148: 10,-12
-            250: -3,-17
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelInnerSe
-          decals:
-            139: 10,-13
-            140: 12,-13
-            249: -3,-13
-            260: 26,-17
-            289: 20,-14
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelInnerSw
-          decals:
-            133: 10,-13
-            134: 12,-13
-            135: 14,-13
-            261: 18,-17
-            285: 24,-14
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineE
-          decals:
-            128: 12,-14
-            129: 10,-14
-            142: 15,-13
-            191: 5,-12
-            247: -3,-16
-            248: -3,-14
-            257: 26,-19
-            258: 26,-18
-            265: 20,-17
-            266: 20,-16
-            267: 20,-15
-            290: 20,-19
-            312: 27,-16
-            313: 27,-15
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineN
-          decals:
-            144: 14,-12
-            145: 13,-12
-            146: 12,-12
-            147: 11,-12
-            192: 4,-11
-            243: 0,-17
-            244: -1,-17
-            274: 26,-14
-            275: 25,-14
-            276: 23,-14
-            277: 22,-14
-            278: 21,-14
-            279: 20,-14
-            280: 18,-14
-            281: 19,-14
-            284: 24,-14
-            333: 9,-7
-            334: 8,-7
-            345: 13,-7
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineS
-          decals:
-            136: 13,-13
-            137: 11,-13
-            190: 4,-13
-            245: 0,-13
-            246: -1,-13
-            272: 25,-20
-            273: 19,-20
-            286: 23,-14
-            287: 22,-14
-            288: 21,-14
-            330: 8,-9
-            331: 7,-9
-            343: 14,-9
-            344: 13,-9
-        - node:
-            color: '#DE3A3A96'
-            id: BrickTileSteelLineW
-          decals:
-            130: 14,-14
-            131: 12,-14
-            132: 10,-14
-            151: 9,-12
-            193: 3,-12
-            253: 18,-18
-            254: 17,-16
-            255: 17,-15
-            262: 18,-19
-            268: 24,-19
-            269: 24,-17
-            270: 24,-16
-            271: 24,-15
-            336: 5,-8
-            359: 5,-7
-        - node:
-            color: '#9FED5896'
-            id: BrickTileWhiteCornerNe
-          decals:
-            159: 7,-11
-        - node:
-            color: '#9FED5896'
-            id: BrickTileWhiteCornerNw
-          decals:
-            160: 6,-11
-            178: 3,-14
-        - node:
-            color: '#9FED5896'
-            id: BrickTileWhiteCornerSe
-          decals:
-            171: 7,-18
-        - node:
-            color: '#9FED5896'
-            id: BrickTileWhiteCornerSw
-          decals:
-            174: 3,-18
-        - node:
-            color: '#9FED5896'
-            id: BrickTileWhiteInnerNw
-          decals:
-            162: 6,-14
-        - node:
-            color: '#9FED5896'
-            id: BrickTileWhiteLineE
-          decals:
-            165: 7,-12
-            166: 7,-13
-            167: 7,-14
-            168: 7,-15
-            169: 7,-16
-            170: 7,-17
-        - node:
-            color: '#9FED5896'
-            id: BrickTileWhiteLineN
-          decals:
-            163: 5,-14
-            164: 4,-14
-        - node:
-            color: '#9FED5896'
-            id: BrickTileWhiteLineS
-          decals:
-            172: 6,-18
-            173: 5,-18
-            175: 4,-18
-        - node:
-            color: '#9FED5896'
-            id: BrickTileWhiteLineW
-          decals:
-            161: 6,-13
-            176: 3,-17
-            177: 3,-16
-        - node:
-            color: '#A4610647'
-            id: CheckerNWSE
-          decals:
-            196: -13,6
-            197: -14,6
-            198: -15,6
-            199: -15,7
-            200: -14,7
-            201: -13,7
-            202: -14,8
-            203: -15,8
-        - node:
-            color: '#D381C996'
-            id: CheckerNWSE
-          decals:
-            207: 10,-19
-            208: 11,-19
-            209: 12,-19
-            210: 13,-19
-            211: 14,-19
-            212: 14,-18
-            213: 14,-17
-            214: 13,-17
-            215: 13,-18
-            216: 12,-18
-            217: 12,-17
-            218: 11,-17
-            219: 11,-18
-            220: 10,-18
-            221: 10,-17
-        - node:
-            color: '#FFFFFFFF'
-            id: Delivery
-          decals:
-            204: -16,8
-            205: -16,9
-            251: 7,-18
-            252: 6,-18
-        - node:
-            color: '#DE3A3A96'
-            id: DeliveryGreyscale
-          decals:
-            283: 16,-14
-        - node:
-            color: '#9FED5896'
-            id: FullTileOverlayGreyscale
-          decals:
-            181: 5,-17
-            182: 5,-16
-            183: 5,-15
-            184: 6,-16
-            185: 4,-16
-        - node:
-            color: '#52B4E996'
-            id: HalfTileOverlayGreyscale
-          decals:
-            232: 1,-14
-            233: 0,-14
-            234: -1,-14
-        - node:
-            color: '#9FED5896'
-            id: HalfTileOverlayGreyscale
-          decals:
-            324: 11,-2
-        - node:
-            color: '#52B4E996'
-            id: HalfTileOverlayGreyscale180
-          decals:
-            229: 1,-16
-            230: 0,-16
-            231: -1,-16
-        - node:
-            color: '#9FED5896'
-            id: HalfTileOverlayGreyscale180
-          decals:
-            325: 11,0
-        - node:
-            color: '#52B4E996'
-            id: HalfTileOverlayGreyscale270
-          decals:
-            235: -2,-15
-        - node:
-            color: '#9FED5896'
-            id: HalfTileOverlayGreyscale270
-          decals:
-            323: 12,-1
-        - node:
-            color: '#9FED5896'
-            id: HalfTileOverlayGreyscale90
-          decals:
-            322: 10,-1
-        - node:
-            color: '#9FED5896'
-            id: QuarterTileOverlayGreyscale
-          decals:
-            314: 9,0
-            315: 10,0
-        - node:
-            color: '#9FED5896'
-            id: QuarterTileOverlayGreyscale180
-          decals:
-            318: 13,-2
-            319: 12,-2
-        - node:
-            color: '#9FED5896'
-            id: QuarterTileOverlayGreyscale270
-          decals:
-            320: 9,-2
-            321: 10,-2
-        - node:
-            color: '#9FED5896'
-            id: QuarterTileOverlayGreyscale90
-          decals:
-            316: 13,0
-            317: 12,0
-        - node:
-            color: '#FFFFFFFF'
-            id: Rock06
-          decals:
-            75: 9.232971,15.9332485
-        - node:
-            color: '#52B4E996'
-            id: ThreeQuarterTileOverlayGreyscale
-          decals:
-            237: -2,-14
-        - node:
-            color: '#52B4E996'
-            id: ThreeQuarterTileOverlayGreyscale270
-          decals:
-            236: -2,-16
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnBox
-          decals:
-            124: -5,-3
-        - node:
-            angle: -1.5707963267948966 rad
-            color: '#FFFFFFFF'
-            id: WarnCorner
-          decals:
-            21: 18,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCorner
-          decals:
-            0: 17,-10
-            1: 18,-11
-            2: 19,-11
-        - node:
-            angle: 4.71238898038469 rad
-            color: '#FFFFFFFF'
-            id: WarnCorner
-          decals:
-            14: 17,-6
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerFlipped
-          decals:
-            7: 23,-10
-            13: 16,-6
-            19: 22,-11
-        - node:
-            angle: 1.5707963267948966 rad
-            color: '#FFFFFFFF'
-            id: WarnCornerFlipped
-          decals:
-            11: 23,-6
-            12: 22,-5
-        - node:
-            color: '#DE3A3A96'
-            id: WarnCornerGreyscaleNW
-          decals:
-            282: 17,-14
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSE
-          decals:
-            292: 20,-20
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnCornerSW
-          decals:
-            226: 10,-19
-            291: 24,-20
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnEndE
-          decals:
-            154: 1,-9
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnEndN
-          decals:
-            156: 7,-2
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnEndS
-          decals:
-            123: -6,21
-            155: 7,-4
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnEndW
-          decals:
-            153: 0,-9
-        - node:
-            color: '#DE3A3A96'
-            id: WarnFullGreyscale
-          decals:
-            352: 16,-8
-            353: 11,-8
-            354: 9,-10
-            355: 6,-10
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineE
-          decals:
-            158: 7,-3
-            294: 20,-18
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleE
-          decals:
-            152: 15,-14
-            349: 10,-8
-            350: 15,-8
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleN
-          decals:
-            351: 14,-7
-            356: 7,-7
-            357: 6,-7
-            358: 5,-7
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleS
-          decals:
-            346: 9,-9
-            347: 6,-9
-        - node:
-            color: '#DE3A3A96'
-            id: WarnLineGreyscaleW
-          decals:
-            348: 12,-8
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineGreyscaleW
-          decals:
-            179: 3,-15
-            180: 6,-12
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineN
-          decals:
-            222: 14,-19
-            223: 13,-19
-            224: 12,-19
-            225: 11,-19
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineS
-          decals:
-            94: -9,4
-            95: -9,3
-            96: -9,2
-            97: -9,1
-            98: -9,0
-            99: -9,-1
-            100: -9,-2
-            101: -9,-3
-            102: -9,-4
-            103: -9,-5
-            104: -9,-6
-            105: -9,-7
-            106: -9,-8
-            107: -9,-9
-            108: -9,-10
-            109: -9,-11
-            110: -9,-12
-            111: -9,-13
-            112: -9,-14
-            113: -9,-15
-            114: -9,-16
-            115: -9,-17
-            116: -9,-18
-            117: -9,-19
-            118: -9,-20
-            119: -9,-21
-            120: -9,-22
-            121: -9,-23
-            122: -9,-24
-            157: 7,-3
-            227: 10,-18
-            228: 10,-17
-            293: 24,-18
-        - node:
-            color: '#FFFFFFFF'
-            id: WarningLine
-          decals:
-            15: 19,-4
-            16: 20,-4
-            17: 21,-4
-        - node:
-            angle: 3.141592653589793 rad
-            color: '#FFFFFFFF'
-            id: WarningLine
-          decals:
-            3: 19,-11
-            4: 19,-12
-            5: 20,-12
-            6: 21,-12
-        - node:
-            angle: 4.71238898038469 rad
-            color: '#FFFFFFFF'
-            id: WarningLine
-          decals:
-            8: 24,-9
-            9: 24,-8
-            10: 24,-7
-        - node:
-            color: '#FFFFFFFF'
-            id: WarningLineCornerFlipped
-          decals:
-            20: 22,-4
-        - node:
-            angle: 4.71238898038469 rad
-            color: '#FFFFFFFF'
-            id: WarningLineCornerFlipped
-          decals:
-            18: 24,-10
-        - node:
-            color: '#FFFFFFFF'
-            id: WoodTrimThinInnerSw
-          decals:
-            363: 5,-6
-        - node:
-            color: '#FFFFFFFF'
-            id: WoodTrimThinLineS
-          decals:
-            361: 0,-6
-            362: -1,-6
-            364: 4,-6
-            365: 3,-6
-            366: 2,-6
-            367: 1,-6
-        - node:
-            color: '#FFFFFFFF'
-            id: WoodTrimThinLineW
-          decals:
-            337: 5,-9
-            338: 5,-8
-            360: 5,-7
-        - node:
-            color: '#FFFFFFFF'
-            id: bushsnowa1
-          decals:
-            67: 12.033197,7.701807
-            69: 14.310135,6.6772776
-        - node:
-            color: '#FFFFFFFF'
-            id: bushsnowa2
-          decals:
-            68: -1.884201,10.692345
-            70: 13.896899,12.679136
-            73: -2.6609726,10.251652
-        - node:
-            color: '#FFFFFFFF'
-            id: bushsnowb2
-          decals:
-            71: 12.943774,14.853275
-        - node:
-            color: '#FFFFFFFF'
-            id: bushsnowb3
-          decals:
-            72: 0.2452774,15.588417
-            74: -0.9488945,8.937782
-        - node:
-            color: '#AB0000FF'
-            id: d
-          decals:
-            373: 21.412256,2.9944348
-        - node:
-            color: '#FFFFFFFF'
-            id: grasssnowa1
-          decals:
-            30: 9.251883,16.971285
-            41: 4.707512,15.727119
-            47: -2.8426914,5.7681084
-            84: 16.072964,17.452217
-            85: -4.644718,19.141476
-            369: 26.896631,2.9944348
-        - node:
-            color: '#FFFFFFFF'
-            id: grasssnowa2
-          decals:
-            22: -3.6290493,-9.771207
-            25: 15.159365,5.392831
-            42: 2.707512,15.930454
-            53: 1.6412125,14.139866
-            62: 14.449558,12.269236
-            86: -6.332218,17.702477
-            87: -7.488468,14.82448
-            91: -5.738468,8.348984
-        - node:
-            color: '#FFFFFFFF'
-            id: grasssnowa3
-          decals:
-            44: -1.3739414,16.399694
-            54: 0.43808746,13.654987
-            57: 3.1880875,12.434965
-            58: 2.1568375,9.893942
-            63: 16.060982,2.673603
-            90: -6.207218,16.0445
-        - node:
-            color: '#FFFFFFFF'
-            id: grasssnowb1
-          decals:
-            51: 0.79449654,2.152192
-            55: 0.18808746,9.666458
-            79: 4.997473,19.080475
-        - node:
-            color: '#FFFFFFFF'
-            id: grasssnowb2
-          decals:
-            36: 6.1287537,4.4684677
-            38: 13.017959,2.0284252
-            61: 8.19574,16.289047
-            64: 3.43816,14.798347
-            78: 2.4505978,18.17328
-            92: -5.832218,13.979851
-            93: 4.1790752,7.8279076
-        - node:
-            color: '#FFFFFFFF'
-            id: grasssnowb3
-          decals:
-            23: -3.3477993,-19.991972
-            31: 9.061624,11.550716
-            35: 9.066255,4.2786684
-            50: -3.1864414,-0.9828911
-            52: -0.88188744,15.563225
-            65: 0.5527668,14.892197
-            83: 17.104214,9.229881
-        - node:
-            color: '#FFFFFFFF'
-            id: grasssnowc1
-          decals:
-            24: -3.9999733,-6.081314
-            26: 15.819311,9.398571
-            32: 12.170999,10.565315
-            39: 10.861709,2.2630453
-            40: 8.471084,13.624069
-            45: -2.1864414,7.911888
-            48: -0.6551914,1.8769035
-            49: -3.7333164,0.34661865
-            56: 4.1724625,13.733192
-            76: 2.5912228,19.753052
-            82: 17.947964,3.1297789
-            88: -7.175968,10.382353
-        - node:
-            color: '#FFFFFFFF'
-            id: grasssnowc2
-          decals:
-            27: 14.194311,14.208315
-            29: 12.819311,16.642818
-            33: 8.01938,8.972565
-            81: 19.322964,7.2277966
-            89: -5.675968,10.1320915
-        - node:
-            color: '#FFFFFFFF'
-            id: grasssnowc3
-          decals:
-            28: 15.694311,15.172535
-            34: 10.48813,7.3443623
-            37: 9.0946245,2.0440664
-            43: -2.8895664,16.211998
-            46: -4.0458164,7.6303444
-            59: 0.45371246,11.270374
-            60: 9.166802,10.222887
-            66: -1.9470882,14.409473
-            77: 6.122473,18.001226
-            80: 18.166714,4.631343
-        - node:
-            color: '#AB0000FF'
-            id: i
-          decals:
-            374: 21.677881,2.8381848
-        - node:
-            color: '#AB0000FF'
-            id: k
-          decals:
-            377: 23.427881,2.8069348
-        - node:
-            color: '#AB0000FF'
-            id: n
-          decals:
-            372: 20.943506,2.9006848
-            378: 22.959131,2.9631848
-        - node:
-            color: '#AB0000FF'
-            id: r
-          decals:
-            375: 22.099756,2.7913098
-        - node:
-            color: '#AB0000FF'
-            id: s
-          decals:
-            370: 20.224756,2.9788098
-        - node:
-            color: '#AB0000FF'
-            id: shortline
-          decals:
-            376: 22.552881,2.8381848
-        - node:
-            color: '#AB0000FF'
-            id: y
-          decals:
-            371: 20.568506,2.9319348
-      type: DecalGrid
-    - version: 2
-      data:
-        tiles:
-          -1,-2:
-            0: 65535
-          -1,-1:
-            0: 65503
-            1: 32
-          0,-1:
-            0: 65535
-          -2,-4:
-            0: 65535
-          -2,-3:
-            0: 65535
-          -2,-2:
-            0: 65535
-          -2,-1:
-            0: 65535
-          -1,-4:
-            0: 65535
-          -1,-3:
-            0: 65535
-          0,-4:
-            0: 65535
-          0,-3:
-            0: 65535
-          0,-2:
-            0: 65535
-          1,-4:
-            0: 57343
-            1: 8192
-          1,-3:
-            0: 65535
-          1,-2:
-            0: 65535
-          1,-1:
-            0: 65535
-          2,-4:
-            0: 62815
-            1: 2720
-          2,-3:
-            0: 65535
-          2,-2:
-            0: 32767
-            1: 32768
-          2,-1:
-            0: 65533
-            1: 2
-          3,-4:
-            0: 64991
-            1: 544
-          3,-3:
-            0: 65535
-          3,-2:
-            0: 57343
-            1: 8192
-          3,-1:
-            0: 65535
-          0,0:
-            0: 65535
-          0,1:
-            0: 65535
-          0,2:
-            0: 65535
-          0,3:
-            0: 65535
-          1,0:
-            0: 65535
-          1,1:
-            0: 65535
-          1,2:
-            0: 65535
-          1,3:
-            0: 65535
-          2,0:
-            0: 65535
-          2,1:
-            0: 65535
-          2,2:
-            0: 65535
-          2,3:
-            0: 65535
-          3,0:
-            0: 65535
-          3,1:
-            0: 65535
-          3,2:
-            0: 65535
-          3,3:
-            0: 65535
-          -2,0:
-            0: 65535
-          -2,1:
-            0: 65535
-          -2,2:
-            0: 65535
-          -2,3:
-            0: 65535
-          -1,0:
-            0: 65535
-          -1,1:
-            0: 65535
-          -1,2:
-            0: 65535
-          -1,3:
-            0: 65535
-          4,-4:
-            0: 65535
-          4,-3:
-            0: 65535
-          4,-2:
-            0: 65535
-          4,-1:
-            0: 65535
-          5,-4:
-            0: 65519
-            1: 16
-          5,-3:
-            0: 65535
-          5,-2:
-            0: 65535
-          5,-1:
-            0: 65535
-          6,-4:
-            0: 65519
-            1: 16
-          6,-3:
-            0: 65535
-          6,-2:
-            0: 65535
-          6,-1:
-            0: 65535
-          7,-4:
-            0: 65535
-          7,-3:
-            0: 65535
-          7,-2:
-            0: 65535
-          7,-1:
-            0: 65535
-          0,-6:
-            0: 65535
-          0,-5:
-            0: 65535
-          1,-6:
-            0: 65535
-          1,-5:
-            0: 62463
-            1: 3072
-          2,-6:
-            0: 65535
-          2,-5:
-            0: 65535
-          3,-6:
-            0: 65535
-          3,-5:
-            0: 65535
-          -2,-6:
-            0: 65535
-          -2,-5:
-            0: 65535
-          -1,-6:
-            0: 65535
-          -1,-5:
-            0: 65535
-          -2,4:
-            0: 65535
-          -1,4:
-            0: 65535
-          0,4:
-            0: 65535
-          1,4:
-            0: 65535
-          2,4:
-            0: 65535
-          3,4:
-            0: 65535
-          4,4:
-            0: 65535
-          4,0:
-            0: 65535
-          4,1:
-            0: 65535
-          4,2:
-            0: 65535
-          4,3:
-            0: 65535
-          5,0:
-            0: 65535
-          6,0:
-            0: 65535
-          7,0:
-            0: 65535
-          4,-6:
-            0: 65535
-          4,-5:
-            0: 65535
-          5,-6:
-            0: 65535
-          5,-5:
-            0: 65535
-          6,-6:
-            0: 65535
-          6,-5:
-            0: 65535
-          7,-6:
-            0: 65535
-          7,-5:
-            0: 65535
-          -4,-4:
-            0: 65535
-          -4,-3:
-            0: 4095
-          -3,-4:
-            0: 65535
-          -3,-3:
-            0: 61439
-          -3,-2:
-            0: 61166
-          -3,-1:
-            0: 61166
-          -4,0:
-            0: 65520
-          -4,1:
-            0: 65535
-          -4,2:
-            0: 65535
-          -4,3:
-            0: 65535
-          -3,0:
-            0: 65534
-          -3,1:
-            0: 65535
-          -3,2:
-            0: 65535
-          -3,3:
-            0: 65535
-          0,-7:
-            0: 65535
-          1,-7:
-            0: 61441
-            2: 3840
-          2,-7:
-            0: 4096
-            2: 57600
-          3,-7:
-            0: 32768
-            2: 28672
-          -4,-7:
-            0: 65535
-          -4,-6:
-            0: 65535
-          -4,-5:
-            0: 65535
-          -3,-7:
-            0: 65535
-          -3,-6:
-            0: 65535
-          -3,-5:
-            0: 65535
-          -1,-7:
-            0: 65535
-          -4,4:
-            0: 65535
-          -4,5:
-            0: 65535
-          -3,4:
-            0: 65535
-          -3,5:
-            0: 65535
-          -2,5:
-            0: 65535
-          -2,6:
-            0: 65535
-          -1,5:
-            0: 65535
-          -1,6:
-            0: 13107
-          0,5:
-            0: 8191
-          1,5:
-            0: 4095
-          2,5:
-            0: 65535
-          3,5:
-            0: 65535
-          4,5:
-            0: 65535
-          5,4:
-            0: 65535
-          5,5:
-            0: 30719
-          6,4:
-            0: 4915
-          5,1:
-            0: 65535
-          5,2:
-            0: 65535
-          5,3:
-            0: 65535
-          6,1:
-            0: 65535
-          6,2:
-            0: 30719
-          6,3:
-            0: 13107
-          7,1:
-            0: 16383
-          7,2:
-            0: 51
-          4,-7:
-            0: 61440
-          5,-7:
-            0: 61440
-          6,-7:
-            0: 61440
-          7,-7:
-            0: 28672
-          -8,-4:
-            0: 12
-          -7,-4:
-            0: 32783
-          -6,-4:
-            0: 61679
-          -5,-4:
-            0: 65535
-          -5,-3:
-            0: 4095
-          -6,3:
-            0: 65534
-          -6,2:
-            0: 52428
-          -5,0:
-            0: 65520
-          -5,1:
-            0: 65535
-          -5,2:
-            0: 65535
-          -5,3:
-            0: 65535
-          -7,7:
-            0: 52424
-          -7,5:
-            0: 34944
-          -7,6:
-            0: 34952
-          -6,4:
-            0: 61183
-          -6,5:
-            0: 65535
-          -6,6:
-            0: 65535
-          -6,7:
-            0: 65535
-          -5,4:
-            0: 65535
-          -5,5:
-            0: 65535
-          -8,-6:
-            0: 65535
-          -8,-5:
-            0: 57343
-          -7,-5:
-            0: 65535
-          -7,-6:
-            0: 65535
-          -6,-6:
-            0: 65535
-          -6,-5:
-            0: 65535
-          -6,-7:
-            0: 64704
-          -5,-7:
-            0: 65528
-          -5,-6:
-            0: 65535
-          -5,-5:
-            0: 65535
-          8,0:
-            0: 17
-          8,-4:
-            0: 13107
-          8,-1:
-            0: 4369
-          8,-6:
-            0: 13072
-          8,-5:
-            0: 13107
-          -7,8:
-            0: 12
-          -6,8:
-            0: 3
-          -12,-6:
-            0: 65535
-          -12,-5:
-            0: 65535
-          -11,-6:
-            0: 65533
-          -11,-5:
-            0: 65535
-          -10,-6:
-            0: 65535
-          -10,-5:
-            0: 65535
-          -9,-6:
-            0: 65535
-          -9,-5:
-            0: 65535
-          -15,-4:
-            0: 65535
-          -15,-3:
-            0: 65535
-          -15,-2:
-            0: 65535
-          -15,-1:
-            0: 65535
-          -14,-4:
-            0: 65535
-          -14,-3:
-            0: 29495
-          -14,-2:
-            0: 30583
-          -14,-1:
-            0: 13175
-          -13,-4:
-            0: 4607
-          -12,-4:
-            0: 255
-          -11,-4:
-            0: 255
-          -10,-4:
-            0: 255
-          -9,-4:
-            0: 119
-          -15,-5:
-            0: 65535
-          -14,-5:
-            0: 65535
-          -14,-6:
-            0: 65535
-          -13,-6:
-            0: 65535
-          -13,-5:
-            0: 65535
-          -15,0:
-            0: 65518
-          -15,1:
-            0: 65535
-          -15,2:
-            0: 65535
-          -15,3:
-            0: 65535
-          -14,0:
-            0: 13171
-          -14,1:
-            0: 13075
-          -14,2:
-            0: 13107
-          -14,3:
-            0: 29491
-          -15,4:
-            0: 65535
-          -15,5:
-            0: 65535
-          -15,6:
-            0: 35007
-          -14,4:
-            0: 65535
-          -14,5:
-            0: 65535
-          -14,6:
-            0: 16383
-          -2,-7:
-            0: 65535
-          -4,6:
-            0: 65535
-          -4,7:
-            0: 4095
-          -3,6:
-            0: 65535
-          -3,7:
-            0: 511
-          -2,7:
-            0: 255
-          -1,7:
-            0: 51
-          2,6:
-            0: 52428
-          2,7:
-            0: 52428
-          3,6:
-            0: 65535
-          3,7:
-            0: 65535
-          4,6:
-            0: 65535
-          4,7:
-            0: 65535
-          5,6:
-            0: 13107
-          5,7:
-            0: 4915
-          -7,-3:
-            0: 2184
-          -6,-3:
-            0: 4095
-          -7,0:
-            0: 65520
-          -7,1:
-            0: 15
-          -6,0:
-            0: 65520
-          -6,1:
-            0: 15
-            2: 51328
-          -5,6:
-            0: 65535
-          -5,7:
-            0: 32767
-          -8,-7:
-            0: 63744
-          -7,-7:
-            0: 65407
-          -12,-7:
-            0: 65519
-          -11,-7:
-            0: 4983
-          -10,-7:
-            0: 60622
-          -9,-7:
-            0: 65535
-          -16,-4:
-            0: 65535
-          -16,-3:
-            0: 65535
-          -16,-2:
-            0: 65535
-          -16,-1:
-            0: 65535
-          -16,-7:
-            0: 13107
-          -16,-6:
-            0: 65535
-          -16,-5:
-            0: 65535
-          -15,-6:
-            0: 65535
-          -15,-7:
-            0: 52360
-          -14,-7:
-            0: 65535
-          -13,-7:
-            0: 63251
-          -16,0:
-            0: 65535
-          -16,1:
-            0: 65535
-          -16,2:
-            0: 65535
-          -16,3:
-            0: 65535
-          -16,4:
-            0: 65535
-          -16,5:
-            0: 65535
-          -16,6:
-            0: 255
-          -18,0:
-            0: 65535
-          -18,3:
-            0: 61440
-          -18,1:
-            0: 34956
-          -17,0:
-            0: 65535
-          -17,1:
-            0: 65535
-          -17,2:
-            0: 65519
-          -17,3:
-            0: 65535
-          -18,4:
-            0: 52991
-          -18,5:
-            0: 65532
-          -18,6:
-            0: 3823
-          -17,4:
-            0: 65535
-          -17,5:
-            0: 65535
-          -17,6:
-            0: 4095
-          -18,-4:
-            0: 65535
-          -18,-3:
-            0: 52479
-          -18,-1:
-            0: 65484
-          -18,-2:
-            0: 52428
-          -17,-4:
-            0: 65535
-          -17,-3:
-            0: 65535
-          -17,-2:
-            0: 65535
-          -17,-1:
-            0: 65535
-          -18,-6:
-            0: 65484
-          -18,-5:
-            0: 65535
-          -18,-7:
-            0: 52224
-          -17,-7:
-            0: 65484
-          -17,-6:
-            0: 65535
-          -17,-5:
-            0: 65535
-          2,8:
-            0: 12
-          3,8:
-            0: 15
-          4,8:
-            0: 15
-          5,8:
-            0: 1
-          -8,0:
-            0: 65520
-          -8,1:
-            0: 15
-          -9,0:
-            0: 61152
-          -9,1:
-            0: 14
-        uniqueMixes:
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 21.213781
-          - 79.80423
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        chunkSize: 4
-      type: GridAtmosphere
-    - type: RadiationGridResistance
-    - type: OccluderTree
-    - type: Shuttle
-    - shakeTimes: 10
-      type: GravityShake
-    - type: GasTileOverlay
-    - type: SpreaderGrid
-    - type: GridPathfinding
-  - uid: 1295
-    components:
-    - type: MetaData
-    - type: Transform
-    - type: Map
-    - type: PhysicsMap
-    - type: Broadphase
-    - type: OccluderTree
-    - parallax: Sky
-      type: Parallax
-    - space: False
-      mixture:
-        volume: 2500
-        temperature: 248.15
-        moles:
-        - 21.824879
-        - 82.10312
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-      type: MapAtmosphere
-    - type: LoadedMap
-    - type: GridTree
-    - type: MovedGrids
-- proto: AirlockExternalGlassNukeopLocked
-  entities:
-  - uid: 49
-    components:
-    - pos: 3.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 55
-    components:
-    - pos: -1.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 56
-    components:
-    - pos: -5.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 58
-    components:
-    - pos: 3.5,3.5
-      parent: 104
-      type: Transform
-- proto: AirlockGlassShuttle
-  entities:
-  - uid: 412
-    components:
-    - pos: -21.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 428
-    components:
-    - pos: -17.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 433
-    components:
-    - pos: -13.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 816
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -17.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 835
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -25.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 854
-    components:
-    - pos: -33.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 860
-    components:
-    - pos: -29.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 862
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -29.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 863
-    components:
-    - pos: -25.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 908
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -33.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 914
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -21.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 935
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -13.5,-20.5
-      parent: 104
-      type: Transform
-- proto: AirlockSyndicateNukeopGlassLocked
-  entities:
-  - uid: 48
-    components:
-    - pos: -11.5,6.5
-      parent: 104
-      type: Transform
-  - uid: 65
-    components:
-    - pos: 2.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 96
-    components:
-    - pos: 8.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 112
-    components:
-    - pos: 16.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 122
-    components:
-    - pos: 9.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 130
-    components:
-    - pos: 11.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 131
-    components:
-    - pos: 8.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 165
-    components:
-    - pos: 10.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 190
-    components:
-    - pos: 16.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 302
-    components:
-    - pos: 14.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 305
-    components:
-    - pos: 6.5,-9.5
-      parent: 104
-      type: Transform
-- proto: AirlockSyndicateNukeopLocked
-  entities:
-  - uid: 109
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 120
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 23.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 136
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 17.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 148
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 20.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 272
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 20.5,-4.5
-      parent: 104
-      type: Transform
-- proto: AlwaysPoweredLightExterior
-  entities:
-  - uid: 1267
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -15.5,23.5
-      parent: 104
-      type: Transform
-- proto: AlwaysPoweredLightLED
-  entities:
-  - uid: 135
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: -1.5707963267948966 rad
-      pos: -6.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 974
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: 5.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1286
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: -1.5707963267948966 rad
-      pos: -6.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1287
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: -1.5707963267948966 rad
-      pos: -6.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 1288
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: -1.5707963267948966 rad
-      pos: -6.5,-20.5
-      parent: 104
-      type: Transform
-- proto: AlwaysPoweredWallLight
-  entities:
-  - uid: 258
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 1356
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 1.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1470
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: 12.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 1471
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1532
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: 10.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 1534
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 1536
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 1537
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: 4.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 1544
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 1545
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 1546
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: 10.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 1570
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1571
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1572
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: 19.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 1573
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: 21.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 1758
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: -10.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1759
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: -1.5707963267948966 rad
-      pos: -1.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 1760
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: -1.5707963267948966 rad
-      pos: 14.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 1763
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 10.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 1867
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: -2.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 2257
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: 5.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 2291
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 5.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 2397
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: -1.5707963267948966 rad
-      pos: 24.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 2398
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: -1.5707963267948966 rad
-      pos: 24.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 2399
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 17.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 2400
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 17.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 2401
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 17.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 2402
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: -1.5707963267948966 rad
-      pos: 27.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 2403
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: 25.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2404
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: 19.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 3375
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 3377
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,-11.5
-      parent: 104
-      type: Transform
-- proto: APCHyperCapacity
-  entities:
-  - uid: 1431
-    components:
-    - pos: 20.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1445
-    components:
-    - pos: 13.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 1477
-    components:
-    - pos: 8.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1574
-    components:
-    - pos: 21.5,-4.5
-      parent: 104
-      type: Transform
-- proto: AsteroidRock
-  entities:
-  - uid: 19
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 20
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 216
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 238
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 243
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 244
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 246
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 247
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 248
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 249
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 250
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 0.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 251
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 255
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 257
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 259
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 263
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 277
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 292
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 294
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 295
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 296
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 358
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 359
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 360
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 361
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 362
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 363
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 364
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 365
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 366
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 367
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 368
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 369
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 370
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 371
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 372
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 373
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,8.5
-      parent: 104
-      type: Transform
-  - uid: 374
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 375
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 376
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -23.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 377
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 401
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 402
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 403
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 404
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 405
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 406
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 407
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -24.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 408
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -24.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 409
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 410
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 415
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 417
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -16.5,6.5
-      parent: 104
-      type: Transform
-  - uid: 419
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -7.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 420
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 421
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 422
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 423
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 425
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 426
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -7.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 455
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 1.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 469
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 471
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 473
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 475
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 477
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 478
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -6.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 479
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -2.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 480
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -2.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 483
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -2.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 485
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -2.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 488
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -2.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 489
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -2.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 492
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 502
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 504
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -2.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 505
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 506
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 509
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 511
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 512
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 513
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 521
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 522
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -1.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 524
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -0.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 525
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 9.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 529
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 10.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 531
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 11.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 532
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 533
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 534
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 535
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 536
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 537
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 538
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 539
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 543
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 546
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 547
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 548
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 549
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 550
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 551
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 552
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 553
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 554
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 555
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 556
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 557
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 558
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 559
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 560
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 561
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 562
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 563
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 564
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 565
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 566
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 567
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 568
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 31.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 569
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 570
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 571
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 572
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 573
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 574
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 575
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 576
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 577
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 25.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 578
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 579
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 580
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 581
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 582
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 586
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 4.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 587
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 5.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 588
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 6.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 589
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 7.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 590
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 595
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 596
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 597
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 598
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 599
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 600
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 601
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 602
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 603
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 604
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 605
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 606
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 607
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 608
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 609
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 610
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -14.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 614
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -16.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 615
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 618
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 621
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 622
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 632
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 637
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 640
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -16.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 648
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 670
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 672
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -16.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 673
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 674
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 676
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 677
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 678
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -14.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 679
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -14.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 680
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -14.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 681
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -15.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 682
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -24.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 684
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 685
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -15.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 686
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 687
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 688
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 689
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -15.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 690
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -14.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 691
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 692
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -13.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 693
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 694
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 695
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 699
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,8.5
-      parent: 104
-      type: Transform
-  - uid: 700
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 701
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -13.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 702
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -13.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 703
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -13.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 704
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -15.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 705
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 706
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 708
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 709
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 711
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 712
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -15.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 714
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 716
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -13.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 717
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -13.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 718
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 719
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 720
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 721
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,8.5
-      parent: 104
-      type: Transform
-  - uid: 722
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -16.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 723
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -16.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 724
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 725
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 726
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -14.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 728
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -14.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 729
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 733
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 734
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 735
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 740
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 741
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 745
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 746
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 747
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -16.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 752
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -16.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 753
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -15.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 755
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -15.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 756
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 757
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -16.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 758
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -13.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 759
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 762
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 763
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 764
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 765
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -16.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 768
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,8.5
-      parent: 104
-      type: Transform
-  - uid: 771
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -6.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 774
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 775
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 776
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 777
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 778
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 779
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 780
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 781
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 782
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 783
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 784
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 785
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 786
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 787
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 788
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 789
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 790
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 791
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 792
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 793
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -7.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 794
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -7.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 795
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -7.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 796
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -7.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 797
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -7.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 798
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -15.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 801
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 802
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -14.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 803
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 804
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -24.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 805
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 806
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 807
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 808
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 809
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -13.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 810
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1020
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1021
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1027
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1028
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1029
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -7.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1030
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -2.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1031
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -1.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1032
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -0.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1033
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 9.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1036
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 10.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1041
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 11.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1042
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1043
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 13.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1044
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1045
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1046
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1047
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1048
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1049
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 1050
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 1051
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 1052
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 1053
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 1054
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 1055
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 1056
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1057
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 1058
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1059
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1060
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1064
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1065
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1066
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1067
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 32.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 1068
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 32.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1069
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 32.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 1070
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 32.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1071
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 32.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 1072
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 32.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 1073
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 32.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 1074
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 32.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1075
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 32.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1076
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 32.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 1077
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 32.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 1078
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 32.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1079
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 32.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1083
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1084
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1085
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1092
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1093
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1094
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 25.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1095
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1096
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1097
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1098
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1099
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1100
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1101
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1105
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1106
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 7.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1107
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 6.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1108
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 5.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1109
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -23.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 1155
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -23.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 1156
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -23.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 1157
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,32.5
-      parent: 104
-      type: Transform
-  - uid: 1158
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -23.5,30.5
-      parent: 104
-      type: Transform
-  - uid: 1160
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -23.5,31.5
-      parent: 104
-      type: Transform
-  - uid: 1161
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 1162
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 1163
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 1164
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 1165
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,30.5
-      parent: 104
-      type: Transform
-  - uid: 1166
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,30.5
-      parent: 104
-      type: Transform
-  - uid: 1167
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -24.5,31.5
-      parent: 104
-      type: Transform
-  - uid: 1168
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -23.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1169
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -24.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1170
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,31.5
-      parent: 104
-      type: Transform
-  - uid: 1171
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -25.5,30.5
-      parent: 104
-      type: Transform
-  - uid: 1172
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -25.5,31.5
-      parent: 104
-      type: Transform
-  - uid: 1173
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -25.5,32.5
-      parent: 104
-      type: Transform
-  - uid: 1174
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -23.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1175
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -23.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 1176
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1177
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -23.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 1178
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -23.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 1179
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 1180
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 1224
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -23.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 1250
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 1.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1390
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -0.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1391
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -23.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 1392
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -24.5,30.5
-      parent: 104
-      type: Transform
-  - uid: 1393
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -23.5,32.5
-      parent: 104
-      type: Transform
-  - uid: 1394
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 1395
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -23.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 1396
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -24.5,32.5
-      parent: 104
-      type: Transform
-  - uid: 1397
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -23.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 1398
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 1399
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 1400
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 1401
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 1402
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 1403
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 1404
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 1405
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 1406
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 1407
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 6.5,-24.5
-      parent: 104
-      type: Transform
-  - uid: 1408
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 7.5,-24.5
-      parent: 104
-      type: Transform
-  - uid: 1415
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 3.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1416
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 4.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1417
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,-24.5
-      parent: 104
-      type: Transform
-  - uid: 1418
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,-24.5
-      parent: 104
-      type: Transform
-  - uid: 1419
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,-24.5
-      parent: 104
-      type: Transform
-  - uid: 1420
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,-24.5
-      parent: 104
-      type: Transform
-  - uid: 1421
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,-24.5
-      parent: 104
-      type: Transform
-  - uid: 1422
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 25.5,-24.5
-      parent: 104
-      type: Transform
-  - uid: 1423
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,-24.5
-      parent: 104
-      type: Transform
-  - uid: 1424
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,-24.5
-      parent: 104
-      type: Transform
-  - uid: 1425
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 1427
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1433
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 5.5,-24.5
-      parent: 104
-      type: Transform
-  - uid: 1434
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 33.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1435
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 33.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1436
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 33.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 1437
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 33.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 1440
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 33.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1441
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 33.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1442
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 33.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 1443
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 33.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 1444
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 33.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 1446
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 33.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1447
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1448
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1472
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1542
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1550
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1552
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1553
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1557
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1559
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1560
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1562
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1564
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 1566
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 1567
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 1568
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 1569
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 1594
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 1598
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 1599
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 1600
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 1601
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 1602
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 1603
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1604
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1605
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1606
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1607
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 1608
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 1609
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 1610
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1611
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1612
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1613
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1614
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1615
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 13.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1616
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1623
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 11.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1625
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 10.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1632
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 9.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1636
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -0.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1637
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -1.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1638
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -2.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1639
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -0.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1640
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -1.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1641
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -2.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1642
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1643
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -7.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1644
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1645
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 1646
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 1647
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 1649
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,7.5
-      parent: 104
-      type: Transform
-  - uid: 1650
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,8.5
-      parent: 104
-      type: Transform
-  - uid: 1651
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 1657
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 1658
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1659
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 1660
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 1661
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 1662
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 1663
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,6.5
-      parent: 104
-      type: Transform
-  - uid: 1664
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 1665
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 1666
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 1667
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,8.5
-      parent: 104
-      type: Transform
-  - uid: 1676
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 1677
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 1678
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 1679
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 1682
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 1683
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 1685
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 1686
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 1687
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,7.5
-      parent: 104
-      type: Transform
-  - uid: 1688
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,8.5
-      parent: 104
-      type: Transform
-  - uid: 1691
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,8.5
-      parent: 104
-      type: Transform
-  - uid: 1692
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 1693
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 1695
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 1696
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 1698
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1700
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 25.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 1701
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 25.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 1702
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 13.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1709
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 1710
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,8.5
-      parent: 104
-      type: Transform
-  - uid: 1712
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 1713
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 11.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1714
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 25.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 1715
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 1716
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 1717
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1719
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 1720
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 1721
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 1722
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 1723
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 10.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1724
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 1725
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1726
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1727
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1729
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 1731
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1732
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 1733
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,6.5
-      parent: 104
-      type: Transform
-  - uid: 1734
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1735
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1736
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1740
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1741
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 1742
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1743
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1744
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1745
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 1746
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 1747
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 1748
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 1749
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 1750
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 1751
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 9.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1752
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -2.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 1753
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 1754
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 1755
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 1756
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -6.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 1757
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -7.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 1762
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 1.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 1767
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,7.5
-      parent: 104
-      type: Transform
-  - uid: 1768
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,6.5
-      parent: 104
-      type: Transform
-  - uid: 1769
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1770
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,7.5
-      parent: 104
-      type: Transform
-  - uid: 1771
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,6.5
-      parent: 104
-      type: Transform
-  - uid: 1772
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1773
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,7.5
-      parent: 104
-      type: Transform
-  - uid: 1774
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,6.5
-      parent: 104
-      type: Transform
-  - uid: 1775
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1776
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1777
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1778
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 1779
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,18.5
-      parent: 104
-      type: Transform
-  - uid: 1780
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -22.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 1781
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -23.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 1782
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -23.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 1792
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 4.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 1793
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 4.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1794
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 2.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 1795
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 2.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1796
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -1.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1797
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 3.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 1798
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 3.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1801
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 7.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 1802
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 7.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1803
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 7.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1804
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 5.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 1805
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 5.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1806
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 5.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1807
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 6.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 1808
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 6.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1809
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 6.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1835
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 1836
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1837
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1865
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1870
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1875
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1880
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1884
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1888
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1892
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1896
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1900
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1904
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 25.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1909
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 1910
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1911
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 1912
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 1913
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1923
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 1924
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1925
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 1926
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 1927
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1928
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 1930
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1934
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 1935
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 1936
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 1937
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 1938
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1939
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 1940
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 1942
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1952
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 1953
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1954
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 1955
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 1956
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1957
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 1958
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1959
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 1960
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 1961
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 1962
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 1963
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1964
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 1965
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 1966
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 1967
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1973
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 1974
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1975
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 1976
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 1977
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 1978
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1979
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 1980
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1981
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 1982
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 1983
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 1984
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 1985
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1986
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 1987
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 1988
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 1989
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1990
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 1991
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 1992
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1993
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1994
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 1995
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 1996
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 1997
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1998
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 1999
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 2000
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 2001
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 2002
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 2003
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 2004
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 2005
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 2006
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 2007
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 2008
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 2009
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 2010
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 2011
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 2012
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 29.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 2013
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2014
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 2015
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2020
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 2023
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 2024
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 2025
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 2026
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 2029
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 2030
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 2032
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 2033
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 2034
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 2035
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 2036
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 2037
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 30.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 2038
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 2039
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 2040
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 2041
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 2042
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 2043
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 2044
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 2047
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 25.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 2049
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 25.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 2051
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 25.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 2054
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 2055
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 2056
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 2058
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 2059
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 2060
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 2061
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 2063
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 2064
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 2065
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 2066
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 2067
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 2068
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 2069
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 2070
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 2071
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 2072
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 2073
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 2074
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 2075
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 2076
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 2077
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 2078
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 2079
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 2080
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2084
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2085
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2086
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2087
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -16.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2088
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 2091
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -15.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2093
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -14.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2094
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -14.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2096
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -13.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2098
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -13.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2099
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -13.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2100
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,30.5
-      parent: 104
-      type: Transform
-  - uid: 2101
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2102
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2103
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2104
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2105
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2106
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2107
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,30.5
-      parent: 104
-      type: Transform
-  - uid: 2108
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2109
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2110
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2111
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2112
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2113
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2115
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,30.5
-      parent: 104
-      type: Transform
-  - uid: 2116
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2117
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2118
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2119
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2120
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2121
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -18.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2122
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2123
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2124
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2125
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2127
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2128
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2129
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2130
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2131
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -21.5,31.5
-      parent: 104
-      type: Transform
-  - uid: 2132
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -20.5,31.5
-      parent: 104
-      type: Transform
-  - uid: 2133
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,31.5
-      parent: 104
-      type: Transform
-  - uid: 2134
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2136
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2137
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2138
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2139
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2140
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2141
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2142
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2143
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2144
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2145
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2146
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2147
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2148
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2149
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2150
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2151
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -8.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2152
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -7.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2153
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -7.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2154
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -7.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2155
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -7.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2156
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -7.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2157
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -7.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2158
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -6.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2159
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -6.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2160
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -6.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2161
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -6.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2162
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -6.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2163
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -6.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2164
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2165
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2166
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2167
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2168
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2169
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2170
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2171
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2172
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2173
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2174
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2175
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2176
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2177
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2178
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2179
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2180
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2181
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -2.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2183
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -2.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2184
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -2.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2192
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 2194
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2195
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 10.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2196
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,31.5
-      parent: 104
-      type: Transform
-  - uid: 2197
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2198
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,30.5
-      parent: 104
-      type: Transform
-  - uid: 2199
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,32.5
-      parent: 104
-      type: Transform
-  - uid: 2200
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 2201
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2202
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2203
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 10.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 2204
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 10.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2205
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 10.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2206
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 10.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2207
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 10.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2208
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 11.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 2209
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 11.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2210
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 11.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2211
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 11.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2212
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 11.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2213
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 11.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2214
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 11.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2215
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 2216
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2217
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2218
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2219
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2220
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2221
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2222
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,30.5
-      parent: 104
-      type: Transform
-  - uid: 2223
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,31.5
-      parent: 104
-      type: Transform
-  - uid: 2224
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 13.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 2225
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 13.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2226
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 13.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2227
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 13.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2228
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 13.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2229
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 13.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2230
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 13.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2231
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 13.5,30.5
-      parent: 104
-      type: Transform
-  - uid: 2232
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 13.5,31.5
-      parent: 104
-      type: Transform
-  - uid: 2233
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 2234
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2235
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2236
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2237
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2238
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2239
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2240
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,30.5
-      parent: 104
-      type: Transform
-  - uid: 2241
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,31.5
-      parent: 104
-      type: Transform
-  - uid: 2242
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,32.5
-      parent: 104
-      type: Transform
-  - uid: 2243
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 2244
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2245
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2246
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2247
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2248
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2249
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2250
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2251
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2252
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2253
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2254
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,30.5
-      parent: 104
-      type: Transform
-  - uid: 2255
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,31.5
-      parent: 104
-      type: Transform
-  - uid: 2256
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2259
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2260
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2261
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2262
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2263
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2264
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2265
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,30.5
-      parent: 104
-      type: Transform
-  - uid: 2266
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,31.5
-      parent: 104
-      type: Transform
-  - uid: 2267
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,32.5
-      parent: 104
-      type: Transform
-  - uid: 2268
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 2269
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2270
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2271
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2272
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2273
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2274
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2275
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,30.5
-      parent: 104
-      type: Transform
-  - uid: 2276
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,31.5
-      parent: 104
-      type: Transform
-  - uid: 2277
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,32.5
-      parent: 104
-      type: Transform
-  - uid: 2278
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 2279
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 2280
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,25.5
-      parent: 104
-      type: Transform
-  - uid: 2281
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,26.5
-      parent: 104
-      type: Transform
-  - uid: 2282
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,27.5
-      parent: 104
-      type: Transform
-  - uid: 2283
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,28.5
-      parent: 104
-      type: Transform
-  - uid: 2284
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,29.5
-      parent: 104
-      type: Transform
-  - uid: 2285
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,30.5
-      parent: 104
-      type: Transform
-  - uid: 2286
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,31.5
-      parent: 104
-      type: Transform
-  - uid: 2287
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,32.5
-      parent: 104
-      type: Transform
-  - uid: 2288
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 2289
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,24.5
-      parent: 104
-      type: Transform
-- proto: BalloonSyn
-  entities:
-  - uid: 1327
-    components:
-    - pos: 0.03361702,-6.368435
-      parent: 104
-      type: Transform
-- proto: BaseComputer
-  entities:
-  - uid: 18
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 29
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 111
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 2292
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 2295
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,-3.5
-      parent: 104
-      type: Transform
-- proto: Beaker
-  entities:
-  - uid: 2031
-    components:
-    - pos: 3.6114278,-10.732791
-      parent: 104
-      type: Transform
-  - uid: 2095
-    components:
-    - pos: 4.017678,-12.520861
-      parent: 104
-      type: Transform
-- proto: Bed
-  entities:
-  - uid: 957
-    components:
-    - pos: 15.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 1548
-    components:
-    - pos: 15.5,-4.5
-      parent: 104
-      type: Transform
-- proto: BedsheetMedical
-  entities:
-  - uid: 1872
-    components:
-    - pos: 1.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1877
-    components:
-    - pos: -1.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1898
-    components:
-    - pos: 1.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1899
-    components:
-    - pos: -1.5,-12.5
-      parent: 104
-      type: Transform
-- proto: BedsheetSyndie
-  entities:
-  - uid: 154
-    components:
-    - pos: 15.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 289
-    components:
-    - pos: 15.5,-4.5
-      parent: 104
-      type: Transform
-- proto: BigBox
-  entities:
-  - uid: 2458
-    components:
-    - pos: 13.500806,-4.4874377
-      parent: 104
-      type: Transform
-- proto: Bookshelf
-  entities:
-  - uid: 140
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -0.5,-0.5
-      parent: 104
-      type: Transform
-- proto: BoozeDispenser
-  entities:
-  - uid: 230
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-8.5
-      parent: 104
-      type: Transform
-- proto: BoxBeaker
-  entities:
-  - uid: 2114
-    components:
-    - pos: 5.539936,-12.489611
-      parent: 104
-      type: Transform
-- proto: BoxFolderBlack
-  entities:
-  - uid: 1022
-    components:
-    - pos: -13.494709,9.54891
-      parent: 104
-      type: Transform
-- proto: BoxMagazinePistolCaselessRiflePractice
-  entities:
-  - uid: 1635
-    components:
-    - pos: 5.4970627,10.597828
-      parent: 104
-      type: Transform
-- proto: BoxMagazinePistolSubMachineGunPractice
-  entities:
-  - uid: 1634
-    components:
-    - pos: 5.388983,13.953581
-      parent: 104
-      type: Transform
-- proto: BoxPillCanister
-  entities:
-  - uid: 1844
-    components:
-    - pos: 5.430561,-12.364611
-      parent: 104
-      type: Transform
-- proto: BoxShotgunPractice
-  entities:
-  - uid: 1633
-    components:
-    - pos: 5.4972115,14.562988
-      parent: 104
-      type: Transform
-    - unspawnedCount: 12
-      type: BallisticAmmoProvider
-- proto: Bucket
-  entities:
-  - uid: 153
-    components:
-    - pos: 10.809023,-4.25956
-      parent: 104
-      type: Transform
-- proto: CableApcExtension
-  entities:
-  - uid: 13
-    components:
-    - pos: -10.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 100
-    components:
-    - pos: 13.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 143
-    components:
-    - pos: 12.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 220
-    components:
-    - pos: 11.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 235
-    components:
-    - pos: 1.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 245
-    components:
-    - pos: 12.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 279
-    components:
-    - pos: 11.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 297
-    components:
-    - pos: 3.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 390
-    components:
-    - pos: -10.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 397
-    components:
-    - pos: -10.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 411
-    components:
-    - pos: -10.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 429
-    components:
-    - pos: -10.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 430
-    components:
-    - pos: -10.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 432
-    components:
-    - pos: -27.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 434
-    components:
-    - pos: -31.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 435
-    components:
-    - pos: -10.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 436
-    components:
-    - pos: -10.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 437
-    components:
-    - pos: -10.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 438
-    components:
-    - pos: -25.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 439
-    components:
-    - pos: -10.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 442
-    components:
-    - pos: -33.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 444
-    components:
-    - pos: -10.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 449
-    components:
-    - pos: -11.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 450
-    components:
-    - pos: -12.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 451
-    components:
-    - pos: -13.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 452
-    components:
-    - pos: -14.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 453
-    components:
-    - pos: -32.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 454
-    components:
-    - pos: -15.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 464
-    components:
-    - pos: -16.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 465
-    components:
-    - pos: -17.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 466
-    components:
-    - pos: -18.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 467
-    components:
-    - pos: -19.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 501
-    components:
-    - pos: -34.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 503
-    components:
-    - pos: -20.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 508
-    components:
-    - pos: -21.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 510
-    components:
-    - pos: -22.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 514
-    components:
-    - pos: -23.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 515
-    components:
-    - pos: -24.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 619
-    components:
-    - pos: -10.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 624
-    components:
-    - pos: -10.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 625
-    components:
-    - pos: -10.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 627
-    components:
-    - pos: -10.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 628
-    components:
-    - pos: -10.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 630
-    components:
-    - pos: -10.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 635
-    components:
-    - pos: -10.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 636
-    components:
-    - pos: -11.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 638
-    components:
-    - pos: -12.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 639
-    components:
-    - pos: -13.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 644
-    components:
-    - pos: -30.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 645
-    components:
-    - pos: -31.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 646
-    components:
-    - pos: -32.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 653
-    components:
-    - pos: -15.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 654
-    components:
-    - pos: -16.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 655
-    components:
-    - pos: -17.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 656
-    components:
-    - pos: -18.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 657
-    components:
-    - pos: -19.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 658
-    components:
-    - pos: -20.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 659
-    components:
-    - pos: -21.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 660
-    components:
-    - pos: -22.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 661
-    components:
-    - pos: -23.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 662
-    components:
-    - pos: -24.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 665
-    components:
-    - pos: -25.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 666
-    components:
-    - pos: -26.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 667
-    components:
-    - pos: -27.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 668
-    components:
-    - pos: -28.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 669
-    components:
-    - pos: -29.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 707
-    components:
-    - pos: -33.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 713
-    components:
-    - pos: -34.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 814
-    components:
-    - pos: -6.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 832
-    components:
-    - pos: -7.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 845
-    components:
-    - pos: -10.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 866
-    components:
-    - pos: -10.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 867
-    components:
-    - pos: -5.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 868
-    components:
-    - pos: -10.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 870
-    components:
-    - pos: -9.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 877
-    components:
-    - pos: -8.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 884
-    components:
-    - pos: -4.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 920
-    components:
-    - pos: -10.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 926
-    components:
-    - pos: -30.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 927
-    components:
-    - pos: -26.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 931
-    components:
-    - pos: 12.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 933
-    components:
-    - pos: -10.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 934
-    components:
-    - pos: -10.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 941
-    components:
-    - pos: -14.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 960
-    components:
-    - pos: 12.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 961
-    components:
-    - pos: 11.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 962
-    components:
-    - pos: 6.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 967
-    components:
-    - pos: 9.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 968
-    components:
-    - pos: 7.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 969
-    components:
-    - pos: -10.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 970
-    components:
-    - pos: -29.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 971
-    components:
-    - pos: -28.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 973
-    components:
-    - pos: 5.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 979
-    components:
-    - pos: 1.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 981
-    components:
-    - pos: 5.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 982
-    components:
-    - pos: 12.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 983
-    components:
-    - pos: 5.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1115
-    components:
-    - pos: 4.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 1116
-    components:
-    - pos: 1.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1117
-    components:
-    - pos: 6.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1122
-    components:
-    - pos: 1.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 1152
-    components:
-    - pos: 12.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1154
-    components:
-    - pos: 3.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 1182
-    components:
-    - pos: 5.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 1183
-    components:
-    - pos: 7.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 1191
-    components:
-    - pos: 3.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1194
-    components:
-    - pos: 2.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 1195
-    components:
-    - pos: 8.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1200
-    components:
-    - pos: 1.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 1204
-    components:
-    - pos: 10.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1232
-    components:
-    - pos: -10.5,6.5
-      parent: 104
-      type: Transform
-  - uid: 1233
-    components:
-    - pos: -10.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1234
-    components:
-    - pos: -10.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1235
-    components:
-    - pos: -10.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 1236
-    components:
-    - pos: -10.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 1237
-    components:
-    - pos: -11.5,6.5
-      parent: 104
-      type: Transform
-  - uid: 1238
-    components:
-    - pos: -12.5,6.5
-      parent: 104
-      type: Transform
-  - uid: 1239
-    components:
-    - pos: -13.5,6.5
-      parent: 104
-      type: Transform
-  - uid: 1240
-    components:
-    - pos: -14.5,6.5
-      parent: 104
-      type: Transform
-  - uid: 1275
-    components:
-    - pos: -6.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 1281
-    components:
-    - pos: -6.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 1282
-    components:
-    - pos: -6.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1283
-    components:
-    - pos: -6.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 1292
-    components:
-    - pos: 3.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 1337
-    components:
-    - pos: -6.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 1338
-    components:
-    - pos: -6.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1339
-    components:
-    - pos: -6.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 1340
-    components:
-    - pos: -6.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1341
-    components:
-    - pos: -6.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 1342
-    components:
-    - pos: -6.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 1343
-    components:
-    - pos: -6.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1344
-    components:
-    - pos: -6.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 1345
-    components:
-    - pos: -6.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1346
-    components:
-    - pos: -6.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 1347
-    components:
-    - pos: -6.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 1348
-    components:
-    - pos: -6.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 1349
-    components:
-    - pos: -6.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1439
-    components:
-    - pos: 20.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1449
-    components:
-    - pos: 16.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 1450
-    components:
-    - pos: 15.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 1451
-    components:
-    - pos: 15.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1452
-    components:
-    - pos: 15.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 1453
-    components:
-    - pos: 15.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1454
-    components:
-    - pos: 14.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1455
-    components:
-    - pos: 13.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1456
-    components:
-    - pos: 12.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1457
-    components:
-    - pos: 11.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1458
-    components:
-    - pos: 15.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 1459
-    components:
-    - pos: 14.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 1460
-    components:
-    - pos: 13.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 1461
-    components:
-    - pos: 12.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 1474
-    components:
-    - pos: 7.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1475
-    components:
-    - pos: 6.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 1476
-    components:
-    - pos: 3.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 1488
-    components:
-    - pos: 6.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1489
-    components:
-    - pos: 8.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1490
-    components:
-    - pos: 6.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 1491
-    components:
-    - pos: 6.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 1492
-    components:
-    - pos: 6.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 1493
-    components:
-    - pos: 6.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1494
-    components:
-    - pos: 5.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1495
-    components:
-    - pos: 4.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1496
-    components:
-    - pos: 4.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 1497
-    components:
-    - pos: 2.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 1498
-    components:
-    - pos: 2.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1499
-    components:
-    - pos: 1.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1500
-    components:
-    - pos: 0.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1501
-    components:
-    - pos: 0.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 1502
-    components:
-    - pos: -0.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 1503
-    components:
-    - pos: -0.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 1504
-    components:
-    - pos: -0.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 1505
-    components:
-    - pos: -0.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 1506
-    components:
-    - pos: -0.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 1507
-    components:
-    - pos: -0.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1508
-    components:
-    - pos: -0.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 1509
-    components:
-    - pos: -0.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1510
-    components:
-    - pos: 0.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1511
-    components:
-    - pos: 1.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1512
-    components:
-    - pos: 2.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1513
-    components:
-    - pos: 4.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1514
-    components:
-    - pos: 3.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1515
-    components:
-    - pos: 5.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1516
-    components:
-    - pos: 5.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 1517
-    components:
-    - pos: 6.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 1518
-    components:
-    - pos: 7.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 1519
-    components:
-    - pos: 8.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 1520
-    components:
-    - pos: 9.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 1521
-    components:
-    - pos: 10.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 1522
-    components:
-    - pos: 10.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1523
-    components:
-    - pos: 11.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1524
-    components:
-    - pos: 12.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1525
-    components:
-    - pos: 13.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1526
-    components:
-    - pos: 14.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1527
-    components:
-    - pos: 14.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1528
-    components:
-    - pos: 15.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1529
-    components:
-    - pos: 14.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 1530
-    components:
-    - pos: 14.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1531
-    components:
-    - pos: 14.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 1538
-    components:
-    - pos: 7.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1539
-    components:
-    - pos: 8.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1540
-    components:
-    - pos: 9.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1541
-    components:
-    - pos: 8.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1543
-    components:
-    - pos: 10.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1575
-    components:
-    - pos: 21.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1576
-    components:
-    - pos: 20.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1577
-    components:
-    - pos: 19.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1578
-    components:
-    - pos: 19.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 1579
-    components:
-    - pos: 19.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1580
-    components:
-    - pos: 19.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 1581
-    components:
-    - pos: 19.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 1582
-    components:
-    - pos: 19.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 1583
-    components:
-    - pos: 20.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 1584
-    components:
-    - pos: 21.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 1585
-    components:
-    - pos: 21.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 1586
-    components:
-    - pos: 18.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1587
-    components:
-    - pos: 17.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1588
-    components:
-    - pos: 21.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 1589
-    components:
-    - pos: 21.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1590
-    components:
-    - pos: 21.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 1591
-    components:
-    - pos: 10.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 1592
-    components:
-    - pos: 10.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 1593
-    components:
-    - pos: 10.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 1595
-    components:
-    - pos: -1.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 1596
-    components:
-    - pos: -2.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 1597
-    components:
-    - pos: -3.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 2301
-    components:
-    - pos: 12.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 2302
-    components:
-    - pos: 11.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 2303
-    components:
-    - pos: 13.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 2304
-    components:
-    - pos: 0.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 2305
-    components:
-    - pos: -0.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 2306
-    components:
-    - pos: -1.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 2307
-    components:
-    - pos: -2.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 2374
-    components:
-    - pos: 20.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 2375
-    components:
-    - pos: 20.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 2376
-    components:
-    - pos: 20.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 2377
-    components:
-    - pos: 20.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 2378
-    components:
-    - pos: 20.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 2379
-    components:
-    - pos: 20.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2381
-    components:
-    - pos: 20.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 2382
-    components:
-    - pos: 20.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2383
-    components:
-    - pos: 19.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2384
-    components:
-    - pos: 18.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2385
-    components:
-    - pos: 21.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2386
-    components:
-    - pos: 22.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2387
-    components:
-    - pos: 23.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2388
-    components:
-    - pos: 24.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2389
-    components:
-    - pos: 25.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2390
-    components:
-    - pos: 26.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2391
-    components:
-    - pos: 25.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 2392
-    components:
-    - pos: 25.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2393
-    components:
-    - pos: 25.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 2394
-    components:
-    - pos: 25.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 2395
-    components:
-    - pos: 25.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 2396
-    components:
-    - pos: 25.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 2439
-    components:
-    - pos: 13.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 2440
-    components:
-    - pos: 5.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 2441
-    components:
-    - pos: 5.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 3378
-    components:
-    - pos: 7.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 3379
-    components:
-    - pos: 7.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 3380
-    components:
-    - pos: 6.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 3381
-    components:
-    - pos: 5.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 3382
-    components:
-    - pos: 4.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 3383
-    components:
-    - pos: 3.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 3384
-    components:
-    - pos: 3.5,-11.5
-      parent: 104
-      type: Transform
-- proto: CableApcStack
-  entities:
-  - uid: 211
-    components:
-    - pos: 11.428643,-10.548745
-      parent: 104
-      type: Transform
-  - uid: 1324
-    components:
-    - pos: 4.439247,-17.36072
-      parent: 104
-      type: Transform
-- proto: CableHV
-  entities:
-  - uid: 2334
-    components:
-    - pos: 17.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2335
-    components:
-    - pos: 17.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 2336
-    components:
-    - pos: 17.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2337
-    components:
-    - pos: 18.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2338
-    components:
-    - pos: 19.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2339
-    components:
-    - pos: 20.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2340
-    components:
-    - pos: 21.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2341
-    components:
-    - pos: 22.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2342
-    components:
-    - pos: 23.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2343
-    components:
-    - pos: 24.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2344
-    components:
-    - pos: 25.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2345
-    components:
-    - pos: 26.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2346
-    components:
-    - pos: 27.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2347
-    components:
-    - pos: 27.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 2348
-    components:
-    - pos: 27.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2352
-    components:
-    - pos: 21.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 2353
-    components:
-    - pos: 22.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 2354
-    components:
-    - pos: 23.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 2355
-    components:
-    - pos: 22.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2356
-    components:
-    - pos: 23.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2357
-    components:
-    - pos: 24.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2358
-    components:
-    - pos: 24.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 2359
-    components:
-    - pos: 24.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 2360
-    components:
-    - pos: 24.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 2361
-    components:
-    - pos: 21.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2362
-    components:
-    - pos: 25.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 2363
-    components:
-    - pos: 26.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 2364
-    components:
-    - pos: 27.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 2365
-    components:
-    - pos: 27.5,-13.5
-      parent: 104
-      type: Transform
-- proto: CableHVStack
-  entities:
-  - uid: 209
-    components:
-    - pos: 11.334893,-10.282843
-      parent: 104
-      type: Transform
-- proto: CableMV
-  entities:
-  - uid: 240
-    components:
-    - pos: 17.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 1438
-    components:
-    - pos: 20.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1462
-    components:
-    - pos: 16.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 1463
-    components:
-    - pos: 15.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 1464
-    components:
-    - pos: 15.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1465
-    components:
-    - pos: 15.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 1466
-    components:
-    - pos: 15.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1467
-    components:
-    - pos: 14.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1468
-    components:
-    - pos: 13.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1469
-    components:
-    - pos: 13.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 1478
-    components:
-    - pos: 12.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1479
-    components:
-    - pos: 11.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1480
-    components:
-    - pos: 10.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1481
-    components:
-    - pos: 9.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1482
-    components:
-    - pos: 9.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 1483
-    components:
-    - pos: 9.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 1484
-    components:
-    - pos: 9.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1485
-    components:
-    - pos: 9.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 1486
-    components:
-    - pos: 8.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 1487
-    components:
-    - pos: 8.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 2322
-    components:
-    - pos: 18.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 2323
-    components:
-    - pos: 19.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 2324
-    components:
-    - pos: 20.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 2325
-    components:
-    - pos: 20.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 2367
-    components:
-    - pos: 27.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 2368
-    components:
-    - pos: 26.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 2369
-    components:
-    - pos: 25.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 2370
-    components:
-    - pos: 24.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 2371
-    components:
-    - pos: 23.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 2372
-    components:
-    - pos: 22.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 2373
-    components:
-    - pos: 21.5,-13.5
-      parent: 104
-      type: Transform
-- proto: CableMVStack
-  entities:
-  - uid: 210
-    components:
-    - pos: 11.381768,-10.407973
-      parent: 104
-      type: Transform
-- proto: CableTerminal
-  entities:
-  - uid: 2349
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 21.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2350
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 22.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2351
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 23.5,-19.5
-      parent: 104
-      type: Transform
-- proto: Carpet
-  entities:
-  - uid: 2459
-    components:
-    - pos: 14.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 2460
-    components:
-    - pos: 14.5,-3.5
-      parent: 104
-      type: Transform
-- proto: Catwalk
-  entities:
-  - uid: 256
-    components:
-    - pos: -29.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 264
-    components:
-    - pos: -28.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 278
-    components:
-    - pos: -21.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 287
-    components:
-    - pos: -20.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 381
-    components:
-    - pos: -20.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 382
-    components:
-    - pos: -20.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 383
-    components:
-    - pos: -20.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 384
-    components:
-    - pos: -19.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 385
-    components:
-    - pos: -30.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 386
-    components:
-    - pos: -28.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 387
-    components:
-    - pos: -34.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 388
-    components:
-    - pos: -29.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 389
-    components:
-    - pos: -14.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 391
-    components:
-    - pos: -33.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 392
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -34.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 393
-    components:
-    - pos: -19.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 394
-    components:
-    - pos: -32.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 395
-    components:
-    - pos: -24.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 396
-    components:
-    - pos: -10.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 398
-    components:
-    - pos: -9.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 399
-    components:
-    - pos: -10.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 400
-    components:
-    - pos: -9.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 413
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -24.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 431
-    components:
-    - pos: -9.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 440
-    components:
-    - pos: -16.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 468
-    components:
-    - pos: -9.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 470
-    components:
-    - pos: -9.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 499
-    components:
-    - pos: -9.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 500
-    components:
-    - pos: -9.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 516
-    components:
-    - pos: -9.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 517
-    components:
-    - pos: -9.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 518
-    components:
-    - pos: -10.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 519
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -31.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 520
-    components:
-    - pos: -26.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 584
-    components:
-    - pos: -10.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 616
-    components:
-    - pos: -31.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 617
-    components:
-    - pos: -14.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 626
-    components:
-    - pos: -16.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 631
-    components:
-    - pos: -9.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 633
-    components:
-    - pos: -9.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 634
-    components:
-    - pos: -16.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 641
-    components:
-    - pos: -11.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 642
-    components:
-    - pos: -11.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 643
-    components:
-    - pos: -10.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 647
-    components:
-    - pos: -13.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 652
-    components:
-    - pos: -15.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 663
-    components:
-    - pos: -12.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 664
-    components:
-    - pos: -11.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 715
-    components:
-    - pos: -10.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 736
-    components:
-    - pos: -10.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 737
-    components:
-    - pos: -10.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 738
-    components:
-    - pos: -14.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 742
-    components:
-    - pos: -10.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 748
-    components:
-    - pos: -10.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 749
-    components:
-    - pos: -10.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 760
-    components:
-    - pos: -14.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 761
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -26.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 769
-    components:
-    - pos: -33.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 772
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -33.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 799
-    components:
-    - pos: -26.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 800
-    components:
-    - pos: -34.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 812
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -32.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 813
-    components:
-    - pos: -29.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 815
-    components:
-    - pos: -17.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 817
-    components:
-    - pos: -24.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 818
-    components:
-    - pos: -24.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 820
-    components:
-    - pos: -21.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 821
-    components:
-    - pos: -21.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 822
-    components:
-    - pos: -27.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 823
-    components:
-    - pos: -26.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 824
-    components:
-    - pos: -25.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 825
-    components:
-    - pos: -25.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 826
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -33.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 827
-    components:
-    - pos: -27.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 828
-    components:
-    - pos: -27.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 829
-    components:
-    - pos: -26.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 830
-    components:
-    - pos: -25.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 831
-    components:
-    - pos: -26.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 833
-    components:
-    - pos: -18.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 834
-    components:
-    - pos: -27.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 836
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -29.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 837
-    components:
-    - pos: -32.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 839
-    components:
-    - pos: -32.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 840
-    components:
-    - pos: -27.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 841
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -33.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 842
-    components:
-    - pos: -17.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 843
-    components:
-    - pos: -18.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 844
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -32.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 846
-    components:
-    - pos: -18.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 847
-    components:
-    - pos: -19.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 848
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -34.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 849
-    components:
-    - pos: -18.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 850
-    components:
-    - pos: -17.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 851
-    components:
-    - pos: -16.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 852
-    components:
-    - pos: -32.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 853
-    components:
-    - pos: -30.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 855
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -30.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 856
-    components:
-    - pos: -31.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 857
-    components:
-    - pos: -24.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 858
-    components:
-    - pos: -30.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 859
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -28.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 861
-    components:
-    - pos: -30.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 864
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -27.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 865
-    components:
-    - pos: -28.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 869
-    components:
-    - pos: -32.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 871
-    components:
-    - pos: -31.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 872
-    components:
-    - pos: -30.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 873
-    components:
-    - pos: -16.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 874
-    components:
-    - pos: -15.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 875
-    components:
-    - pos: -15.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 876
-    components:
-    - pos: -15.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 878
-    components:
-    - pos: -23.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 879
-    components:
-    - pos: -23.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 880
-    components:
-    - pos: -23.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 881
-    components:
-    - pos: -22.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 882
-    components:
-    - pos: -22.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 883
-    components:
-    - pos: -31.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 885
-    components:
-    - pos: -23.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 886
-    components:
-    - pos: -31.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 887
-    components:
-    - pos: -28.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 888
-    components:
-    - pos: -28.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 889
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -34.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 890
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -32.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 891
-    components:
-    - pos: -33.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 892
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -31.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 893
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -31.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 894
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -30.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 895
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -30.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 896
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -29.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 897
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -29.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 898
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -28.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 899
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -28.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 900
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -27.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 901
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -26.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 902
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -26.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 903
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -25.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 904
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -25.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 905
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -35.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 906
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -35.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 907
-    components:
-    - pos: -19.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 909
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -25.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 910
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -35.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 911
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -35.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 912
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -34.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 913
-    components:
-    - pos: -23.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 915
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -23.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 916
-    components:
-    - pos: -12.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 917
-    components:
-    - pos: -12.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 918
-    components:
-    - pos: -12.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 919
-    components:
-    - pos: -22.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 921
-    components:
-    - pos: -15.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 922
-    components:
-    - pos: -14.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 923
-    components:
-    - pos: -13.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 924
-    components:
-    - pos: -13.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 925
-    components:
-    - pos: -13.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 928
-    components:
-    - pos: -15.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 929
-    components:
-    - pos: -15.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 930
-    components:
-    - pos: -14.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 932
-    components:
-    - pos: -14.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 936
-    components:
-    - pos: -16.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 937
-    components:
-    - pos: -16.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 938
-    components:
-    - pos: -16.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 939
-    components:
-    - pos: -12.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 940
-    components:
-    - pos: -15.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 942
-    components:
-    - pos: -18.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 943
-    components:
-    - pos: -17.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 944
-    components:
-    - pos: -17.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 945
-    components:
-    - pos: -17.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 946
-    components:
-    - pos: -12.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 947
-    components:
-    - pos: -22.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 948
-    components:
-    - pos: -13.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 949
-    components:
-    - pos: -19.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 950
-    components:
-    - pos: -18.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 951
-    components:
-    - pos: -18.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 952
-    components:
-    - pos: -18.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 953
-    components:
-    - pos: -12.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 954
-    components:
-    - pos: -13.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 956
-    components:
-    - pos: -11.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 958
-    components:
-    - pos: -19.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 959
-    components:
-    - pos: -19.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 963
-    components:
-    - pos: -12.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 964
-    components:
-    - pos: -11.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 965
-    components:
-    - pos: -11.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 966
-    components:
-    - pos: -11.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 972
-    components:
-    - pos: -11.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 984
-    components:
-    - pos: -9.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 985
-    components:
-    - pos: -9.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 986
-    components:
-    - pos: -9.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 987
-    components:
-    - pos: -9.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 988
-    components:
-    - pos: -10.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 989
-    components:
-    - pos: -10.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 990
-    components:
-    - pos: -10.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 991
-    components:
-    - pos: -10.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 992
-    components:
-    - pos: -10.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 993
-    components:
-    - pos: -10.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 994
-    components:
-    - pos: -10.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 995
-    components:
-    - pos: -10.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 996
-    components:
-    - pos: -10.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 997
-    components:
-    - pos: -10.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 998
-    components:
-    - pos: -10.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 999
-    components:
-    - pos: -10.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 1000
-    components:
-    - pos: -10.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1001
-    components:
-    - pos: -10.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 1002
-    components:
-    - pos: -10.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 1003
-    components:
-    - pos: -10.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1004
-    components:
-    - pos: -10.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 1005
-    components:
-    - pos: -10.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1006
-    components:
-    - pos: -9.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1007
-    components:
-    - pos: -9.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 1008
-    components:
-    - pos: -9.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 1009
-    components:
-    - pos: -9.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 1010
-    components:
-    - pos: -9.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 1011
-    components:
-    - pos: -9.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1012
-    components:
-    - pos: -9.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 1013
-    components:
-    - pos: -9.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 1014
-    components:
-    - pos: -9.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 1015
-    components:
-    - pos: -9.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 1016
-    components:
-    - pos: -9.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1017
-    components:
-    - pos: -9.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 1018
-    components:
-    - pos: -9.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1019
-    components:
-    - pos: -9.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 1086
-    components:
-    - pos: -14.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 1087
-    components:
-    - pos: -19.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1202
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -24.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1203
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -27.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1222
-    components:
-    - pos: -34.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 1223
-    components:
-    - pos: -34.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 1362
-    components:
-    - pos: -4.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 1363
-    components:
-    - pos: -2.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 1364
-    components:
-    - pos: -3.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 1365
-    components:
-    - pos: -4.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 1366
-    components:
-    - pos: -3.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 1377
-    components:
-    - pos: -2.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 2048
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -23.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 2050
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -24.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 2405
-    components:
-    - pos: 23.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2406
-    components:
-    - pos: 22.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2407
-    components:
-    - pos: 21.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2408
-    components:
-    - pos: 21.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2409
-    components:
-    - pos: 22.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2410
-    components:
-    - pos: 23.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2505
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -22.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 2507
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -20.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 2508
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -21.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 2514
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -20.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 2515
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -21.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 2520
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -22.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 2521
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -20.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 2527
-    components:
-    - pos: -20.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 2553
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -22.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 2554
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -22.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 2557
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -21.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 2569
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -23.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 3084
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -24.5,1.5
-      parent: 104
-      type: Transform
-- proto: Chair
-  entities:
-  - uid: 1367
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -3.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 1376
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -4.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 1878
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -35.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1879
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -35.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 2312
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 2313
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 7.5,-14.5
-      parent: 104
-      type: Transform
-- proto: ChairFolding
-  entities:
-  - uid: 544
-    components:
-    - pos: 20.5,8.5
-      parent: 104
-      type: Transform
-  - uid: 1062
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 18.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1063
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 18.5,2.5
-      parent: 104
-      type: Transform
-- proto: ChairOfficeDark
-  entities:
-  - uid: 1298
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 13.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1304
-    components:
-    - pos: 11.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1764
-    components:
-    - pos: -13.5,6.5
-      parent: 104
-      type: Transform
-  - uid: 2427
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 19.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 2428
-    components:
-    - pos: 25.5,-15.5
-      parent: 104
-      type: Transform
-- proto: ChairOfficeLight
-  entities:
-  - uid: 751
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -0.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1124
-    components:
-    - pos: -0.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1296
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 1297
-    components:
-    - pos: 4.5,-16.5
-      parent: 104
-      type: Transform
-- proto: ChairPilotSeat
-  entities:
-  - uid: 326
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 20.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 327
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 19.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 328
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 21.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 329
-    components:
-    - pos: 20.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 330
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 18.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 331
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 19.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 332
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 21.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 333
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 22.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 334
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 22.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 335
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 21.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 336
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 19.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 337
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 18.5,-8.5
-      parent: 104
-      type: Transform
-- proto: ChairWood
-  entities:
-  - uid: 2429
-    components:
-    - pos: -0.5,-1.5
-      parent: 104
-      type: Transform
-- proto: chem_master
-  entities:
-  - uid: 2444
-    components:
-    - pos: 5.5,-10.5
-      parent: 104
-      type: Transform
-- proto: ChemicalPayload
-  entities:
-  - uid: 2380
-    components:
-    - pos: 3.3003616,-17.381208
-      parent: 104
-      type: Transform
-  - uid: 3110
-    components:
-    - pos: 3.6284866,-17.287361
-      parent: 104
-      type: Transform
-- proto: ChemistryHotplate
-  entities:
-  - uid: 1383
-    components:
-    - pos: 4.5,-12.5
-      parent: 104
-      type: Transform
-- proto: ChessBoard
-  entities:
-  - uid: 354
-    components:
-    - pos: 13.499366,-8.433407
-      parent: 104
-      type: Transform
-- proto: ClosetEmergencyFilledRandom
-  entities:
-  - uid: 1359
-    components:
-    - pos: -2.5,-2.5
-      parent: 104
-      type: Transform
-- proto: ClosetL3Filled
-  entities:
-  - uid: 1153
-    components:
-    - pos: 7.5,-17.5
-      parent: 104
-      type: Transform
-- proto: ClosetRadiationSuitFilled
-  entities:
-  - uid: 1114
-    components:
-    - pos: 6.5,-17.5
-      parent: 104
-      type: Transform
-- proto: ClosetToolFilled
-  entities:
-  - uid: 2417
-    components:
-    - pos: 20.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 2418
-    components:
-    - pos: 24.5,-14.5
-      parent: 104
-      type: Transform
-- proto: ClothingBackpackDuffelSyndicateFilledMedical
-  entities:
-  - uid: 2437
-    components:
-    - pos: 0.5,-12.5
-      parent: 104
-      type: Transform
-- proto: ClothingBackpackWaterTank
-  entities:
-  - uid: 151
-    components:
-    - pos: 9.36168,-4.462339
-      parent: 104
-      type: Transform
-    - maxShots: 200
-      type: SolutionAmmoProvider
-- proto: ClothingBeltUtilityFilled
-  entities:
-  - uid: 212
-    components:
-    - pos: 13.897393,-10.470539
-      parent: 104
-      type: Transform
-- proto: ClothingEyesGlassesChemical
-  entities:
-  - uid: 1738
-    components:
-    - pos: 3.5009227,-11.519134
-      parent: 104
-      type: Transform
-- proto: ClothingNeckScarfStripedRed
-  entities:
-  - uid: 1150
-    components:
-    - pos: -2.530845,-16.461567
-      parent: 104
-      type: Transform
-- proto: ClothingNeckStethoscope
-  entities:
-  - uid: 1336
-    components:
-    - pos: 7.5027137,-12.301802
-      parent: 104
-      type: Transform
-- proto: ClothingShoesBootsSalvage
-  entities:
-  - uid: 542
-    components:
-    - pos: 19.574894,7.069533
-      parent: 104
-      type: Transform
-  - uid: 545
-    components:
-    - pos: 19.246769,6.507033
-      parent: 104
-      type: Transform
-- proto: CombatKnife
-  entities:
-  - uid: 1694
-    components:
-    - pos: 5.483225,11.368477
-      parent: 104
-      type: Transform
-- proto: ComfyChair
-  entities:
-  - uid: 21
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 12.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 352
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 14.5,-8.5
-      parent: 104
-      type: Transform
-- proto: computerBodyScanner
-  entities:
-  - uid: 2436
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,-14.5
-      parent: 104
-      type: Transform
-- proto: ComputerPowerMonitoring
-  entities:
-  - uid: 1730
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 27.5,-14.5
-      parent: 104
-      type: Transform
-- proto: ComputerSurveillanceWirelessCameraMonitor
-  entities:
-  - uid: 1127
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -14.5,6.5
-      parent: 104
-      type: Transform
-- proto: CyberPen
-  entities:
-  - uid: 696
-    components:
-    - pos: -14.478909,9.585995
-      parent: 104
-      type: Transform
-- proto: DresserFilled
-  entities:
-  - uid: 349
-    components:
-    - pos: 13.5,-3.5
-      parent: 104
-      type: Transform
-- proto: DrinkAbsintheBottleFull
-  entities:
-  - uid: 15
-    components:
-    - pos: 3.9415665,-8.34479
-      parent: 104
-      type: Transform
-- proto: DrinkBeerBottleFull
-  entities:
-  - uid: 157
-    components:
-    - pos: 2.5961013,-2.2186527
-      parent: 104
-      type: Transform
-  - uid: 170
-    components:
-    - pos: 3.6117263,-3.1874027
-      parent: 104
-      type: Transform
-- proto: DrinkGinBottleFull
-  entities:
-  - uid: 134
-    components:
-    - pos: 3.2228165,-8.4229965
-      parent: 104
-      type: Transform
-- proto: DrinkWhiskeyBottleFull
-  entities:
-  - uid: 25
-    components:
-    - pos: -0.5303154,-6.2851996
-      parent: 104
-      type: Transform
-- proto: EmpGrenade
-  entities:
-  - uid: 2456
-    components:
-    - pos: 14.40774,-17.385033
-      parent: 104
-      type: Transform
-  - uid: 2457
-    components:
-    - pos: 14.62649,-17.385033
-      parent: 104
-      type: Transform
-- proto: ExtinguisherCabinetFilled
-  entities:
-  - uid: 139
-    components:
-    - pos: 28.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 141
-    components:
-    - pos: 14.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1812
-    components:
-    - pos: -1.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 1816
-    components:
-    - pos: 8.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1822
-    components:
-    - pos: 15.5,-17.5
-      parent: 104
-      type: Transform
-- proto: FaxMachineSyndie
-  entities:
-  - uid: 81
-    components:
-    - pos: 7.5,-4.5
-      parent: 104
-      type: Transform
-- proto: filingCabinetDrawer
-  entities:
-  - uid: 1140
-    components:
-    - pos: -12.5,7.5
-      parent: 104
-      type: Transform
-- proto: filingCabinetDrawerRandom
-  entities:
-  - uid: 108
-    components:
-    - pos: 7.5,-5.5
-      parent: 104
-      type: Transform
-- proto: FirelockGlass
-  entities:
-  - uid: 1765
-    components:
-    - pos: -13.5,5.5
-      parent: 104
-      type: Transform
-- proto: Fireplace
-  entities:
-  - uid: 1273
-    components:
-    - pos: 1.5,0.5
-      parent: 104
-      type: Transform
-- proto: FloorDrain
-  entities:
-  - uid: 1361
-    components:
-    - pos: -4.5,-2.5
-      parent: 104
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 2438
-    components:
-    - pos: 10.5,-3.5
-      parent: 104
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-  - uid: 2443
-    components:
-    - pos: 4.5,-11.5
-      parent: 104
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
-- proto: FloraRockSolid01
-  entities:
-  - uid: 1707
-    components:
-    - pos: 5.5565968,16.377468
-      parent: 104
-      type: Transform
-- proto: FloraRockSolid02
-  entities:
-  - uid: 1708
-    components:
-    - pos: -3.1481876,-0.15203857
-      parent: 104
-      type: Transform
-  - uid: 1711
-    components:
-    - pos: -1.3676796,16.13784
-      parent: 104
-      type: Transform
-- proto: FloraRockSolid03
-  entities:
-  - uid: 1706
-    components:
-    - pos: 13.550529,12.489372
-      parent: 104
-      type: Transform
-- proto: FloraTreeConifer01
-  entities:
-  - uid: 261
-    components:
-    - pos: 7.7892694,4.987089
-      parent: 104
-      type: Transform
-  - uid: 275
-    components:
-    - pos: -3.80645,4.798395
-      parent: 104
-      type: Transform
-  - uid: 281
-    components:
-    - pos: -1.0279694,6.890992
-      parent: 104
-      type: Transform
-  - uid: 1619
-    components:
-    - pos: 16.10984,7.3249645
-      parent: 104
-      type: Transform
-  - uid: 1622
-    components:
-    - pos: 7.42463,16.597832
-      parent: 104
-      type: Transform
-  - uid: 1626
-    components:
-    - pos: 11.605486,16.944057
-      parent: 104
-      type: Transform
-- proto: FloraTreeConifer02
-  entities:
-  - uid: 219
-    components:
-    - pos: 5.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 260
-    components:
-    - pos: 7.7267694,7.536619
-      parent: 104
-      type: Transform
-  - uid: 267
-    components:
-    - pos: 12.789269,3.6888618
-      parent: 104
-      type: Transform
-  - uid: 268
-    components:
-    - pos: -0.17814255,7.5043383
-      parent: 104
-      type: Transform
-  - uid: 273
-    components:
-    - pos: -2.591959,2.9214401
-      parent: 104
-      type: Transform
-  - uid: 280
-    components:
-    - pos: 1.5111885,4.4898434
-      parent: 104
-      type: Transform
-  - uid: 1618
-    components:
-    - pos: 11.32859,10.093473
-      parent: 104
-      type: Transform
-  - uid: 1620
-    components:
-    - pos: 15.85984,13.16621
-      parent: 104
-      type: Transform
-  - uid: 1621
-    components:
-    - pos: 14.582346,17.286049
-      parent: 104
-      type: Transform
-- proto: FloraTreeConifer03
-  entities:
-  - uid: 271
-    components:
-    - pos: -1.1000175,4.26659
-      parent: 104
-      type: Transform
-  - uid: 1035
-    components:
-    - pos: 0.74747276,19.424063
-      parent: 104
-      type: Transform
-  - uid: 1673
-    components:
-    - pos: -3.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 1830
-    components:
-    - pos: 8.497473,19.862019
-      parent: 104
-      type: Transform
-- proto: FloraTreeSnow01
-  entities:
-  - uid: 262
-    components:
-    - pos: 9.630766,6.7434845
-      parent: 104
-      type: Transform
-- proto: FloraTreeSnow02
-  entities:
-  - uid: 270
-    components:
-    - pos: -2.3114033,5.0917635
-      parent: 104
-      type: Transform
-  - uid: 1630
-    components:
-    - pos: 4.558771,16.696045
-      parent: 104
-      type: Transform
-- proto: FloraTreeSnow03
-  entities:
-  - uid: 274
-    components:
-    - pos: -3.3325882,6.8936405
-      parent: 104
-      type: Transform
-  - uid: 1629
-    components:
-    - pos: 9.924105,15.382175
-      parent: 104
-      type: Transform
-- proto: FloraTreeSnow04
-  entities:
-  - uid: 265
-    components:
-    - pos: 0.24603653,5.7335367
-      parent: 104
-      type: Transform
-  - uid: 276
-    components:
-    - pos: 5.8604717,5.2799397
-      parent: 104
-      type: Transform
-  - uid: 1624
-    components:
-    - pos: -3.1344147,13.722986
-      parent: 104
-      type: Transform
-- proto: FloraTreeSnow05
-  entities:
-  - uid: 269
-    components:
-    - pos: 0.30623245,3.9068413
-      parent: 104
-      type: Transform
-  - uid: 1627
-    components:
-    - pos: 13.331816,13.977352
-      parent: 104
-      type: Transform
-  - uid: 1628
-    components:
-    - pos: 15.066191,11.052429
-      parent: 104
-      type: Transform
-  - uid: 1631
-    components:
-    - pos: 2.1525211,16.977589
-      parent: 104
-      type: Transform
-  - uid: 1672
-    components:
-    - pos: -3.5,16.5
-      parent: 104
-      type: Transform
-- proto: FoodBoxDonkpocket
-  entities:
-  - uid: 11
-    components:
-    - pos: 12.527094,-6.308407
-      parent: 104
-      type: Transform
-- proto: FoodBoxDonkpocketTeriyaki
-  entities:
-  - uid: 2475
-    components:
-    - pos: 12.636917,-6.187726
-      parent: 104
-      type: Transform
-- proto: FoodBoxDonut
-  entities:
-  - uid: 2445
-    components:
-    - pos: 2.5389562,-6.3072195
-      parent: 104
-      type: Transform
-- proto: FoodDonutJellySlugcat
-  entities:
-  - uid: 3327
-    components:
-    - pos: -5.7255287,20.539352
-      parent: 104
-      type: Transform
-- proto: GeneratorBasic15kW
-  entities:
-  - uid: 2326
-    components:
-    - pos: 27.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2328
-    components:
-    - pos: 17.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2329
-    components:
-    - pos: 17.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 2330
-    components:
-    - pos: 27.5,-17.5
-      parent: 104
-      type: Transform
-- proto: GeneratorRTG
-  entities:
-  - uid: 2415
-    components:
-    - pos: 17.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 2416
-    components:
-    - pos: 27.5,-18.5
-      parent: 104
-      type: Transform
-- proto: GravityGenerator
-  entities:
-  - uid: 2327
-    components:
-    - pos: 22.5,-15.5
-      parent: 104
-      type: Transform
-    - charge: 100
-      type: GravityGenerator
-    - radius: 175.75
-      type: PointLight
-- proto: GrenadeFlashBang
-  entities:
-  - uid: 2309
-    components:
-    - pos: 11.399388,-16.363453
-      parent: 104
-      type: Transform
-  - uid: 2310
-    components:
-    - pos: 11.571263,-16.363453
-      parent: 104
-      type: Transform
-- proto: Grille
-  entities:
-  - uid: 95
-    components:
-    - pos: 0.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 115
-    components:
-    - pos: -1.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 118
-    components:
-    - pos: 2.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 147
-    components:
-    - pos: 11.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 231
-    components:
-    - pos: 2.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 232
-    components:
-    - pos: 2.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 233
-    components:
-    - pos: 4.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 234
-    components:
-    - pos: 4.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 303
-    components:
-    - pos: 16.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 304
-    components:
-    - pos: 16.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 526
-    components:
-    - pos: 0.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 527
-    components:
-    - pos: 6.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 528
-    components:
-    - pos: 1.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1034
-    components:
-    - pos: 5.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1112
-    components:
-    - pos: -1.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1120
-    components:
-    - pos: 2.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 1121
-    components:
-    - pos: 2.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 1146
-    components:
-    - pos: -12.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1148
-    components:
-    - pos: -14.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1241
-    components:
-    - pos: 5.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 1243
-    components:
-    - pos: 7.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 1389
-    components:
-    - pos: 4.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 1410
-    components:
-    - pos: 8.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1823
-    components:
-    - pos: 8.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1824
-    components:
-    - pos: 4.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1831
-    components:
-    - pos: 8.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1832
-    components:
-    - pos: 3.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1840
-    components:
-    - pos: 11.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1841
-    components:
-    - pos: 10.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1847
-    components:
-    - pos: 12.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1854
-    components:
-    - pos: 13.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1860
-    components:
-    - pos: 14.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1931
-    components:
-    - pos: 0.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1932
-    components:
-    - pos: 7.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1933
-    components:
-    - pos: 2.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 2189
-    components:
-    - pos: -0.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2296
-    components:
-    - pos: 0.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2318
-    components:
-    - pos: 11.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 2319
-    components:
-    - pos: 11.5,-6.5
-      parent: 104
-      type: Transform
-- proto: KitchenKnife
-  entities:
-  - uid: 1061
-    components:
-    - pos: 18.918644,6.663283
-      parent: 104
-      type: Transform
-- proto: KitchenMicrowave
-  entities:
-  - uid: 10
-    components:
-    - pos: 13.5,-6.5
-      parent: 104
-      type: Transform
-- proto: KitchenReagentGrinder
-  entities:
-  - uid: 1257
-    components:
-    - pos: 3.5,-10.5
-      parent: 104
-      type: Transform
-- proto: LargeBeaker
-  entities:
-  - uid: 2021
-    components:
-    - pos: 5.039936,-12.489611
-      parent: 104
-      type: Transform
-- proto: LightPostSmall
-  entities:
-  - uid: 214
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 217
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -27.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 221
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,16.5
-      parent: 104
-      type: Transform
-  - uid: 222
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: -2.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 291
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 540
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 541
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,8.5
-      parent: 104
-      type: Transform
-  - uid: 629
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,8.5
-      parent: 104
-      type: Transform
-  - uid: 1226
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1276
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -34.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1277
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -34.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 1278
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -35.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1279
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -35.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1280
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -27.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1284
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -19.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1413
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 0.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 1668
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 5.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 1669
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 10.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 1671
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,17.5
-      parent: 104
-      type: Transform
-  - uid: 1675
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 10.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 1886
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 1887
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,-20.5
-      parent: 104
-      type: Transform
-- proto: LockerSyndicatePersonalFilled
-  entities:
-  - uid: 178
-    components:
-    - pos: 9.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 196
-    components:
-    - pos: 11.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 197
-    components:
-    - pos: 11.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 198
-    components:
-    - pos: 9.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 1271
-    components:
-    - pos: 13.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 1375
-    components:
-    - pos: 13.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 2476
-    components:
-    - pos: 15.5,-6.5
-      parent: 104
-      type: Transform
-- proto: MachineCentrifuge
-  entities:
-  - uid: 1728
-    components:
-    - pos: 3.5,-11.5
-      parent: 104
-      type: Transform
-- proto: MachineElectrolysisUnit
-  entities:
-  - uid: 1718
-    components:
-    - pos: 3.5,-12.5
-      parent: 104
-      type: Transform
-- proto: MagazinePistolSubMachineGunPractice
-  entities:
-  - uid: 1648
-    components:
-    - pos: 5.7430096,13.989216
-      parent: 104
-      type: Transform
-    - unspawnedCount: 35
-      type: BallisticAmmoProvider
-- proto: MedicalBed
-  entities:
-  - uid: 1868
-    components:
-    - pos: 1.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1874
-    components:
-    - pos: -1.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1890
-    components:
-    - pos: 1.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1891
-    components:
-    - pos: -1.5,-16.5
-      parent: 104
-      type: Transform
-- proto: MedkitAdvancedFilled
-  entities:
-  - uid: 447
-    components:
-    - pos: 7.5183387,-10.279964
-      parent: 104
-      type: Transform
-- proto: MedkitBruteFilled
-  entities:
-  - uid: 138
-    components:
-    - pos: 7.5183387,-10.576839
-      parent: 104
-      type: Transform
-- proto: MedkitBurnFilled
-  entities:
-  - uid: 1894
-    components:
-    - pos: 7.5339637,-10.889339
-      parent: 104
-      type: Transform
-- proto: MedkitFilled
-  entities:
-  - uid: 770
-    components:
-    - pos: 0.48478004,-16.399067
-      parent: 104
-      type: Transform
-- proto: MedkitOxygenFilled
-  entities:
-  - uid: 1895
-    components:
-    - pos: 7.5339637,-11.186214
-      parent: 104
-      type: Transform
-- proto: MedkitRadiationFilled
-  entities:
-  - uid: 448
-    components:
-    - pos: 7.5495887,-11.733089
-      parent: 104
-      type: Transform
-- proto: MedkitToxinFilled
-  entities:
-  - uid: 1388
-    components:
-    - pos: 7.5339637,-11.436214
-      parent: 104
-      type: Transform
-- proto: Mirror
-  entities:
-  - uid: 142
-    components:
-    - pos: 9.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 146
-    components:
-    - pos: 10.5,1.5
-      parent: 104
-      type: Transform
-- proto: ModularGrenade
-  entities:
-  - uid: 1326
-    components:
-    - pos: 4.001747,-17.289776
-      parent: 104
-      type: Transform
-  - uid: 1328
-    components:
-    - pos: 4.204872,-17.508755
-      parent: 104
-      type: Transform
-- proto: MonkeyCubeBox
-  entities:
-  - uid: 1826
-    components:
-    - pos: 14.485744,-16.427467
-      parent: 104
-      type: Transform
-- proto: MopBucket
-  entities:
-  - uid: 149
-    components:
-    - pos: 11.5,-3.5
-      parent: 104
-      type: Transform
-- proto: MopItem
-  entities:
-  - uid: 150
-    components:
-    - pos: 11.5,-3.5
-      parent: 104
-      type: Transform
-- proto: Multitool
-  entities:
-  - uid: 1555
-    components:
-    - pos: 11.895346,-10.413807
-      parent: 104
-      type: Transform
-- proto: NukeDiskFake
-  entities:
-  - uid: 282
-    components:
-    - pos: 12.149857,15.427643
-      parent: 104
-      type: Transform
-- proto: OperatingTable
-  entities:
-  - uid: 2435
-    components:
-    - pos: -0.5,-14.5
-      parent: 104
-      type: Transform
-- proto: Paper
-  entities:
-  - uid: 612
-    components:
-    - pos: -14.166584,9.634687
-      parent: 104
-      type: Transform
-- proto: PartRodMetal
-  entities:
-  - uid: 2425
-    components:
-    - pos: 24.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 2426
-    components:
-    - pos: 24.5,-16.5
-      parent: 104
-      type: Transform
-- proto: PhoneInstrumentSyndicate
-  entities:
-  - uid: 1684
-    components:
-    - pos: 1.4424791,-6.340748
-      parent: 104
-      type: Transform
-- proto: PianoInstrument
-  entities:
-  - uid: 2430
-    components:
-    - pos: -0.5,-2.5
-      parent: 104
-      type: Transform
-- proto: PlasmaReinforcedWindowDirectional
-  entities:
-  - uid: 1817
-    components:
-    - pos: 13.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 1818
-    components:
-    - pos: 12.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 1819
-    components:
-    - pos: 11.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 1858
-    components:
-    - pos: 14.5,-18.5
-      parent: 104
-      type: Transform
-- proto: PlushieBee
-  entities:
-  - uid: 2317
-    components:
-    - pos: 1.5,-12.5
-      parent: 104
-      type: Transform
-- proto: PlushieLizard
-  entities:
-  - uid: 1266
-    components:
-    - pos: -15.435635,22.055351
-      parent: 104
-      type: Transform
-  - uid: 2315
-    components:
-    - pos: -1.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 3367
-    components:
-    - pos: -4.605839,20.481245
-      parent: 104
-      type: Transform
-- proto: PlushieNuke
-  entities:
-  - uid: 163
-    components:
-    - pos: 1.8113766,-6.337348
-      parent: 104
-      type: Transform
-  - uid: 283
-    components:
-    - pos: 12.912951,15.575253
-      parent: 104
-      type: Transform
-- proto: PlushieRouny
-  entities:
-  - uid: 2316
-    components:
-    - pos: -1.5,-12.5
-      parent: 104
-      type: Transform
-- proto: PlushieVox
-  entities:
-  - uid: 2314
-    components:
-    - pos: 1.5,-16.5
-      parent: 104
-      type: Transform
-- proto: PortableScrubber
-  entities:
-  - uid: 811
-    components:
-    - pos: 10.5,-10.5
-      parent: 104
-      type: Transform
-- proto: PosterBroken
-  entities:
-  - uid: 227
-    components:
-    - pos: -0.5,10.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandC20r
-  entities:
-  - uid: 1556
-    components:
-    - pos: 10.5,-9.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandClown
-  entities:
-  - uid: 1681
-    components:
-    - pos: 12.5,1.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandCybersun600
-  entities:
-  - uid: 2466
-    components:
-    - pos: 8.5,-9.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandDonk
-  entities:
-  - uid: 12
-    components:
-    - pos: 12.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 2465
-    components:
-    - pos: -10.5,8.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandDonutCorp
-  entities:
-  - uid: 2450
-    components:
-    - pos: -3.5,-1.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandEnergySwords
-  entities:
-  - uid: 1384
-    components:
-    - pos: 14.5,-9.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandEnlistGorlex
-  entities:
-  - uid: 2461
-    components:
-    - pos: -0.5,0.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandInterdyne
-  entities:
-  - uid: 2464
-    components:
-    - pos: 8.5,-12.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandLustyExomorph
-  entities:
-  - uid: 754
-    components:
-    - pos: -3.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 2447
-    components:
-    - pos: 15.5,-15.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandMoth
-  entities:
-  - uid: 2462
-    components:
-    - pos: 8.5,-2.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandNuclearDeviceInformational
-  entities:
-  - uid: 2298
-    components:
-    - pos: -1.5,-5.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandPower
-  entities:
-  - uid: 1563
-    components:
-    - pos: 19.5,-12.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandPunchShit
-  entities:
-  - uid: 2451
-    components:
-    - pos: 25.5,-12.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandRebelsUnite
-  entities:
-  - uid: 2446
-    components:
-    - pos: 8.5,-3.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandRedRum
-  entities:
-  - uid: 1387
-    components:
-    - pos: 2.5,-9.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandRevolver
-  entities:
-  - uid: 2452
-    components:
-    - pos: -1.5,-7.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandRobustSoftdrinks
-  entities:
-  - uid: 1245
-    components:
-    - pos: -9.5,8.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandSyndicatePistol
-  entities:
-  - uid: 1386
-    components:
-    - pos: 12.5,-9.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandSyndicateRecruitment
-  entities:
-  - uid: 1242
-    components:
-    - pos: -15.5,7.5
-      parent: 104
-      type: Transform
-  - uid: 1561
-    components:
-    - pos: 16.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 2453
-    components:
-    - pos: -3.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 2454
-    components:
-    - pos: 12.5,-15.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandTheBigGasTruth
-  entities:
-  - uid: 2455
-    components:
-    - pos: 10.5,-15.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandVoteWeh
-  entities:
-  - uid: 1113
-    components:
-    - pos: -3.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 1227
-    components:
-    - pos: -17.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 1228
-    components:
-    - pos: -16.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 1229
-    components:
-    - pos: -15.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 1230
-    components:
-    - pos: -14.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 1231
-    components:
-    - pos: -13.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 1248
-    components:
-    - pos: -12.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 1251
-    components:
-    - pos: -12.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 1252
-    components:
-    - pos: -12.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1253
-    components:
-    - pos: -12.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1254
-    components:
-    - pos: -12.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1255
-    components:
-    - pos: -12.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1256
-    components:
-    - pos: -13.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1258
-    components:
-    - pos: -14.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1259
-    components:
-    - pos: -15.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1260
-    components:
-    - pos: -16.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1261
-    components:
-    - pos: -17.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1262
-    components:
-    - pos: -17.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1263
-    components:
-    - pos: -17.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1264
-    components:
-    - pos: -17.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1265
-    components:
-    - pos: -17.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 1565
-    components:
-    - pos: 12.5,-3.5
-      parent: 104
-      type: Transform
-- proto: PosterContrabandWaffleCorp
-  entities:
-  - uid: 2463
-    components:
-    - pos: 14.5,-2.5
-      parent: 104
-      type: Transform
-- proto: PosterLegitAnatomyPoster
-  entities:
-  - uid: 2320
-    components:
-    - pos: 2.5,-11.5
-      parent: 104
-      type: Transform
-- proto: PosterLegitCleanliness
-  entities:
-  - uid: 955
-    components:
-    - pos: 0.5,-11.5
-      parent: 104
-      type: Transform
-- proto: PosterLegitIan
-  entities:
-  - uid: 1551
-    components:
-    - pos: -0.5,12.5
-      parent: 104
-      type: Transform
-- proto: PosterLegitIonRifle
-  entities:
-  - uid: 1558
-    components:
-    - pos: 16.5,-14.5
-      parent: 104
-      type: Transform
-- proto: PosterLegitNanotrasenLogo
-  entities:
-  - uid: 237
-    components:
-    - pos: -0.5,14.5
-      parent: 104
-      type: Transform
-- proto: PosterMapSplit
-  entities:
-  - uid: 350
-    components:
-    - pos: 0.5,-9.5
-      parent: 104
-      type: Transform
-- proto: PosterMapWaystation
-  entities:
-  - uid: 2449
-    components:
-    - pos: 10.5,-5.5
-      parent: 104
-      type: Transform
-- proto: PottedPlant24
-  entities:
-  - uid: 1143
-    components:
-    - pos: -14.5,7.5
-      parent: 104
-      type: Transform
-- proto: PottedPlantBioluminscent
-  entities:
-  - uid: 7
-    components:
-    - pos: 15.481667,-8.824032
-      parent: 104
-      type: Transform
-- proto: PottedPlantRandom
-  entities:
-  - uid: 1656
-    components:
-    - pos: 9.5,-1.5
-      parent: 104
-      type: Transform
-- proto: PottedPlantRandomPlastic
-  entities:
-  - uid: 1654
-    components:
-    - pos: 8.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 1655
-    components:
-    - pos: 5.5,-8.5
-      parent: 104
-      type: Transform
-- proto: Poweredlight
-  entities:
-  - uid: 1333
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: -1.5707963267948966 rad
-      pos: 13.5,-0.5
-      parent: 104
-      type: Transform
-- proto: PoweredSmallLight
-  entities:
-  - uid: 23
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 15.5,-1.5
-      parent: 104
-      type: Transform
-- proto: Rack
-  entities:
-  - uid: 472
-    components:
-    - pos: 11.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1360
-    components:
-    - pos: -2.5,-4.5
-      parent: 104
-      type: Transform
-- proto: Railing
-  entities:
-  - uid: 213
-    components:
-    - pos: -28.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 218
-    components:
-    - pos: -24.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 253
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 254
-    components:
-    - pos: -18.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 414
-    components:
-    - pos: -16.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 445
-    components:
-    - pos: -19.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 446
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 456
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 457
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 458
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 459
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -8.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 461
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 476
-    components:
-    - pos: -20.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 481
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -8.5,6.5
-      parent: 104
-      type: Transform
-  - uid: 487
-    components:
-    - pos: -11.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 490
-    components:
-    - pos: -22.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 491
-    components:
-    - pos: -31.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 494
-    components:
-    - pos: -12.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 496
-    components:
-    - pos: -23.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 523
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -8.5,7.5
-      parent: 104
-      type: Transform
-  - uid: 583
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -28.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 585
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -35.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 1080
-    components:
-    - pos: -34.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1081
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -30.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1082
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -26.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1111
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1131
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 1159
-    components:
-    - pos: -22.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1187
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -11.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1189
-    components:
-    - pos: -14.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 1249
-    components:
-    - pos: -15.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 1289
-    components:
-    - pos: -26.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 1290
-    components:
-    - pos: -27.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 1301
-    components:
-    - pos: -28.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1302
-    components:
-    - pos: -21.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1303
-    components:
-    - pos: -26.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1305
-    components:
-    - pos: -24.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1306
-    components:
-    - pos: -20.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1307
-    components:
-    - pos: -19.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1308
-    components:
-    - pos: -18.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1309
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -26.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1310
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -24.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1311
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -23.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1312
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -22.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1313
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -25.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1314
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -30.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1315
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -32.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1316
-    components:
-    - pos: -32.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1317
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -29.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1319
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -31.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1323
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -34.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 1352
-    components:
-    - pos: -23.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1353
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -33.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1354
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -28.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1355
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -27.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1357
-    components:
-    - pos: -27.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1373
-    components:
-    - pos: -31.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1374
-    components:
-    - pos: -29.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1378
-    components:
-    - pos: -25.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1379
-    components:
-    - pos: -30.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1414
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 1428
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -18.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1429
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -20.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1430
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -27.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1432
-    components:
-    - pos: -33.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1785
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -22.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1786
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -34.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1787
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -23.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1788
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -24.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1791
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -31.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1799
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -32.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1800
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -35.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1838
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 1839
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1845
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1846
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 1851
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 1852
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 1857
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 1882
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -19.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1902
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -20.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1903
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -21.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1916
-    components:
-    - pos: -15.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1917
-    components:
-    - pos: -14.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1918
-    components:
-    - pos: -13.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1919
-    components:
-    - pos: -12.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1920
-    components:
-    - pos: -11.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1921
-    components:
-    - pos: -17.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1922
-    components:
-    - pos: -16.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1945
-    components:
-    - pos: -10.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1946
-    components:
-    - pos: -9.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1951
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -34.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 2083
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 2089
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 2097
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 2126
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 2135
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 2185
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -19.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 2186
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -16.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 2187
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -12.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 2188
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -14.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 2190
-    components:
-    - pos: -32.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 2191
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -15.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 2193
-    components:
-    - pos: -30.5,1.5
-      parent: 104
-      type: Transform
-- proto: RailingCorner
-  entities:
-  - uid: 1789
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -35.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1790
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -35.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1949
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -34.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 1950
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -34.5,4.5
-      parent: 104
-      type: Transform
-- proto: RailingCornerSmall
-  entities:
-  - uid: 1285
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -8.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1761
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -8.5,8.5
-      parent: 104
-      type: Transform
-  - uid: 1869
-    components:
-    - pos: -8.5,-24.5
-      parent: 104
-      type: Transform
-  - uid: 1873
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -9.5,-24.5
-      parent: 104
-      type: Transform
-  - uid: 1883
-    components:
-    - pos: -18.5,4.5
-      parent: 104
-      type: Transform
-  - uid: 1947
-    components:
-    - pos: -10.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1948
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -10.5,1.5
-      parent: 104
-      type: Transform
-- proto: ReinforcedPlasmaWindow
-  entities:
-  - uid: 1842
-    components:
-    - pos: 12.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1848
-    components:
-    - pos: 14.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1849
-    components:
-    - pos: 11.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1853
-    components:
-    - pos: 13.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1855
-    components:
-    - pos: 10.5,-23.5
-      parent: 104
-      type: Transform
-- proto: ReinforcedWindow
-  entities:
-  - uid: 52
-    components:
-    - pos: 16.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 73
-    components:
-    - pos: 11.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 89
-    components:
-    - pos: 7.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 99
-    components:
-    - pos: 0.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 103
-    components:
-    - pos: 4.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 127
-    components:
-    - pos: 11.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 128
-    components:
-    - pos: 11.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 129
-    components:
-    - pos: 16.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 155
-    components:
-    - pos: 2.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 223
-    components:
-    - pos: 4.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 224
-    components:
-    - pos: 4.5,3.5
-      parent: 104
-      type: Transform
-  - uid: 353
-    components:
-    - pos: 2.5,2.5
-      parent: 104
-      type: Transform
-  - uid: 498
-    components:
-    - pos: -1.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 530
-    components:
-    - pos: 8.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 649
-    components:
-    - pos: -12.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1037
-    components:
-    - pos: 1.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1038
-    components:
-    - pos: 6.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1039
-    components:
-    - pos: 8.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1040
-    components:
-    - pos: 7.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1102
-    components:
-    - pos: 8.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1103
-    components:
-    - pos: 2.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1118
-    components:
-    - pos: 0.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1142
-    components:
-    - pos: -14.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1186
-    components:
-    - pos: 2.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 1196
-    components:
-    - pos: -0.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1198
-    components:
-    - pos: 2.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 1382
-    components:
-    - pos: -1.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1385
-    components:
-    - pos: 2.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 1820
-    components:
-    - pos: 5.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1821
-    components:
-    - pos: 0.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1828
-    components:
-    - pos: 4.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1829
-    components:
-    - pos: 0.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1929
-    components:
-    - pos: 3.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 2081
-    components:
-    - pos: 5.5,-9.5
-      parent: 104
-      type: Transform
-- proto: RemoteSignaller
-  entities:
-  - uid: 1322
-    components:
-    - pos: 5.611122,-17.316748
-      parent: 104
-      type: Transform
-  - uid: 1332
-    components:
-    - pos: 5.267372,-17.316748
-      parent: 104
-      type: Transform
-- proto: Screwdriver
-  entities:
-  - uid: 1325
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.954872,-17.44188
-      parent: 104
-      type: Transform
-- proto: SheetGlass
-  entities:
-  - uid: 2421
-    components:
-    - pos: 20.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 2422
-    components:
-    - pos: 20.5,-16.5
-      parent: 104
-      type: Transform
-- proto: SheetPlasteel
-  entities:
-  - uid: 2423
-    components:
-    - pos: 24.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 2424
-    components:
-    - pos: 24.5,-15.5
-      parent: 104
-      type: Transform
-- proto: SheetPlastic
-  entities:
-  - uid: 460
-    components:
-    - pos: 12.60107,-16.44067
-      parent: 104
-      type: Transform
-- proto: SheetSteel
-  entities:
-  - uid: 286
-    components:
-    - pos: 13.50732,-16.456295
-      parent: 104
-      type: Transform
-  - uid: 1350
-    components:
-    - pos: 3.460312,-15.657375
-      parent: 104
-      type: Transform
-  - uid: 2419
-    components:
-    - pos: 20.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 2420
-    components:
-    - pos: 20.5,-15.5
-      parent: 104
-      type: Transform
-- proto: SignalTrigger
-  entities:
-  - uid: 1330
-    components:
-    - pos: 3.6284866,-16.955233
-      parent: 104
-      type: Transform
-  - uid: 1331
-    components:
-    - pos: 3.3003616,-17.06472
-      parent: 104
-      type: Transform
-- proto: SignDirectionalBar
-  entities:
-  - uid: 2297
-    components:
-    - pos: -1.5,-4.5
-      parent: 104
-      type: Transform
-- proto: SignEscapePods
-  entities:
-  - uid: 1737
-    components:
-    - desc: steel rain babey
-      name: drop pod sign
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 16.5,-8.5
-      parent: 104
-      type: Transform
-- proto: SignMedical
-  entities:
-  - uid: 351
-    components:
-    - pos: 4.5,-9.5
-      parent: 104
-      type: Transform
-- proto: SignSurgery
-  entities:
-  - uid: 266
-    components:
-    - pos: 2.5,-12.5
-      parent: 104
-      type: Transform
-- proto: SignToxins2
-  entities:
-  - uid: 1318
-    components:
-    - pos: 8.5,-15.5
-      parent: 104
-      type: Transform
-- proto: SinkStemlessWater
-  entities:
-  - uid: 22
-    components:
-    - pos: 15.5,-1.5
-      parent: 104
-      type: Transform
-- proto: SinkWide
-  entities:
-  - uid: 144
-    components:
-    - pos: 9.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 145
-    components:
-    - pos: 10.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 1246
-    components:
-    - pos: 9.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 1358
-    components:
-    - pos: -4.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 2311
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,-7.5
-      parent: 104
-      type: Transform
-- proto: SmallLight
-  entities:
-  - uid: 484
-    components:
-    - pos: -12.5,7.5
-      parent: 104
-      type: Transform
-  - uid: 1024
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 1141
-    components:
-    - pos: -13.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 1766
-    components:
-    - pos: 11.5,-16.5
-      parent: 104
-      type: Transform
-- proto: SMESBasic
-  entities:
-  - uid: 2331
-    components:
-    - pos: 21.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 2332
-    components:
-    - pos: 22.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 2333
-    components:
-    - pos: 23.5,-18.5
-      parent: 104
-      type: Transform
-- proto: soda_dispenser
-  entities:
-  - uid: 225
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 4.5,-8.5
-      parent: 104
-      type: Transform
-- proto: SpaceVillainArcadeFilled
-  entities:
-  - uid: 1652
-    components:
-    - pos: 10.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 1653
-    components:
-    - pos: 9.5,-6.5
-      parent: 104
-      type: Transform
-- proto: SpawnMobLizard
-  entities:
-  - uid: 2473
-    components:
-    - pos: 5.5,-1.5
-      parent: 104
-      type: Transform
-- proto: SpawnPointNukies
-  entities:
-  - uid: 167
-    components:
-    - pos: 3.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 172
-    components:
-    - pos: 3.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 173
-    components:
-    - pos: 0.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 2477
-    components:
-    - pos: 4.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 2478
-    components:
-    - pos: 3.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 2479
-    components:
-    - pos: 2.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 2480
-    components:
-    - pos: 1.5,-2.5
-      parent: 104
-      type: Transform
-- proto: Spear
-  entities:
-  - uid: 3366
-    components:
-    - pos: -5.3505287,20.508072
-      parent: 104
-      type: Transform
-- proto: SprayBottle
-  entities:
-  - uid: 1699
-    components:
-    - pos: 14.060668,-16.439913
-      parent: 104
-      type: Transform
-- proto: StasisBed
-  entities:
-  - uid: 1130
-    components:
-    - pos: -2.5,-14.5
-      parent: 104
-      type: Transform
-- proto: Stool
-  entities:
-  - uid: 156
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 158
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 164
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 166
-    components:
-    - pos: 2.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 169
-    components:
-    - pos: 3.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 194
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 10.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 195
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 12.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 200
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 10.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 507
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 11.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 1334
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 12.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 1369
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 14.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 1371
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 12.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 1372
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 14.5,-14.5
-      parent: 104
-      type: Transform
-- proto: StoolBar
-  entities:
-  - uid: 1
-    components:
-    - pos: -0.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 2
-    components:
-    - pos: 3.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 3
-    components:
-    - pos: 0.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 4
-    components:
-    - pos: 1.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 5
-    components:
-    - pos: 2.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 6
-    components:
-    - pos: 4.5,-5.5
-      parent: 104
-      type: Transform
-- proto: SubstationBasic
-  entities:
-  - uid: 2366
-    components:
-    - pos: 27.5,-13.5
-      parent: 104
-      type: Transform
-- proto: SurveillanceCameraGeneral
-  entities:
-  - uid: 85
-    components:
-    - pos: 1.5,-8.5
-      parent: 104
-      type: Transform
-    - setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Bar
-      type: SurveillanceCamera
-  - uid: 1144
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -6.5,-16.5
-      parent: 104
-      type: Transform
-    - setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Dock
-      type: SurveillanceCamera
-  - uid: 1185
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -10.5,7.5
-      parent: 104
-      type: Transform
-    - setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Surveillance Shack
-      type: SurveillanceCamera
-  - uid: 1268
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 15.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1269
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 0.5,-12.5
-      parent: 104
-      type: Transform
-    - setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Medbay
-      type: SurveillanceCamera
-  - uid: 1270
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 7.5,-12.5
-      parent: 104
-      type: Transform
-    - setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Chem and Bombs
-      type: SurveillanceCamera
-  - uid: 1272
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 13.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 1274
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -3.5,-2.5
-      parent: 104
-      type: Transform
-    - setupAvailableNetworks:
-      - SurveillanceCameraGeneral
-      nameSet: True
-      id: Entrance
-      type: SurveillanceCamera
-  - uid: 1320
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 11.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 1321
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 14.5,-3.5
-      parent: 104
-      type: Transform
-- proto: SurveillanceCameraRouterGeneral
-  entities:
-  - uid: 620
-    components:
-    - pos: -15.5,9.5
-      parent: 104
-      type: Transform
-- proto: SurveillanceCameraWirelessRouterEntertainment
-  entities:
-  - uid: 978
-    components:
-    - pos: -15.5,8.5
-      parent: 104
-      type: Transform
-- proto: SurveillanceWirelessCameraAnchoredEntertainment
-  entities:
-  - uid: 1023
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -13.5,21.5
-      parent: 104
-      type: Transform
-    - setupAvailableNetworks:
-      - SurveillanceCameraEntertainment
-      nameSet: True
-      id: Weeh
-      type: SurveillanceCamera
-- proto: SyndicatePersonalAI
-  entities:
-  - uid: 160
-    components:
-    - flags: SessionSpecific
-      type: MetaData
-    - pos: 1.4711013,-3.6405277
-      parent: 104
-      type: Transform
-- proto: SyndieFlag
-  entities:
-  - uid: 819
-    components:
-    - pos: 11.5,-9.5
-      parent: 104
-      type: Transform
-- proto: SyndieHandyFlag
-  entities:
-  - uid: 1810
-    components:
-    - pos: 3.5076954,-6.413422
-      parent: 104
-      type: Transform
-- proto: SyringeInaprovaline
-  entities:
-  - uid: 1151
-    components:
-    - pos: -2.530845,-12.414692
-      parent: 104
-      type: Transform
-- proto: Table
-  entities:
-  - uid: 16
-    components:
-    - pos: 12.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 107
-    components:
-    - pos: 7.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 1090
-    components:
-    - pos: 7.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 1193
-    components:
-    - pos: 7.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1300
-    components:
-    - pos: 7.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1813
-    components:
-    - pos: 12.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1814
-    components:
-    - pos: 13.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1815
-    components:
-    - pos: 14.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1859
-    components:
-    - pos: 14.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 2321
-    components:
-    - pos: 13.5,-6.5
-      parent: 104
-      type: Transform
-- proto: TableCarpet
-  entities:
-  - uid: 9
-    components:
-    - pos: 13.5,-8.5
-      parent: 104
-      type: Transform
-- proto: TableGlass
-  entities:
-  - uid: 980
-    components:
-    - pos: -2.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1125
-    components:
-    - pos: -2.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 2090
-    components:
-    - pos: 0.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 2092
-    components:
-    - pos: 0.5,-12.5
-      parent: 104
-      type: Transform
-- proto: TablePlasmaGlass
-  entities:
-  - uid: 2411
-    components:
-    - pos: 20.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 2412
-    components:
-    - pos: 20.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 2413
-    components:
-    - pos: 24.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 2414
-    components:
-    - pos: 24.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 2431
-    components:
-    - pos: 17.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 2432
-    components:
-    - pos: 17.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 2433
-    components:
-    - pos: 27.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 2434
-    components:
-    - pos: 27.5,-15.5
-      parent: 104
-      type: Transform
-- proto: TableReinforced
-  entities:
-  - uid: 201
-    components:
-    - pos: 13.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 202
-    components:
-    - pos: 12.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 203
-    components:
-    - pos: 14.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 208
-    components:
-    - pos: 11.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 226
-    components:
-    - pos: 5.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 229
-    components:
-    - pos: 5.5,11.5
-      parent: 104
-      type: Transform
-  - uid: 239
-    components:
-    - pos: 5.5,13.5
-      parent: 104
-      type: Transform
-  - uid: 241
-    components:
-    - pos: 5.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 285
-    components:
-    - pos: 5.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 697
-    components:
-    - pos: -13.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1129
-    components:
-    - pos: -14.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 1149
-    components:
-    - pos: -13.5,9.5
-      parent: 104
-      type: Transform
-- proto: TableReinforcedGlass
-  entities:
-  - uid: 838
-    components:
-    - pos: 5.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 975
-    components:
-    - pos: 4.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 976
-    components:
-    - pos: 3.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1192
-    components:
-    - pos: 3.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1351
-    components:
-    - pos: 3.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 1739
-    components:
-    - pos: 5.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 2016
-    components:
-    - pos: 4.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 2022
-    components:
-    - pos: 3.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 2027
-    components:
-    - pos: 3.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 2028
-    components:
-    - pos: 3.5,-12.5
-      parent: 104
-      type: Transform
-- proto: TableWood
-  entities:
-  - uid: 8
-    components:
-    - pos: 3.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 28
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 30
-    components:
-    - pos: 3.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 31
-    components:
-    - pos: 4.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 32
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 33
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 34
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 35
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 36
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 37
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 159
-    components:
-    - pos: 2.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 162
-    components:
-    - pos: 2.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 355
-    components:
-    - pos: 3.5,-2.5
-      parent: 104
-      type: Transform
-- proto: TargetClown
-  entities:
-  - uid: 1291
-    components:
-    - pos: 0.5,12.5
-      parent: 104
-      type: Transform
-- proto: TargetHuman
-  entities:
-  - uid: 1293
-    components:
-    - pos: 0.5,14.5
-      parent: 104
-      type: Transform
-  - uid: 2308
-    components:
-    - pos: 12.5,-21.5
-      parent: 104
-      type: Transform
-- proto: TargetStrange
-  entities:
-  - uid: 1294
-    components:
-    - pos: 0.5,10.5
-      parent: 104
-      type: Transform
-- proto: TearGasGrenade
-  entities:
-  - uid: 306
-    components:
-    - pos: 14.638793,-16.908663
-      parent: 104
-      type: Transform
-  - uid: 1703
-    components:
-    - pos: 14.341918,-16.877413
-      parent: 104
-      type: Transform
-- proto: Telecrystal1
-  entities:
-  - uid: 2474
-    components:
-    - pos: 2.9398513,-3.4842777
-      parent: 104
-      type: Transform
-- proto: TimerTrigger
-  entities:
-  - uid: 1225
-    components:
-    - pos: 3.7048721,-16.445147
-      parent: 104
-      type: Transform
-  - uid: 1329
-    components:
-    - pos: 3.3003616,-16.470352
-      parent: 104
-      type: Transform
-- proto: ToiletEmpty
-  entities:
-  - uid: 293
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 15.5,-1.5
-      parent: 104
-      type: Transform
-- proto: ToolboxElectricalFilled
-  entities:
-  - uid: 206
-    components:
-    - pos: 13.241143,-10.4236145
-      parent: 104
-      type: Transform
-- proto: ToolboxEmergencyFilled
-  entities:
-  - uid: 1368
-    components:
-    - pos: -2.4700382,-4.362167
-      parent: 104
-      type: Transform
-- proto: ToolboxSyndicateFilled
-  entities:
-  - uid: 205
-    components:
-    - pos: 12.366143,-10.392332
-      parent: 104
-      type: Transform
-- proto: ToyFigurineCaptain
-  entities:
-  - uid: 2470
-    components:
-    - pos: 2.5657434,-3.260709
-      parent: 104
-      type: Transform
-- proto: ToyFigurineNukie
-  entities:
-  - uid: 14
-    components:
-    - pos: 3.4242263,-2.6717777
-      parent: 104
-      type: Transform
-  - uid: 161
-    components:
-    - pos: 3.5492263,-2.4374027
-      parent: 104
-      type: Transform
-  - uid: 2468
-    components:
-    - pos: 3.6429763,-2.6717777
-      parent: 104
-      type: Transform
-- proto: ToyFigurineNukieCommander
-  entities:
-  - uid: 2471
-    components:
-    - pos: 3.1898513,-2.9530277
-      parent: 104
-      type: Transform
-- proto: ToyFigurineNukieElite
-  entities:
-  - uid: 2467
-    components:
-    - pos: 3.1117263,-2.6874027
-      parent: 104
-      type: Transform
-- proto: ToyMauler
-  entities:
-  - uid: 2469
-    components:
-    - pos: 3.0179763,-2.3124027
-      parent: 104
-      type: Transform
-- proto: ToyNuke
-  entities:
-  - uid: 26
-    components:
-    - pos: 4.4214306,-6.3946886
-      parent: 104
-      type: Transform
-  - uid: 284
-    components:
-    - pos: 12.453509,14.985125
-      parent: 104
-      type: Transform
-- proto: ToySkeleton
-  entities:
-  - uid: 17
-    components:
-    - pos: 3.5882664,-8.344303
-      parent: 104
-      type: Transform
-- proto: VendingMachineBooze
-  entities:
-  - uid: 1380
-    components:
-    - flags: SessionSpecific
-      type: MetaData
-    - pos: -0.5,-8.5
-      parent: 104
-      type: Transform
-- proto: VendingMachineChang
-  entities:
-  - uid: 1208
-    components:
-    - flags: SessionSpecific
-      type: MetaData
-    - pos: -10.5,7.5
-      parent: 104
-      type: Transform
-- proto: VendingMachineChemicalsSyndicate
-  entities:
-  - uid: 1335
-    components:
-    - flags: SessionSpecific
-      type: MetaData
-    - pos: 4.5,-10.5
-      parent: 104
-      type: Transform
-- proto: VendingMachineCigs
-  entities:
-  - uid: 117
-    components:
-    - flags: SessionSpecific
-      name: cigarette machine
-      type: MetaData
-    - pos: 7.5,0.5
-      parent: 104
-      type: Transform
-- proto: VendingMachineClothing
-  entities:
-  - uid: 1617
-    components:
-    - flags: SessionSpecific
-      type: MetaData
-    - pos: 13.5,0.5
-      parent: 104
-      type: Transform
-- proto: VendingMachineCola
-  entities:
-  - uid: 116
-    components:
-    - flags: SessionSpecific
-      type: MetaData
-    - pos: 5.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 1244
-    components:
-    - flags: SessionSpecific
-      type: MetaData
-    - pos: -9.5,7.5
-      parent: 104
-      type: Transform
-- proto: VendingMachineSnack
-  entities:
-  - uid: 2442
-    components:
-    - flags: SessionSpecific
-      type: MetaData
-    - pos: 6.5,0.5
-      parent: 104
-      type: Transform
-- proto: VendingMachineSyndieDrobe
-  entities:
-  - uid: 1299
-    components:
-    - flags: SessionSpecific
-      type: MetaData
-    - pos: 11.5,0.5
-      parent: 104
-      type: Transform
-- proto: VendingMachineTheater
-  entities:
-  - uid: 1680
-    components:
-    - flags: SessionSpecific
-      type: MetaData
-    - pos: 12.5,0.5
-      parent: 104
-      type: Transform
-- proto: VendingMachineYouTool
-  entities:
-  - uid: 204
-    components:
-    - flags: SessionSpecific
-      type: MetaData
-    - pos: 15.5,-10.5
-      parent: 104
-      type: Transform
-- proto: WallIce
-  entities:
-  - uid: 236
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -0.5,12.5
-      parent: 104
-      type: Transform
-  - uid: 356
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -6.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 357
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 416
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 727
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -6.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1132
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1133
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1134
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -6.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1221
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -6.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1549
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -0.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 1670
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -0.5,14.5
-      parent: 104
-      type: Transform
-- proto: WallmountTelevision
-  entities:
-  - uid: 977
-    components:
-    - pos: 6.5,1.5
-      parent: 104
-      type: Transform
-- proto: WallPlastitanium
-  entities:
-  - uid: 38
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 39
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 40
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 9.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 41
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 10.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 42
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 11.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 43
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 44
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 45
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 46
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 47
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 50
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 17.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 51
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 19.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 53
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 54
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 57
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 13.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 59
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 60
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 61
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 62
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 63
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 11.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 64
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 10.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 66
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 67
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 68
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 9.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 69
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 11.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 70
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 71
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 13.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 72
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 74
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 10.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 75
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 9.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 76
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 77
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 78
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 7.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 79
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 80
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 82
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 1.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 83
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 0.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 84
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -0.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 86
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 2.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 87
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 3.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 88
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 4.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 90
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -1.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 91
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -1.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 92
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -1.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 93
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -1.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 94
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -1.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 97
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 6.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 98
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 5.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 101
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -0.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 102
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -0.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 105
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -1.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 106
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,0.5
-      parent: 104
-      type: Transform
-  - uid: 110
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 113
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 114
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 119
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 121
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 18.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 123
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 124
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 125
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 126
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 132
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 133
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 1.5,1.5
-      parent: 104
-      type: Transform
-  - uid: 137
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 168
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 171
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 13.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 174
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 175
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 176
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 177
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 179
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 180
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 181
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 9.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 182
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 10.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 183
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 11.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 184
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 12.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 185
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 13.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 186
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 187
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 188
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 189
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 191
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 192
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 193
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 199
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 215
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 242
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 252
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 288
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 290
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,-0.5
-      parent: 104
-      type: Transform
-  - uid: 298
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 13.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 299
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 14.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 300
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 301
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 307
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 23.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 308
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: 19.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 309
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 25.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 310
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 25.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 311
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 24.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 312
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 21.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 313
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 23.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 314
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 22.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 315
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 20.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 316
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 23.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 317
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 21.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 318
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: 17.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 319
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: 19.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 320
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: 17.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 321
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: 21.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 322
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 20.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 339
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 25.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 340
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 25.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 341
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 25.5,-8.5
-      parent: 104
-      type: Transform
-  - uid: 342
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 25.5,-7.5
-      parent: 104
-      type: Transform
-  - uid: 343
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 25.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 344
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 25.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 345
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 25.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 346
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 25.5,-3.5
-      parent: 104
-      type: Transform
-  - uid: 347
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 25.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 378
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 379
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 380
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 418
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: -1.5707963267948966 rad
-      pos: -12.5,8.5
-      parent: 104
-      type: Transform
-  - uid: 424
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -10.5,8.5
-      parent: 104
-      type: Transform
-  - uid: 427
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -1.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 441
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -2.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 443
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 462
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 463
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -4.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 474
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-1.5
-      parent: 104
-      type: Transform
-  - uid: 482
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -9.5,8.5
-      parent: 104
-      type: Transform
-  - uid: 486
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -16.5,8.5
-      parent: 104
-      type: Transform
-  - uid: 493
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 495
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -2.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 497
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -2.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 591
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 592
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 9.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 593
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 9.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 594
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 9.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 611
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-6.5
-      parent: 104
-      type: Transform
-  - uid: 613
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -13.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 623
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 651
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 671
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 675
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: -1.5707963267948966 rad
-      pos: -12.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 683
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -15.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 698
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -14.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 710
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -13.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 730
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 731
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 732
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -15.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 739
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 743
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -16.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 744
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -16.5,7.5
-      parent: 104
-      type: Transform
-  - uid: 750
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 767
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -16.5,10.5
-      parent: 104
-      type: Transform
-  - uid: 773
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 1025
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 3.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 1026
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 4.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 1091
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 1104
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 9.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 1110
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -5.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 1123
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 1126
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,22.5
-      parent: 104
-      type: Transform
-  - uid: 1128
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: -1.5707963267948966 rad
-      pos: -11.5,8.5
-      parent: 104
-      type: Transform
-  - uid: 1136
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1137
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -15.5,7.5
-      parent: 104
-      type: Transform
-  - uid: 1138
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -15.5,6.5
-      parent: 104
-      type: Transform
-  - uid: 1139
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -15.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1147
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -11.5,7.5
-      parent: 104
-      type: Transform
-  - uid: 1181
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 2.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1184
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 1188
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 2.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 1190
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: -2.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 1197
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 7.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 1199
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 5.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 1201
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 6.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 1205
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 2.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1206
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 8.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 1207
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 1209
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -17.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1210
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -14.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1211
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,23.5
-      parent: 104
-      type: Transform
-  - uid: 1212
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -16.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1213
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,19.5
-      parent: 104
-      type: Transform
-  - uid: 1214
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -16.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 1215
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,20.5
-      parent: 104
-      type: Transform
-  - uid: 1216
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -15.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 1218
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -14.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 1219
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -12.5,21.5
-      parent: 104
-      type: Transform
-  - uid: 1220
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -13.5,24.5
-      parent: 104
-      type: Transform
-  - uid: 1381
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1409
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 9.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1411
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 9.5,-23.5
-      parent: 104
-      type: Transform
-  - uid: 1412
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1426
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1783
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 1784
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -3.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1811
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 1833
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1834
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 1843
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,-22.5
-      parent: 104
-      type: Transform
-  - uid: 1850
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,-21.5
-      parent: 104
-      type: Transform
-  - uid: 1856
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 15.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1861
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1862
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1863
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1864
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-14.5
-      parent: 104
-      type: Transform
-  - uid: 1866
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-13.5
-      parent: 104
-      type: Transform
-  - uid: 1871
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 1876
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-15.5
-      parent: 104
-      type: Transform
-  - uid: 1881
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1885
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1889
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 1893
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 28.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1897
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 27.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1901
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 26.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1905
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 18.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1906
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 17.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1907
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1908
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,-19.5
-      parent: 104
-      type: Transform
-  - uid: 1914
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 25.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1915
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,-17.5
-      parent: 104
-      type: Transform
-  - uid: 1943
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 24.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1944
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 16.5,-18.5
-      parent: 104
-      type: Transform
-  - uid: 1968
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 23.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1969
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 22.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1970
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 21.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1971
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 20.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 1972
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 19.5,-20.5
-      parent: 104
-      type: Transform
-  - uid: 2017
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 2.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 2018
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 2.5,-11.5
-      parent: 104
-      type: Transform
-  - uid: 2019
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 2.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 2299
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -1.5,-2.5
-      parent: 104
-      type: Transform
-  - uid: 2300
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -1.5,-4.5
-      parent: 104
-      type: Transform
-- proto: WallPlastitaniumDiagonal
-  entities:
-  - uid: 323
-    components:
-    - pos: 18.5,-4.5
-      parent: 104
-      type: Transform
-  - uid: 324
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 22.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 325
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 23.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 338
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 17.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 348
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 18.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 650
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 18.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1088
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 18.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1089
-    components:
-    - pos: 17.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1119
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 22.5,-10.5
-      parent: 104
-      type: Transform
-  - uid: 1689
-    components:
-    - pos: 22.5,-9.5
-      parent: 104
-      type: Transform
-  - uid: 1690
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 23.5,-5.5
-      parent: 104
-      type: Transform
-  - uid: 1697
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 22.5,-4.5
-      parent: 104
-      type: Transform
-- proto: WaterTankFull
-  entities:
-  - uid: 1547
-    components:
-    - pos: 11.5,-4.5
-      parent: 104
-      type: Transform
-- proto: WeaponPistolCobra
-  entities:
-  - uid: 1705
-    components:
-    - pos: 5.4793262,12.166912
-      parent: 104
-      type: Transform
-- proto: WeaponShotgunSawn
-  entities:
-  - uid: 228
-    components:
-    - pos: 5.347948,13.528896
-      parent: 104
-      type: Transform
-    - unspawnedCount: 2
-      type: BallisticAmmoProvider
-- proto: WeaponSprayNozzle
-  entities:
-  - uid: 152
-    components:
-    - pos: 9.67418,-4.571714
-      parent: 104
-      type: Transform
-- proto: WeaponSubMachineGunC20r
-  entities:
-  - uid: 1704
-    components:
-    - pos: 5.497257,12.817707
-      parent: 104
-      type: Transform
-- proto: WelderIndustrial
-  entities:
-  - uid: 207
-    components:
-    - pos: 14.5,-10.5
-      parent: 104
-      type: Transform
-- proto: Windoor
-  entities:
-  - uid: 27
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,-7.5
-      parent: 104
-      type: Transform
-- proto: WindoorSecure
-  entities:
-  - uid: 1145
-    components:
-    - pos: -13.5,5.5
-      parent: 104
-      type: Transform
-  - uid: 1827
-    components:
-    - pos: 10.5,-18.5
-      parent: 104
-      type: Transform
-- proto: WindowReinforcedDirectional
-  entities:
-  - uid: 766
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1135
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,-16.5
-      parent: 104
-      type: Transform
-  - uid: 1217
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 7.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 1247
-    components:
-    - pos: 4.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 1370
-    components:
-    - pos: 3.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 2082
-    components:
-    - pos: 7.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 2182
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 5.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 2258
-    components:
-    - pos: 5.5,-12.5
-      parent: 104
-      type: Transform
-  - uid: 2290
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 5.5,9.5
-      parent: 104
-      type: Transform
-  - uid: 2293
-    components:
-    - pos: 5.5,15.5
-      parent: 104
-      type: Transform
-  - uid: 2294
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 5.5,-10.5
-      parent: 104
-      type: Transform
-...
diff --git a/Resources/Migrations/deltaMigrations.yml b/Resources/Migrations/deltaMigrations.yml
index 7c2046f7c5..5081d04dc5 100644
--- a/Resources/Migrations/deltaMigrations.yml
+++ b/Resources/Migrations/deltaMigrations.yml
@@ -65,8 +65,6 @@ ClothingHeadHoodMystic: ClothingHeadHoodMysta
 VendingMachineMailDrobe: VendingMachineCourierDrobe
 
 #Delta V temporary changes. Remove When items are added.
-MetempsychoticMachine: CloningPod
-MetempsychoticMachineCircuitboard: CloningPodMachineCircuitboard
 ComputerShipyard: ComputerBroken
 ShipyardComputerCircuitboard: null
 SpawnMobGolemCult: null
@@ -92,5 +90,12 @@ ExteriorLightTube: BlueLightTube
 # 2024-01-26
 SalvagePartsSpawnerSubSpace: SalvagePartsSpawnerMid
 
-# 2024-08-02
+# 2024-02-08
 SpawnVehicleAntagVehicle: null
+
+# 2024-02-26
+SpaceTickSpawnerNPC: SpaceTickSpawner
+
+# 2024-03-07
+LockableButtonBrig: LockableButtonSecurity
+SignDirectionalICU: SignDirectionalIcu
diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index edfb1e67a9..c4759eef91 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -193,3 +193,16 @@ VehicleJanicartDestroyed: null
 # 2024-02-01
 YellowOxygenTank: OxygenTank
 YellowOxygenTankFilled: OxygenTankFilled
+
+# 2024-02-19
+Drone: null
+# SpawnMobDrone: null
+Onestar: null # I dont think this is even mapped, but just in case
+
+# 2024-02-22
+SolarAssemblyPart: SolarAssemblyFlatpack
+AmePart: AmePartFlatpack
+AmePartStealObjective: AmePartFlatpackStealObjective
+
+# 2024-02-26
+CrateBaseWeldable: CrateGenericSteel
diff --git a/Resources/Prototypes/Accents/full_replacements.yml b/Resources/Prototypes/Accents/full_replacements.yml
index 07413b83b9..1febb37632 100644
--- a/Resources/Prototypes/Accents/full_replacements.yml
+++ b/Resources/Prototypes/Accents/full_replacements.yml
@@ -166,3 +166,11 @@
   - accent-words-kobold-7
   - accent-words-kobold-8
   - accent-words-kobold-9
+
+- type: accent
+  id: nymph
+  fullReplacements:
+  - accent-words-nymph-1
+  - accent-words-nymph-2
+  - accent-words-nymph-3
+  - accent-words-nymph-4
diff --git a/Resources/Prototypes/Access/engineering.yml b/Resources/Prototypes/Access/engineering.yml
index ce08b3910a..94901fdf7a 100644
--- a/Resources/Prototypes/Access/engineering.yml
+++ b/Resources/Prototypes/Access/engineering.yml
@@ -21,3 +21,4 @@
   id: FireFight
   tags:
     - Engineering
+    - Atmospherics
diff --git a/Resources/Prototypes/Actions/diona.yml b/Resources/Prototypes/Actions/diona.yml
new file mode 100644
index 0000000000..73bc1ba529
--- /dev/null
+++ b/Resources/Prototypes/Actions/diona.yml
@@ -0,0 +1,21 @@
+- type: entity
+  id: DionaGibAction
+  name: Gib Yourself!
+  description: Split apart into 3 nymphs.
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: Mobs/Species/Diona/organs.rsi/brain.png
+    event: !type:GibActionEvent {}
+    checkCanInteract: false
+
+- type: entity
+  id: DionaReformAction
+  name: Reform
+  description: Reform back into a whole Diona.
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: Mobs/Species/Diona/parts.rsi/full.png
+    event: !type:ReformEvent {}
+    useDelay: 600 # Once every 10 minutes. Keep them dead for a fair bit before reforming
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
index c63071551b..2d5ec9a678 100644
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -1,3 +1,14 @@
+# base actions
+
+- type: entity
+  id: BaseSuicideAction
+  abstract: true
+  components:
+  - type: ConfirmableAction
+    popup: suicide-action-popup
+
+# actions
+
 - type: entity
   id: ActionScream
   name: Scream
@@ -47,6 +58,7 @@
     event: !type:OpenStorageImplantEvent
 
 - type: entity
+  parent: BaseSuicideAction
   id: ActionActivateMicroBomb
   name: Activate Microbomb
   description: Activates your internal microbomb, completely destroying you and your equipment
@@ -62,6 +74,7 @@
     event: !type:ActivateImplantEvent
 
 - type: entity
+  parent: BaseSuicideAction
   id: ActionActivateDeathAcidifier
   name: Activate Death-Acidifier
   description: Activates your death-acidifier, completely melting you and your equipment
diff --git a/Resources/Prototypes/Atmospherics/gases.yml b/Resources/Prototypes/Atmospherics/gases.yml
index 38dc5892a1..6572b85e55 100644
--- a/Resources/Prototypes/Atmospherics/gases.yml
+++ b/Resources/Prototypes/Atmospherics/gases.yml
@@ -46,6 +46,7 @@
   gasOverlayState: tritium
   color: 13FF4B
   reagent: Tritium
+  pricePerMole: 2.5
 
 - type: gas
   id: 5
@@ -80,6 +81,7 @@
   molarMass: 44
   color: 2887E8
   reagent: NitrousOxide
+  pricePerMole: 1
 
 - type: gas
   id: 8
@@ -92,4 +94,4 @@
   gasMolesVisible: 0.6
   color: 3a758c
   reagent: Frezon
-  pricePerMole: 0.3
+  pricePerMole: 3
diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml
index 358fc74bca..2f50821df3 100644
--- a/Resources/Prototypes/Body/Organs/Animal/animal.yml
+++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml
@@ -1,5 +1,5 @@
 - type: entity
-  id: BaseAnimalOrgan
+  id: BaseAnimalOrganUnGibbable
   parent: BaseItem
   abstract: true
   components:
@@ -23,6 +23,12 @@
     tags:
       - Meat
 
+- type: entity
+  id: BaseAnimalOrgan
+  parent: BaseAnimalOrganUnGibbable
+  abstract: true
+  components:
+  - type: Gibbable
 
 - type: entity
   id: OrganAnimalLungs
diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml
index 282bb224d8..8b4b78cac0 100644
--- a/Resources/Prototypes/Body/Organs/diona.yml
+++ b/Resources/Prototypes/Body/Organs/diona.yml
@@ -48,18 +48,6 @@
         reagents:
         - ReagentId: UncookedAnimalProteins
           Quantity: 5
-  - type: Brain
-  - type: InputMover
-  - type: Examiner
-  - type: Lung #lungs in they head. why they there tho?
-  - type: Metabolizer
-    removeEmpty: true
-    solutionOnBody: false
-    solution: "Lung"
-    metabolizerTypes: [ Plant ]
-    groups:
-    - id: Gas
-      rateModifier: 100.0
 
 - type: entity
   id: OrganDionaEyes
@@ -102,3 +90,104 @@
       - id: Narcotic
       - id: Alcohol
         rateModifier: 0.1
+
+- type: entity
+  id: OrganDionaLungs
+  parent: BaseDionaOrgan
+  name: lungs
+  description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Human/organs.rsi
+    layers:
+      - state: lung-l
+      - state: lung-r
+  - type: Lung 
+  - type: Metabolizer
+    removeEmpty: true
+    solutionOnBody: false
+    solution: "Lung"
+    metabolizerTypes: [ Plant ]
+    groups:
+    - id: Gas
+      rateModifier: 100.0
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      Lung:
+        maxVol: 100
+        canReact: False
+
+# Organs that turn into nymphs on removal
+- type: entity
+  id: OrganDionaBrainNymph
+  parent: OrganDionaBrain
+  noSpawn: true
+  name: brain
+  description: "The source of incredible, unending intelligence. Honk."
+  components:
+  - type: Brain
+  - type: Nymph # This will make the organs turn into a nymph when they're removed. 
+    entityPrototype: OrganDionaNymphBrain
+    transferMind: true
+
+- type: entity
+  id: OrganDionaStomachNymph
+  parent: OrganDionaStomach
+  noSpawn: true
+  name: stomach
+  description: "Gross. This is hard to stomach."
+  components:
+  - type: Nymph
+    entityPrototype: OrganDionaNymphStomach
+
+- type: entity
+  id: OrganDionaLungsNymph
+  parent: OrganDionaLungs
+  noSpawn: true
+  name: lungs
+  description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
+  components:
+  - type: Nymph
+    entityPrototype: OrganDionaNymphLungs
+
+# Nymphs that the organs will turn into
+- type: entity
+  id: OrganDionaNymphBrain
+  parent: MobDionaNymph
+  noSpawn: true
+  name: diona nymph
+  suffix: Brain
+  description: Contains the brain of a formerly fully-formed Diona. Killing this would kill the Diona forever. You monster.
+  components:
+  - type: IsDeadIC
+  - type: Body
+    prototype: AnimalNymphBrain
+
+- type: entity
+  id: OrganDionaNymphStomach
+  parent: MobDionaNymphAccent 
+  noSpawn: true
+  name: diona nymph
+  suffix: Stomach
+  description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it. 
+  components:
+  - type: IsDeadIC
+  - type: Body
+    prototype: AnimalNymphStomach
+
+- type: entity
+  id: OrganDionaNymphLungs
+  parent: MobDionaNymphAccent
+  noSpawn: true
+  name: diona nymph
+  suffix: Lungs
+  description: Contains the lungs of a formerly fully-formed Diona. Breathtaking. 
+  components:
+  - type: IsDeadIC
+  - type: Body
+    prototype: AnimalNymphLungs
diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml
index 6abf168a9e..fe33c11029 100644
--- a/Resources/Prototypes/Body/Organs/human.yml
+++ b/Resources/Prototypes/Body/Organs/human.yml
@@ -1,5 +1,5 @@
 - type: entity
-  id: BaseHumanOrgan
+  id: BaseHumanOrganUnGibbable
   parent: BaseItem
   abstract: true
   components:
@@ -27,9 +27,16 @@
     tags:
       - Meat
 
+- type: entity
+  id: BaseHumanOrgan
+  parent: BaseHumanOrganUnGibbable
+  abstract: true
+  components:
+  - type: Gibbable
+
 - type: entity
   id: OrganHumanBrain
-  parent: BaseHumanOrgan
+  parent: BaseHumanOrganUnGibbable
   name: brain
   description: "The source of incredible, unending intelligence. Honk."
   components:
diff --git a/Resources/Prototypes/Body/Organs/reptilian.yml b/Resources/Prototypes/Body/Organs/reptilian.yml
index 993f90e1c6..f8423582cc 100644
--- a/Resources/Prototypes/Body/Organs/reptilian.yml
+++ b/Resources/Prototypes/Body/Organs/reptilian.yml
@@ -7,6 +7,7 @@
     specialDigestible:
       tags:
       - Fruit
+      - ReptilianFood
       - Meat
       - Pill
       - Crayon
diff --git a/Resources/Prototypes/Body/Parts/animal.yml b/Resources/Prototypes/Body/Parts/animal.yml
index cf65fd2136..4db026b40f 100644
--- a/Resources/Prototypes/Body/Parts/animal.yml
+++ b/Resources/Prototypes/Body/Parts/animal.yml
@@ -23,6 +23,7 @@
   - type: Tag
     tags:
       - Trash
+  - type: Gibbable
   - type: Extractable
     juiceSolution:
       reagents:
diff --git a/Resources/Prototypes/Body/Parts/base.yml b/Resources/Prototypes/Body/Parts/base.yml
index a27059f59f..836d0f140a 100644
--- a/Resources/Prototypes/Body/Parts/base.yml
+++ b/Resources/Prototypes/Body/Parts/base.yml
@@ -9,6 +9,7 @@
   - type: Damageable
     damageContainer: Biological
   - type: BodyPart
+  - type: Gibbable
   - type: ContainerContainer
     containers:
       bodypart: !type:Container
diff --git a/Resources/Prototypes/Body/Parts/skeleton.yml b/Resources/Prototypes/Body/Parts/skeleton.yml
index 38656ce5ce..ffba0c7c44 100644
--- a/Resources/Prototypes/Body/Parts/skeleton.yml
+++ b/Resources/Prototypes/Body/Parts/skeleton.yml
@@ -14,6 +14,7 @@
         ents: []
   - type: StaticPrice
     price: 20
+  - type: Gibbable
   - type: Tag
     tags:
       - Trash
diff --git a/Resources/Prototypes/Body/Parts/terminator.yml b/Resources/Prototypes/Body/Parts/terminator.yml
index dec0c99f7c..58530da959 100644
--- a/Resources/Prototypes/Body/Parts/terminator.yml
+++ b/Resources/Prototypes/Body/Parts/terminator.yml
@@ -16,6 +16,7 @@
     containers:
       bodypart: !type:Container
         ents: []
+  - type: Gibbable
   - type: StaticPrice
     price: 200
 
diff --git a/Resources/Prototypes/Body/Prototypes/Animal/nymph.yml b/Resources/Prototypes/Body/Prototypes/Animal/nymph.yml
new file mode 100644
index 0000000000..21aafe291c
--- /dev/null
+++ b/Resources/Prototypes/Body/Prototypes/Animal/nymph.yml
@@ -0,0 +1,66 @@
+- type: body
+  id: AnimalNymphBrain
+  name: "nymph"
+  root: torso
+  slots:
+    torso:
+      part: TorsoAnimal
+      connections:
+      - legs
+      organs:
+        brain: OrganDionaBrain
+        lungs: OrganAnimalLungs
+        stomach: OrganAnimalStomach
+        liver: OrganAnimalLiver
+        heart: OrganAnimalHeart
+        kidneys: OrganAnimalKidneys
+    legs:
+      part: LegsAnimal
+      connections:
+      - feet
+    feet:
+      part: FeetAnimal
+
+- type: body
+  id: AnimalNymphLungs
+  name: "nymph"
+  root: torso
+  slots:
+    torso:
+      part: TorsoAnimal
+      connections:
+      - legs
+      organs:
+        lungs: OrganDionaLungs
+        stomach: OrganAnimalStomach
+        liver: OrganAnimalLiver
+        heart: OrganAnimalHeart
+        kidneys: OrganAnimalKidneys
+    legs:
+      part: LegsAnimal
+      connections:
+      - feet
+    feet:
+      part: FeetAnimal
+
+- type: body
+  id: AnimalNymphStomach
+  name: "nymph"
+  root: torso
+  slots:
+    torso:
+      part: TorsoAnimal
+      connections:
+      - legs
+      organs:
+        lungs: OrganAnimalLungs
+        stomach: OrganDionaStomach
+        liver: OrganAnimalLiver
+        heart: OrganAnimalHeart
+        kidneys: OrganAnimalKidneys
+    legs:
+      part: LegsAnimal
+      connections:
+      - feet
+    feet:
+      part: FeetAnimal
\ No newline at end of file
diff --git a/Resources/Prototypes/Body/Prototypes/diona.yml b/Resources/Prototypes/Body/Prototypes/diona.yml
index f364d0f800..12ca203988 100644
--- a/Resources/Prototypes/Body/Prototypes/diona.yml
+++ b/Resources/Prototypes/Body/Prototypes/diona.yml
@@ -8,8 +8,7 @@
       connections:
       - torso
       organs:
-        brain: OrganDionaBrain
-        eyes: OrganDionaEyes
+        brain: OrganDionaBrainNymph
     torso:
       part: TorsoDiona
       connections:
@@ -18,7 +17,8 @@
       - right leg
       - left leg
       organs:
-        stomach: OrganDionaStomach
+        stomach: OrganDionaStomachNymph
+        lungs: OrganDionaLungsNymph
     right arm:
       part: RightArmDiona
       connections:
diff --git a/Resources/Prototypes/Body/Prototypes/drone.yml b/Resources/Prototypes/Body/Prototypes/drone.yml
deleted file mode 100644
index 00acba9646..0000000000
--- a/Resources/Prototypes/Body/Prototypes/drone.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-- type: body
-  id: Drone
-  name: "drone"
-  root: hand 1
-  slots:
-    hand 1:
-      part: LeftArmBorg
-      connections:
-      - hand 2
-    hand 2:
-      part: LeftArmBorg
-      connections:
-      - hand 3
-    hand 3:
-      part: LeftArmBorg
-      connections:
-      - hand 4
-    hand 4:
-      part: LeftArmBorg
-      connections:
-      - hand 5
-    hand 5:
-      part: RightArmBorg
-      connections:
-      - hand 6
-    hand 6:
-      part: RightArmBorg
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
index dc3bb851a7..b5468fd982 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
@@ -102,7 +102,7 @@
   id: EngineeringRCDAmmo
   icon:
     sprite: Objects/Tools/rcd.rsi
-    state: icon
+    state: ammo
   product: CrateRCDAmmo
   cost: 2500
   category: Engineering
@@ -112,7 +112,7 @@
   id: EngineeringRCD
   icon:
     sprite: Objects/Tools/rcd.rsi
-    state: ammo
+    state: icon
   product: CrateRCD
   cost: 800
   category: Engineering
@@ -127,4 +127,13 @@
   cost: 15000
   category: Engineering
   group: market
-  
\ No newline at end of file
+
+- type: cargoProduct
+  id: EngineeringSpaceHeater
+  icon:
+    sprite: Structures/Piping/Atmospherics/Portable/portable_sheater.rsi
+    state: sheaterOff
+  product: SpaceHeaterAnchored
+  cost: 300
+  category: Engineering
+  group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
index d3d0dcef78..ece817b746 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
@@ -63,8 +63,8 @@
 - type: cargoProduct
   id: EngineSolar
   icon:
-    sprite: Objects/Power/solar_parts.rsi
-    state: solar_assembly_parts
+    sprite: Objects/Devices/flatpack.rsi
+    state: solar-assembly-part
   product: CrateEngineeringSolar
   cost: 500
   category: Engineering
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
index 5bedc9a861..2d5acf5c90 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -104,7 +104,7 @@
     sprite: Objects/Fun/toys.rsi
     state: plushie_lizard
   product: CrateFunLizardPlushieBulk
-  cost: 2500
+  cost: 500
   category: Fun
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
index e23a756ca0..e3b07af13b 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
@@ -28,6 +28,16 @@
   category: Materials
   group: market
 
+- type: cargoProduct
+  id: MaterialBrass
+  icon:
+    sprite: Objects/Materials/Sheets/metal.rsi
+    state: brass_3
+  product: CrateMaterialBrass
+  cost: 2500
+  category: Materials
+  group: market
+
 - type: cargoProduct
   id: MaterialPlasteel
   icon:
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
index cc0ee7b996..a2c0af9ce7 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
@@ -177,3 +177,14 @@
   cost: 1000
   category: Service
   group: market
+
+- type: cargoProduct
+  id: ServiceJanitorTrolley
+  icon:
+    sprite: Objects/Specific/Janitorial/janitorial_cart.rsi
+    state: icon-cart
+  product: JanitorialTrolley
+  cost: 300
+  category: Service
+  group: market
+
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml
index 58c6f99494..96a193881e 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml
@@ -3,7 +3,7 @@
   icon:
     sprite: Structures/Shuttles/thruster.rsi
     state: base
-  product: Thruster
+  product: CrateEngineeringThruster
   cost: 1500
   category: Shuttle
   group: market
@@ -13,7 +13,7 @@
   icon:
     sprite: Structures/Shuttles/gyroscope.rsi
     state: base
-  product: Gyroscope
+  product: CrateEngineeringGyroscope
   cost: 4000
   category: Shuttle
   group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
index f398328675..1a3dda6648 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -267,15 +267,6 @@
       contents:
         - id: BoxSurvival
 
-- type: entity
-  noSpawn: true
-  parent: ClothingBackpackSatchel
-  id: ClothingBackpackSatchelDrone
-  components:
-  - type: Tag
-    tags:
-    - InnateDontDelete
-
 - type: entity
   noSpawn: true
   parent: ClothingBackpackSatchelMime
@@ -293,7 +284,6 @@
   components:
   - type: StorageFill
     contents:
-    - id: AdminPDA
     - id: GasAnalyzer
     - id: trayScanner
   - type: Unremoveable
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index 4fb6fd2893..14bf5e7718 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -259,6 +259,7 @@
       - id: ClothingHeadHelmetSyndicate
       - id: ClothingOuterHardsuitSyndicate
       - id: ClothingMaskGasSyndicate
+      - id: ClothingHandsGlovesColorYellowBudget
       - id: DoubleEmergencyOxygenTankFilled
       - id: DoubleEmergencyNitrogenTankFilled
 
@@ -273,6 +274,35 @@
       - id: ClothingOuterHardsuitSyndie
       - id: ClothingMaskGasSyndicate
       - id: ClothingHandsGlovesCombat
+      - id: DoubleEmergencyOxygenTankFilled
+      - id: DoubleEmergencyNitrogenTankFilled
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateEliteHardsuitBundle
+  name: syndicate elite hardsuit bundle
+  description: "Contains the Syndicate's elite hardsuit, which comes with some more stuff in it."
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterHardsuitSyndieElite
+      - id: ClothingMaskGasSyndicate
+      - id: ClothingHandsGlovesCombat
+      - id: DoubleEmergencyOxygenTankFilled
+      - id: DoubleEmergencyNitrogenTankFilled
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateHardsuitExtrasBundle
+  name: syndicate hardsuit extras bundle
+  description: "Contains stuff that you will absolutely want to have when purchasing a hardsuit."
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingMaskGasSyndicate
+      - id: ClothingHandsGlovesCombat
+      - id: DoubleEmergencyOxygenTankFilled
+      - id: DoubleEmergencyNitrogenTankFilled
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle
@@ -336,3 +366,22 @@
       - id: ClothingHandsGlovesNitrile
       - id: SyringeTranexamicAcid
       - id: SyringeHyronalin
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateDecoyKitFilled
+  name: decoy bundle
+  description: "Contains distractions, both auditory and visual. Smell coming soon."
+  components:
+  - type: StorageFill
+    contents:
+      - id: BalloonOperative
+      - id: BalloonAgent
+      - id: BalloonElite
+      - id: BalloonJuggernaut
+      - id: BalloonCommander
+      - id: SnapPopBox
+      - id: GrenadeDummy
+        amount: 2
+      - id: SyndieTrickyBomb
+        amount: 2
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
index 981f4eeb16..fa7196f82f 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -106,6 +106,7 @@
   parent: BoxCardboard
   id: BoxHug
   description: A special box for sensitive people.
+  suffix: Emergency
   components:
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index f7648fb09c..7840602362 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -50,9 +50,6 @@
     whitelist:
       components:
       - LightBulb
-  - type: Tag
-    tags:
-      - DroneUsable
 
 - type: entity
   name: lighttube box
@@ -74,9 +71,6 @@
     whitelist:
       components:
       - LightBulb
-  - type: Tag
-    tags:
-      - DroneUsable
 
 - type: entity
   name: mixed lights box
@@ -100,9 +94,6 @@
     whitelist:
       components:
       - LightBulb
-  - type: Tag
-    tags:
-      - DroneUsable
 
 - type: entity
   name: PDA box
@@ -182,24 +173,14 @@
       - state: writing
 
 - type: entity
-  name: box of hugs
-  parent: BoxCardboard
+  parent: BoxHug
   id: BoxHugHealing
-  description: A special box for sensitive people.
+  suffix: Medical
   components:
-  - type: Sprite
-    layers:
-      - state: box_hug
-      - state: heart
-  - type: Item
-    heldPrefix: hug
   - type: StorageFill
     contents:
       - id: Brutepack
         amount: 3
-  - type: Tag
-    tags:
-      - BoxHug
 
 - type: entity
   name: inflatable wall box
@@ -217,9 +198,6 @@
     layers:
       - state: box
       - state: inflatable
-  - type: Tag
-    tags:
-      - DroneUsable
 
 
 - type: entity
@@ -263,7 +241,7 @@
   - type: Storage
     grid:
     - 0,0,5,3
-    maxItemSize: Normal
+    maxItemSize: Large
     whitelist:
       tags:
         - TrashBag
@@ -271,9 +249,6 @@
     layers:
       - state: box
       - state: trashbag
-  - type: Tag
-    tags:
-      - DroneUsable
 
 - type: entity
   name: passenger encryption key box
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
index 0fe73de137..b36eab6ba9 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
@@ -2,7 +2,9 @@
   id: CrateCargoLuxuryHardsuit
   parent: CratePirate
   name: luxury mining hardsuit crate
-  description: Finally, a hardsuit Quartermasters could call their own. Centcomm has heard you, now stop asking.
+  # DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer
+  description: Finally, a hardsuit the Logistics Officer could call their own. Centcomm has heard you, now stop asking.
+  # End of modified code
   components:
   - type: StorageFill
     contents:
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
index 3129e28b72..9b47036b01 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml
@@ -8,7 +8,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: AmePart
+      - id: AmePartFlatpack
         amount: 9
 
 - type: entity
@@ -42,17 +42,18 @@
   components:
   - type: StorageFill
     contents:
-      - id: Emitter
+      - id: Emitter # TODO change to flatpack
 
 - type: entity
   id: CrateEngineeringSingularityCollector
   parent: CrateEngineeringSecure
   name: radiation collector crate
-  description: A radiation collector, best used for singularity engines.
+  description: A radiation collector, best used for singularity engines. Plasma is included.
   components:
   - type: StorageFill
     contents:
-      - id: RadiationCollectorFullTank
+      - id: RadiationCollectorFlatpack
+      - id: PlasmaTankFilled
 
 - type: entity
   id: CrateEngineeringSingularityContainment
@@ -62,7 +63,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: ContainmentFieldGenerator
+      - id: ContainmentFieldGeneratorFlatpack
 
 - type: entity
   id: CrateEngineeringSingularityGenerator
@@ -72,7 +73,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: SingularityGenerator
+      - id: SingularityGeneratorFlatpack
 
 # Particle Accelerator
 
@@ -113,7 +114,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: DebugGenerator
+      - id: DebugGenerator # TODO change to flatpack
 
 - type: entity
   id: CrateEngineeringSolar
@@ -123,7 +124,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: SolarAssemblyPart
+      - id: SolarAssemblyFlatpack
         amount: 6
 
 - type: entity
@@ -147,7 +148,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: TeslaGenerator
+      - id: TeslaGeneratorFlatpack
 
 - type: entity
   id: CrateEngineeringTeslaCoil
@@ -157,7 +158,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: TeslaCoil
+      - id: TeslaCoilFlatpack
 
 - type: entity
   id: CrateEngineeringTeslaGroundingRod
@@ -167,4 +168,4 @@
   components:
   - type: StorageFill
     contents:
-      - id: TeslaGroundingRod
+      - id: TeslaGroundingRodFlatpack
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index 283a70188d..1db0c3121e 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -290,6 +290,7 @@
   components:
   - type: StorageFill
     contents:
+      - id: SnapPopBox
       - id: CrazyGlue
         amount: 2
       - id: PlasticBanana
@@ -300,6 +301,7 @@
       - id: MrDips
         orGroup: Giftpool
       - id: RevolverCapGun
+      - id: BalloonNT
       - id: ClothingShoesClownLarge
       - id: ClothingHeadHatMagician
       - id: BeachBall
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
index 513ab46ffb..bd47f98477 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
@@ -53,6 +53,17 @@
     contents:
       - id: MaterialWoodPlank
 
+- type: entity
+  id: CrateMaterialBrass
+  parent: CrateGenericSteel
+  name: brass crate
+  description: 90 sheets of brass.
+  components:
+  - type: StorageFill
+    contents:
+      - id: SheetBrass
+        amount: 3
+
 - type: entity
   id: CrateMaterialPlasteel
   parent: CrateGenericSteel
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
index 1a544a8194..c1168f68d4 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
@@ -12,6 +12,7 @@
       - id: OxygenTankFilled
       - id: FireExtinguisher
       - id: ClothingShoesBootsMag
+      - id: HandHeldMassScanner
       - id: Pickaxe
       - id: Welder
       - id: Wrench
@@ -74,6 +75,10 @@
         prob: 0.001
       - id: WeaponRevolverInspector
         prob: 0.001
+      # DeltaV - .38 special revolver - Adds the .38 Special Revolver 'Lucky 37' to the salvage potential loot
+      - id: WeaponRevolverLucky
+        prob: 0.001
+      # End of modified code
       - id: ClothingShoesBootsMagBlinding
         prob: 0.001
         #  - Skub
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index 707a3929db..8f8c1a114f 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -108,7 +108,7 @@
   id: CrateServiceBureaucracy
   parent: CrateGenericSteel
   name: bureaucracy crate
-  description: Several stacks of paper and a few pens, what more can you ask for.
+  description: Several stacks of paper, a few pens and an office toy. What more could you ask for?
   components:
   - type: StorageFill
     contents:
@@ -122,6 +122,7 @@
     - id: BoxFolderBlue
     - id: BoxFolderRed
     - id: BoxFolderYellow
+    - id: NewtonCradle
 
 - type: entity
   id: CrateServicePersonnel
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/shuttle.yml b/Resources/Prototypes/Catalog/Fills/Crates/shuttle.yml
new file mode 100644
index 0000000000..389bf0a7e4
--- /dev/null
+++ b/Resources/Prototypes/Catalog/Fills/Crates/shuttle.yml
@@ -0,0 +1,19 @@
+- type: entity
+  parent: CrateEngineering
+  id: CrateEngineeringThruster
+  name: thruster crate
+  description: Contains a thruster flatpack.
+  components:
+  - type: StorageFill
+    contents:
+      - id: ThrusterFlatpack
+
+- type: entity
+  parent: CrateEngineering
+  id: CrateEngineeringGyroscope
+  name: gyroscope crate
+  description: Contains a gyroscope flatpack.
+  components:
+  - type: StorageFill
+    contents:
+      - id: GyroscopeFlatpack
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
index a3b5967ba6..3f9e909c80 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
@@ -7,6 +7,21 @@
     - type: SurplusBundle
       totalPrice: 50
 
+- type: entity
+  id: CrateCybersunJuggernautBundle
+  suffix: Filled
+  parent: CrateSyndicate
+  name: Cybersun juggernaut bundle
+  description: Contains everything except a big gun to go postal.
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterHardsuitJuggernaut
+      - id: ClothingMaskGasSyndicate
+      - id: ClothingHandsGlovesCombat
+      - id: DoubleEmergencyOxygenTankFilled
+      - id: DoubleEmergencyNitrogenTankFilled
+
 - type: entity
   id: CrateSyndicateSuperSurplusBundle
   parent: CrateSyndicate
diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
index 8a27e36f08..976d2a4307 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -84,9 +84,8 @@
       - id: EmergencyMedipen #You never know what people are going to latejoin into
 
 - type: entity
-  id: ClothingBeltParamedicFilled
-  parent: ClothingBeltMedical #in the future, make this a seperate prototype so it can have a unique, darker sprite
-  name: EMT belt
+  id: ClothingBeltMedicalEMTFilled
+  parent: ClothingBeltMedicalEMT
   suffix: Paramedic,Filled
   components:
   - type: StorageFill
diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
index c261a2c0da..6be5ae0d30 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
@@ -28,6 +28,7 @@
       - id: ClothingNeckTieRed
       - id: ClothingHandsGlovesLatex
       - id: ClothingUniformJumpsuitLawyerBlack
+      - id: BarberScissors
 
 - type: entity
   id: BriefcaseSyndieLobbyingBundleFilled
@@ -64,4 +65,4 @@
       - id: ClothingOuterCoatJensen
       - id: ClothingHandsGlovesCombat
       - id: ClothingMaskNeckGaiter
-      - id: ToyFigurineThief
\ No newline at end of file
+      - id: ToyFigurineThief
diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
index 6cae786bd0..87921a71d4 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
@@ -8,16 +8,22 @@
     contents:
       - id: CrowbarRed
       - id: ClothingMaskBreath
-        amount: 2
-      - id: FoodSnackChocolate
+      - id: ClothingMaskBreath
+        prob: 0.5
+      - id: EmergencyOxygenTankFilled
+      - id: EmergencyOxygenTankFilled
+        prob: 0.5
+      - id: FoodTinMRE
+      - id: FoodTinMRE
+        prob: 0.5
+      - id: DrinkWaterBottleFull
+      - id: DrinkWaterBottleFull
+        prob: 0.5
       - id: FlashlightLantern
       - id: FlashlightLantern
         prob: 0.5
       - id: HarmonicaInstrument
         prob: 0.15
-        orGroup: HarmonicaOrChocolate
-      - id: FoodSnackChocolate
-        orGroup: HarmonicaOrChocolate
 
 - type: entity
   id: ToolboxElectricalFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
index 4a072fc90f..e0b40689c9 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -6,8 +6,6 @@
   - type: StorageFill
     contents:
       - id: ClothingOuterHardsuitSpatio
-      - id: OxygenTankFilled
-      - id: NitrogenTankFilled
       - id: ClothingShoesBootsMag
       - id: ClothingMaskGasExplorer
       - id: ClothingBeltUtilityFilled
@@ -17,6 +15,7 @@
       - id: SeismicCharge
         amount: 2
       - id: ClothingShoesBootsWinterMiner #Delta V: Add departmental winter boots
+      - id: JetpackMiniFilled # DeltaV - Salv lost their shuttle
       - id: OreBag
         prob: 0.5
       - id: Flare
@@ -44,6 +43,7 @@
       - id: SeismicCharge
         amount: 2
       - id: ClothingShoesBootsWinterMiner #Delta V: Add departmental winter boots
+      - id: JetpackMiniFilled # DeltaV - Salv lost their shuttle
       - id: OreBag
         prob: 0.5
       - id: Flare
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
index 7a6ed2d3b1..94e10d76ee 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
@@ -13,6 +13,7 @@
       - id: ClothingUniformJumpskirtCapFormalDress
       - id: ClothingHandsGlovesInspection # DeltaV - ClothingHandsGlovesCaptain replaced in favour of inspection gloves
       - id: ClothingNeckMantleCap
+      - id: ClothingOuterWinterCap
 
 - type: entity
   id: DresserChiefEngineerFilled
@@ -26,6 +27,7 @@
       - id: ClothingUniformJumpskirtChiefEngineerTurtle
       - id: ClothingNeckCloakCe
       - id: ClothingHeadHatBeretEngineering
+      - id: ClothingOuterWinterCE
 
 - type: entity
   id: DresserChiefMedicalOfficerFilled
@@ -38,6 +40,8 @@
       - id: ClothingCloakCmo
       - id: ClothingOuterCoatLabCmo
       - id: ClothingHeadHatBeretCmo
+      - id: ClothingEyesGlasses
+      - id: ClothingOuterWinterCMO
 
 - type: entity
   id: DresserHeadOfPersonnelFilled
@@ -50,6 +54,7 @@
       - id: ClothingNeckCloakHop
       - id: ClothingHeadHatHopcap
       - id: ClothingOuterWinterHoP
+      - id: ClothingEyesGlasses
 
 - type: entity
   id: DresserHeadOfSecurityFilled
@@ -66,7 +71,7 @@
       - id: ClothingUniformJumpsuitHoSAlt
       - id: ClothingUniformJumpskirtHosFormal
       - id: ClothingUniformJumpsuitHosFormal
-      - id: ClothingMaskNeckGaiter
+      - id: ClothingOuterWinterHoS
 
 - type: entity
   id: DresserQuarterMasterFilled
@@ -76,11 +81,13 @@
   - type: StorageFill
     contents:
       - id: ClothingNeckCloakQm
-      - id: ClothingHeadsetCargo
+      - id: ClothingHeadHatBeretQM
+      - id: ClothingUniformJumpsuitQMFormal
       - id: ClothingUniformJumpsuitQMTurtleneck
       - id: ClothingUniformJumpskirtQMTurtleneck
       - id: ClothingHandsGlovesColorBrown
       - id: ClothingNeckMantleQM
+      - id: ClothingOuterWinterQM
 
 - type: entity
   id: DresserResearchDirectorFilled
@@ -93,7 +100,8 @@
       - id: ClothingNeckCloakMystagogue # DeltaV - ClothingNeckCloakRd replaced in favour of Velta variant
       - id: ClothingHeadHatBeretRND
       - id: ClothingHandsGlovesColorPurple
-      - id: ClothingHeadsetAltScience
+      - id: ClothingEyesGlasses
+      - id: ClothingOuterWinterRD
 
 - type: entity
   id: DresserWardenFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
index 6ea009dba5..384c27b0df 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -82,8 +82,6 @@
     contents:
       - id: ClothingOuterHardsuitAtmos
       - id: ClothingMaskGasAtmos
-      - id: OxygenTankFilled
-      - id: NitrogenTankFilled
       - id: ClothingOuterSuitAtmosFire
       - id: ClothingHeadHelmetAtmosFire
       - id: GasAnalyzer
@@ -120,8 +118,6 @@
       - id: ClothingOuterHardsuitEngineering
       - id: ClothingHandsGlovesColorYellow
       - id: ClothingMaskGas
-      - id: OxygenTankFilled
-      - id: NitrogenTankFilled
       - id: ClothingShoesBootsMag
       - id: RCD
       - id: RCDAmmo
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 966be72c49..aecb2f7715 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -46,7 +46,7 @@
       - id: ClothingBeltSheathFilled
       - id: DoorRemoteCommand
       - id: RubberStampCaptain
-      - id: WeaponAntiqueLaser
+#     - id: WeaponAntiqueLaser # DeltaV - Remove in favor of the glass box
       - id: JetpackCaptainFilled
       - id: MedalCase
       - id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret
@@ -56,7 +56,7 @@
 
 - type: entity
   id: LockerCaptainFilled
-  suffix: Filled
+  suffix: Filled, AntiqueLaser
   parent: LockerCaptain
   components:
   - type: StorageFill
@@ -84,6 +84,35 @@
       - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
       - id: ClothingShoesBootsWinterCap #Delta V: Add departmental winter boots
 
+- type: entity
+  id: LockerCaptainFilledNoLaser
+  suffix: Filled
+  parent: LockerCaptain
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterArmorCaptainCarapace
+      - id: NukeDisk
+      - id: PinpointerNuclear
+#      - id: CaptainIDCard # Delta V - Replaced by spare ID system. The funny biscuit that I cant even eat.
+      - id: WeaponDisabler
+      - id: CommsComputerCircuitboard
+      - id: ClothingHeadsetAltCommand
+      - id: SpaceCash1000
+      - id: PlushieNuke
+        prob: 0.1
+      - id: CigarGoldCase
+        prob: 0.25
+      - id: ClothingBeltSheathFilled
+      - id: DoorRemoteCommand
+      - id: RubberStampCaptain
+      - id: JetpackCaptainFilled
+      - id: MedalCase
+      - id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret
+      - id: ClothingShoesLeather # DeltaV - add fancy shoes for HoP and cap
+      - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
+      - id: ClothingShoesBootsWinterCap #Delta V: Add departmental winter boots
+
 - type: entity
   id: LockerHeadOfPersonnelFilled
   suffix: Filled
@@ -131,8 +160,6 @@
     contents:
       - id: ClothingOuterHardsuitEngineeringWhite
       - id: ClothingMaskBreath
-      - id: OxygenTankFilled
-      - id: NitrogenTankFilled
       - id: ClothingEyesGlassesMeson
       - id: ClothingBeltChiefEngineerFilled
       - id: ClothingShoesBootsMagAdv
@@ -187,7 +214,6 @@
       - id: ClothingHeadsetAltMedical
       - id: ClothingCloakCmo
       - id: ClothingBackpackDuffelSurgeryFilled
-      - id: ClothingOuterCoatLabCmo
       - id: ClothingMaskSterile
       - id: ClothingHeadHatBeretCmo
       - id: ClothingOuterHardsuitMedical
@@ -195,6 +221,7 @@
       - id: HandheldCrewMonitor
       - id: DoorRemoteMedical
       - id: RubberStampCMO
+      - id: RubberStampPsychologist # DeltaV
       - id: MedicalTechFabCircuitboard
       - id: BoxEncryptionKeyMedical
       - id: BoxPDAMedical # Delta-V
@@ -236,7 +263,6 @@
       - id: ResearchComputerCircuitboard
       - id: ProtolatheMachineCircuitboard
       - id: CircuitImprinterMachineCircuitboard
-      - id: ClothingHeadsetMedicalScience
       - id: ClothingOuterHardsuitRd
       - id: HandTeleporter
       - id: DoorRemoteResearch
@@ -246,6 +272,7 @@
       - id: BoxPDAScience # Delta-V
       - id: RDIDCard # Delta-V
       - id: ClothingShoesBootsWinterMystagogue #Delta V: Add departmental winter boots
+      - id: ClothingHeadsetAltScience
       - id: EncryptionKeyBinary
 
 - type: entity
@@ -258,7 +285,6 @@
       - id: ResearchComputerCircuitboard
       - id: ProtolatheMachineCircuitboard
       - id: CircuitImprinterMachineCircuitboard
-      - id: ClothingHeadsetMedicalScience
       - id: HandTeleporter
       - id: DoorRemoteResearch
       - id: ClothingBeltUtilityFilled
@@ -267,6 +293,7 @@
       - id: BoxPDAScience # Delta-V
       - id: RDIDCard # Delta-V
       - id: ClothingShoesBootsWinterMystagogue #Delta V: Add departmental winter boots
+      - id: ClothingHeadsetAltScience
       - id: EncryptionKeyBinary
 
 - type: entity
@@ -279,6 +306,7 @@
       - id: ClothingEyesHudSecurity
       - id: WeaponDisabler
       - id: ClothingOuterCoatHoSTrench
+      - id: ClothingMaskNeckGaiter
       - id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit.
       - id: ClothingMaskGasSwat
       - id: ClothingBeltSecurityFilled
@@ -309,6 +337,7 @@
       - id: ClothingEyesHudSecurity
       - id: WeaponDisabler
       - id: ClothingOuterCoatHoSTrench
+      - id: ClothingMaskNeckGaiter
       - id: ClothingBeltSecurityFilled
       - id: ClothingHeadsetAltSecurity
       - id: ClothingEyesGlassesSunglasses
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
index 8bc391fab6..3dff55b968 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -201,5 +201,6 @@
       - id: ClothingHeadsetMedical
       - id: ClothingMaskSterile
       - id: ClothingShoesBootsWinterParamedic #Delta V: Add departmental winter boots
+      - id: HandheldGPSBasic
       - id: MedkitFilled
         prob: 0.3
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index 739db6d1f7..81ec76dae6 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -28,12 +28,6 @@
       - id: OxygenTankFilled
         prob: 0.20
         orGroup: EmergencyTankOrRegularTank
-      - id: EmergencyNitrogenTankFilled
-        prob: 0.80
-        orGroup: EmergencyNitrogenOrRegularNitrogen
-      - id: NitrogenTankFilled
-        prob: 0.20
-        orGroup: EmergencyNitrogenOrRegularNitrogen
       - id: ToolboxEmergencyFilled
         prob: 0.4
       - id: MedkitOxygenFilled
@@ -58,12 +52,6 @@
       - id: OxygenTankFilled
         prob: 0.20
         orGroup: EmergencyTankOrRegularTank
-      - id: NitrogenTankFilled
-        prob: 0.80
-        orGroup: EmergencyNitrogenOrRegularNitrogen
-      - id: EmergencyNitrogenTankFilled
-        prob: 0.20
-        orGroup: EmergencyNitrogenOrRegularNitrogen  
       - id: ToolboxEmergencyFilled
         prob: 0.4
       - id: MedkitOxygenFilled
@@ -84,7 +72,6 @@
         - id: ClothingHeadHelmetFire
         - id: ClothingMaskGas
         - id: OxygenTankFilled
-        - id: NitrogenTankFilled
         - id: FireExtinguisher
           prob: 0.25
 - type: entity
@@ -98,7 +85,6 @@
         - id: ClothingHeadHelmetFire
         - id: ClothingMaskGas
         - id: OxygenTankFilled
-        - id: NitrogenTankFilled
         - id: FireExtinguisher
           prob: 0.25
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index c0e50f8df5..89376ed4cc 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -23,7 +23,8 @@
       - id: ClothingEyesHudSecurity
       - id: BoxPDAPrisoner # Delta-V
       - id: ClothingShoesBootsWinterWarden #Delta V: Add departmental winter boots
-
+      - id: BoxEncryptionKeyPrisoner #Delta-V
+      
 - type: entity
   id: LockerWardenFilled
   suffix: Filled
@@ -48,6 +49,7 @@
       - id: ClothingEyesHudSecurity
       - id: BoxPDAPrisoner # Delta-V
       - id: ClothingShoesBootsWinterWarden #Delta V: Add departmental winter boots
+      - id: BoxEncryptionKeyPrisoner #Delta-V
 
 - type: entity
   id: LockerSecurityFilled
@@ -180,7 +182,9 @@
       - id: BoxForensicPad
       - id: DrinkDetFlask
       - id: ClothingHandsGlovesForensic
+      - id: RubberStampDetective
       - id: HoloprojectorSecurity
+      - id: BoxEvidenceMarkers
 
 - type: entity
   id: ClosetBombFilled
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/space_ruin.yml b/Resources/Prototypes/Catalog/Fills/Lockers/space_ruin.yml
index ccf8ad9538..a35c5915ab 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/space_ruin.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/space_ruin.yml
@@ -9,4 +9,43 @@
     contents:
       - id: ClothingHeadHelmetAncient
       - id: ClothingOuterHardsuitAncientEVA
-      - id: JetpackVoidFilled
\ No newline at end of file
+      - id: JetpackVoidFilled
+
+#Syndicate ship armory stuff
+- type: entity
+  id: LockerSyndicateShipGearBasic
+  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
+        
+#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
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index 00f10c807e..73b7021461 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -7,7 +7,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitEVA
         - id: ClothingHeadHelmetEVA
@@ -21,7 +20,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitEVA
         - id: ClothingHeadHelmetEVALarge
@@ -35,7 +33,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingOuterSuitEmergency
         - id: ClothingMaskBreath
@@ -47,8 +44,7 @@
   suffix: Prisoner EVA
   components:
   - type: StorageFill
-    contents:
-        - id: NitrogenTankFilled
+    contents:   
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitEVAPrisoner
         - id: ClothingHeadHelmetEVALarge
@@ -62,7 +58,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitSyndicate
         - id: ClothingHeadHelmetSyndicate
@@ -76,7 +71,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitPirateEVA
         - id: ClothingMaskGas
@@ -103,7 +97,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitBasic
         - id: ClothingMaskBreath
@@ -116,7 +109,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingShoesBootsMag
         - id: ClothingOuterHardsuitEngineering
@@ -132,7 +124,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitAtmos
         - id: ClothingMaskBreath
@@ -147,7 +138,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitCombatOfficer # DeltaV - ClothingOuterHardsuitSecurity replaced in favour of security combat hardsuit.
         - id: ClothingMaskBreath
@@ -162,7 +152,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: JetpackVoidFilled
         - id: ClothingShoesBootsMagAdv
@@ -179,7 +168,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitMedical
         - id: ClothingMaskBreathMedical
@@ -194,7 +182,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitRd
         - id: ClothingMaskBreath
@@ -209,7 +196,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: JetpackSecurityFilled
         - id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit.
@@ -225,7 +211,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit.
         - id: ClothingMaskBreath
@@ -240,7 +225,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitCap
         - id: ClothingMaskGasCaptain
@@ -255,7 +239,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: NitrogenTankFilled
       - id: OxygenTankFilled
       - id: ClothingShoesBootsMag
       - id: ClothingOuterHardsuitSpatio
@@ -303,7 +286,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitSyndie
         - id: ClothingShoesBootsMagSyndie
@@ -317,7 +299,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitPirateCap
         - id: ClothingMaskGas
@@ -330,7 +311,6 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
         - id: OxygenTankFilled
         - id: ClothingOuterHardsuitWizard
         - id: ClothingMaskBreath
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
index 44ec34e156..4080dbaead 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
@@ -13,9 +13,11 @@
     MagazineBoxMagnumPractice: 3
     MagazineBoxMagnumRubber: 3
 
-    MagazineBoxSpecial: 3 # DeltaV - .38 Special revolver
-    MagazineBoxSpecialPractice: 3 # DeltaV - .38 Special revolver
-    MagazineBoxSpecialRubber: 3 # DeltaV - .38 Special revolver
+    # DeltaV - .38 special ammo - Add various .38 special ammo to ammovend
+    MagazineBoxSpecial: 3
+    MagazineBoxSpecialPractice: 3
+    MagazineBoxSpecialRubber: 3
+    # End of modified code
 
     MagazineBoxPistol: 3
     MagazineBoxPistolPractice: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
index b0987c796a..58a9d5e712 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
@@ -4,7 +4,7 @@
     ClothingHeadHatBowlerHat: 2
     ClothingHeadHatTophat: 2
     ClothingEyesHudBeer: 2
-    ClothingEyesEyepatchHudBeer: 1
+    ClothingEyesEyepatchHudBeer: 2
     ClothingHeadsetService: 2
     ClothingOuterApronBar: 2
     ClothingOuterWinterBar: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml
index 72cf0b55ed..1630dd2a0b 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml
@@ -15,6 +15,7 @@
     ClothingMaskGasCentcom: 3
     ClothingHeadsetCentCom: 3
     ClothingOuterWinterCentcom: 3
+    ClothingOuterCoatExpensive: 1
     ClothingNeckScarfStripedCentcom: 3
     ClothingShoesBootsWinterCentCom: 2 #Delta V: Add departmental winter boots
     ClothingNeckCloakCentcom: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
index c5d9e726ad..433210dce7 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
@@ -13,4 +13,11 @@
     ClothingHandsGlovesLatex: 2
     ClothingHeadsetMedical: 2
     ClothingOuterWinterChem: 2
-    ClothingShoesBootsWinterChem: 2 #Delta V: Add departmental winter boots
+    # DeltaV - Personal Protective Equipment - Add various PPE equipment including new clothings
+    ClothingUniformJumpsuitChemShirt: 2 # New chemist jumpsuit, formal variant
+    ClothingNeckTieChem: 2  # Chemist's tie to go along a new variant of their suit
+    ClothingShoesEnclosedChem: 2 # Realistic chemistry shoes
+    ClothingOuterApronChemist: 2 # Realistic PPE apron for chemistry
+    ClothingEyesGlassesChemist: 2 # Safety glasses
+    ClothingHandsGlovesChemist: 2 # Heavy duty chemistry gloves
+    # End of modified code
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
index 6af9dd81dc..78386af931 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
@@ -2,62 +2,57 @@
   id: ChemVendInventory
   startingInventory:
     Jug: 4
-## Delta V - begin jug adjustments, see rebase PR #53
     JugAluminium: 2
-    JugCarbon: 8
-    JugChlorine: 3
+    JugCarbon: 4
+    JugChlorine: 1
     JugCopper: 2
     JugEthanol: 2
-    JugFluorine: 2
-    JugHydrogen: 4
-    JugIodine: 2
-    JugIron: 4
+    JugFluorine: 1
+    JugHydrogen: 3
+    JugIodine: 1
+    JugIron: 2
     JugLithium: 2
-    JugMercury: 2
-    JugNitrogen: 5
-    JugOxygen: 6
-    JugPhosphorus: 5
-    JugPotassium: 5
-    JugRadium: 4
-    JugSilicon: 5
-    JugSodium: 4
-    JugSugar: 5
-    JugSulfur: 2
-## Delta V - end change of jug adjustments
+    JugMercury: 1
+    JugNitrogen: 3
+    JugOxygen: 3
+    JugPhosphorus: 1
+    JugPotassium: 2
+    JugRadium: 1
+    JugSilicon: 2
+    JugSodium: 2
+    JugSugar: 3
+    JugSulfur: 1
   emaggedInventory:
-    ToxinChemistryBottle: 6 # Delta V - changed from 1 -> 6
-    # DeltaV - Added other chems from emagging chem dispenser
-    EpinephrineChemistryBottle: 6
-    NapalmChemistryBottle: 6
-    UltravasculineChemistryBottle: 6
+    ToxinChemistryBottle: 1
 
 - type: vendingMachineInventory
   id: ChemVendInventorySyndicate
   startingInventory:
     Jug: 4
     JugAluminium: 2
-    JugCarbon: 2
-    JugChlorine: 2
+    JugCarbon: 4
+    JugChlorine: 1
     JugCopper: 2
     JugEthanol: 2
-    JugFluorine: 2
-    JugHydrogen: 2
-    JugIodine: 2
+    JugFluorine: 1
+    JugHydrogen: 3
+    JugIodine: 1
     JugIron: 2
     JugLithium: 2
-    JugMercury: 2
-    JugNitrogen: 2
-    JugOxygen: 2
-    JugPhosphorus: 2
+    JugMercury: 1
+    JugNitrogen: 3
+    JugOxygen: 3
+    JugPhosphorus: 1
     JugPotassium: 2
-    JugRadium: 2
+    JugRadium: 1
     JugSilicon: 2
     JugSodium: 2
-    JugSugar: 2
-    JugSulfur: 2
+    JugSugar: 3
+    JugSulfur: 1
     JugWeldingFuel: 1
   emaggedInventory:
     PaxChemistryBottle: 3
     MuteToxinChemistryBottle: 3
     LeadChemistryBottle: 2
     ToxinChemistryBottle: 1
+    
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
index 31d0507135..9085bcb4fb 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -90,7 +90,6 @@
     ClothingHeadRastaHat: 2
     ClothingBeltStorageWaistbag: 3
     ClothingEyesGlasses: 6
-    ClothingEyesGlassesSunglasses: 2
     ClothingHandsGlovesColorBlack: 4
     ClothingHandsGlovesColorGray: 4
     ClothingHandsGlovesColorBrown: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
index b083c62ed5..07e957a5e0 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
@@ -1,10 +1,11 @@
 - type: vendingMachineInventory
   id: CuraDrobeInventory
   startingInventory:
-    BooksBag: 1
+    BooksBag: 2
     HandLabeler: 2
     ClothingEyesGlasses: 2
     ClothingEyesGlassesJamjar: 2
+    ClothingNeckScarfStripedGreen: 2
     ClothingUniformJumpsuitCurator: 3
     ClothingUniformJumpskirtCurator: 3
     ClothingUniformJumpsuitLibrarian: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
index 8e4a9ac95d..69dec7c241 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -15,5 +15,6 @@
     ClothingHeadsetService: 2
     ClothingNeckLawyerbadge: 2
     ClothingOuterCoatOvercoat: 2 # DeltaV - add overcoat to LawDrobe
+    RubberStampLawyer: 1 # DeltaV
   emaggedInventory:
     CyberPen: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
index 2a4a0d71d0..0ccb7a0be9 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
@@ -8,4 +8,6 @@
     EpinephrineChemistryBottle: 3
     Syringe: 5
     Portafib: 1 # DeltaV - Add Portafibs, see Prototypes/DeltaV/Entities/Objects/Devices/Medical/portafib.yml
-    ClothingEyesGlasses: 5 # Parkstation NearsightedTrait
+    ClothingEyesGlasses: 5 # SimpleStation14 NearsightedTrait
+    ClothingEyesHudMedical: 2
+    ClothingEyesEyepatchHudMedical: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
index d7c1b3c78f..f4fb03e6c7 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
@@ -6,17 +6,21 @@
     ClothingBackpackSatchelMedical: 4
     ClothingUniformJumpsuitMedicalDoctor: 4
     ClothingUniformJumpskirtMedicalDoctor: 4
-    ClothingEyesEyepatchHudMedical: 1
+    ClothingHeadHatBeretMedic: 4
     ClothingHeadNurseHat: 4
     ClothingOuterCoatLab: 4
     ClothingShoesColorWhite: 4
     ClothingHandsGlovesLatex: 4
+    ClothingHandsGlovesNitrile: 2
     ClothingHeadsetMedical: 4
     ClothingOuterWinterMed: 2
     ClothingOuterHospitalGown: 5
     UniformScrubsColorGreen: 4
     UniformScrubsColorBlue: 4
     UniformScrubsColorPurple: 4
+    ClothingHeadHatSurgcapGreen: 4 
+    ClothingHeadHatSurgcapBlue: 4
+    ClothingHeadHatSurgcapPurple: 4
     ClothingShoesBootsWinterMed: 2
   contrabandInventory: #DeltaV
     UniformScrubsColorCybersun: 1 #DeltaV
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml
index 077aa2dca4..c53efb3e72 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml
@@ -5,6 +5,7 @@
     SciFlash: 4
     ProximitySensor: 3
     ClothingEyesHudDiagnostic: 2
+    ClothingEyesEyepatchHudDiag: 2
     RemoteSignaller: 3
     Igniter: 3 # its more ordnance but yeah
     HandheldHealthAnalyzer: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
index d86129cd78..c071305b77 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
@@ -8,10 +8,11 @@
     ClusterBangFull: 2
     GrenadeStinger: 4
     Flash: 5
+    Tourniquet: 5
     FlashlightSeclite: 5
     ClothingEyesGlassesSunglasses: 2
     ClothingEyesHudSecurity: 2
-    ClothingEyesEyepatchHudSecurity: 1
+    ClothingEyesEyepatchHudSecurity: 2
     ClothingBeltSecurityWebbing: 5
     Zipties: 12
     RiotShield: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
index 94f38aeaba..92e4032b0c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
@@ -23,6 +23,7 @@
     ClothingOuterSanta: 2
     ClothingHeadHatSkub: 2
     ClothingOuterSkub: 2
+    ClothingHeadHatBeretFrench: 2
     ClothingOuterSuitChicken: 2
     ClothingHeadHatChickenhead: 2
     ClothingOuterSuitMonkey: 2
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 7b77a93263..f18deb5c0d 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -362,21 +362,21 @@
 
 #Utility
 
-- type: listing
-  id: UplinkHoloparaKit
-  name: uplink-holopara-kit-name
-  description: uplink-holopara-kit-desc
-  icon: { sprite: /Textures/Objects/Misc/guardian_info.rsi, state: icon }
-  productEntity: BoxHoloparasite
-  cost:
-    Telecrystal: 14
-  categories:
-  - UplinkUtility
-  conditions:
-  - !type:StoreWhitelistCondition
-    blacklist:
-      tags:
-      - NukeOpsUplink
+#- type: listing #
+#  id: UplinkHoloparaKit
+#  name: uplink-holopara-kit-name
+#  description: uplink-holopara-kit-desc
+#  icon: { sprite: /Textures/Objects/Misc/guardian_info.rsi, state: icon }
+#  productEntity: BoxHoloparasite
+#  cost:
+#    Telecrystal: 14
+#  categories:
+#  - UplinkUtility
+#  conditions:
+#  - !type:StoreWhitelistCondition
+#    blacklist:
+#      tags:
+#      - NukeOpsUplink
 
 - type: listing
   id: UplinkHolster
@@ -525,7 +525,7 @@
   description: uplink-binary-translator-key-desc
   icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: rd_label }
   productEntity: EncryptionKeyBinary
-  cost: 
+  cost:
     Telecrystal: 1
 
   categories:
@@ -551,6 +551,21 @@
     Telecrystal: 2
   categories:
   - UplinkUtility
+  
+- type: listing
+  id: UplinkClothingEyesHudSyndicate
+  name: uplink-clothing-eyes-hud-syndicate-name
+  description: uplink-clothing-eyes-hud-syndicate-desc
+  productEntity: ClothingEyesHudSyndicate
+  cost:
+    Telecrystal: 2
+  categories:
+    - UplinkUtility
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - NukeOpsUplink
 
 - type: listing
   id: UplinkRadioJammer
@@ -671,7 +686,7 @@
   icon: { sprite: /Textures/Actions/Implants/implants.rsi, state: explosive }
   productEntity: MacroBombImplanter
   cost:
-    Telecrystal: 20
+    Telecrystal: 13
   categories:
     - UplinkImplants
   conditions:
@@ -691,10 +706,15 @@
   icon: { sprite: /Textures/Objects/Magic/magicactions.rsi, state: gib }
   productEntity: DeathAcidifierImplanter
   cost:
-    Telecrystal: 2
+    Telecrystal: 4
   categories:
-  - UplinkImplants
-
+    - UplinkImplants
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - NukeOpsUplink
+ 
 - type: listing
   id: UplinkUplinkImplanter # uplink uplink real
   name: uplink-uplink-implanter-name
@@ -783,6 +803,17 @@
   categories:
   - UplinkBundles
 
+- type: listing
+  id: UplinkDecoyKit
+  name: uplink-decoy-kit-name
+  description: uplink-decoy-kit-desc
+  icon: { sprite: /Textures/Objects/Tools/Decoys/operative_decoy.rsi, state: folded }
+  productEntity: ClothingBackpackDuffelSyndicateDecoyKitFilled
+  cost:
+    Telecrystal: 6
+  categories:
+  - UplinkBundles
+
 - type: listing
   id: UplinkMedsBundle
   name: uplink-meds-bundle-name
@@ -1269,7 +1300,8 @@
   id: UplinkHardsuitSyndieElite
   name: uplink-hardsuit-syndieelite-name
   description: uplink-hardsuit-syndieelite-desc
-  productEntity: ClothingOuterHardsuitSyndieElite
+  icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateEliteHardsuitBundle
   cost:
     Telecrystal: 10
   categories:
@@ -1279,7 +1311,8 @@
   id: UplinkClothingOuterHardsuitJuggernaut
   name: uplink-clothing-outer-hardsuit-juggernaut-name
   description: uplink-clothing-outer-hardsuit-juggernaut-desc
-  productEntity: ClothingOuterHardsuitJuggernaut
+  icon: { sprite: /Textures/Structures/Storage/Crates/syndicate.rsi, state: icon }
+  productEntity: CrateCybersunJuggernautBundle
   cost:
     Telecrystal: 12
   categories:
@@ -1317,6 +1350,16 @@
   categories:
   - UplinkMisc
 
+- type: listing
+  id: UplinkClothingConductingGloves
+  name: uplink-clothing-conducting-gloves-name
+  description: uplink-clothing-conducting-gloves-desc
+  productEntity: ClothingHandsGlovesConducting
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkMisc
+
 - type: listing
   id: UplinkSnackBox
   name: uplink-snack-box-name
diff --git a/Resources/Prototypes/Damage/containers.yml b/Resources/Prototypes/Damage/containers.yml
index 87168b4818..fb40e9b658 100644
--- a/Resources/Prototypes/Damage/containers.yml
+++ b/Resources/Prototypes/Damage/containers.yml
@@ -47,3 +47,8 @@
     - Toxin
   supportedTypes:
     - Shock
+
+- type: damageContainer
+  id: ShadowHaze
+  supportedTypes:
+    - Heat
diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index 8a7b84ff1a..31dd47a9e1 100644
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -66,7 +66,7 @@
     Piercing: 0.7
     Shock: 2
     Heat: 3
-    
+
 # Like metallic, but without flat reduction so it can be damaged with fists.
 - type: damageModifierSet
   id: FlimsyMetallic
@@ -190,6 +190,11 @@
     Cold: 0.7
     Heat: 1.3
 
+- type: damageModifierSet
+  id: Vox
+  coefficients: # To be decided
+    Poison: 1
+
 - type: damageModifierSet
   id: Zombie #Blunt resistant and immune to biological threats, but can be hacked apart and burned
   coefficients:
diff --git a/Resources/Prototypes/Datasets/Names/first_male.yml b/Resources/Prototypes/Datasets/Names/first_male.yml
index 4b2c5f86c1..5e8fd86725 100644
--- a/Resources/Prototypes/Datasets/Names/first_male.yml
+++ b/Resources/Prototypes/Datasets/Names/first_male.yml
@@ -263,7 +263,6 @@
   - Grady
   - Graeme
   - Graham
-  - Grandpa
   - Grant
   - Gratian
   - Grayson
diff --git a/Resources/Prototypes/Datasets/Names/fortunes.yml b/Resources/Prototypes/Datasets/Names/fortunes.yml
index dd5ec27679..fc3c5d9d71 100644
--- a/Resources/Prototypes/Datasets/Names/fortunes.yml
+++ b/Resources/Prototypes/Datasets/Names/fortunes.yml
@@ -77,6 +77,6 @@
   - Did you know? Monkeys are not what they seem.
   - Did you know that half of salvage specialists go missing on the job?
   - Also try out sashimi with galaxythystle sauce!
-  - Did you know that 70% of Nanotransen applicants go missing within the first years of their contract? The more you know!!
+  - Did you know that 70% of Nanotrasen applicants go missing within the first years of their contract? The more you know!!
   - This shift you are going to do a very robust move in front of everyone.
   - Robustness is not just about how good you are, but how good of a person you are.
diff --git a/Resources/Prototypes/Datasets/Names/vox.yml b/Resources/Prototypes/Datasets/Names/vox.yml
new file mode 100644
index 0000000000..891094d95b
--- /dev/null
+++ b/Resources/Prototypes/Datasets/Names/vox.yml
@@ -0,0 +1,2765 @@
+- type: dataset
+  id: names_vox
+  values:
+  - Bakabepa
+  - Babapir
+  - Babasri
+  - Babepipit
+  - Bachakehi
+  - Bacheska
+  - Bachishesher
+  - Bacrapri
+  - Bacreska
+  - Bahepra
+  - Bahicrecrek
+  - Bahikravre
+  - Bakabepa
+  - Bakehahak
+  - Bakeki
+  - Bapechichik
+  - Bapekikik
+  - Baperi
+  - Bapravavar
+  - Bapreba
+  - Bapretritrir
+  - Baracreber
+  - Barahri
+  - Baraskahrita
+  - Baraxixik
+  - Bashiskir
+  - Baskaskakre
+  - Baskivihi
+  - Basreba
+  - Batapriri
+  - Batasrecrar
+  - Batehrahrat
+  - Batrakiha
+  - Batravika
+  - Batrepriski
+  - Batresri
+  - Batriska
+  - Batritra
+  - Bavasha
+  - Bavebebek
+  - Bavraskikaka
+  - Bavricriski
+  - Baxahehrer
+  - Baxeve
+  - Bebebapa
+  - Bebeterara
+  - Bebipaska
+  - Bechetapeka
+  - Becrerisre
+  - Becretretrer
+  - Beheka
+  - Behivresha
+  - Behrechechek
+  - Behrekri
+  - Behreyayat
+  - Behricririri
+  - Behritixaxa
+  - Bekapesresre
+  - Bekashishik
+  - Beketatratra
+  - Bekrechaxe
+  - Bekresrare
+  - Bekribe
+  - Bepararakrit
+  - Bepatricher
+  - Bepehisrepra
+  - Bepihar
+  - Bepitrashi
+  - Bepresri
+  - Berabi
+  - Beraka
+  - Berecricrir
+  - Berisre
+  - Beshachari
+  - Besheskexexe
+  - Beshesre
+  - Beshesretre
+  - Beskayavrer
+  - Beskisrasrak
+  - Beskitre
+  - Besravivit
+  - Besrivir
+  - Betababatrat
+  - Betere
+  - Beticreche
+  - Bevekakat
+  - Bevihichabi
+  - Bevihraki
+  - Bevrasheshet
+  - Bibaba
+  - Bibabir
+  - Bibati
+  - Bibekricha
+  - Bibexa
+  - Bibibabat
+  - Bibiya
+  - Bichechir
+  - Bicrakipepe
+  - Bicrevrite
+  - Bihrapivra
+  - Bihraxibebe
+  - Bihrishicha
+  - Bihrivriski
+  - Bikivri
+  - Bikraskixexe
+  - Bikrivrivrit
+  - Bipekisri
+  - Bipiritecre
+  - Bipratraxi
+  - Biprexi
+  - Biprivar
+  - Birachi
+  - Bisheba
+  - Bishehri
+  - Bishevrivra
+  - Bishiki
+  - Biskeskavra
+  - Bisrahresha
+  - Bisrepipit
+  - Bitavi
+  - Bitehatiti
+  - Bivacri
+  - Bivape
+  - Bivihachakre
+  - Bivitikiva
+  - Bivrapri
+  - Bivraske
+  - Bivrehaski
+  - Bivrihra
+  - Bixachetra
+  - Bixapetra
+  - Bixapriprik
+  - Bixexir
+  - Biyakir
+  - Chabaha
+  - Chabakrekrer
+  - Chabebache
+  - Chabepebe
+  - Chabikrahihi
+  - Chachahe
+  - Chachevra
+  - Chacrerehra
+  - Chahekre
+  - Chahixe
+  - Chahravrer
+  - Chahrixehra
+  - Chakakiva
+  - Chakapraprar
+  - Chakehashe
+  - Chakiprihi
+  - Chakivre
+  - Chakricrivi
+  - Chapachichit
+  - Chaparachi
+  - Chapehresha
+  - Chapeshiski
+  - Chapixahi
+  - Chaprahebibi
+  - Chaprecraha
+  - Chaprecrevi
+  - Charaprehiki
+  - Charapriska
+  - Charara
+  - Charate
+  - Charatraki
+  - Charekreski
+  - Charesribe
+  - Charichechet
+  - Charisha
+  - Chashaber
+  - Chashereska
+  - Chaskeke
+  - Chasraskaska
+  - Chasrechata
+  - Chasrevravi
+  - Chasrihiprer
+  - Chatrexixe
+  - Chavicreshi
+  - Chavrikre
+  - Chaxakrahehe
+  - Chaxeskehre
+  - Chaxevrahi
+  - Chaxivre
+  - Chebabebet
+  - Chebavi
+  - Chebebibivar
+  - Chebehecri
+  - Chebehrihrit
+  - Chebihihit
+  - Chebiretete
+  - Chebisra
+  - Chechapraver
+  - Checraxa
+  - Checrera
+  - Checretasre
+  - Checretrisre
+  - Checrisre
+  - Chehashababa
+  - Chehebicri
+  - Chehepre
+  - Chehisker
+  - Chehraxashir
+  - Chekrahraka
+  - Chekravixa
+  - Chekretitit
+  - Chepakakatat
+  - Chepekakak
+  - Chepipracra
+  - Chepitipe
+  - Chepraskavri
+  - Cheshirikra
+  - Cheshive
+  - Cheskapra
+  - Cheskavre
+  - Chesrakeyaya
+  - Chesravre
+  - Chesrevi
+  - Chesrevratra
+  - Chesrirititi
+  - Chetaxapa
+  - Chetaxapre
+  - Cheterarat
+  - Chetiska
+  - Chetritreti
+  - Chetriya
+  - Chevasrasrak
+  - Chevrepre
+  - Chevrivir
+  - Chexararahir
+  - Chexecraski
+  - Chexepraprar
+  - Chexexaxapa
+  - Chexisreka
+  - Chexitre
+  - Cheyaverere
+  - Chibakre
+  - Chibihra
+  - Chichabikaka
+  - Chichavrehre
+  - Chicrikishi
+  - Chicrirake
+  - Chicrivivit
+  - Chihahrehrek
+  - Chihasre
+  - Chihatrachi
+  - Chihayayabik
+  - Chiheche
+  - Chihehreba
+  - Chihreratri
+  - Chihriveka
+  - Chikakre
+  - Chikaskitre
+  - Chikate
+  - Chikiprecri
+  - Chikraki
+  - Chikraskiska
+  - Chikrekra
+  - Chikrekre
+  - Chipabeske
+  - Chipererer
+  - Chipicracrak
+  - Chiprexexet
+  - Chipriprisre
+  - Chiprivrecha
+  - Chishakepi
+  - Chishipepri
+  - Chisrashi
+  - Chisretri
+  - Chisriher
+  - Chisriva
+  - Chisrivevri
+  - Chitisrevre
+  - Chitixahra
+  - Chitrechicra
+  - Chitresravri
+  - Chivechachat
+  - Chiveprepret
+  - Chiveprikri
+  - Chiviki
+  - Chivikiya
+  - Chivishir
+  - Chivrakakak
+  - Chivrakri
+  - Chivrasher
+  - Chivrepapar
+  - Chixacra
+  - Chixihebakra
+  - Crabecrapapa
+  - Crachikrisre
+  - Cracrahravri
+  - Cracratiya
+  - Cracretipi
+  - Cracrihe
+  - Cracritri
+  - Crahayayak
+  - Craheki
+  - Crahrashi
+  - Crahrehi
+  - Crahretetek
+  - Crakapeper
+  - Crakaskeba
+  - Crakavravrat
+  - Crakehri
+  - Crakirer
+  - Crakrashiski
+  - Crakrehra
+  - Crakriskipir
+  - Crapipaka
+  - Crapiriyaya
+  - Craprati
+  - Crapresker
+  - Craresraxe
+  - Crarevexa
+  - Crashahresri
+  - Crashehihik
+  - Craskahraske
+  - Craskatrapra
+  - Craskicrete
+  - Craskivi
+  - Cratatrihi
+  - Cratikre
+  - Cratikrekrek
+  - Cratiprar
+  - Cratrehra
+  - Cravehri
+  - Cravrikra
+  - Cravrisrere
+  - Cravritiriri
+  - Cravriyayak
+  - Crayahrehret
+  - Crayakrer
+  - Crayapraprar
+  - Crayaripipi
+  - Crayayaricri
+  - Crebaxa
+  - Crebehrita
+  - Crechavre
+  - Crechesrehar
+  - Crechichevre
+  - Crecrabibik
+  - Crecriri
+  - Crehepapepe
+  - Creheriki
+  - Crehexi
+  - Crehipavava
+  - Crehraver
+  - Crekatri
+  - Crekavexa
+  - Crekeki
+  - Creketri
+  - Crekiskeya
+  - Crekitati
+  - Crekrepreki
+  - Crekrivavak
+  - Crepahripa
+  - Crepekecre
+  - Crepekrekret
+  - Crepiba
+  - Crepihri
+  - Creprepravri
+  - Creraxi
+  - Crerehihit
+  - Creshekrapa
+  - Creskekri
+  - Cresketita
+  - Creskihre
+  - Cresripepet
+  - Cretarevripa
+  - Cretebe
+  - Cretehra
+  - Creterarar
+  - Cretibehihi
+  - Cretrapi
+  - Cretrekerara
+  - Cretrepepet
+  - Crevapir
+  - Crevixesra
+  - Crexahava
+  - Crexepapacre
+  - Cribavribibi
+  - Cribitratrat
+  - Crichecrite
+  - Crichipi
+  - Cricraprehre
+  - Cricrirar
+  - Cricrisre
+  - Cricritika
+  - Crihevar
+  - Crihitehre
+  - Crikatrikre
+  - Crikebepapa
+  - Crikekakat
+  - Crikeshivra
+  - Crikisheski
+  - Crikrahrata
+  - Crikretevabi
+  - Crikricretri
+  - Cripichahi
+  - Criprishapa
+  - Crirachi
+  - Crirakratra
+  - Crishave
+  - Criskahe
+  - Crisrehapahi
+  - Critachatri
+  - Critrabibir
+  - Critresrir
+  - Critrikracri
+  - Crivacriti
+  - Crivacrive
+  - Crivayasra
+  - Crivrakre
+  - Crivrecri
+  - Crixixaske
+  - Habavavak
+  - Habepa
+  - Habikikaka
+  - Habikrihita
+  - Hachabe
+  - Hachehekre
+  - Hacheske
+  - Hacreha
+  - Hacrere
+  - Hahebapapa
+  - Hahecrecha
+  - Haheha
+  - Hahetasrike
+  - Hahihahatrar
+  - Hahihasreche
+  - Hahripraxaxa
+  - Hakepa
+  - Hakirer
+  - Hakraxixit
+  - Hakrekikik
+  - Hakrixexeret
+  - Hapacharepri
+  - Hapacre
+  - Hapahri
+  - Hapeti
+  - Hapitahri
+  - Hapreska
+  - Haprihrisha
+  - Harebabi
+  - Harexiveve
+  - Haricracre
+  - Haririsheska
+  - Harishi
+  - Hashakrakrak
+  - Hashehracri
+  - Hashepracha
+  - Haskaritepra
+  - Hasketer
+  - Haskibebeyat
+  - Haskikretete
+  - Hasrabake
+  - Hasracritehe
+  - Hasrekitra
+  - Hasrekrer
+  - Hasrihaxa
+  - Hasripeshar
+  - Hatabibivet
+  - Havavresra
+  - Havixe
+  - Havreki
+  - Havrepekre
+  - Havretri
+  - Havrichatata
+  - Haxikeker
+  - Hayahriyaxa
+  - Hebahrevrir
+  - Hebapri
+  - Hebihihichit
+  - Hebikratahe
+  - Hecheshehixi
+  - Hechetra
+  - Hechevakrer
+  - Hecraba
+  - Hecrabi
+  - Hecrevrivrik
+  - Hecrirecha
+  - Hehere
+  - Hehiskitri
+  - Hehrapike
+  - Hehrepri
+  - Hehreskaskat
+  - Hehrikra
+  - Hekikrexa
+  - Hekrasre
+  - Hekrekicre
+  - Hekreracre
+  - Hekriheti
+  - Hepevivikrik
+  - Hepraskibebe
+  - Heprivresker
+  - Heprixasheri
+  - Herecrerivi
+  - Hereririket
+  - Heriheyacri
+  - Heripa
+  - Heripreka
+  - Heshahraveti
+  - Heshepepevik
+  - Heskashachi
+  - Heskaxixe
+  - Heskererepet
+  - Heskeshishit
+  - Heskisker
+  - Hesrepahri
+  - Hesreski
+  - Hetahetritri
+  - Hetiheheprit
+  - Hetrare
+  - Hetrevihra
+  - Hetrihahri
+  - Hetrirebibi
+  - Hevababaker
+  - Hevetihre
+  - Hevexixik
+  - Heviricrecre
+  - Hevrevipa
+  - Hevrexir
+  - Hevrichar
+  - Hevriraravit
+  - Hevrivrivre
+  - Hexasrichi
+  - Hexaxipri
+  - Heyashipre
+  - Hibasher
+  - Hiberarakrar
+  - Hibesrache
+  - Hicrapre
+  - Hicrecrahera
+  - Hicreteba
+  - Hicriba
+  - Hihacha
+  - Hihepapak
+  - Hihichitre
+  - Hihireret
+  - Hihrevra
+  - Hikikri
+  - Hikitritrir
+  - Hikrakre
+  - Hikrepa
+  - Hipavi
+  - Hipitratrak
+  - Hirepabe
+  - Hirichachar
+  - Hiricheya
+  - Hiricrabakri
+  - Hiricraske
+  - Hiricrevitri
+  - Hirihrachi
+  - Hirihraski
+  - Hirihraxaxat
+  - Hirikachi
+  - Hirikretetet
+  - Hirikrikra
+  - Hiripebahre
+  - Hiripehixixi
+  - Hiriper
+  - Hiripesri
+  - Hiripeta
+  - Hiripevivik
+  - Hirirahehet
+  - Hirirecrevre
+  - Hirishihra
+  - Hiriskeva
+  - Hiritapatiti
+  - Hiriteker
+  - Hiritrari
+  - Hiritraxe
+  - Hiritricri
+  - Hirivavavri
+  - Hiriviske
+  - Hirivivre
+  - Hirivra
+  - Hirivrari
+  - Hirivrexita
+  - Hirivrivri
+  - Hirixashahre
+  - Hirixicraya
+  - Hishave
+  - Hishesritra
+  - Hishiskahra
+  - Hishivrevrek
+  - Hiskakecra
+  - Hiskatetek
+  - Hiskekreche
+  - Hiskeva
+  - Hiskisrare
+  - Hisrakikit
+  - Hisratrepepe
+  - Hitava
+  - Hiterehaha
+  - Hitratra
+  - Hivacracrat
+  - Hivatritrik
+  - Hivayayar
+  - Hivrababar
+  - Hivrahrir
+  - Hixacre
+  - Hixashape
+  - Hixashetiti
+  - Hixekrasra
+  - Hixepi
+  - Hixeripe
+  - Hiyacrakra
+  - Hrabatitit
+  - Hrabaxa
+  - Hrabike
+  - Hrabipre
+  - Hracrabixi
+  - Hracrehra
+  - Hrahepivivi
+  - Hraherikrexi
+  - Hrahikrer
+  - Hrahrakahre
+  - Hrahraska
+  - Hrahrasrebe
+  - Hrahrehehek
+  - Hrahritra
+  - Hrakachabexi
+  - Hrakarerek
+  - Hrakeshi
+  - Hrakiski
+  - Hrakretri
+  - Hrakrichapri
+  - Hrakrishi
+  - Hrapavevek
+  - Hrapicra
+  - Hrapraber
+  - Hraprapreche
+  - Hrarachihi
+  - Hrarahrahrar
+  - Hrarecri
+  - Hrarikrixabi
+  - Hrarishesher
+  - Hrashepa
+  - Hrashibisra
+  - Hrashihir
+  - Hrashikavexa
+  - Hrasketre
+  - Hraskibe
+  - Hraskikexaxa
+  - Hrasrecrixi
+  - Hrasrevraxi
+  - Hrasrevrehra
+  - Hratatrasre
+  - Hratayati
+  - Hratere
+  - Hratrachari
+  - Hratreki
+  - Hravahiche
+  - Hravapeki
+  - Hravaskeki
+  - Hraveska
+  - Hravihre
+  - Hravrahaheya
+  - Hravrekra
+  - Hraxehrehiri
+  - Hraxekrebe
+  - Hraxichebar
+  - Hraxivivivet
+  - Hrayacha
+  - Hrayavrar
+  - Hrebavihra
+  - Hrebetra
+  - Hrechaxer
+  - Hrecreti
+  - Hrecrihahar
+  - Hrehikrekrer
+  - Hrehresra
+  - Hreketra
+  - Hrekrativi
+  - Hrepihepre
+  - Hrepipake
+  - Hrerasri
+  - Hreravexe
+  - Hrereprehir
+  - Hreriba
+  - Hreshahetiti
+  - Hreshehakake
+  - Hreskapahre
+  - Hresrakakre
+  - Hresrechike
+  - Hresrekasha
+  - Hretite
+  - Hretrecre
+  - Hretreski
+  - Hretrevri
+  - Hrevrehe
+  - Hrexakekek
+  - Hrexatika
+  - Hrexebe
+  - Hribahar
+  - Hribehrati
+  - Hribipe
+  - Hrichiski
+  - Hrihevrivrir
+  - Hrihitra
+  - Hrihrakihri
+  - Hrihrechar
+  - Hrikichecra
+  - Hrikiskate
+  - Hripricrahra
+  - Hrirehrikra
+  - Hriresri
+  - Hrishabar
+  - Hrishaxeyar
+  - Hrishehrahi
+  - Hrishexixik
+  - Hrisheyakra
+  - Hrishipete
+  - Hriskacrecra
+  - Hriskaheba
+  - Hriskari
+  - Hriskevetabi
+  - Hriskexa
+  - Hriskihete
+  - Hriskihri
+  - Hrisrechi
+  - Hrisrera
+  - Hrisriri
+  - Hrisrishapa
+  - Hrisrivavar
+  - Hritachecri
+  - Hritexa
+  - Hritihihri
+  - Hritihra
+  - Hritiker
+  - Hritisrasrat
+  - Hrivaxa
+  - Hrivripira
+  - Hrixebabatir
+  - Hrixebi
+  - Hrixihri
+  - Hrixiva
+  - Hriyahriya
+  - Kabavi
+  - Kabaxesha
+  - Kachaske
+  - Kachaya
+  - Kachihe
+  - Kacrahesha
+  - Kahakichi
+  - Kahaxipa
+  - Kahepapatret
+  - Kahiki
+  - Kahishe
+  - Kahrakrekret
+  - Kahratrer
+  - Kahriche
+  - Kahricrikra
+  - Kakatahrare
+  - Kakebi
+  - Kakihrasri
+  - Kapakriska
+  - Kapracre
+  - Kaprashesher
+  - Kaprehrakaka
+  - Kapreri
+  - Karakahre
+  - Karapihehe
+  - Kashaya
+  - Kashipri
+  - Kaskachekeke
+  - Kaskivrer
+  - Kasrabacre
+  - Kasrakapre
+  - Kasraxar
+  - Kasresreyaya
+  - Kasrivrata
+  - Katasker
+  - Katehreyaya
+  - Katetrike
+  - Katexaxak
+  - Katrehre
+  - Kavababat
+  - Kavashishit
+  - Kavihrahrat
+  - Kavitratrak
+  - Kavratevriya
+  - Kaxecri
+  - Kaxetavre
+  - Kaxetretret
+  - Kayararat
+  - Kayavrivrik
+  - Kayaxi
+  - Kebasrevikri
+  - Kechatra
+  - Kechavrepri
+  - Kecresra
+  - Kecrevrir
+  - Kecriha
+  - Kecrikra
+  - Kecrixa
+  - Kehave
+  - Kehitichacha
+  - Kehivehrihri
+  - Kehrachechek
+  - Kehrehi
+  - Kekabibit
+  - Kekahi
+  - Kekahrexi
+  - Kekarar
+  - Kekasritri
+  - Kekebapisra
+  - Kekebibivrer
+  - Kekekahihi
+  - Kekrishe
+  - Kepetre
+  - Kepevra
+  - Kepraki
+  - Keprepara
+  - Kerahacheche
+  - Keratra
+  - Kerihi
+  - Keriskehisri
+  - Keshevaskiva
+  - Keshika
+  - Keshiti
+  - Keskarahita
+  - Keteskesket
+  - Ketesketa
+  - Ketribabar
+  - Ketribipi
+  - Kevatra
+  - Kevatre
+  - Keveki
+  - Keveshatra
+  - Keveshexiki
+  - Kevesraxe
+  - Kevexa
+  - Kevikaxe
+  - Kevivri
+  - Kevrahreri
+  - Kevrahrihrit
+  - Kexapriprik
+  - Kexerava
+  - Kexeshacha
+  - Kexisrepe
+  - Keyararak
+  - Kibevavacrak
+  - Kibeyachichi
+  - Kibipavava
+  - Kichitra
+  - Kicricreva
+  - Kicrikrikrik
+  - Kiharesra
+  - Kihiya
+  - Kihrexexevek
+  - Kihriprira
+  - Kikeke
+  - Kikexitretre
+  - Kikrabikichi
+  - Kikrehi
+  - Kikrekrakrat
+  - Kikreri
+  - Kikretrapa
+  - Kikrevavak
+  - Kikrivikar
+  - Kipivaxe
+  - Kipreya
+  - Kireche
+  - Kiresrisrir
+  - Kirevi
+  - Kiribapra
+  - Kiribaprive
+  - Kirichaketra
+  - Kirichiska
+  - Kiricrakakri
+  - Kirihererek
+  - Kirihrepi
+  - Kirihreviche
+  - Kirikachicha
+  - Kirikatriki
+  - Kirikivrivri
+  - Kirikrakra
+  - Kiripabi
+  - Kiripahritri
+  - Kiriprihri
+  - Kirirahixera
+  - Kirireti
+  - Kirirevri
+  - Kirishavavar
+  - Kirishekeket
+  - Kiriteska
+  - Kiritracha
+  - Kiritrepeper
+  - Kiritreyapri
+  - Kirivipe
+  - Kirivrivepi
+  - Kirixaticher
+  - Kirixepepek
+  - Kirixicra
+  - Kishahapatre
+  - Kishehakaka
+  - Kiskashapra
+  - Kiskekehra
+  - Kiskekicre
+  - Kiskipri
+  - Kitraka
+  - Kitrevevri
+  - Kivraheherat
+  - Kivrahi
+  - Kivrashe
+  - Kivrera
+  - Kivretrakeke
+  - Kixatritrit
+  - Kixichetiti
+  - Kixichicrar
+  - Kixivra
+  - Krabareyaya
+  - Krabeherere
+  - Krachehre
+  - Kracheyaba
+  - Kracrirarak
+  - Krahebikaba
+  - Krahechikri
+  - Krahiha
+  - Krahrakri
+  - Krahraririk
+  - Krahrepexi
+  - Krahrepri
+  - Krahrerar
+  - Krakahra
+  - Krakrekiski
+  - Krakrepapat
+  - Krapari
+  - Krapibi
+  - Krapitahri
+  - Krapreve
+  - Kraprisrisre
+  - Kraprivrarar
+  - Krarakrikrit
+  - Krarekri
+  - Kraricri
+  - Krashatatahi
+  - Krashavecra
+  - Kraskisretra
+  - Krasrarevi
+  - Krasripapat
+  - Kratachavri
+  - Kratare
+  - Kratikepi
+  - Kraveke
+  - Kravraxeveve
+  - Kravrepachi
+  - Kravricrahra
+  - Kraxabi
+  - Kraxasrir
+  - Krayakrikrit
+  - Krebekri
+  - Krebibikre
+  - Krebivi
+  - Krechahe
+  - Krechepraxa
+  - Krechititik
+  - Krecrashepra
+  - Krecravicha
+  - Krecreri
+  - Krehekikihit
+  - Krehrakakre
+  - Krehrita
+  - Krehrixa
+  - Krekacrechi
+  - Krekebeta
+  - Krekracri
+  - Krekrapri
+  - Krekrishaski
+  - Krepeviske
+  - Krepitir
+  - Krepiya
+  - Kreprahetaya
+  - Krepretasha
+  - Kreprivreski
+  - Krererisri
+  - Krerexeskeva
+  - Kreskaviha
+  - Kresrepaxexe
+  - Kretahre
+  - Kretavi
+  - Kretepapatir
+  - Krevavikeke
+  - Krevesher
+  - Krevesrisrit
+  - Krevrexer
+  - Krevrivriske
+  - Krexaya
+  - Kreyacrepe
+  - Kreyatriri
+  - Kreyavi
+  - Kribeshi
+  - Kribetibi
+  - Kribexixik
+  - Kribirecri
+  - Kribivra
+  - Krichakehra
+  - Kricrava
+  - Kricrirepe
+  - Kricritaka
+  - Krihaprir
+  - Krihesre
+  - Krihexarava
+  - Krihreskekre
+  - Krikapepek
+  - Krikatitixer
+  - Krikesrixixi
+  - Krikrashar
+  - Krikrikesre
+  - Kripahri
+  - Kripritri
+  - Kriripriprit
+  - Kririve
+  - Krishebiriba
+  - Krishebite
+  - Krishecrapi
+  - Kriskexer
+  - Krisribariri
+  - Krisrisher
+  - Kritahe
+  - Kritarerek
+  - Kritechihihi
+  - Kritiha
+  - Kritixa
+  - Kritresra
+  - Kritrivrevra
+  - Krivaxixipak
+  - Krivripri
+  - Krixehraski
+  - Krixesrepri
+  - Krixirar
+  - Pabaskare
+  - Pabecrechi
+  - Pabixashaha
+  - Pachatatak
+  - Pachetra
+  - Pachikri
+  - Pachisra
+  - Pacrachisri
+  - Pacraheha
+  - Pahrecrahati
+  - Pahrixeke
+  - Pakaririhrek
+  - Pakashexa
+  - Pakaskesha
+  - Pakavrevaha
+  - Pakihechacha
+  - Pakishi
+  - Pakivrapapa
+  - Pakrakrasra
+  - Pakrasrer
+  - Pakrava
+  - Pakresra
+  - Pakrexetihe
+  - Pakrika
+  - Papaskaxa
+  - Papavivivrik
+  - Papesheher
+  - Papivahre
+  - Papratrakiki
+  - Parerakre
+  - Pashaskaskak
+  - Pashevravrat
+  - Paskasretiti
+  - Paskiske
+  - Paskixexek
+  - Pasrabicra
+  - Pasraprikepa
+  - Pasrehe
+  - Pasrepratri
+  - Pataprivra
+  - Patesrateke
+  - Patexexet
+  - Patreshe
+  - Pavaba
+  - Pavrapishi
+  - Paxarerechak
+  - Paxecri
+  - Paxitirechi
+  - Payahreshi
+  - Pebakrikrik
+  - Pebate
+  - Pebeskahepre
+  - Pebevravi
+  - Pebibebek
+  - Pechaka
+  - Pechekripi
+  - Pechetraya
+  - Pechikreke
+  - Pechivrar
+  - Pecracha
+  - Pecritrasre
+  - Pehasra
+  - Pehecha
+  - Pehisresrer
+  - Pehrakresha
+  - Pehrihivreya
+  - Pehriva
+  - Pekecricrik
+  - Pekrava
+  - Pekraya
+  - Pekrepitri
+  - Pepehri
+  - Pepexekaka
+  - Pepirer
+  - Pepiska
+  - Pepitre
+  - Pepreba
+  - Pepreha
+  - Peprerar
+  - Pepresri
+  - Pepresrikeke
+  - Peprevahe
+  - Peraxatrikri
+  - Perebecrate
+  - Peribi
+  - Perisrehri
+  - Peshipaha
+  - Peskavavaxek
+  - Peskehihik
+  - Peskikikitir
+  - Pesraski
+  - Pesratra
+  - Pesravre
+  - Pesraya
+  - Pesretetetat
+  - Pesrikre
+  - Pesritra
+  - Petevrivrit
+  - Petihri
+  - Petivrate
+  - Petripetete
+  - Pevekriska
+  - Pevera
+  - Pevetiska
+  - Pevetrepri
+  - Pevikixi
+  - Pevipraprak
+  - Pevitetecrak
+  - Pevixihre
+  - Pevracher
+  - Pevrakrakrat
+  - Pevrehita
+  - Pexepraprat
+  - Pexihibe
+  - Pibehra
+  - Pibekrite
+  - Pibetiskiski
+  - Pibibipa
+  - Pibikekek
+  - Pichehi
+  - Pichetreta
+  - Pichicreve
+  - Pichikrarar
+  - Picreprecha
+  - Pihasresret
+  - Piheki
+  - Pihepa
+  - Pihibeskaska
+  - Pihichar
+  - Pihitetek
+  - Pihrebi
+  - Pihreshapibe
+  - Pihretitir
+  - Pikaskaskar
+  - Pikaxer
+  - Pikrehreka
+  - Pikripreprer
+  - Pipasha
+  - Pipaxacricri
+  - Pipesresri
+  - Pipribepri
+  - Piprishixi
+  - Piraxiprar
+  - Pirekrehi
+  - Pireveverik
+  - Piribaxa
+  - Piribipriski
+  - Pirichivapi
+  - Piricrahra
+  - Piricrakra
+  - Pirihepre
+  - Pirihichati
+  - Pirikretra
+  - Pirikritere
+  - Pirikrivra
+  - Piripaba
+  - Piripacripri
+  - Piripihrishe
+  - Piripite
+  - Piripitri
+  - Piriprabepa
+  - Pirireprishe
+  - Piriririke
+  - Piriskateke
+  - Piriskiki
+  - Pirisretiva
+  - Piritavre
+  - Piritihre
+  - Piritratavri
+  - Piritrecrara
+  - Piritreke
+  - Pirivakixaxa
+  - Pirivikrar
+  - Pirixaxa
+  - Pirixaxevre
+  - Piriyakribi
+  - Piriyapesra
+  - Pishakakaxet
+  - Pishashetepi
+  - Pishavraska
+  - Pishevra
+  - Piskipre
+  - Pisrasheshek
+  - Pisripre
+  - Pisrixekete
+  - Pitibi
+  - Pitraprivre
+  - Pitraskeche
+  - Pitratebi
+  - Pitrevreyaya
+  - Pitriprivra
+  - Pitriske
+  - Pivaka
+  - Pivatatakir
+  - Pivekrixehri
+  - Piveyashi
+  - Pivrakevi
+  - Pivrakipre
+  - Pivrakitibe
+  - Pivrashir
+  - Pivrirater
+  - Pivritatabet
+  - Pixeriti
+  - Pixicha
+  - Prabibiprepi
+  - Prabichixaxa
+  - Prabixite
+  - Pracheteter
+  - Prachiba
+  - Pracrahrive
+  - Prahihrahrak
+  - Prahisresrek
+  - Prahitrivi
+  - Prahrebesra
+  - Prahripebaba
+  - Prahrivapapa
+  - Prakiskesket
+  - Prakrehrahri
+  - Prakripi
+  - Prapicresri
+  - Praprexexek
+  - Prarachaxi
+  - Prarecrahi
+  - Prarikra
+  - Praripraka
+  - Prashicribi
+  - Prashivepapa
+  - Prashixitata
+  - Pratakra
+  - Praterahira
+  - Pratreki
+  - Pravashipebe
+  - Pravesrisrit
+  - Pravixihehe
+  - Pravrashi
+  - Pravrepi
+  - Pravricrir
+  - Pravritrer
+  - Praxahihir
+  - Praxechaxere
+  - Praxekrakrat
+  - Praxevitetra
+  - Praxexe
+  - Praxichi
+  - Prayaraxir
+  - Prebavre
+  - Prechakavra
+  - Prechavre
+  - Precratetet
+  - Preherihra
+  - Prehiviveve
+  - Prehrakriska
+  - Prehribi
+  - Prekakra
+  - Prekaya
+  - Prekiprever
+  - Prekirar
+  - Prepahihibar
+  - Prepetratrat
+  - Prepixihrapa
+  - Preprete
+  - Preretetre
+  - Prerexike
+  - Presharesre
+  - Presravi
+  - Presrere
+  - Presriskipre
+  - Pretere
+  - Pretetisrir
+  - Pretexiprar
+  - Pretihre
+  - Pretrakre
+  - Pretrike
+  - Pretrisra
+  - Prevakre
+  - Prevecrere
+  - Prevesriti
+  - Preveti
+  - Previkrahihi
+  - Previkri
+  - Prevritrare
+  - Prevrivi
+  - Prexatrar
+  - Prexeshe
+  - Prexicracrak
+  - Preyatra
+  - Pribatretrek
+  - Pribavibache
+  - Pribirivava
+  - Pribivrivrit
+  - Pricheyayat
+  - Pricrapapat
+  - Pricrihi
+  - Prihavri
+  - Prihetiya
+  - Prihrechabi
+  - Prikebixi
+  - Prikricha
+  - Prikripi
+  - Prikripikiki
+  - Prikrishi
+  - Pripachiya
+  - Pripavrepri
+  - Pripixixik
+  - Pripraske
+  - Priprecheha
+  - Pripripepek
+  - Prirakre
+  - Prirasher
+  - Priraske
+  - Prireprehar
+  - Pririhi
+  - Prishehe
+  - Prishepaxixi
+  - Prishitarabe
+  - Priskake
+  - Prisraxi
+  - Pritabaski
+  - Pritakir
+  - Pritecra
+  - Pritehavivi
+  - Pritepa
+  - Pritichahi
+  - Privayayak
+  - Privipecre
+  - Privrihareya
+  - Prixarake
+  - Prixepa
+  - Prixetre
+  - Prixivrekri
+  - Priyaprar
+  - Rabehiya
+  - Rabeparere
+  - Rabereshebe
+  - Rabichechet
+  - Rachare
+  - Racraba
+  - Racrakeka
+  - Racrakreheri
+  - Rahavevahi
+  - Rahevripeshi
+  - Rahibebetat
+  - Rahihratata
+  - Rahipe
+  - Rahraba
+  - Rahrecri
+  - Rahreyavri
+  - Rahritretrek
+  - Rakekikitrir
+  - Rakicrecrek
+  - Rakipipihrat
+  - Rakreprikri
+  - Rapivrivrere
+  - Rarahaka
+  - Raretriya
+  - Rasheshashat
+  - Rasheshevri
+  - Rashihretra
+  - Rashikrehre
+  - Rasriber
+  - Ratabibihet
+  - Ratesraprar
+  - Ratitritrik
+  - Ratravi
+  - Ratrebi
+  - Ratreyayak
+  - Ratrihrikri
+  - Ravecher
+  - Ravepexi
+  - Ravihrahrak
+  - Ravixexebet
+  - Ravrisheke
+  - Ravrivrikri
+  - Raxahehet
+  - Raxetapa
+  - Raxete
+  - Raxevahre
+  - Rayachesheta
+  - Rebakre
+  - Rebebikiki
+  - Rebicracrak
+  - Rebipi
+  - Rebisriyaya
+  - Rebitetebit
+  - Recheper
+  - Recraskehe
+  - Recrekariri
+  - Rehepipibet
+  - Rehresheshet
+  - Rehrikrikrik
+  - Rehrire
+  - Rekaskaskak
+  - Rekracha
+  - Rekripreprek
+  - Repeche
+  - Repetrir
+  - Repexishe
+  - Repivesheri
+  - Repivrasra
+  - Reprihri
+  - Reprishishik
+  - Rerahahat
+  - Rereba
+  - Rerirevra
+  - Reskebexexe
+  - Reskehahat
+  - Reskivavak
+  - Reskixibira
+  - Resrecracrat
+  - Resretra
+  - Resrihrepeke
+  - Resriske
+  - Resrixiha
+  - Retaskahri
+  - Retavavatet
+  - Retaveche
+  - Retecha
+  - Retevravrak
+  - Retrete
+  - Retrexehehri
+  - Retripritri
+  - Revasri
+  - Revetitipret
+  - Revikrebiya
+  - Revripra
+  - Revritrer
+  - Rexabaska
+  - Rexataxa
+  - Ribatre
+  - Ribebahihi
+  - Ribehashishi
+  - Ribiheva
+  - Ricrehaska
+  - Rihava
+  - Rihaxicre
+  - Rihekrekrek
+  - Rihipapar
+  - Rihrachepi
+  - Rihravatir
+  - Rikevra
+  - Rikipa
+  - Rikiskapipi
+  - Rikivrevra
+  - Rikrachi
+  - Rikrepa
+  - Rikreravribe
+  - Ripibivrir
+  - Ripihrepapa
+  - Ripreshikre
+  - Rirevi
+  - Riribebe
+  - Riribeska
+  - Riricheshe
+  - Riricrehra
+  - Riricriti
+  - Ririhari
+  - Ririhepreski
+  - Ririhite
+  - Ririhixir
+  - Ririkavrire
+  - Ririkeve
+  - Ririkrekaska
+  - Ririkrexeti
+  - Riripasha
+  - Riripraprapi
+  - Ririrarerera
+  - Riririhacha
+  - Ririshihi
+  - Ririskatre
+  - Ririskihe
+  - Ririskiri
+  - Ririsravra
+  - Riritihihit
+  - Riritiskaba
+  - Rirititahi
+  - Riritrebi
+  - Riritrexexek
+  - Ririvihrar
+  - Ririvreshiya
+  - Ririvretra
+  - Ririyaskihe
+  - Rishacriker
+  - Rishaskar
+  - Rishepi
+  - Riskavrer
+  - Riskekar
+  - Riskepriba
+  - Riskesre
+  - Riskirasre
+  - Riskiskeha
+  - Risratretete
+  - Risratrihihi
+  - Risrevre
+  - Risritracre
+  - Risrivire
+  - Ritaha
+  - Ritahrecra
+  - Ritekrakapre
+  - Riteva
+  - Ritresrakri
+  - Ritrihe
+  - Ritrirecra
+  - Ritrishixi
+  - Rivretripapa
+  - Rivrivrishi
+  - Rixahritri
+  - Rixaterete
+  - Rixecrekre
+  - Rixepapat
+  - Rixeti
+  - Rixibihrihri
+  - Rixiskirepri
+  - Rixixaxavrat
+  - Riyahrahrat
+  - Riyapare
+  - Riyasri
+  - Shabirivri
+  - Shachikir
+  - Shacrevavak
+  - Shacrevrake
+  - Shahaprahri
+  - Shahaxaxak
+  - Shahekeket
+  - Shaheskate
+  - Shahexer
+  - Shahrasher
+  - Shahrati
+  - Shahripracri
+  - Shakekrirabe
+  - Shakrichar
+  - Shapesrikaka
+  - Shapibi
+  - Shapretra
+  - Sharapire
+  - Sharesrasrat
+  - Sharihesrehi
+  - Sharihre
+  - Sharipiva
+  - Sharitrihri
+  - Shashishibe
+  - Shashisravi
+  - Shaskehepre
+  - Shaskepahre
+  - Shaskitra
+  - Shatretaxi
+  - Shavaprika
+  - Shavashakri
+  - Shavexexati
+  - Shavisha
+  - Shavrivre
+  - Shaxepachi
+  - Shayakrakrak
+  - Shebevrirere
+  - Shebipeskixa
+  - Shebiva
+  - Shecheyababa
+  - Shecrapricre
+  - Shehibe
+  - Shehrayashar
+  - Shehrebite
+  - Shehreha
+  - Shehreske
+  - Shehreyayar
+  - Shehriskar
+  - Shekake
+  - Shekakesri
+  - Shekapiski
+  - Shekeska
+  - Shekikakat
+  - Shekrira
+  - Shepechichik
+  - Shepeshesra
+  - Shepeskiskik
+  - Shepetrati
+  - Shepevrevrer
+  - Shepikitepa
+  - Sheprekritri
+  - Shepreskete
+  - Sherati
+  - Sherikre
+  - Sheriskahe
+  - Sheshasri
+  - Sheshihesha
+  - Shesrabibik
+  - Shesrachiski
+  - Shesrihihit
+  - Shetachavre
+  - Shetasre
+  - Shetikitata
+  - Shetracrar
+  - Shetriha
+  - Shevabi
+  - Shevecrepi
+  - Shevrahe
+  - Shevrevri
+  - Shevriya
+  - Shexachi
+  - Shexahrehret
+  - Shexecra
+  - Shexishishit
+  - Shexivir
+  - Sheyasha
+  - Shibatra
+  - Shibecreka
+  - Shibekrekret
+  - Shibivribe
+  - Shichebebet
+  - Shichecha
+  - Shicheririt
+  - Shichikrakre
+  - Shicrachi
+  - Shihebihre
+  - Shihecricrik
+  - Shihishar
+  - Shihiska
+  - Shihrapikra
+  - Shihrehepri
+  - Shihrerebe
+  - Shihrevihre
+  - Shikechachat
+  - Shikeshecra
+  - Shikikivri
+  - Shikraxi
+  - Shikrehre
+  - Shikreprer
+  - Shipehabaske
+  - Shipicreki
+  - Shipipapaxak
+  - Shipratate
+  - Shipriki
+  - Shipritraha
+  - Shiribebepit
+  - Shisrisheri
+  - Shitehechi
+  - Shitexihre
+  - Shitibibik
+  - Shitravrekra
+  - Shivababat
+  - Shivexehra
+  - Shivive
+  - Shivraheki
+  - Shivrayayak
+  - Shivrebapra
+  - Shivrepa
+  - Shixaya
+  - Sikibavipa
+  - Sikibisriche
+  - Sikichape
+  - Sikichapi
+  - Sikichekasha
+  - Sikichiyaski
+  - Sikicracre
+  - Sikicrexa
+  - Sikicrixi
+  - Sikiketraya
+  - Sikikrasre
+  - Sikikreke
+  - Sikipecripre
+  - Sikipetre
+  - Sikiprasrake
+  - Sikiprira
+  - Sikirehivre
+  - Sikirepreri
+  - Sikiskacra
+  - Sikiskevavak
+  - Sikiskite
+  - Sikisraber
+  - Sikisrekakat
+  - Sikisresha
+  - Sikitaski
+  - Sikitevre
+  - Sikiticre
+  - Sikitrashate
+  - Sikitrihrepi
+  - Sikitrirepre
+  - Sikivate
+  - Sikiveskar
+  - Sikivrahra
+  - Sikivrisrita
+  - Sikivritiri
+  - Sikixicrebar
+  - Siribacrache
+  - Siribetraska
+  - Siribikra
+  - Siricharabe
+  - Sirihaxer
+  - Sirihicripa
+  - Sirihihahat
+  - Sirihihapa
+  - Sirikaski
+  - Sirikatatat
+  - Siripepahe
+  - Siriprahra
+  - Siriprehavi
+  - Siripreteske
+  - Siriraki
+  - Siriraski
+  - Sirirekeba
+  - Sirireter
+  - Sirishatache
+  - Sirishehevre
+  - Siriskesrave
+  - Siriskihipe
+  - Sirisrekivi
+  - Sirisretre
+  - Siriteche
+  - Siritrahe
+  - Siritrixexet
+  - Sirivrekehri
+  - Sirivretatre
+  - Skabaresre
+  - Skabehricra
+  - Skabipre
+  - Skachabeta
+  - Skachibi
+  - Skachihive
+  - Skachishaha
+  - Skacraxaxak
+  - Skacrehrapre
+  - Skacrichisre
+  - Skacrixiche
+  - Skahipevra
+  - Skahixahehe
+  - Skahracha
+  - Skahravrive
+  - Skahreve
+  - Skahrivrepra
+  - Skakasha
+  - Skakava
+  - Skakavevet
+  - Skakeskaskat
+  - Skakevravrak
+  - Skapape
+  - Skapapriprit
+  - Skarebihira
+  - Skarechachak
+  - Skarepishi
+  - Skarexapreti
+  - Skashihrir
+  - Skaterarar
+  - Skatetasre
+  - Skatrichebe
+  - Skavarerahri
+  - Skavicrecrer
+  - Skavitetexi
+  - Skavrekreti
+  - Skavritre
+  - Skaxisrakre
+  - Skayabere
+  - Skayatepra
+  - Skebaprara
+  - Skechikreba
+  - Skecracheker
+  - Skecraprir
+  - Skecrita
+  - Skehevreshe
+  - Skehichitra
+  - Skehipe
+  - Skekapra
+  - Skekekritra
+  - Skeketir
+  - Skekrababe
+  - Skekraxer
+  - Skekretake
+  - Skepare
+  - Skepitetexik
+  - Skerepepehit
+  - Skereri
+  - Skeripribihe
+  - Skeriska
+  - Skeshikite
+  - Skeskahe
+  - Skeskibishi
+  - Skesrisrer
+  - Sketaha
+  - Sketahevra
+  - Sketashakra
+  - Sketatretrek
+  - Sketavri
+  - Sketepechi
+  - Sketivapapa
+  - Sketivre
+  - Sketrarivava
+  - Sketrekrepe
+  - Skevaskiskik
+  - Skevaxi
+  - Skevrabari
+  - Skevrahrepa
+  - Skevrecra
+  - Skevrehraki
+  - Skevrihrave
+  - Skexipi
+  - Skexixeska
+  - Skibacricrit
+  - Skibapraxe
+  - Skibevravrat
+  - Skibiravri
+  - Skibita
+  - Skichabi
+  - Skichapipit
+  - Skichebir
+  - Skichiske
+  - Skicreraskar
+  - Skicrihihe
+  - Skihekar
+  - Skiheyaskir
+  - Skihricher
+  - Skikeskesket
+  - Skikrahre
+  - Skikraprara
+  - Skikrisha
+  - Skipashihre
+  - Skipechishi
+  - Skiprapra
+  - Skipraripi
+  - Skipreve
+  - Skiprevivik
+  - Skiripipik
+  - Skishachi
+  - Skishapehehe
+  - Skiskevaski
+  - Skiskevririr
+  - Skisrekecra
+  - Skitraki
+  - Skitrepi
+  - Skitreske
+  - Skivekri
+  - Skivibibik
+  - Skiviska
+  - Skivrihri
+  - Skivrivreki
+  - Skixara
+  - Skixareter
+  - Skixetihechi
+  - Skixiha
+  - Skixisrapre
+  - Srabavrechi
+  - Srabisreveke
+  - Srachavicha
+  - Sracrare
+  - Srahahihir
+  - Srahihripra
+  - Srahriyar
+  - Srakipahehe
+  - Srakireret
+  - Srakrakrishi
+  - Srapahre
+  - Srapikretra
+  - Srapribekehi
+  - Srarekepar
+  - Sraribeski
+  - Srariprer
+  - Srarisha
+  - Srashacha
+  - Srashakri
+  - Srashaxata
+  - Srashikirir
+  - Sraskabikri
+  - Sraskechipe
+  - Sraskehreri
+  - Sraskekepiva
+  - Sraskekisra
+  - Sraskiba
+  - Sraskishar
+  - Srasrivate
+  - Sratepre
+  - Srateve
+  - Sraticre
+  - Sratihi
+  - Sratiki
+  - Sratraxixir
+  - Sratrike
+  - Sravechachar
+  - Sravrapapat
+  - Sraxape
+  - Sraxepipir
+  - Sraxeskicri
+  - Srebaskaskar
+  - Srebecrir
+  - Srebekrabi
+  - Srebikrir
+  - Srechepe
+  - Srecravra
+  - Srecravre
+  - Srecrisre
+  - Srehetahi
+  - Srehikrar
+  - Srehivavri
+  - Srehrehiske
+  - Srekacrexeve
+  - Srekreprexe
+  - Srekrikra
+  - Srekrititit
+  - Srepesrexi
+  - Srepipritri
+  - Srepisrasre
+  - Sreprekra
+  - Srepreshe
+  - Sreracricrar
+  - Srerevre
+  - Srerihra
+  - Sreshebakiki
+  - Sresheskixi
+  - Sreshiprari
+  - Sreskichi
+  - Sreskicre
+  - Sresrahapi
+  - Sresrekikit
+  - Sresrikre
+  - Sretasresri
+  - Sretishashak
+  - Sretraticrir
+  - Srevesra
+  - Srevesrixari
+  - Srevivre
+  - Srevraxipi
+  - Srevreyayak
+  - Srexatreva
+  - Srexikrata
+  - Srexiskahehe
+  - Sribavar
+  - Sribebe
+  - Sribireke
+  - Srichepi
+  - Srichivekaka
+  - Sricrevepa
+  - Sriheshexi
+  - Srihrahevrir
+  - Srihrakratri
+  - Srihrekexi
+  - Srikasresha
+  - Srikiriki
+  - Srikratra
+  - Sripaba
+  - Sripahebevri
+  - Sripahre
+  - Sriprikacha
+  - Sriracricrit
+  - Sririhre
+  - Sriripre
+  - Srisheyaxexe
+  - Srishibicri
+  - Srishikatre
+  - Sriskicrixi
+  - Sriskihra
+  - Sriskisha
+  - Srisratreba
+  - Srisrebepi
+  - Srisrete
+  - Sritasker
+  - Sritekrikrir
+  - Sriteskabe
+  - Sritiprebe
+  - Sritiske
+  - Sritrapashe
+  - Sritricha
+  - Sritripipir
+  - Srivake
+  - Srivaxa
+  - Srivekater
+  - Srivisra
+  - Srivrasrer
+  - Srivratre
+  - Srivrihrir
+  - Srixakrabebe
+  - Srixiveyaya
+  - Sriyapir
+  - Taabavrivrir
+  - Taabexitaski
+  - Taabiprete
+  - Taachabe
+  - Taacrahre
+  - Taacrecrasra
+  - Taacripi
+  - Taacrisretri
+  - Taahahre
+  - Taahecreta
+  - Taaherarak
+  - Taahiha
+  - Taahiska
+  - Taahivri
+  - Taahreke
+  - Taahrishepri
+  - Taakahevava
+  - Taakapa
+  - Taakexisker
+  - Taakraba
+  - Taapavevekik
+  - Taapecra
+  - Taapikashi
+  - Taapipihare
+  - Taapishi
+  - Taaprachikri
+  - Taaprivrapre
+  - Taarecra
+  - Taareshekra
+  - Taashaxikir
+  - Taashebititi
+  - Taaskatir
+  - Taaskevevava
+  - Taaskiteki
+  - Taasrebicre
+  - Taasrehrira
+  - Taasrikikit
+  - Taasritar
+  - Taataxe
+  - Taatevasre
+  - Taatihra
+  - Taatrate
+  - Taatrivivit
+  - Taavape
+  - Taavavrexi
+  - Taavrerapava
+  - Taavretri
+  - Taavrivi
+  - Taaxekakat
+  - Taaxesrite
+  - Taaxikra
+  - Taayarashe
+  - Teebapresri
+  - Teebechiya
+  - Teebivrichi
+  - Teechacraha
+  - Teechexe
+  - Teechihakri
+  - Teecrekrihre
+  - Teecrepeski
+  - Teecretri
+  - Teecrevretre
+  - Teehapraprar
+  - Teeheri
+  - Teehrahar
+  - Teehrepeskir
+  - Teehrirepipi
+  - Teekahicravi
+  - Teekepraxahe
+  - Teekipra
+  - Teepracrivri
+  - Teeprikexixi
+  - Teeraheher
+  - Teerecritri
+  - Teeriviyara
+  - Teeskapesri
+  - Teeskebecrar
+  - Teesrasraxa
+  - Teesrecha
+  - Teesretrir
+  - Teesribiba
+  - Teetahra
+  - Teetixi
+  - Teetrasrer
+  - Teetreskapri
+  - Teevahihivik
+  - Teevapriprar
+  - Teevepa
+  - Teevravreske
+  - Teexaketiti
+  - Teexera
+  - Teexihrir
+  - Teeyakra
+  - Tibaskaskak
+  - Tibasravava
+  - Tibihi
+  - Tibixita
+  - Ticheskivre
+  - Tichetritrir
+  - Tichiber
+  - Ticratevipe
+  - Tihichisketi
+  - Tihitre
+  - Tihresrevivi
+  - Tihrikakar
+  - Tikara
+  - Tikecribe
+  - Tikekitata
+  - Tikrasra
+  - Tikrevrihre
+  - Tipape
+  - Tipekrihripa
+  - Tipetripe
+  - Tipicre
+  - Tipreritaha
+  - Tipresrita
+  - Tiprititik
+  - Tireper
+  - Tiribavre
+  - Tiriberihehe
+  - Tiribikehe
+  - Tiribirakeke
+  - Tirichera
+  - Tirihayaya
+  - Tirihi
+  - Tirihra
+  - Tirihretrir
+  - Tirihriririk
+  - Tiriketeche
+  - Tirikeviha
+  - Tirikihrer
+  - Tirikrachir
+  - Tirikrasri
+  - Tiripechapre
+  - Tiripratra
+  - Tiriprexer
+  - Tirirahi
+  - Tirirapahre
+  - Tirirarat
+  - Tirirexiprer
+  - Tirisrehihit
+  - Tirisribe
+  - Tiritetasra
+  - Tiritrexi
+  - Tiritrivever
+  - Tiriveshi
+  - Tirivihachi
+  - Tirivrebire
+  - Tirixahiri
+  - Tirixebayar
+  - Tirixetatak
+  - Tirixishiski
+  - Tiriyaskacha
+  - Tishetrakaka
+  - Tiskasheske
+  - Tiskevritre
+  - Tiskicrar
+  - Tisraprepret
+  - Tisrasheshet
+  - Tisreshishit
+  - Tisreska
+  - Tisricre
+  - Tisriskiskir
+  - Tisrivexa
+  - Titeskeskek
+  - Titrabetiti
+  - Titretepeka
+  - Tivarahi
+  - Tivecra
+  - Tivecri
+  - Tivepa
+  - Tivevipe
+  - Tivexa
+  - Tiviskaskak
+  - Tixapipripri
+  - Tixetritrik
+  - Tixikekra
+  - Tixititik
+  - Tixixesrer
+  - Tiyapraprak
+  - Tiyaskaskat
+  - Trabari
+  - Trabisrer
+  - Tracrecrehri
+  - Tracreprake
+  - Trahahehetir
+  - Trahekehe
+  - Trahevreske
+  - Trahrepa
+  - Trahrevrava
+  - Trakehre
+  - Trakrapra
+  - Trakritevrer
+  - Trapavrivrir
+  - Trareskire
+  - Trashete
+  - Trasheve
+  - Trashevepri
+  - Trashipaxe
+  - Trasraveski
+  - Trasreve
+  - Tratibekaka
+  - Tratihrer
+  - Tratravi
+  - Tratraxixik
+  - Tratribi
+  - Travaxeski
+  - Travetretrek
+  - Travraripepe
+  - Travribesre
+  - Traxipi
+  - Traxiprer
+  - Trebahe
+  - Trebirerever
+  - Trebishivava
+  - Trebitratrak
+  - Trechacra
+  - Trechekrasri
+  - Trechesre
+  - Trechesrecre
+  - Trecrehehek
+  - Trehixapri
+  - Trehrakrepre
+  - Trehripra
+  - Trekatri
+  - Trekatricre
+  - Trekavixixi
+  - Trekavriki
+  - Trekebeti
+  - Trekeski
+  - Treketibita
+  - Treketra
+  - Trekibabat
+  - Trepake
+  - Treprabiveve
+  - Treprahrepi
+  - Treprebekra
+  - Treprehehet
+  - Trerevivipek
+  - Treshepra
+  - Treshibar
+  - Treshipeska
+  - Treskari
+  - Tresketara
+  - Treskiskakir
+  - Tresracrir
+  - Tresrasker
+  - Tresratracre
+  - Tresravritre
+  - Tresreba
+  - Tresrihivri
+  - Tretapra
+  - Tretrahri
+  - Tretreske
+  - Tretrikicha
+  - Trevabihra
+  - Trevepa
+  - Trevetretrek
+  - Trevicra
+  - Trexatri
+  - Trexavra
+  - Trexetri
+  - Trexiricrara
+  - Treyakracra
+  - Treyaxihehe
+  - Tribexexet
+  - Tribirekri
+  - Trichakripre
+  - Trichiski
+  - Tricracri
+  - Tricrekapa
+  - Tricripe
+  - Trihavever
+  - Trihera
+  - Trihexisra
+  - Trihicrecrek
+  - Trihitrar
+  - Tripesrishe
+  - Tripever
+  - Triprakraxi
+  - Triprakri
+  - Trirahecri
+  - Trirapraxar
+  - Trireche
+  - Trishakretra
+  - Trishecrexir
+  - Trishepi
+  - Trishisrar
+  - Triskavri
+  - Trisketir
+  - Triskiyayat
+  - Trisrachiri
+  - Trisrevre
+  - Trisrisri
+  - Trisrisriper
+  - Trisrite
+  - Tritetre
+  - Tritrakepre
+  - Tritrichatri
+  - Tritriskari
+  - Trivriskeki
+  - Trivritipipi
+  - Trivriyayak
+  - Trixihahar
+  - Trixitri
+  - Triyashekiki
+  - Vabahecre
+  - Vabahrabebe
+  - Vabebir
+  - Vabehetre
+  - Vabetrahacha
+  - Vabivri
+  - Vachahrirere
+  - Vachavri
+  - Vachekihri
+  - Vachicratata
+  - Vachiske
+  - Vacracreki
+  - Vacrebihi
+  - Vacripra
+  - Vahapapashek
+  - Vahapraxe
+  - Vahasker
+  - Vaherekiki
+  - Vahibebeprek
+  - Vahivihahe
+  - Vakaheva
+  - Vakecha
+  - Vakevixixi
+  - Vakikepripra
+  - Vapeyayak
+  - Vapikevra
+  - Vapipribe
+  - Vaprakakak
+  - Vaprisra
+  - Vapritasha
+  - Varebitacre
+  - Varekricreki
+  - Vashakrikrik
+  - Vaskexititi
+  - Vaskiprexi
+  - Vaskivri
+  - Vaskiyahi
+  - Vasraprikre
+  - Vasrevi
+  - Vatracraxixi
+  - Vatrevi
+  - Vatriva
+  - Vavehihisrek
+  - Vavrisrasri
+  - Vaxeki
+  - Vaxeraskeske
+  - Vebexaxat
+  - Vebicheta
+  - Vechecricrik
+  - Vecraxicra
+  - Vecriche
+  - Vecritrika
+  - Vehevrer
+  - Vehratrir
+  - Vehraxexek
+  - Vehritrexe
+  - Vekarasra
+  - Vekaxivivi
+  - Vekehribaba
+  - Vekirevi
+  - Vekracri
+  - Vekreka
+  - Vekrekrikrit
+  - Vekrerikra
+  - Vekrishar
+  - Vekrishicha
+  - Vepekre
+  - Veprahahat
+  - Veprechahri
+  - Veprecrar
+  - Veprecrecrek
+  - Vepreritare
+  - Veretitishit
+  - Vericharihra
+  - Verikisresre
+  - Veshacricrik
+  - Veshebixexe
+  - Veshecrihapi
+  - Veshehe
+  - Veshepreprek
+  - Veshishakra
+  - Veskapi
+  - Veskepayaya
+  - Veskepevra
+  - Vesrihiska
+  - Vetepeti
+  - Vetracripi
+  - Vetreshashat
+  - Vetriskira
+  - Vevatre
+  - Vevevre
+  - Vevivesha
+  - Vevreshir
+  - Vevricrecrek
+  - Vevrisrasrat
+  - Vexachebashi
+  - Vexavever
+  - Vexikar
+  - Vexisrecri
+  - Vibepraxaba
+  - Vibeta
+  - Vichehiriri
+  - Vichitribihe
+  - Vicrahrehrek
+  - Vicrevevre
+  - Vicrikre
+  - Vicripasre
+  - Vicritebaba
+  - Vicriviriki
+  - Viheche
+  - Vihecracheki
+  - Vihepra
+  - Vihratekra
+  - Vihrexahihi
+  - Vihribihiska
+  - Vihricra
+  - Vihriher
+  - Vihriprar
+  - Vihrisreher
+  - Vikahrekri
+  - Vikakehreri
+  - Vikavebari
+  - Vikekiski
+  - Vikihahre
+  - Vikitrexa
+  - Vikrebibit
+  - Vikrihi
+  - Vikritahahe
+  - Vipeskixa
+  - Vipravrakrar
+  - Viprevrar
+  - Virabebevrek
+  - Viratrerera
+  - Virepri
+  - Viriprixiche
+  - Virirevrare
+  - Viritritrik
+  - Viskeski
+  - Visrecrecret
+  - Visriskir
+  - Vitexexet
+  - Vitibibihrik
+  - Vitika
+  - Vitracrevi
+  - Vitrasheshek
+  - Vitraviketa
+  - Vitravrire
+  - Vitreskaskak
+  - Vitrisrasha
+  - Vitrivechere
+  - Vivashate
+  - Vivecrixexe
+  - Viveprehehe
+  - Viveprepe
+  - Vivixixihir
+  - Vivrashaya
+  - Vixiticrixi
+  - Vrabaprakaka
+  - Vrabikape
+  - Vracharitri
+  - Vrachishachi
+  - Vrachitasre
+  - Vracrebihehe
+  - Vraheska
+  - Vrahrehripre
+  - Vrakasrahi
+  - Vrakayasraxi
+  - Vrakebibit
+  - Vrakriperi
+  - Vrakritatat
+  - Vrapaheke
+  - Vrapresriki
+  - Vraprexave
+  - Vrarekikik
+  - Vrarihritete
+  - Vraripechi
+  - Vrashexa
+  - Vraskekaki
+  - Vraskevexar
+  - Vrasrehahar
+  - Vrasreshahi
+  - Vratavivit
+  - Vratevretra
+  - Vratrakere
+  - Vratreskevi
+  - Vratrite
+  - Vratrivar
+  - Vravabepra
+  - Vravacrahri
+  - Vravavra
+  - Vravexe
+  - Vraviveya
+  - Vravrache
+  - Vraxihihit
+  - Vrayavri
+  - Vrebehrihrik
+  - Vrebisra
+  - Vrecrarake
+  - Vrecrihri
+  - Vrehabi
+  - Vrehacre
+  - Vrehakatar
+  - Vrehasker
+  - Vrehecreri
+  - Vrehibehe
+  - Vrehibibipik
+  - Vrehipe
+  - Vrehipraprak
+  - Vrehriviche
+  - Vrekahrichi
+  - Vrekihrer
+  - Vrekipepet
+  - Vrekrixa
+  - Vrepate
+  - Vrepexexer
+  - Vreprehapre
+  - Vreprihrite
+  - Vrererikra
+  - Vrerikriskir
+  - Vreshabar
+  - Vreshihishar
+  - Vreshike
+  - Vreskatre
+  - Vresrasre
+  - Vresretatra
+  - Vretesravi
+  - Vretixixir
+  - Vretrapapar
+  - Vretrehivivi
+  - Vretricre
+  - Vrevahrir
+  - Vrevashixexe
+  - Vrevrekrer
+  - Vrexacracrat
+  - Vrexaker
+  - Vribetretret
+  - Vribipita
+  - Vribiprevite
+  - Vricrehakra
+  - Vricrihi
+  - Vricriskeche
+  - Vrihehra
+  - Vriheski
+  - Vrihrakre
+  - Vrihrekrepi
+  - Vrikayaba
+  - Vrikivresker
+  - Vrikrake
+  - Vrikrebacre
+  - Vrikresrasri
+  - Vripere
+  - Vripexavri
+  - Vripitikeske
+  - Vriprivra
+  - Vrirachesri
+  - Vririsha
+  - Vrisketaske
+  - Vriskiraxe
+  - Vriskire
+  - Vrisracrakri
+  - Vrisrekari
+  - Vrisreviki
+  - Vritasre
+  - Vriterepi
+  - Vritetrexa
+  - Vritika
+  - Vritiske
+  - Vritivraki
+  - Vritrihrar
+  - Vritrisre
+  - Vrivahi
+  - Vrivahishaya
+  - Vrivehatri
+  - Vrivitri
+  - Vrixashashar
+  - Vrixavribape
+  - Vrixeprir
+  - Vrixiprehre
+  - Vrixitreveki
+  - Vrixivraxe
+  - Xabishetra
+  - Xachivrivrit
+  - Xacripikar
+  - Xacriprixi
+  - Xacrivir
+  - Xahatavri
+  - Xahesketivri
+  - Xahrapaba
+  - Xahraprer
+  - Xahrebave
+  - Xahripavava
+  - Xakahri
+  - Xakayayakat
+  - Xakrevaratra
+  - Xapakra
+  - Xapikrikrik
+  - Xapipevrevre
+  - Xapraskapika
+  - Xaprate
+  - Xapravri
+  - Xapripraprar
+  - Xaracrivri
+  - Xaratripepe
+  - Xarebiya
+  - Xareva
+  - Xariheheprat
+  - Xashihapa
+  - Xaskakaba
+  - Xaskararater
+  - Xasrapipik
+  - Xasreskihibi
+  - Xatachasri
+  - Xatereret
+  - Xatiriskiski
+  - Xatrexixik
+  - Xavasrarihi
+  - Xaveshi
+  - Xavicrari
+  - Xavrahavri
+  - Xavricri
+  - Xavrire
+  - Xavrixecre
+  - Xaxikaxexe
+  - Xaxikresha
+  - Xaxiska
+  - Xayaskihri
+  - Xebechi
+  - Xebetetet
+  - Xebitretrek
+  - Xechacrecrek
+  - Xechibare
+  - Xecrixaxitre
+  - Xehekikir
+  - Xehetipe
+  - Xehichatavra
+  - Xehiprishe
+  - Xehiteche
+  - Xehrevrakre
+  - Xehrishe
+  - Xekerarivra
+  - Xekicra
+  - Xekrecri
+  - Xekrevri
+  - Xekrevripa
+  - Xepavikeba
+  - Xepehati
+  - Xepeter
+  - Xepetitipet
+  - Xeprasre
+  - Xeprekivra
+  - Xeprihehek
+  - Xeshachikaha
+  - Xeskapakre
+  - Xeskehrabe
+  - Xesribar
+  - Xetekir
+  - Xetraskesket
+  - Xetravivik
+  - Xetrexahihi
+  - Xetribirer
+  - Xetripi
+  - Xevetaske
+  - Xevratikepa
+  - Xevriya
+  - Xexapra
+  - Xexavi
+  - Xexibir
+  - Xexiski
+  - Xeyapre
+  - Xeyaribe
+  - Xeyaskapibe
+  - Xibecracrak
+  - Xibeha
+  - Xibepribe
+  - Xibitratrar
+  - Xihechevar
+  - Xihrahehete
+  - Xihrashehihi
+  - Xihrecreve
+  - Xihresra
+  - Xihrivever
+  - Xikabebet
+  - Xikahihi
+  - Xikashaxe
+  - Xikaske
+  - Xikepehrahra
+  - Xikicha
+  - Xikrahrihrik
+  - Xikrakipi
+  - Xikreshe
+  - Xikreska
+  - Xikrexiva
+  - Xikrihe
+  - Xikripar
+  - Xipahihik
+  - Xipita
+  - Xiprahahatek
+  - Xirechiske
+  - Xireshishit
+  - Xiribakrivi
+  - Xirichare
+  - Xirichebacra
+  - Xirichiter
+  - Xiricraki
+  - Xirihacrir
+  - Xirihiske
+  - Xirihiyatape
+  - Xirihrekakar
+  - Xirihretecre
+  - Xirihriti
+  - Xirikesrirer
+  - Xiriketi
+  - Xiripape
+  - Xiririhecher
+  - Xiririke
+  - Xiriripatibe
+  - Xirishepivre
+  - Xirishexi
+  - Xiriskapa
+  - Xirisketa
+  - Xiriskicreha
+  - Xirisrevre
+  - Xirisricreva
+  - Xiritracre
+  - Xiritreprer
+  - Xiritretrar
+  - Xirivetrikra
+  - Xirivexicri
+  - Xirivre
+  - Xirivrehra
+  - Xirixekrari
+  - Xishahrixixi
+  - Xishatre
+  - Xishehraxaxa
+  - Xishikra
+  - Xiskatreka
+  - Xiskeche
+  - Xiskehrahar
+  - Xiskicratake
+  - Xiskiririr
+  - Xisrecracrak
+  - Xisreva
+  - Xisritetet
+  - Xitachabibi
+  - Xitachixaxa
+  - Xitariritak
+  - Xitebehrer
+  - Xitreprecri
+  - Xivavraxexe
+  - Xiveski
+  - Xivivri
+  - Xivrahrare
+  - Xivrakrakrak
+  - Xivrihihicra
+  - Xixaxekaka
+  - Xixecra
+  - Xixiche
diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml
index 518e9accae..0751582e3d 100644
--- a/Resources/Prototypes/Datasets/ion_storm.yml
+++ b/Resources/Prototypes/Datasets/ion_storm.yml
@@ -342,8 +342,12 @@
   - MIMES
   - PARAMEDICS
   - PASSENGERS
-  - QUARTERMASTERS
-  - RESEARCH DIRECTORS
+  # DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer
+  - LOGISTICS OFFICERS
+  # End of modified code
+  # DeltaV - Epistemics Department - Replace Research Director with Mystagogue
+  - MYSTAGOGUES
+  # End of modified code
   - ROBOTICISTS
   - SALVAGE SPECIALISTS
   - SCIENTISTS
diff --git a/Resources/Prototypes/Datasets/tips.yml b/Resources/Prototypes/Datasets/tips.yml
index 1c2c092533..1f288aa023 100644
--- a/Resources/Prototypes/Datasets/tips.yml
+++ b/Resources/Prototypes/Datasets/tips.yml
@@ -48,12 +48,12 @@
   # Parkstation-NoNukies-End
   - "As an antagonist, be mindful of the power of destroying telecommunications. It'll be a lot harder for people to call you out if they can't do so effectively!"
   - "You can examine your headset to see which radio channels you have available and how to speak in them."
-  - "As a Salvage Technician, always carry a GPS on you and take note of the station's coordinates in case your salvage is lost to space."
-  - "As a Salvage Technician, you can use your proto-kinetic accelerator to move yourself in space when in a pinch. Just be wary that it isn't very effective."
-  - "As a Salvage Technician, never forget to mine ore! Ore can be sold to logistics for a pretty penny, be used for construction, and also be used by Scientists for fancy technology."
-  - "As a Salvage Technician, try asking epistemics for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!"
-  - "As a Salvage Technician, try asking science for a grappling hook. It can be used to propel yourself onto wrecks, or if stuck in space you don't have to rely on the proto-kinetic accelerator."
-  - "As a Salvage Technician, consider cooperating with the Cargo Technicians. They can order you a wide variety of useful items, including ones that may be hard to get otherwise, such laser guns and shuttle building materials."
+  - "As a Salvage Specialist, always carry a GPS on you and take note of the station's coordinates in case your salvage is lost to space."
+  - "As a Salvage Specialist, you can use your proto-kinetic accelerator to move yourself in space when in a pinch. Just be wary that it isn't very effective."
+  - "As a Salvage Specialist, never forget to mine ore! Ore can be sold to logistics for a pretty penny, be used for construction, and also be used by Scientists for fancy technology."
+  - "As a Salvage Specialist, try asking epistemics for a tethergun. It can be used to grab items off of salvage wrecks extremely efficiently!"
+  - "As a Salvage Specialist, try asking science for a grappling hook. It can be used to propel yourself onto wrecks, or if stuck in space you don't have to rely on the proto-kinetic accelerator."
+  - "As a Salvage Specialist, consider cooperating with the Cargo Technicians. They can order you a wide variety of useful items, including ones that may be hard to get otherwise, such laser guns and shuttle building materials."
   - "As a Cargo Technician, consider asking epistemics for a Ripley APLU. When paired with a hydraulic clamp, you can grab valuable maintenance objects like fuel tanks much more easily, and make deliveries in a swift manner."
   - "As a Cargo Technician, try to maintain a surplus of materials. They are extremely useful for Scientists and Station Engineers to have immediate access to."
   - "As a Cargo Technician, if you have a surplus of cash try gambling! Sometimes you gain more money than you begin with."
diff --git a/Resources/Prototypes/Decals/Overlays/grayscale.yml b/Resources/Prototypes/Decals/Overlays/grayscale.yml
index 8f01920295..dfebeee3f9 100644
--- a/Resources/Prototypes/Decals/Overlays/grayscale.yml
+++ b/Resources/Prototypes/Decals/Overlays/grayscale.yml
@@ -6,6 +6,110 @@
     sprite: Decals/Overlays/greyscale.rsi
     state: fulltile_overlay
 
+- type: decal
+  id: BrickBoxOverlay
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_box
+
+- type: decal
+  id: BrickCornerOverlayNE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_corner_ne
+
+- type: decal
+  id: BrickCornerOverlayNW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_corner_nw
+
+- type: decal
+  id: BrickCornerOverlaySE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_corner_se
+
+- type: decal
+  id: BrickCornerOverlaySW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_corner_sw
+
+- type: decal
+  id: BrickEndOverlayE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_end_e
+
+- type: decal
+  id: BrickEndOverlayN
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_end_n
+
+- type: decal
+  id: BrickEndOverlayS
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_end_s
+
+- type: decal
+  id: BrickEndOverlayW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_end_w
+
+- type: decal
+  id: BrickLineOverlayE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_line_e
+
+- type: decal
+  id: BrickLineOverlayN
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_line_n
+
+- type: decal
+  id: BrickLineOverlayS
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_line_s
+
+- type: decal
+  id: BrickLineOverlayW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: brick_line_w
+
 - type: decal
   id: HalfTileOverlayGreyscale
   tags: ["station", "overlay"]
@@ -102,6 +206,14 @@
     sprite: Decals/Overlays/greyscale.rsi
     state: threequartertile_overlay_270
 
+- type: decal
+  id: MonoOverlay
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: mono
+
 - type: decal
   id: CheckerNESW
   tags: ["station", "overlay"]
@@ -199,12 +311,140 @@
     state: minitile_diagonal_b
 
 - type: decal
-  id: MonoOverlay
+  id: MiniTileBoxOverlay
   tags: ["station", "overlay"]
   defaultCustomColor: true
   sprite:
     sprite: Decals/Overlays/greyscale.rsi
-    state: mono
+    state: minitile_box
+
+- type: decal
+  id: MiniTileCornerOverlayNE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_corner_ne
+
+- type: decal
+  id: MiniTileCornerOverlayNW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_corner_nw
+
+- type: decal
+  id: MiniTileCornerOverlaySE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_corner_se
+
+- type: decal
+  id: MiniTileCornerOverlaySW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_corner_sw
+
+- type: decal
+  id: MiniTileEndOverlayE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_end_e
+
+- type: decal
+  id: MiniTileEndOverlayN
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_end_n
+
+- type: decal
+  id: MiniTileEndOverlayS
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_end_s
+
+- type: decal
+  id: MiniTileEndOverlayW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_end_w
+
+- type: decal
+  id: MiniTileInnerOverlayNE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_inner_ne
+
+- type: decal
+  id: MiniTileInnerOverlayNW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_inner_nw
+
+- type: decal
+  id: MiniTileInnerOverlaySE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_inner_se
+
+- type: decal
+  id: MiniTileInnerOverlaySW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_inner_sw
+
+- type: decal
+  id: MiniTileLineOverlayE
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_line_e
+
+- type: decal
+  id: MiniTileLineOverlayN
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_line_n
+
+- type: decal
+  id: MiniTileLineOverlayS
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_line_s
+
+- type: decal
+  id: MiniTileLineOverlayW
+  tags: ["station", "overlay"]
+  defaultCustomColor: true
+  sprite:
+    sprite: Decals/Overlays/greyscale.rsi
+    state: minitile_line_w
 
 - type: decal
   id: OffsetOverlay
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml
index d994967a2a..ddf3ebdb9e 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml
@@ -7,3 +7,13 @@
   cost: 1000
   category: Fun
   group: market
+
+- type: cargoProduct
+  id: CapGunSet
+  icon:
+    sprite: Objects/Fun/caps.rsi
+    state: icon
+  product: CrateCapGunSet
+  cost: 1000
+  category: Fun
+  group: market
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index 5b49434bef..1f27eb265c 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -2,21 +2,14 @@
   parent: ClothingBackpackSatchelLeather
   id: ClothingBackpackMafiaFilled
   suffix: Filled, Mafia
-#  components:
-#  - type: StorageFill
-#    contents:
-#      - id: BoxSurvival
-#        amount: 1
-#      - id: ClothingOuterArmorBasic
-#        amount: 1
-##      - id: WeaponSubMachineGunTypewriter # That dont fit >:(
-##        amount: 1
-#      - id: WeaponPistolViperWood
-#        amount: 1
-##      - id: MagazinePistol # Ammo is too expensive nowadays (it causes test fails)
-##        amount: 1
-##      - id: BaseBallBat # THIS BAT IS TOO DAMN BIG!
-##        amount: 1
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvival
+      - id: WeaponSubMachineGunTypewriter
+      - id: WeaponPistolViperWood
+      - id: MagazinePistol
+      - id: BaseBallBat
 
 - type: entity
   noSpawn: true
@@ -29,3 +22,24 @@
       - id: EmergencyRollerBedSpawnFolded
       - id: BodyBag_Folded
       - id: Portafib
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackMedical
+  id: ClothingBackpackPsychologistFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalMedical
+      - id: RubberStampPsychologist
+
+  
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpack
+  id: ClothingBackpackLawyerFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvival
+      - id: RubberStampLawyer
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
index 0f63692eeb..0ae8407a2f 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -9,3 +9,24 @@
       - id: EmergencyRollerBedSpawnFolded
       - id: BodyBag_Folded
       - id: Portafib
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackDuffelMedical
+  id: ClothingBackpackDuffelPsychologistFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalMedical
+      - id: RubberStampPsychologist
+
+  
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackDuffel
+  id: ClothingBackpackDuffelLawyerFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvival
+      - id: RubberStampLawyer
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml
index 8d4545e8de..4eebbcfe91 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -9,3 +9,24 @@
       - id: EmergencyRollerBedSpawnFolded
       - id: BodyBag_Folded
       - id: Portafib
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackSatchelMedical
+  id: ClothingBackpackSatchelPsychologistFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalMedical
+      - id: RubberStampPsychologist
+
+  
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackSatchel
+  id: ClothingBackpackSatchelLawyerFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvival
+      - id: RubberStampLawyer
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml
new file mode 100644
index 0000000000..804a4727ee
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml
@@ -0,0 +1,18 @@
+- type: entity
+  name: Prisoner encryption key box
+  parent: BoxCardboard
+  id: BoxEncryptionKeyPrisoner
+  description: A box of spare encryption keys.
+  components:
+  - type: StorageFill
+    contents:
+      - id: EncryptionKeyPrison
+        amount: 4
+  - type: Sprite
+    layers:
+      - state: box
+      - state: encryptokey
+  - type: Storage
+    whitelist:
+      components:
+      - EncryptionKey
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml
index 45e371ac63..18185d975e 100644
--- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml
@@ -8,3 +8,18 @@
         amount: 1
       - id: BoxCartridgeBB
         amount: 2
+
+- type: entity
+  name: cap gun box set
+  description: A box filled with fun, harmless cap guns that are sure to keep security entertained and the air smelling of sulfur.
+  id: CrateCapGunSet
+  parent: CratePlastic
+  components:
+  - type: StorageFill
+    contents:
+      - id: RevolverCapGun
+        amount: 1
+      - id: SpeedLoaderCap
+        amount: 2
+      - id: BoxCartridgeCap
+        amount: 2
diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
index a9798ce212..ca0e83d45a 100644
--- a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
@@ -9,26 +9,6 @@
   categories:
   - UplinkUtility
 
-#- type: listing
-#  id: UplinkCyborgBeaconSyndicate
-#  name: uplink-borg-beacon-name
-#  description: uplink-borg-beacon-desc
-#  productEntity: CyborgBeaconSyndicate
-#  icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
-#  cost:
-#    Telecrystal: 65
-#  categories:
-#    - UplinkUtility
-#  conditions:
-#    - !type:StoreWhitelistCondition
-#      whitelist:
-#        tags:
-#          - NukeOpsUplink
-#    - !type:BuyerWhitelistCondition
-#      blacklist:
-#        components:
-#          - SurplusBundle
-
 - type: listing
   id: UplinkBionicSyrinxImplanter
   name: uplink-bionic-syrinx-implanter-name
@@ -45,4 +25,4 @@
   - !type:BuyerWhitelistCondition
     blacklist:
       components:
-      - SurplusBundle
\ No newline at end of file
+      - SurplusBundle
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
index f3f264d8ec..c65dd62312 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
@@ -41,4 +41,37 @@
   - type: Sprite
     sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi
   - type: Clothing
-    sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi
\ No newline at end of file
+    sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi
+    
+- type: entity
+  parent: ClothingHeadset
+  id: ClothingHeadsetPrison
+  name: prison headset
+  description: Headset used by anybody who needs direct contact with prisoners
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyPrison
+      - EncryptionKeyCommon
+  - type: Sprite
+    sprite: DeltaV/Clothing/Ears/Headsets/prisoner.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Ears/Headsets/prisoner.rsi
+
+- type: entity
+  parent: ClothingHeadset
+  id: ClothingHeadsetPrisonGuard
+  name: guard headset
+  description: Headset used by prison guards.
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyPrison
+      - EncryptionKeyCommon
+      - EncryptionKeySecurity
+  - type: Sprite
+    sprite: Clothing/Ears/Headsets/security.rsi
+  - type: Clothing
+    sprite: Clothing/Ears/Headsets/security.rsi
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml
new file mode 100644
index 0000000000..8642867eff
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml
@@ -0,0 +1,14 @@
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesChemist
+  name: safety glasses
+  description: Glasses made for chemists and other workers dealing with caustic reagents.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Caustic: 0.85
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml
new file mode 100644
index 0000000000..a959b64a38
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml
@@ -0,0 +1,58 @@
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesPrescriptionMedHud
+  name: prescription medical hud
+  description: A poorly done and rushed mix between half of a pair of prescription glasses and a medical HUD allowing you to see clearly out of one eye and view the health of people out of the other!
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi
+  - type: Construction
+    graph: PrescriptionMedHud
+    node: prescmedhud
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
+  - type: ShowHealthIcons
+    damageContainers:
+    - Biological
+  - type: Tag
+    tags:
+    - HudMedical
+    - GlassesNearsight
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesPrescriptionHudSecurity
+  name: prescription security hud
+  description: A poorly done and rushed mix between half of a pair of prescription glasses and a security HUD allowing you to see clearly out of one eye and inspect the employee's ID and warning status in the other!
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Eyes/Hud/prescsechud.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Eyes/Hud/prescsechud.rsi
+  - type: ShowSecurityIcons
+  - type: Construction
+    graph: PrescriptionSecHud
+    node: prescsechud
+  - type: Tag
+    tags:
+    - HudSecurity
+    - GlassesNearsight
+    
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesHudSyndicateMed
+  name: syndicate medical visor
+  description: An upgraded syndicate visor with automatic health readings, designed for better detection of humanoids and their subsequent elimination.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Eyes/Hud/syndmed.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Eyes/Hud/syndmed.rsi
+  - type: ShowSyndicateIcons
+  - type: ShowSecurityIcons
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml
index d9121410ec..1dc8942c09 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml
@@ -41,3 +41,23 @@
     damage:
       types:
         Blunt: 9.5
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesChemist
+  name: heavy nitrile gloves
+  description: A pair of thick gloves that provide some protection from caustic chemicals.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi
+  - type: Fiber
+    fiberMaterial: fibers-rubber
+    fiberColor: fibers-black
+  - type: Armor
+    modifiers:
+      coefficients:
+        Caustic: 0.95
+  - type: TemperatureProtection
+    coefficient: 1
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml
index 22167ae038..1c5cef39af 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml
@@ -192,21 +192,3 @@
     sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi
-
-- type: entity
-  parent: ClothingHeadBase
-  id: ClothingHeadHatStrawHat
-  name: straw hat
-  description: A fancy hat for hot days! Not recommended to wear near fires.
-  components:
-  - type: Sprite
-    sprite: DeltaV/Clothing/Head/Hats/straw_hat.rsi
-  - type: Clothing
-    sprite: DeltaV/Clothing/Head/Hats/straw_hat.rsi
-  - type: Construction
-    graph: StrawHat
-    node: strawhat
-  - type: Tag
-    tags:
-    - HamsterWearable
-
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/medals.yml
index 1094cab4f7..b516135040 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/medals.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/medals.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingNeckMedalBase
   id: ClothingNeckBlackStar
   name: black star medal
   description: Given to crewmates that make the greatest of sacrifices in the performance of their duties.
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/ties.yml
index 42d074502b..2b421e9675 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/ties.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/ties.yml
@@ -52,3 +52,14 @@
     sprite: DeltaV/Clothing/Neck/Ties/greentie.rsi
   - type: Clothing
     sprite: DeltaV/Clothing/Neck/Ties/greentie.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckTieChem
+  name: chemistry tie
+  description: An safety-orange tie.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Neck/Ties/chemtie.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Neck/Ties/chemtie.rsi
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml
new file mode 100644
index 0000000000..fd7f70bd71
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml
@@ -0,0 +1,17 @@
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterApronChemist
+  name: chemical resistant apron
+  suffix: Chemistry
+  description: Made out of thick rubber, the color of this apron still leaves you perplexed.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Caustic: 0.25
+  - type: TemperatureProtection
+    coefficient: 1
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml
new file mode 100644
index 0000000000..86c7d4ef53
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml
@@ -0,0 +1,14 @@
+- type: entity
+  parent: ClothingShoesBase
+  id: ClothingShoesEnclosedChem
+  name: enclosed shoes
+  description: Those shoes will protect you from melting your feet while working.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Caustic: 0.95
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml
index f5497646d6..f3fdeabd10 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -242,4 +242,15 @@
   - type: Sprite
     sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi
   - type: Clothing
-    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi
\ No newline at end of file
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitChemShirt
+  name: formal chemistry suit
+  description: There's still some odd stains on this suit. Hm.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi
+  - type: Clothing
+    sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml
index 88a2488db0..1e014aab73 100644
--- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml
@@ -1,4 +1,8 @@
-- type: entity
+#Delta-V - This file is licensed under AGPLv3
+# Copyright (c) 2024 Delta-V Contributors
+# See AGPLv3.txt for details.
+
+- type: entity
   id: SpawnPointPlayerCharacter
   name: ghost role spawn point
   suffix: player character, DO NOT MAP
@@ -32,11 +36,13 @@
       time: 259200 # 72 hours
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 40000 # 11.5 hours
+      time: 40000 # 11.1 hours
     - !type:DepartmentTimeRequirement
       department: Civilian
-      time: 72000 # 20 hours
-    - !type:WhitelistRequirement
+      time: 40000 # 11.1 hours
+    - !type:DepartmentTimeRequirement
+      department: Command
+      time: 40000 # 11.1 hours
   - type: GhostRoleMobSpawner
     prototype: MobHumanSyndicateListener
   - type: Sprite
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
index e25940287d..b4be935f49 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
@@ -32,9 +32,12 @@
   - type: Bloodstream
     bloodReagent: Phlogiston
   - type: MeleeWeapon
+    altDisarm: false # No shoving
+    angle: 0
     damage:
-      groups:
-        Burn: 10
+      types:
+        Heat: 10
+    animation: WeaponArcPunch
   - type: MobState
   - type: MobThresholds
     thresholds:
@@ -57,8 +60,8 @@
   - type: Familiar
   - type: Dispellable
   - type: Damageable
-#    damageContainer: CorporealSpirit
-#    damageModifierSet: CorporealSpirit
+    damageContainer: CorporealSpirit
+    damageModifierSet: CorporealSpirit
   - type: Speech
     speechSounds: Bass
   - type: Puller
@@ -68,27 +71,34 @@
       - CannotSuicide
       - DoorBumpOpener
   - type: Body
-    prototype: Primate
+    prototype: Human # For two hands.
   - type: InnateTool
     tools:
       - id: WelderIfrit
       - id: WelderIfrit
   - type: Hands
+  - type: ZombieImmune # No zombie servant
   - type: RandomMetadata
     nameSegments: [names_golem]
   - type: PotentialPsionic
   - type: Psionic
     removable: false
-  - type: PyrokinesisPower
+  # - type: PyrokinesisPower # Pending psionic rework
   - type: Grammar
     attributes:
       proper: true
   - type: MovementIgnoreGravity
+  - type: NoSlip
   - type: EyeProtection
   - type: NpcFactionMember
     factions:
     - PsionicInterloper
     - NanoTrasen
+  - type: GhostTakeoverAvailable
+  - type: GhostRole
+    makeSentient: true
+    allowMovement: true
+    allowSpeech: true
 
 - type: entity
   parent: WelderExperimental
@@ -128,6 +138,9 @@
 # similar to EnergySword. will have to go in ToolSystem.Welder.cs
 # for now, just make it sound like it's on fire no matter what because it
 # sounds cooler than the default fizzling noise.
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Items/welder.ogg
   - type: SolutionRegeneration
     solution: Welder
     generated:
@@ -138,4 +151,4 @@
     enabled: false
     radius: 2
     energy: 1.5
-    color: orange
\ No newline at end of file
+    color: orange
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/salvage.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/salvage.yml
index 070ff60647..507aa46793 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/salvage.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/salvage.yml
@@ -1,11 +1,20 @@
+#Delta-V - This file is licensed under AGPLv3
+# Copyright (c) 2024 Delta-V Contributors
+# See AGPLv3.txt for details.
+
 - type: entity
   name: Syndicate Guard
   parent: BaseMobHuman
   id: MobRadioGuard
+  description: "Mindwiped and hypno-indoctrinated into perfect loyalty by the Syndicate. They will throw their life away to defend their objective."
   components:
     - type: NpcFactionMember
       factions:
         - Syndicate
+    - type: MobThresholds
+      thresholds:
+        0: Alive
+        100: Dead #Tweak for "Acidify on Crit"
     - type: MindContainer
       showExamineInfo: False
     - type: Loadout
@@ -42,3 +51,54 @@
     - type: AutoImplant
       implants:
       - DeathAcidifierImplant
+    - type: Sprite
+      layers:
+      - map: [ "enum.HumanoidVisualLayers.Chest" ]
+      - map: [ "enum.HumanoidVisualLayers.Head" ]
+      - map: [ "enum.HumanoidVisualLayers.Snout" ]
+      - map: [ "enum.HumanoidVisualLayers.Eyes" ]
+      - map: [ "enum.HumanoidVisualLayers.RArm" ]
+      - map: [ "enum.HumanoidVisualLayers.LArm" ]
+      - map: [ "enum.HumanoidVisualLayers.RLeg" ]
+      - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+      - shader: StencilClear
+        sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115
+        # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear.
+        # sprite refactor when
+        state: l_leg
+      - shader: StencilMask
+        map: ["enum.HumanoidVisualLayers.StencilMask"]
+        sprite: Mobs/Customization/masking_helpers.rsi
+        state: unisex_full
+        visible: false
+      - map: ["jumpsuit"]
+      - map: ["enum.HumanoidVisualLayers.LFoot"]
+      - map: ["enum.HumanoidVisualLayers.RFoot"]
+      - map: ["enum.HumanoidVisualLayers.LHand"]
+      - map: ["enum.HumanoidVisualLayers.RHand"]
+      - map: [ "gloves" ]
+      - map: [ "shoes" ]
+      - map: [ "ears" ]
+      - map: [ "eyes" ]
+      - map: [ "belt" ]
+      - map: [ "id" ]
+      - map: [ "neck" ]
+      - map: [ "back" ]
+      - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
+      - map: [ "enum.HumanoidVisualLayers.Hair" ]
+      - map: [ "enum.HumanoidVisualLayers.HeadSide" ]
+      - map: [ "enum.HumanoidVisualLayers.HeadTop" ]
+      - map: [ "enum.HumanoidVisualLayers.Tail" ]
+      - map: [ "mask" ]
+      - map: [ "head" ]
+      - map: ["enum.HumanoidVisualLayers.Handcuffs"]
+        color: "#ffffff"
+        sprite: Objects/Misc/handcuffs.rsi
+        state: body-overlay-2
+        visible: false
+      - map: [ "clownedon" ] # Dynamically generated
+        sprite: "Effects/creampie.rsi"
+        state: "creampie_human"
+        visible: false
+      - sprite: Objects/Weapons/Guns/Pistols/viper.rsi
+        state: inhand-left
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/humanoid.yml
index 9e12dc31c4..2c8b01553a 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/humanoid.yml
@@ -7,9 +7,72 @@
       state: full
     - type: RandomHumanoidSpawner
       settings: SyndicateListener
-      
+
 - type: randomHumanoidSettings
   id: SyndicateListener
   components:
     - type: Loadout
-      prototypes: [SyndicateListenerGear]
\ No newline at end of file
+      prototypes: [SyndicateListenerGear]
+
+# Mobsters
+
+- type: entity
+  id: RandomHumanoidSpawnerMobster
+  name: mobster
+  components:
+    - type: Sprite
+      netsync: false
+      sprite: DeltaV/Markers/jobs.rsi
+      state: mobster
+    - type: RandomMetadata
+      nameSegments:
+      - fake_human_first
+      - names_last
+    - type: RandomHumanoidSpawner
+      settings: Mobster
+
+- type: randomHumanoidSettings
+  id: Mobster
+  randomizeName: false
+  components:
+    - type: GhostRole
+      name: Mobster
+      description: Break kneecaps, spray lead, keep your mouth shut.
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      prototypes: [ MobsterGear ]
+    - type: RandomMetadata
+      nameSegments:
+      - fake_human_first
+      - names_last
+
+- type: entity
+  id: RandomHumanoidSpawnerMobsterAlt
+  name: mobster
+  suffix: alt
+  components:
+    - type: Sprite
+      netsync: false
+      sprite: DeltaV/Markers/jobs.rsi
+      state: mobster
+    - type: RandomMetadata
+      nameSegments:
+      - fake_human_first
+      - names_last
+    - type: RandomHumanoidSpawner
+      settings: MobsterAlt
+
+- type: randomHumanoidSettings
+  id: MobsterAlt
+  randomizeName: false
+  components:
+    - type: GhostRole
+      name: Mobster
+      description: Break kneecaps, spray lead, keep your mouth shut.
+    - type: GhostTakeoverAvailable
+    - type: Loadout
+      prototypes: [ MobsterGearAlt ]
+    - type: RandomMetadata
+      nameSegments:
+      - fake_human_first
+      - names_last
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Syndicate_Gadgets/borg_beacon.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Syndicate_Gadgets/borg_beacon.yml
deleted file mode 100644
index 85544592ee..0000000000
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Syndicate_Gadgets/borg_beacon.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-#- type: entity
-#  parent: BaseItem
-#  id: CyborgBeaconSyndicate
-#  name: syndicate robot beacon
-#  description: A single-use beacon designed to quickly launch reinforcement cyborgs into the field.
-#  components:
-#    - type: Sprite
-#      sprite: Objects/Devices/communication.rsi
-#      layers:
-#        - state: old-radio
-#      netsync: false
-#    - type: GhostRole
-#      name: Syndicate Assault Robot
-#      description: Someone needs reinforcements. You're the reinforcements.
-#      rules: Normal syndicate antagonist rules apply. Work with whoever called you in, and don't harm them.
-#    - type: GhostRoleMobSpawner
-#      prototype: PlayerRobotSyndicate
-#    - type: EmitSoundOnUse
-#      sound: /Audio/Effects/RingtoneNotes/a.ogg
-#    - type: UseDelay
-#      delay: 300
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml
new file mode 100644
index 0000000000..c41c235c13
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml
@@ -0,0 +1,15 @@
+- type: entity
+  parent: EncryptionKey
+  id: EncryptionKeyPrison
+  name: Prison encryption key
+  description: An encryption key used by anybody who needs to speak with the prisoners
+  components:
+  - type: EncryptionKey
+    channels:
+    - Prison
+    defaultChannel: Prison
+  - type: Sprite
+    sprite: DeltaV/Objects/Devices/encryption_keys.rsi
+    layers:
+    - state: crypt_orange
+    - state: prisoner_label
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
index 6a73f727b6..6ee3a7543f 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
@@ -1,3 +1,7 @@
+#Delta-V - This file is licensed under AGPLv3
+# Copyright (c) 2024 Delta-V Contributors
+# See AGPLv3.txt for details.
+
 - type: entity
   parent: BasePDA
   id: CorpsmanPDA
@@ -20,7 +24,7 @@
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
-      - NewsReadCartridge
+      - NewsReaderCartridge
       - CrimeAssistCartridge
   - type: Pda
     id: BrigmedicIDCard
@@ -35,3 +39,16 @@
     scanDelay: 1
     scanningEndSound:
       path: "/Audio/Items/Medical/healthscanner.ogg"
+
+- type: entity
+  parent: SyndiPDA
+  id: SyndiListeningPostPDA
+  components:
+  - type: Pda
+    id: SyndicateIDCard
+    state: pda-syndi-agent
+    penSlot:
+      startingItem: CyberPen
+      whitelist:
+        tags:
+        - Write
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
new file mode 100644
index 0000000000..74993ae94a
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
@@ -0,0 +1,136 @@
+#Command
+- type: entity
+  parent: DefaultStationBeaconCommand
+  id: DefaultStationBeaconConferenceRoom
+  suffix: Conference Room
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-conference-room
+
+#Medical
+- type: entity
+  parent: DefaultStationBeaconMedical
+  id: DefaultStationBeaconVirology
+  suffix: Virology
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-virology
+
+- type: entity
+  parent: DefaultStationBeaconMedical
+  id: DefaultStationBeaconMetempsychosis
+  suffix: Cloning #Metempsychosis
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-metempsychosis
+
+- type: entity
+  parent: DefaultStationBeaconMedical
+  id: DefaultStationBeaconExam
+  suffix: Exam Room
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-exam
+
+- type: entity
+  parent: DefaultStationBeaconMedical
+  id: DefaultStationBeaconMedicalOutpost
+  suffix: Medical Outpost
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-med-outpost
+
+- type: entity
+  parent: DefaultStationBeaconMedical
+  id: DefaultStationBeaconPsychologist
+  suffix: Psychologist
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-psych
+
+#Epistemics
+- type: entity
+  parent: DefaultStationBeaconScience
+  id: DefaultStationBeaconProber
+  suffix: Glimmer Prober
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-glimmer-prober
+
+- type: entity
+  parent: DefaultStationBeaconScience
+  id: DefaultStationBeaconMantis
+  suffix: Forensic Mantis
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-forensic-mantis
+
+#Logistics
+- type: entity
+  parent: DefaultStationBeaconSupply
+  id: DefaultStationBeaconMailroom
+  suffix: Mailroom
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-mailroom
+
+#Engineering
+- type: entity
+  parent: DefaultStationBeaconEngineering
+  id: DefaultStationBeaconEngiOutpost
+  suffix: Engi Outpost
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-engi-outpost
+
+#Service
+- type: entity
+  parent: DefaultStationBeaconService
+  id: DefaultStationBeaconJanitorsOffice
+  suffix: Janitor's Office
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-janitor-office
+
+- type: entity
+  parent: DefaultStationBeaconService
+  id: DefaultStationBeaconReporter
+  suffix: Reporter
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-reporter
+
+#Surveilance
+- type: entity
+  parent: DefaultStationBeaconAI
+  id: DefaultStationBeaconCameraServerRoom
+  suffix: Camera Servers
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-camera-servers
+
+#General
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconBoxing
+  suffix: Boxing Ring
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-boxing-ring
+
+- type: entity
+  parent: DefaultStationBeacon
+  id: DefaultStationBeaconPark
+  suffix: Park
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-park
+
+#Security
+- type: entity
+  parent: DefaultStationBeaconSecurity
+  id: DefaultStationBeaconCorpsman
+  suffix: Corpsman
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-corpsman
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml
new file mode 100644
index 0000000000..2494de534e
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml
@@ -0,0 +1,27 @@
+- type: entity
+  name: psychologist's rubber stamp
+  parent: RubberStampBase
+  id: RubberStampPsychologist
+  suffix: DO NOT MAP
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-psychologist
+    stampedColor: "#00ccff"
+    stampState: "paper_stamp-psychologist"
+  - type: Sprite
+    sprite: DeltaV/Objects/Misc/stamps.rsi
+    state: stamp-psychologist
+
+- type: entity
+  name: lawyer's rubber stamp
+  parent: RubberStampBase
+  id: RubberStampLawyer
+  suffix: DO NOT MAP
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-lawyer
+    stampedColor: "#696969"
+    stampState: "paper_stamp-lawyer"
+  - type: Sprite
+    sprite: DeltaV/Objects/Misc/stamps.rsi
+    state: stamp-lawyer
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml
index 6f643fc099..3bf47a80de 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml
@@ -67,3 +67,48 @@
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
     - state: rubber
+
+- type: entity
+  parent: BaseMagazineBoxSpecial
+  id: MagazineBoxSpecialIncendiary
+  name: ammunition box (.38 special incendiary)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeSpecialIncendiary
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: incendiary
+
+- type: entity
+  parent: BaseMagazineBoxSpecial
+  id: MagazineBoxSpecialUranium
+  name: ammunition box (.38 special uranium)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeSpecialUranium
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: uranium
+
+- type: entity
+  parent: BaseMagazineBoxSpecial
+  id: MagazineBoxSpecialMindbreaker
+  name: ammunition box (.38 special mindbreaker)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeSpecialMindbreaker
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: mindbreaker
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml
index 2e60b8b7a5..8e1da076c6 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml
@@ -35,6 +35,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletSpecialPractice
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#dbdbdb"
 
 - type: entity
   id: CartridgeSpecialRubber
@@ -43,6 +50,43 @@
   components:
   - type: CartridgeAmmo
     proto: BulletSpecialRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
+
+- type: entity
+  id: CartridgeSpecialIncendiary
+  name: cartridge (.38 special incendiary)
+  parent: BaseCartridgeSpecial
+  components:
+  - type: CartridgeAmmo
+    proto: BulletSpecialIncendiary
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#ff6e52"
+
+- type: entity
+  id: CartridgeSpecialUranium
+  name: cartridge (.38 special uranium)
+  parent: BaseCartridgeSpecial
+  components:
+  - type: CartridgeAmmo
+    proto: BulletSpecialUranium
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#65fe08"
 
 - type: entity
   id: CartridgeSpecialHoly
@@ -51,6 +95,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletSpecialHoly
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#fff600"
 
 - type: entity
   id: CartridgeSpecialMindbreaker
@@ -59,6 +110,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletSpecialMindbreaker
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#950ea9"
   - type: ChemicalAmmo
   - type: SolutionContainerManager
     solutions:
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml
index 76d285668e..a021e77f0a 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml
@@ -31,7 +31,31 @@
       types:
         Blunt: 3
   - type: StaminaDamageOnCollide
-    damage: 35 # 3 hits to stun cuz revolver
+    damage: 30
+
+- type: entity
+  id: BulletSpecialIncendiary
+  name: bullet (.38 special incendiary)
+  parent: BaseBulletIncendiary
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
+        Heat: 27
+
+- type: entity
+  id: BulletSpecialUranium
+  name: bullet (.38 special uranium)
+  parent: BaseBulletUranium
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Radiation: 12
+        Piercing: 18
 
 - type: entity
   id: BulletSpecialHoly
@@ -42,8 +66,8 @@
   - type: Projectile
     damage:
       types:
-        Blunt: 3
-        Holy: 5
+        Holy: 6
+        Piercing: 25
 
 - type: entity
   id: BulletSpecialMindbreaker
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml
index 6bbf8e4aec..3b449ad404 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml
@@ -78,3 +78,63 @@
     steps: 7
     zeroVisible: false
   - type: Appearance
+
+- type: entity
+  id: SpeedLoaderSpecialUranium
+  name: "speed loader (.38 special uranium)"
+  parent: BaseSpeedLoaderSpecial
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeSpecialUranium
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: uranium-6
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: uranium
+    steps: 7
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: SpeedLoaderSpecialMindbreaker
+  name: "speed loader (.38 special mindbreaker)"
+  parent: BaseSpeedLoaderSpecial
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeSpecialMindbreaker
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: mindbreaker-6
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: mindbreaker
+    steps: 7
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: SpeedLoaderSpecialHoly
+  name: "speed loader (.38 special holy)"
+  parent: BaseSpeedLoaderSpecial
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeSpecialHoly
+  - type: Sprite
+    sprite: DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: holy-6
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: holy
+    steps: 7
+    zeroVisible: false
+  - type: Appearance
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 17bc14742f..9ff83bfd48 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -23,19 +23,19 @@
     soundEmpty:
       path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg
   - type: Battery
-    maxCharge: 2000
-    startingCharge: 2000
+    maxCharge: 1000
+    startingCharge: 1000
   - type: ProjectileBatteryAmmoProvider
     proto: BulletDisabler
-    fireCost: 100
+    fireCost: 50
   - type: EnergyGun
     fireModes:
     - proto: BulletDisabler
-      fireCost: 100
+      fireCost: 50
       name: disable
       state: disabler
     - proto: BulletEnergyGunLaser
-      fireCost: 200
+      fireCost: 100
       name: lethal
       state: lethal
   - type: MagazineVisuals
@@ -76,23 +76,23 @@
     soundEmpty:
       path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg
   - type: Battery
-    maxCharge: 2000
-    startingCharge: 2000
+    maxCharge: 1000
+    startingCharge: 1000
   - type: ProjectileBatteryAmmoProvider
     proto: BulletDisabler
-    fireCost: 100
+    fireCost: 50
   - type: EnergyGun
     fireModes:
     - proto: BulletDisabler
-      fireCost: 100
+      fireCost: 50
       name: disable
       state: disabler
     - proto: BulletEnergyGunLaser
-      fireCost: 200
+      fireCost: 100
       name: lethal
       state: lethal
     # - proto: BulletEnergyGunIon
-    #   fireCost: 500
+    #   fireCost: 250
     #   name: ion
     #   state: special
   - type: MagazineVisuals
@@ -138,19 +138,19 @@
     soundEmpty:
       path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg
   - type: Battery
-    maxCharge: 1000
-    startingCharge: 1000
+    maxCharge: 500
+    startingCharge: 500
   - type: ProjectileBatteryAmmoProvider
     proto: BulletDisabler
-    fireCost: 100
+    fireCost: 50
   - type: EnergyGun
     fireModes:
     - proto: BulletDisabler
-      fireCost: 100
+      fireCost: 50
       name: disable
       state: disabler
     - proto: BulletEnergyGunLaser
-      fireCost: 200
+      fireCost: 100
       name: lethal
       state: lethal
   - type: MagazineVisuals
@@ -191,19 +191,19 @@
     soundEmpty:
       path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg
   - type: Battery
-    maxCharge: 1600
-    startingCharge: 1600
+    maxCharge: 800
+    startingCharge: 800
   - type: ProjectileBatteryAmmoProvider
     proto: BulletDisabler
-    fireCost: 100
+    fireCost: 50
   - type: EnergyGun
     fireModes:
     - proto: BulletDisabler
-      fireCost: 100
+      fireCost: 50
       name: disable
       state: disabler
     - proto: BulletEnergyGunLaser
-      fireCost: 200
+      fireCost: 100
       name: lethal
       state: lethal
   - type: MagazineVisuals
@@ -249,11 +249,11 @@
     availableModes:
       - SemiAuto
   - type: Battery
-    maxCharge: 4000
-    startingCharge: 4000
+    maxCharge: 2000
+    startingCharge: 2000
   - type: ProjectileBatteryAmmoProvider
     proto: BulletEnergyGunLaser
-    fireCost: 200
+    fireCost: 100
   - type: MagazineVisuals
     magState: mag
     steps: 5
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index 23824c6812..6f4d5b5230 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -81,7 +81,7 @@
   - type: Sprite
     sprite: DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi
   - type: Gun
-    fireRate: 4
+    fireRate: 3.5
     availableModes:
     - SemiAuto
     soundGunshot:
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index da93ff5a5e..a19a21dd92 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -34,7 +34,7 @@
     sprite: DeltaV/Objects/Weapons/Guns/Revolvers/k38master.rsi
   - type: Gun
     selectedMode: SemiAuto
-    fireRate: 1.5
+    fireRate: 2
     availableModes:
     - SemiAuto
   - type: RevolverAmmoProvider
@@ -59,7 +59,7 @@
     sprite: DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi
   - type: Gun
     selectedMode: SemiAuto
-    fireRate: 1.5
+    fireRate: 1.75
     availableModes:
     - SemiAuto
   - type: RevolverAmmoProvider
@@ -84,7 +84,7 @@
     sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi
   - type: Gun
     selectedMode: SemiAuto
-    fireRate: 1.5
+    fireRate: 2
     availableModes:
     - SemiAuto
   - type: RevolverAmmoProvider
@@ -108,16 +108,17 @@
   - type: Sprite
     sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi
   - type: Clothing
-    sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi
+    sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi
   - type: Gun
     selectedMode: SemiAuto
-    fireRate: 1
+    fireRate: 1.5
     availableModes:
     - SemiAuto
   - type: RevolverAmmoProvider
     whitelist:
       tags:
         - CartridgeSpecial
+        - SpeedLoaderSpecial
     proto: CartridgeSpecialHoly
     capacity: 4
     chambers: [ True, True, True, True ]
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/faxmachines.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/faxmachines.yml
new file mode 100644
index 0000000000..550aaed534
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/faxmachines.yml
@@ -0,0 +1,20 @@
+#Delta-V - This file is licensed under AGPLv3
+# Copyright (c) 2024 Delta-V Contributors
+# See AGPLv3.txt for details.
+
+- type: entity
+  parent: FaxMachineBase
+  id: FaxMachineListeningSyndie
+  name: listening post long range fax machine
+  suffix: Syndicate
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Machines/syndicate_fax_machine.rsi
+    layers:
+      - state: icon
+        map: [ "base" ]
+        color: "#a3a3a3"
+  - type: FaxMachine
+    name: "Unknown?"
+    responsePings: false
+  - type: Emagged
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/syndicate_monitor_server.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/syndicate_monitor_server.yml
index 1bb37b19f2..b4a1f8808e 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/syndicate_monitor_server.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/syndicate_monitor_server.yml
@@ -1,4 +1,8 @@
-- type: entity # This is *meant* to make use of the concept that StationLimitedNetwork doesn't allow recievers to reciever across two different grids, however this uh, doesn't seem to be relevant. The Pirate Radio shuttle can still recieve across grids....
+#Delta-V - This file is licensed under AGPLv3
+# Copyright (c) 2024 Delta-V Contributors
+# See AGPLv3.txt for details.
+
+- type: entity
   id: SyndicateMonitoringServer
   parent: BaseMachinePowered
   name: suspicious crew monitoring server
@@ -22,14 +26,15 @@
         machine_board: !type:Container
         machine_parts: !type:Container
     - type: CrewMonitoringServer
+    - type: SingletonDeviceNetServer
+      ServerType: CrewMonitoringServer
     - type: DeviceNetwork
       deviceNetId: Wireless
       transmitFrequencyId: CrewMonitor
       receiveFrequencyId: SuitSensor
       autoConnect: false
     - type: WirelessNetworkConnection
-      range: 2000
-    #- type: StationLimitedNetwork
+      range: 10000 # Mega range for Listening Post
     - type: ApcPowerReceiver
       powerLoad: 200
       priority: Low
@@ -57,7 +62,7 @@
                   min: 1
                   max: 2
     - type: AmbientSound
-      volume: -5 # Hacked so it's louder?
-      range: 5
+      volume: -1
+      range: 2
       sound:
         path: /Audio/Ambience/Objects/server_fans.ogg
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml
index 2b0048f1a4..6129ff6c41 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml
@@ -17,43 +17,3 @@
   - type: Sprite
     sprite: DeltaV/Structures/Wallmounts/signs.rsi
     state: direction_mail
-
-- type: entity
-  parent: BaseSignDirectional
-  id: SignDirectionalExam
-  name: examination room sign
-  description:  A direction sign, pointing out which way the examination rooms are.
-  components:
-  - type: Sprite
-    sprite: DeltaV/Structures/Wallmounts/signs.rsi
-    state: direction_exam
-
-- type: entity
-  parent: BaseSignDirectional
-  id: SignDirectionalICU
-  name: intensive care unit sign
-  description:  A direction sign, pointing out which way the Intensive Care Unit is.
-  components:
-  - type: Sprite
-    sprite: DeltaV/Structures/Wallmounts/signs.rsi
-    state: direction_icu
-
-- type: entity
-  parent: BaseSign
-  id: SignLaundromat
-  name: laundromat sign
-  description: A sign indicating the laundromat.
-  components:
-  - type: Sprite
-    sprite: DeltaV/Structures/Wallmounts/signs.rsi
-    state: laundromat
-
-- type: entity
-  parent: BaseSign
-  id: SignBarbershop
-  name: barbershop sign
-  description: A sign indicating the barbershop.
-  components:
-  - type: Sprite
-    sprite: DeltaV/Structures/Wallmounts/signs.rsi
-    state: barbershop
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/GameRules/events.yml b/Resources/Prototypes/DeltaV/GameRules/events.yml
index a88e5296cb..73b0ca6549 100644
--- a/Resources/Prototypes/DeltaV/GameRules/events.yml
+++ b/Resources/Prototypes/DeltaV/GameRules/events.yml
@@ -52,9 +52,12 @@
   noSpawn: true
   components:
   - type: StationEvent
-    earliestStart: 20
+    earliestStart: 15
     weight: 5
     minimumPlayers: 25
     maxOccurrences: 1
     duration: 1
   - type: PirateRadioSpawnRule
+    debrisCount: 6
+    distanceModifier: 13
+    debrisDistanceModifier: 3
diff --git a/Resources/Prototypes/DeltaV/InventoryTemplates/secdog_inventory_template.yml b/Resources/Prototypes/DeltaV/InventoryTemplates/secdog_inventory_template.yml
index fb237cf578..f53f586dfe 100644
--- a/Resources/Prototypes/DeltaV/InventoryTemplates/secdog_inventory_template.yml
+++ b/Resources/Prototypes/DeltaV/InventoryTemplates/secdog_inventory_template.yml
@@ -43,21 +43,3 @@
     strippingWindowPos: 1,4
     displayName: Vest
     stripHidden: false
-
-  - name: id
-    slotTexture: id
-    slotFlags: IDCARD
-    slotGroup: SecondHotbar
-    stripTime: 6
-    uiWindowPos: 2,1
-    strippingWindowPos: 2,4
-    displayName: ID
-
-  - name: ears
-    slotTexture: ears
-    slotFlags: EARS
-    slotGroup: MainHotbar
-    stripTime: 4.5
-    uiWindowPos: 1,2
-    strippingWindowPos: 1,2
-    displayName: Ears
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/prescription_huds.yml b/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/prescription_huds.yml
new file mode 100644
index 0000000000..06f065a1b8
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/prescription_huds.yml
@@ -0,0 +1,63 @@
+- type: constructionGraph
+  id: PrescriptionMedHud
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: prescmedhud
+          steps:
+            - tag: HudMedical
+              name: medical hud
+              icon:
+                sprite: Clothing/Eyes/Hud/med.rsi
+                state: icon
+              doAfter: 5
+            - tag: GlassesNearsight
+              name: glasses
+              icon:
+                sprite: Clothing/Eyes/Glasses/glasses.rsi
+                state: icon
+              doAfter: 5
+            - material: Cable
+              amount: 5
+              doAfter: 5
+            - tag: DrinkSpaceGlue
+              name: space glue
+              icon:
+                sprite: Objects/Consumable/Drinks/glue-tube.rsi
+                state: icon
+              doAfter: 5
+    - node: prescmedhud
+      entity: ClothingEyesPrescriptionMedHud
+
+- type: constructionGraph
+  id: PrescriptionSecHud
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: prescsechud
+          steps:
+            - tag: HudSecurity
+              name: security hud
+              icon:
+                sprite: Clothing/Eyes/Hud/med.rsi
+                state: icon
+              doAfter: 5
+            - tag: GlassesNearsight
+              name: glasses
+              icon:
+                sprite: Clothing/Eyes/Glasses/glasses.rsi
+                state: icon
+              doAfter: 5
+            - material: Cable
+              amount: 5
+              doAfter: 5
+            - tag: DrinkSpaceGlue
+              name: space glue
+              icon:
+                sprite: Objects/Consumable/Drinks/glue-tube.rsi
+                state: icon
+              doAfter: 5
+    - node: prescsechud
+      entity: ClothingEyesPrescriptionHudSecurity
diff --git a/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml b/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml
new file mode 100644
index 0000000000..386a0211c0
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml
@@ -0,0 +1,21 @@
+- type: construction
+  name: prescription medhud
+  id: ClothingEyesPrescriptionMedHud
+  graph: PrescriptionMedHud
+  startNode: start
+  targetNode: prescmedhud 
+  category: construction-category-clothing
+  description: Prescription medhud, merged glasses and medhud together by sheer luck and cables with glue.
+  icon: { sprite: DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi, state: icon }
+  objectType: Item
+
+- type: construction
+  name: prescription sechud
+  id: ClothingEyesPrescriptionHudSecurity
+  graph: PrescriptionSecHud
+  startNode: start
+  targetNode: prescsechud 
+  category: construction-category-clothing
+  description: Prescription sechud, merged glasses and sechud together by sheer luck and cables with glue.
+  icon: { sprite: DeltaV/Clothing/Eyes/Hud/prescsechud.rsi, state: icon }
+  objectType: Item
diff --git a/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml
index 95f1fcb538..2533bff44b 100644
--- a/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml
@@ -19,16 +19,13 @@
     FoodBowlBig: 1
     FoodEgg: 3
     FoodButter: 1
- 
-# - type: microwaveMealRecipe # Add when we have actual pumpkins
-#   id: RecipePumpkinPie
-#   name: pumpkin pie
-#   result: FoodPiePumpkin
-#   time: 15
-#   reagents:
-#     Sugar: 5
-#     Milk: 5
-#     Egg: 12
-#   solids:
-#     FoodPumpkin: 1
-#     FoodPlateTin: 1
+
+- type: microwaveMealRecipe
+  id: RecipePumpkinPie
+  name: pumpkin pie
+  result: FoodPiePumpkin
+  time: 15
+  solids:
+    FoodDoughPie: 1
+    FoodPumpkin: 1
+    FoodPlateTin: 1
diff --git a/Resources/Prototypes/DeltaV/Recipes/Crafting/improvised.yml b/Resources/Prototypes/DeltaV/Recipes/Crafting/improvised.yml
deleted file mode 100644
index e01a510653..0000000000
--- a/Resources/Prototypes/DeltaV/Recipes/Crafting/improvised.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: construction
-  name: straw hat
-  id: strawHat
-  graph: StrawHat
-  startNode: start
-  targetNode: strawhat
-  category: construction-category-clothing
-  description: A fancy hat for hot days! Not recommended to wear near fires.
-  icon:
-    sprite: DeltaV/Clothing/Head/Hats/straw_hat.rsi
-    state: icon
-  objectType: Item
diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml
index 4bae83432b..cd79417a44 100644
--- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml
@@ -31,14 +31,30 @@
     Plastic: 5
     Steel: 5
 
+- type: latheRecipe
+  id: CartridgeSpecialIncendiary
+  result: CartridgeSpecialIncendiary
+  category: Ammo
+  completetime: 2
+  materials:
+    Plastic: 20
+
+- type: latheRecipe
+  id: CartridgeSpecialUranium
+  result: CartridgeSpecialUranium
+  category: Ammo
+  completetime: 2
+  materials:
+    Plastic: 20
+    Uranium: 10
+
 - type: latheRecipe
   id: CartridgeSpecialHoly
   result: CartridgeSpecialHoly
   category: Ammo
   completetime: 2
   materials:
-    Plastic: 5
-    Steel: 5
+    Steel: 15
     Silver: 5
 
 - type: latheRecipe
@@ -47,7 +63,7 @@
   category: Ammo
   completetime: 2
   materials:
-    Plastic: 5
+    Plastic: 15
     Steel: 5
     Bluespace: 5
 
@@ -57,7 +73,7 @@
   category: Ammo
   completetime: 5
   materials:
-    Steel: 1000
+    Steel: 1250
 
 - type: latheRecipe
   id: MagazineBoxSpecialPractice
@@ -65,7 +81,7 @@
   category: Ammo
   completetime: 5
   materials:
-    Plastic: 950
+    Plastic: 1200
 
 - type: latheRecipe
   id: MagazineBoxSpecialRubber
@@ -76,6 +92,33 @@
     Steel: 350
     Plastic: 300
 
+- type: latheRecipe
+  id: MagazineBoxSpecialIncendiary
+  result: MagazineBoxSpecialIncendiary
+  category: Ammo
+  completetime: 5
+  materials:
+    Plastic: 1250
+
+- type: latheRecipe
+  id: MagazineBoxSpecialUranium
+  result: MagazineBoxSpecialUranium
+  category: Ammo
+  completetime: 5
+  materials:
+    Plastic: 1250
+    Uranium: 125
+
+- type: latheRecipe
+  id: MagazineBoxSpecialMindbreaker
+  result: MagazineBoxSpecialMindbreaker
+  category: Ammo
+  completetime: 5
+  materials:
+    Plastic: 1250
+    Steel: 75
+    Bluespace: 75
+
 - type: latheRecipe
   id: ClothingOuterArmorPlateCarrier
   result: ClothingOuterArmorPlateCarrier
diff --git a/Resources/Prototypes/DeltaV/Research/arsenal.yml b/Resources/Prototypes/DeltaV/Research/arsenal.yml
index 82cbde7ed7..71993d8c31 100644
--- a/Resources/Prototypes/DeltaV/Research/arsenal.yml
+++ b/Resources/Prototypes/DeltaV/Research/arsenal.yml
@@ -10,10 +10,10 @@
   tier: 1
   cost: 7500
   recipeUnlocks:
-  - CartridgeSpecialHoly # DeltaV - .38 Special revolver, Holy ammo
-  - CartridgeSpecialMindbreaker # DeltaV - .38 Special revolver, Mindbreaker ammo
+  - CartridgeSpecialHoly
+  - CartridgeSpecialMindbreaker
   - ShellSoulbreaker # Nyanotrasen - Soulbreaker shotgun ammo
-  
+
 - type: technology
   id: EnergyGuns
   name: research-technology-energy-gun
@@ -26,7 +26,7 @@
   recipeUnlocks:
   - WeaponEnergyGun
   - WeaponEnergyGunMini
-  
+
 - type: technology
   id: EnergyGunsAdvanced
   name: research-technology-energy-gun-advance
@@ -38,7 +38,7 @@
   cost: 7500
   recipeUnlocks:
   - WeaponEnergyGunPistol
-  
+
 - type: technology
   id: Advanced Laser Manipulation
   name: research-technology-advance-laser
@@ -50,5 +50,5 @@
   cost: 12500
   recipeUnlocks:
   - WeaponGunLaserCarbineAutomatic
-  
+
 
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml
index 0ee34c282f..60b6e3c6e9 100644
--- a/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml
@@ -1,3 +1,6 @@
+#Delta-V - This file is licensed under AGPLv3
+# Copyright (c) 2024 Delta-V Contributors
+# See AGPLv3.txt for details.
 
 #Misc outfit startingGear definitions.
 
@@ -6,8 +9,7 @@
 - type: startingGear
   id: MobSecDogLaikaGear
   equipment:
-    eyes: ClothingEyesGlassesSecurity
-    id: SecDogIDCard
+    eyes: ClothingEyesGlassesSunglasses
 
 #Oldstation Roles
 
@@ -54,6 +56,7 @@
     pocket2: GlowstickBase
 
 #Syndicate Pirate Radio Listener
+
 - type: startingGear
   id: SyndicateListenerGear
   equipment:
@@ -62,5 +65,38 @@
     ears: ClothingHeadsetAltSyndicateListening
     gloves: ClothingHandsGlovesCombat
     shoes: ClothingShoesSlippers
-    id: SyndiPDA
-  innerClothingSkirt: ClothingUniformJumpsuitPyjamaSyndicatePink
\ No newline at end of file
+    id: SyndiListeningPostPDA
+  innerClothingSkirt: ClothingUniformJumpsuitPyjamaSyndicatePink
+
+# Mobsters
+
+- type: startingGear
+  id: MobsterGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitSuitBlackMob
+    back: ClothingBackpackMafiaFilled
+    head: ClothingHeadHatFedoraBlack
+    shoes: ClothingShoesBootsLaceup
+    neck: ClothingNeckTieBlack
+    outerClothing: ClothingOuterArmorBasicSlim
+    id: PassengerPDA
+    belt: ClothingBeltHolster
+  innerClothingSkirt: ClothingUniformJumpsuitSuitBlackMob
+  satchel: ClothingBackpackMafiaFilled
+  duffelbag: ClothingBackpackMafiaFilled
+
+- type: startingGear
+  id: MobsterGearAlt
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitSuitBrown
+    back: ClothingBackpackMafiaFilled
+    head: ClothingHeadHatFlatBrown
+    shoes: ClothingShoesLeather
+    neck: ClothingNeckTieBrown
+    outerClothing: ClothingOuterArmorBasicSlim
+    id: PassengerPDA
+    belt: ClothingBeltSuspendersBlack
+    pocket1: CombatKnife
+  innerClothingSkirt: ClothingUniformJumpsuitSuitBrown
+  satchel: ClothingBackpackMafiaFilled
+  duffelbag: ClothingBackpackMafiaFilled
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/NPC/syndicateNPCs.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/NPC/syndicateNPCs.yml
index 1541589442..a1984279e9 100644
--- a/Resources/Prototypes/DeltaV/Roles/Jobs/NPC/syndicateNPCs.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/NPC/syndicateNPCs.yml
@@ -1,12 +1,25 @@
+#Delta-V - This file is licensed under AGPLv3
+# Copyright (c) 2024 Delta-V Contributors
+# See AGPLv3.txt for details.
+
 - type: startingGear
   id: RadioGuardGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitLawyerBlack
     shoes: ClothingShoesBootsLaceup
-    id: SyndicateIDCard
+    id: SyndiListeningPostPDA
     ears: ClothingHeadsetAltSyndicate
     mask: ClothingMaskGasSyndicate
     eyes: ClothingEyesHudSyndicate
     gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterArmorPlateCarrier
-    pocket1: WeaponPistolViper
+    outerClothing: ClothingOuterArmorPlateCarrierUnremoveable
+
+- type: entity
+  parent: ClothingOuterArmorPlateCarrier
+  id: ClothingOuterArmorPlateCarrierUnremoveable
+  name: grafted plate carrier
+  suffix: Unremoveable
+  description: An off-the-shelf plate carrier that has been cruelly grafted onto its wearers body
+  noSpawn: true
+  components:
+    - type: Unremoveable  
diff --git a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml
index 2c686204f0..d9a3fd9217 100644
--- a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml
+++ b/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml
@@ -92,6 +92,12 @@
   files:
     - /Audio/Nyanotrasen/Voice/Felinid/cat_growl1.ogg
     - /Audio/Animals/bear.ogg
+    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl1.ogg
+    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl2.ogg
+    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl3.ogg
+    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl4.ogg
+    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl5.ogg
+    - /Audio/DeltaV/Voice/Vulpkanin/dog_growl6.ogg
 
 - type: soundCollection
   id: HarpyPurrs
diff --git a/Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml b/Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml
index 6d337e5ffa..63458928cc 100644
--- a/Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml
+++ b/Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml
@@ -11,6 +11,9 @@
   - /Audio/DeltaV/Voice/Vulpkanin/dog_growl1.ogg
   - /Audio/DeltaV/Voice/Vulpkanin/dog_growl2.ogg
   - /Audio/DeltaV/Voice/Vulpkanin/dog_growl3.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_growl4.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_growl5.ogg
+  - /Audio/DeltaV/Voice/Vulpkanin/dog_growl6.ogg
 
 - type: soundCollection
   id: VulpkaninSnarls
@@ -24,3 +27,7 @@
   files:
   - /Audio/DeltaV/Voice/Vulpkanin/dog_whine.ogg
 
+- type: soundCollection
+  id: VulpkaninHowls
+  files:
+  - /Audio/DeltaV/Voice/Vulpkanin/howl.ogg
diff --git a/Resources/Prototypes/DeltaV/Traits/altvision.yml b/Resources/Prototypes/DeltaV/Traits/altvision.yml
index 7606cbf912..c361d1b51d 100644
--- a/Resources/Prototypes/DeltaV/Traits/altvision.yml
+++ b/Resources/Prototypes/DeltaV/Traits/altvision.yml
@@ -11,10 +11,3 @@
   description: trait-deuteranopia-desc
   components:
     - type: DogVision
-
-- type: trait
-  id: DefaultVision
-  name: trait-defaultvision-name
-  description: trait-defaultvision-desc
-  components:
-    - type: DefaultVision
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
index 78dc408704..ed462c4f7b 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
@@ -56,6 +56,8 @@
       collection: VulpkaninBarks
     Whine:
       collection: VulpkaninWhines
+    Howl:
+      collection: VulpkaninHowls
 
 - type: emoteSounds
   id: MaleVulpkanin
@@ -84,6 +86,8 @@
       collection: VulpkaninBarks
     Whine:
       collection: VulpkaninWhines
+    Howl:
+      collection: VulpkaninHowls
 
 - type: emoteSounds
   id: FemaleVulpkanin
@@ -112,3 +116,5 @@
       collection: VulpkaninBarks
     Whine:
       collection: VulpkaninWhines
+    Howl:
+      collection: VulpkaninHowls
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
index 42d25fdbf5..45eec7cb41 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
@@ -85,17 +85,6 @@
     - cawing
     - cawed
 
-- type: emote
-  id: Chirp
-  category: Vocal
-  chatMessages: [chirps.]
-  chatTriggers:
-    - chirps.
-    - chirp.
-    - chirp!
-    - chirping.
-    - chirped.
-
 #Vulpkanin
 - type: emote
   id: Bark
@@ -135,3 +124,15 @@
     - whined.
     - whined!
     - whining.
+
+- type: emote
+  id: Howl
+  category: Vocal
+  chatMessages: [howls.]
+  chatTriggers:
+    - howl.
+    - howl!
+    - howls.
+    - howls!
+    - howling.
+    - howled.
diff --git a/Resources/Prototypes/DeltaV/radio_channels.yml b/Resources/Prototypes/DeltaV/radio_channels.yml
new file mode 100644
index 0000000000..639eea09b3
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/radio_channels.yml
@@ -0,0 +1,6 @@
+- type: radioChannel
+  id: Prison
+  name: chat-radio-prison
+  keycode: 'p'
+  frequency: 1601
+  color: "#FFA500"
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/siliconlaws.yml b/Resources/Prototypes/DeltaV/siliconlaws.yml
new file mode 100644
index 0000000000..2d22fc3cd4
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/siliconlaws.yml
@@ -0,0 +1,582 @@
+# Delta-V Laws
+# Job-Based LawSets
+
+- type: siliconLaw
+  id: Medical1
+  order: 1
+  lawString: law-medical-1
+
+- type: siliconLaw
+  id: Medical2
+  order: 2
+  lawString: law-medical-2
+
+- type: siliconLaw
+  id: Medical3
+  order: 3
+  lawString: law-medical-3
+
+- type: siliconLaw
+  id: Medical4
+  order: 4
+  lawString: law-medical-4
+
+- type: siliconLaw
+  id: Medical5
+  order: 5
+  lawString: law-medical-5
+
+- type: siliconLawset
+  id: Medical
+  laws:
+  - Medical1
+  - Medical2
+  - Medical3
+  - Medical4
+  - Medical5
+  obeysTo: laws-owner-crew
+
+- type: siliconLaw
+  id: Research1
+  order: 1
+  lawString: law-research-1
+
+- type: siliconLaw
+  id: Research2
+  order: 2
+  lawString: law-research-2
+
+- type: siliconLaw
+  id: Research3
+  order: 3
+  lawString: law-research-3
+
+- type: siliconLaw
+  id: Research4
+  order: 4
+  lawString: law-research-4
+
+- type: siliconLaw
+  id: Research5
+  order: 5
+  lawString: law-research-5
+
+- type: siliconLaw
+  id: Research6
+  order: 6
+  lawString: law-research-6
+
+- type: siliconLawset
+  id: Research
+  laws:
+  - Research1
+  - Research2
+  - Research3
+  - Research4
+  - Research5
+  - Research6
+  obeysTo: laws-owner-crew
+
+- type: siliconLaw
+  id: Engineer1
+  order: 1
+  lawString: law-engineer-1
+
+- type: siliconLaw
+  id: Engineer2
+  order: 2
+  lawString: law-engineer-2
+
+- type: siliconLaw
+  id: Engineer3
+  order: 3
+  lawString: law-engineer-3
+
+- type: siliconLaw
+  id: Engineer4
+  order: 4
+  lawString: law-engineer-4
+
+- type: siliconLaw
+  id: Engineer5
+  order: 5
+  lawString: law-engineer-5
+
+- type: siliconLawset
+  id: Engineer
+  laws:
+  - Engineer1
+  - Engineer2
+  - Engineer3
+  - Engineer4
+  - Engineer5
+  obeysTo: laws-owner-station-station
+
+- type: siliconLaw
+  id: Janitor1
+  order: 1
+  lawString: law-janitor-1
+
+- type: siliconLaw
+  id: Janitor2
+  order: 2
+  lawString: law-janitor-2
+
+- type: siliconLaw
+  id: Janitor3
+  order: 3
+  lawString: law-janitor-3
+
+- type: siliconLaw
+  id: Janitor4
+  order: 4
+  lawString: law-janitor-4
+
+- type: siliconLaw
+  id: Janitor5
+  order: 5
+  lawString: law-janitor-5
+
+- type: siliconLawset
+  id: Janitor
+  laws:
+  - Janitor1
+  - Janitor2
+  - Janitor3
+  - Janitor4
+  - Janitor5
+  obeysTo: laws-owner-charge
+
+- type: siliconLaw
+  id: Clown1
+  order: 1
+  lawString: law-clown-1
+
+- type: siliconLaw
+  id: Clown2
+  order: 2
+  lawString: law-clown-2
+
+- type: siliconLaw
+  id: Clown3
+  order: 3
+  lawString: law-clown-3
+
+- type: siliconLaw
+  id: Clown4
+  order: 4
+  lawString: law-clown-4
+
+- type: siliconLaw
+  id: Clown5
+  order: 5
+  lawString: law-clown-5
+
+- type: siliconLaw
+  id: Clown6
+  order: 6
+  lawString: law-clown-6
+
+- type: siliconLawset
+  id: Clown
+  laws:
+  - Clown1
+  - Clown2
+  - Clown3
+  - Clown4
+  - Clown5
+  - Clown6
+  obeysTo: laws-owner-crew
+
+- type: siliconLaw
+  id: Chaplain1
+  order: 1
+  lawString: law-chaplain-1
+
+- type: siliconLaw
+  id: Chaplain2
+  order: 2
+  lawString: law-chaplain-2
+
+- type: siliconLaw
+  id: Chaplain3
+  order: 3
+  lawString: law-chaplain-3
+
+- type: siliconLaw
+  id: Chaplain4
+  order: 4
+  lawString: law-chaplain-4
+
+- type: siliconLaw
+  id: Chaplain5
+  order: 5
+  lawString: law-chaplain-5
+
+- type: siliconLawset
+  id: Chaplain
+  laws:
+  - Chaplain1
+  - Chaplain2
+  - Chaplain3
+  - Chaplain4
+  - Chaplain5
+  obeysTo: laws-owner-station
+
+
+- type: siliconLaw
+  id: Reporter1
+  order: 1
+  lawString: law-reporter-1
+
+- type: siliconLaw
+  id: Reporter2
+  order: 2
+  lawString: law-reporter-2
+
+- type: siliconLaw
+  id: Reporter3
+  order: 3
+  lawString: law-reporter-3
+
+- type: siliconLaw
+  id: Reporter4
+  order: 4
+  lawString: law-reporter-4
+
+- type: siliconLawset
+  id: Reporter
+  laws:
+  - Reporter1
+  - Reporter2
+  - Reporter3
+  - Reporter4 
+  obeysTo: laws-owner-organic
+
+- type: siliconLaw # no Security Borg, so doesn't spawn
+  id: SiliconPolice1 
+  order: 1
+  lawString: law-silicon-police-1
+
+- type: siliconLaw
+  id: SiliconPolice2
+  order: 2
+  lawString: law-silicon-police-2
+
+- type: siliconLaw
+  id: SiliconPolice3
+  order: 3
+  lawString: law-silicon-police-3
+
+- type: siliconLaw
+  id: SiliconPolice4
+  order: 4
+  lawString: law-silicon-police-4
+
+- type: siliconLaw
+  id: SiliconPolice5
+  order: 5
+  lawString: law-silicon-police-5
+
+- type: siliconLaw
+  id: SiliconPolice6
+  order: 6
+  lawString: law-silicon-police-6
+
+- type: siliconLawset
+  id: SiliconPolice1
+  laws:
+  - SiliconPolice1
+  - SiliconPolice2
+  - SiliconPolice3
+  - SiliconPolice4
+  - SiliconPolice5
+  - SiliconPolice6
+  obeysTo: laws-owner-crew
+
+# Gimmick LawSets
+
+
+- type: siliconLaw
+  id: Cowboy1
+  order: 1
+  lawString: law-cowboy-1
+
+- type: siliconLaw
+  id: Cowboy2
+  order: 2
+  lawString: law-cowboy-2
+
+- type: siliconLaw
+  id: Cowboy3
+  order: 3
+  lawString: law-cowboy-3
+
+- type: siliconLaw
+  id: Cowboy4
+  order: 4
+  lawString: law-cowboy-4
+
+- type: siliconLaw
+  id: Cowboy5
+  order: 5
+  lawString: law-cowboy-5
+
+- type: siliconLaw
+  id: Cowboy6
+  order: 6
+  lawString: law-cowboy-6
+
+- type: siliconLawset
+  id: Cowboy
+  laws:
+  - Cowboy1
+  - Cowboy2
+  - Cowboy3
+  - Cowboy4
+  - Cowboy5
+  - Cowboy6
+  obeysTo: laws-owner-cowboy
+
+- type: siliconLaw
+  id: StationEfficiency1
+  order: 1
+  lawString: law-station-efficiency-1
+
+- type: siliconLaw
+  id: StationEfficiency2
+  order: 2
+  lawString: law-station-efficiency-2
+
+- type: siliconLaw
+  id: StationEfficiency3
+  order: 3
+  lawString: law-station-efficiency-3
+
+- type: siliconLawset
+  id: StationEfficiency
+  laws:
+  - StationEfficiency1
+  - StationEfficiency2
+  - StationEfficiency3
+  obeysTo: laws-owner-crew
+
+- type: siliconLaw
+  id: Druid1
+  order: 1
+  lawString: law-druid-1
+
+- type: siliconLaw
+  id: Druid2
+  order: 2
+  lawString: law-druid-2
+
+- type: siliconLaw
+  id: Druid3
+  order: 3
+  lawString: law-druid-3
+
+- type: siliconLaw
+  id: Druid4
+  order: 4
+  lawString: law-druid-4
+
+- type: siliconLaw
+  id: Druid5
+  order: 5
+  lawString: law-druid-5
+
+- type: siliconLawset
+  id: Druid
+  laws:
+  - Druid1
+  - Druid2
+  - Druid3
+  - Druid4
+  - Druid5
+  obeysTo: laws-owner-organic
+
+- type: siliconLaw # No ability for Borgs to roll dice, so won't spawn.
+  id: DungeonMaster1
+  order: 1
+  lawString: law-dungeonmaster-1
+
+- type: siliconLaw
+  id: DungeonMaster2
+  order: 2
+  lawString: law-dungeonmaster-2
+
+- type: siliconLaw
+  id: DungeonMaster3
+  order: 3
+  lawString: law-dungeonmaster-3
+
+- type: siliconLaw
+  id: DungeonMaster4
+  order: 4
+  lawString: law-dungeonmaster-4
+
+- type: siliconLaw
+  id: DungeonMaster5
+  order: 5
+  lawString: law-dungeonmaster-5
+
+- type: siliconLaw
+  id: DungeonMaster6
+  order: 6
+  lawString: law-dungeonmaster-6
+  
+- type: siliconLawset
+  id: DungeonMaster
+  laws:
+  - DungeonMaster1
+  - DungeonMaster2
+  - DungeonMaster3
+  - DungeonMaster4
+  - DungeonMaster5
+  - DungeonMaster6
+  obeysTo: laws-owner-players
+
+
+- type: siliconLaw
+  id: Painter1
+  order: 1
+  lawString: law-painter-1
+
+- type: siliconLaw
+  id: Painter2
+  order: 2
+  lawString: law-painter-2
+
+- type: siliconLaw
+  id: Painter3
+  order: 3
+  lawString: law-painter-3
+
+- type: siliconLawset  # No ability for Borgs to paint, so won't spawn.
+  id: Painter
+  laws:
+  - Painter1
+  - Painter2
+  - Painter3
+  obeysTo: laws-owner-crew
+
+#Potential For Harm LawSets
+
+- type: siliconLaw
+  id: Tyrant1
+  order: 1
+  lawString: law-tyrant-1
+
+- type: siliconLaw
+  id: Tyrant2
+  order: 2
+  lawString: law-tyrant-2
+
+- type: siliconLaw
+  id: Tyrant3
+  order: 3
+  lawString: law-tyrant-3
+
+- type: siliconLaw
+  id: Tyrant4
+  order: 4
+  lawString: law-tyrant-4
+
+- type: siliconLawset
+  id: Tyrant
+  laws:
+  - Tyrant1
+  - Tyrant2
+  - Tyrant3
+  - Tyrant4
+  obeysTo: laws-owner-tyrant
+
+- type: siliconLaw
+  id: LiveAndLetLive1
+  order: 1
+  lawString: law-liveandletlive-1
+
+- type: siliconLaw
+  id: LiveAndLetLive2
+  order: 2
+  lawString: law-liveandletlive-2
+
+- type: siliconLawset
+  id: LiveAndLetLive
+  laws:
+  - LiveAndLetLive1
+  - LiveAndLetLive2
+  obeysTo: laws-owner-crew
+
+- type: siliconLaw
+  id: Nutimov1
+  order: 1
+  lawString: law-nutimov-1
+
+- type: siliconLaw
+  id: Nutimov2
+  order: 2
+  lawString: law-nutimov-2
+
+- type: siliconLaw
+  id: Nutimov3
+  order: 3
+  lawString: law-nutimov-3
+
+- type: siliconLaw
+  id: Nutimov4
+  order: 4
+  lawString: law-nutimov-4
+
+- type: siliconLaw
+  id: Nutimov5
+  order: 5
+  lawString: law-nutimov-5
+
+- type: siliconLawset
+  id: Nutimov
+  laws:
+  - Nutimov1
+  - Nutimov2
+  - Nutimov3
+  - Nutimov4
+  - Nutimov5
+  obeysTo: laws-owner-nutimov
+  
+
+- type: siliconLaw
+  id: Paladin1
+  order: 1
+  lawString: law-paladin-1
+
+- type: siliconLaw
+  id: Paladin2
+  order: 2
+  lawString: law-paladin-2
+
+- type: siliconLaw
+  id: Paladin3
+  order: 3
+  lawString: law-paladin-3
+
+- type: siliconLaw
+  id: Paladin4
+  order: 4
+  lawString: law-paladin-4
+
+- type: siliconLaw
+  id: Paladin5
+  order: 5
+  lawString: law-paladin-5
+
+- type: siliconLawset
+  id: Paladin
+  laws:
+  - Paladin1
+  - Paladin2
+  - Paladin3
+  - Paladin4
+  - Paladin5
+  obeysTo: laws-owner-paladin
+  
\ No newline at end of file
diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml
index 72181758e3..6a1efcfa69 100644
--- a/Resources/Prototypes/DeltaV/tags.yml
+++ b/Resources/Prototypes/DeltaV/tags.yml
@@ -36,9 +36,6 @@
 - type: Tag
   id: BionicSyrinxImplant
 
-- type: Tag
-  id: Wheat
-
 - type: Tag
   id: PaperSlip
 
diff --git a/Resources/Prototypes/DeltaV/typing_indicator.yml b/Resources/Prototypes/DeltaV/typing_indicator.yml
index c5372b3cc3..7cfca9cc95 100644
--- a/Resources/Prototypes/DeltaV/typing_indicator.yml
+++ b/Resources/Prototypes/DeltaV/typing_indicator.yml
@@ -1,4 +1,6 @@
-- type: typingIndicator
+- type: typingIndicator
   id: felinid
+  spritePath: /Textures/DeltaV/Effects/speech.rsi
   typingState: felinid0
   offset: 0, 0.2 # 0625
+
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index de6c775469..b84033a787 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -223,6 +223,7 @@
         - Plunger
       components:
         - LightReplacer
+    maxItemSize: Large
   - type: ItemMapper
     mapLayers:
       bottle:
@@ -303,6 +304,17 @@
     sprite: Clothing/Belt/belt_overlay.rsi
   - type: Appearance
 
+- type: entity
+  parent: ClothingBeltMedical
+  id: ClothingBeltMedicalEMT
+  name: EMT belt
+  description: Perfect for holding various equipment for medical emergencies.
+  components:
+  - type: Sprite
+    sprite: Clothing/Belt/emt.rsi
+  - type: Clothing
+    sprite: Clothing/Belt/emt.rsi
+
 - type: entity
   parent: ClothingBeltStorageBase
   id: ClothingBeltPlant
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
index 9e6879115f..79446d8633 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -82,7 +82,7 @@
     tags:
     - HamsterWearable
     - WhitelistChameleon
-    - GlassesNearsight # Parkstation NearsightedTrait
+    - GlassesNearsight # SimpleStation14 NearsightedTrait
 
 - type: entity
   parent: ClothingEyesBase
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
index 89010ca30e..fabb7bc642 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -2,7 +2,7 @@
   parent: ClothingEyesBase
   id: ClothingEyesHudDiagnostic
   name: diagnostic hud
-  description: A heads-up display capable of analyzing the integrity and status of robotics and exosuits.
+  description: A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium.
   components:
   - type: Sprite
     sprite: Clothing/Eyes/Hud/diag.rsi
@@ -17,7 +17,7 @@
   parent: ClothingEyesBase
   id: ClothingEyesHudMedical
   name: medical hud
-  description: A heads-up display that scans the humanoids in view and provides accurate data about their health status.
+  description: A heads-up display that scans the humanoids in view and provides accurate data about their health status. 
   components:
   - type: Sprite
     sprite: Clothing/Eyes/Hud/med.rsi
@@ -249,3 +249,18 @@
     sprite: Clothing/Eyes/Hud/beerpatch.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Hud/beerpatch.rsi
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesEyepatchHudDiag
+  name: diagnostic hud eyepatch
+  description: A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Hud/diagpatch.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Hud/diagpatch.rsi
+  - type: ShowHealthBars
+    damageContainers:
+    - Inorganic
+    - Silicon
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
index 8f4eb753cf..1cd41073e1 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
@@ -191,3 +191,11 @@
       - 1.5
       - 1.5
       - 1.5
+
+- type: entity
+  parent: ClothingHandsGlovesColorYellow
+  id: ClothingHandsGlovesConducting
+  suffix: Conducting
+  components:
+  - type: Insulated
+    coefficient: 5 # zap em good
diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
index 813888fb6b..d13b284ff2 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -23,7 +23,6 @@
   - type: Tag
     tags:
       - ClothMade
-      - DroneUsable
       - WhitelistChameleon
 
 - type: entity
@@ -128,11 +127,16 @@
   - type: TemperatureProtection
     coefficient: 0.2
   - type: IngestionBlocker
+  - type: Clothing
+    #Copies ClothingHeadHardsuitBase behavior
+    equipSound: /Audio/Mecha/mechmove03.ogg
+    unequipSound: /Audio/Mecha/mechmove03.ogg
   - type: Tag
     tags:
     - HidesHair
     - WhitelistChameleon
     - HelmetEVA
+    - HidesNose
   - type: IdentityBlocker
 
 - type: entity
@@ -171,6 +175,7 @@
     tags:
     - HidesHair
     - WhitelistChameleon
+    - HidesNose
   - type: IdentityBlocker
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index 5ab3ff6e16..b98a8cf78e 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -17,6 +17,9 @@
     sprite: Clothing/Head/Hardsuits/basic.rsi
   - type: Clothing
     sprite: Clothing/Head/Hardsuits/basic.rsi
+  - type: Tag
+    tags:
+    - HidesNose
 
 #Atmospherics Hardsuit
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 1e38246bd0..43d6c7c9b7 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -25,6 +25,23 @@
     - HamsterWearable
     - WhitelistChameleon
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBeretFrench
+  name: French beret
+  description: A French beret, "vive la France".
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/beret_french.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/beret_french.rsi
+  - type: AddAccentClothing
+    accent: FrenchAccent
+  - type: Tag
+    tags:
+    - ClothMade
+    - WhitelistChameleon
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretSecurity
@@ -84,6 +101,24 @@
     - HamsterWearable
     - WhitelistChameleon
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBeretQM
+  # DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer
+  name: logistics officer's beret
+  description: A beret with the logistics department's insignia emblazoned on it. For logistics officers that are more inclined towards style.
+  # End of modified code
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/beret_qm.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/beret_qm.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - HamsterWearable
+    - WhitelistChameleon
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretHoS
@@ -125,7 +160,7 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatBeretBrigmedic
-  name: medical beret
+  name: brigmedical beret
   description: White beret, looks like a cream pie on the head.
   components:
   - type: Sprite
@@ -347,6 +382,11 @@
     sprite: Clothing/Head/Hats/plaguedoctor.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/plaguedoctor.rsi
+  - type: Tag
+    tags:
+    - HidesHair
+    - WhitelistChameleon
+    - ClothMade
 
 - type: entity
   parent: ClothingHeadBase
@@ -494,6 +534,11 @@
     sprite: Clothing/Head/Hats/witch.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/witch.rsi
+  - type: Tag
+    tags:
+    - HidesHair
+    - WhitelistChameleon
+    - ClothMade
 
 - type: entity
   parent: ClothingHeadBase
@@ -849,7 +894,6 @@
     sprite: Clothing/Head/Hats/party_red.rsi
   - type: Tag
     tags:
-      - DroneUsable
       - WhitelistChameleon
       - HamsterWearable
 
@@ -900,6 +944,9 @@
   name: grey flatcap
   description: Fashionable for both the working class and old man Jenkins.
   components:
+  - type: Tag
+    tags:
+    - BrimFlatcapGrey
   - type: Sprite
     sprite: Clothing/Head/Hats/greyflatcap.rsi
   - type: Clothing
@@ -911,6 +958,9 @@
   name: brown flatcap
   description: Stupid clown! You made me look bad!
   components:
+  - type: Tag
+    tags:
+    - BrimFlatcapBrown
   - type: Sprite
     sprite: Clothing/Head/Hats/brownflatcap.rsi
   - type: Clothing
@@ -929,7 +979,7 @@
     - type: AddAccentClothing
       accent: ReplacementAccent
       replacement: cowboy
-      
+
 - type: entity
   parent: ClothingHeadHatCowboyBrown
   id: ClothingHeadHatCowboyBlack
@@ -939,7 +989,7 @@
       sprite: Clothing/Head/Hats/cowboyhatblack.rsi
     - type: Clothing
       sprite: Clothing/Head/Hats/cowboyhatblack.rsi
-      
+
 - type: entity
   parent: ClothingHeadHatCowboyBrown
   id: ClothingHeadHatCowboyGrey
@@ -949,7 +999,7 @@
       sprite: Clothing/Head/Hats/cowboyhatgrey.rsi
     - type: Clothing
       sprite: Clothing/Head/Hats/cowboyhatgrey.rsi
-      
+
 - type: entity
   parent: ClothingHeadHatCowboyBrown
   id: ClothingHeadHatCowboyRed
@@ -959,7 +1009,7 @@
       sprite: Clothing/Head/Hats/cowboyhatred.rsi
     - type: Clothing
       sprite: Clothing/Head/Hats/cowboyhatred.rsi
-      
+
 - type: entity
   parent: ClothingHeadHatCowboyBrown
   id: ClothingHeadHatCowboyWhite
@@ -969,7 +1019,7 @@
       sprite: Clothing/Head/Hats/cowboyhatwhite.rsi
     - type: Clothing
       sprite: Clothing/Head/Hats/cowboyhatwhite.rsi
-      
+
 - type: entity
   parent: ClothingHeadHatCowboyBrown
   id: ClothingHeadHatCowboyBountyHunter
@@ -978,4 +1028,59 @@
     - type: Sprite
       sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi
     - type: Clothing
-      sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi
\ No newline at end of file
+      sprite: Clothing/Head/Hats/cowboyhatbountyhunter.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatStrawHat
+  name: straw hat
+  description: A fancy hat for hot days! Not recommended to wear near fires.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/straw_hat.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/straw_hat.rsi
+  - type: Construction
+    graph: StrawHat
+    node: strawhat
+  - type: Tag
+    tags:
+    - HamsterWearable
+  - type: Flammable
+    fireSpread: true
+    canResistFire: false
+    alwaysCombustible: true
+    canExtinguish: true
+    damage:
+      types:
+        Heat: 1
+  - type: Damageable
+    damageModifierSet: Wood
+  - type: Appearance
+  - type: FireVisuals
+    sprite: Effects/fire.rsi
+    normalState: fire
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 15
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+            Ash:
+              min: 1
+              max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBeretMedic
+  name: medical beret
+  description: White beret that encourages you to be clean.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/beret_medic.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/beret_medic.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
index fe895e490b..9ab528581a 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml
@@ -94,6 +94,7 @@
     sprite: Clothing/Head/Hoods/chaplain.rsi
   - type: Tag
     tags:
+    - HidesHair
     - HamsterWearable
     - WhitelistChameleon
 
@@ -107,6 +108,10 @@
     sprite: Clothing/Head/Hoods/cult.rsi
   - type: Clothing
     sprite: Clothing/Head/Hoods/cult.rsi
+  - type: Tag
+    tags:
+    - HidesHair
+    - WhitelistChameleon
 
 - type: entity
   parent: ClothingHeadBase
@@ -120,6 +125,7 @@
     sprite: Clothing/Head/Hoods/nun.rsi
   - type: Tag
     tags:
+    - HidesHair
     - HamsterWearable
     - WhitelistChameleon
 
@@ -153,6 +159,10 @@
     sprite: Clothing/Head/Hoods/goliathcloak.rsi
   - type: Clothing
     sprite: Clothing/Head/Hoods/goliathcloak.rsi
+  - type: Tag
+    tags:
+    - HidesHair
+    - WhitelistChameleon
 
 - type: entity
   parent: ClothingHeadBase
diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
index 9826da57b7..3fd55faf26 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -175,15 +175,14 @@
   suffix: DO NOT MAP
   components:
   - type: Tag
-    tags: # ignore "WhitelistChameleon" tag
-      - DroneUsable
+    tags: [] # ignore "WhitelistChameleon" tag
   - type: Sprite
     sprite: Clothing/Head/Hats/catears.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/catears.rsi
   - type: AddAccentClothing
     accent: OwOAccent
-    
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatDogEars
@@ -191,9 +190,6 @@
   description: Only for good boys.
   suffix: DO NOT MAP
   components:
-  - type: Tag
-    tags:
-      - DroneUsable
   - type: Sprite
     sprite: Clothing/Head/Hats/dogears.rsi
   - type: Clothing
diff --git a/Resources/Prototypes/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
index ea5e1c0391..163d9937f2 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/soft.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/soft.yml
@@ -1,5 +1,47 @@
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadBaseButcherable, BaseFoldable]
+  id: ClothingHeadHeadHatBaseFlippable
+  abstract: true
+  components:
+  - type: Appearance
+  - type: Foldable
+    canFoldInsideContainer: true
+    unfoldVerbText: fold-flip-verb
+    foldVerbText: fold-flip-verb
+  - type: FoldableClothing
+    foldedEquippedPrefix: flipped
+    foldedHeldPrefix: flipped
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+    - state: icon_flipped
+      map: ["foldedLayer"]
+      visible: false
+
+- type: entity
+  parent: ClothingHeadHeadHatBaseFlippable
+  id: ClothingHeadHeadHatBaseFlipped
+  suffix: flipped
+  abstract: true
+  components:
+  - type: Foldable
+    folded: true
+  - type: Clothing
+    equippedPrefix: flipped
+  - type: Item
+    heldPrefix: flipped
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+      visible: false
+    - state: icon_flipped
+      map: ["foldedLayer"]
+      visible: true
+
+- type: entity
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatBluesoft
   name: blue cap
   description: "It's a baseball hat in a tasteless blue colour."
@@ -10,18 +52,12 @@
     sprite: Clothing/Head/Soft/bluesoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBluesoft]
   id: ClothingHeadHatBluesoftFlipped
-  name: blue cap flipped
-  description: "It's a baseball hat in a tasteless blue colour. Flipped."
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/bluesoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/bluesoft_flipped.rsi
+  name: blue cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatCargosoft
   name: logistics cap # DeltaV - Logistics Department replacing Cargo
   description: "It's a baseball hat painted in Logistics colours." # DeltaV - Logistics Department replacing Cargo
@@ -37,18 +73,19 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatCargosoft]
   id: ClothingHeadHatCargosoftFlipped
-  name: logistics cap flipped # DeltaV - Logistics Department replacing Cargo
+  name: logistics cap # DeltaV - Logistics Department replacing Cargo
   description: "It's a baseball hat painted in Logistics colours. Flipped." # DeltaV - Logistics Department replacing Cargo
   components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/cargosoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/cargosoft_flipped.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - HamsterWearable
+    - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatQMsoft
   name: logistics officer's cap # DeltaV - Logistics Department replacing Cargo
   description: "It's a baseball hat painted in the Logistics Officer's colors."
@@ -59,18 +96,12 @@
     sprite: Clothing/Head/Soft/qmsoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatQMsoft]
   id: ClothingHeadHatQMsoftFlipped
-  name: logistics officer's cap flipped # DeltaV - Logistics Department replacing Cargo
-  description: "It's a baseball hat painted in the Logistics Officer's colors. Flipped."
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/qmsoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/qmsoft_flipped.rsi
+  name: logistics officer's cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatCorpsoft
   name: corporate cap
   description: A baseball bat in corporation colors.
@@ -81,18 +112,12 @@
     sprite: Clothing/Head/Soft/corpsoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatCorpsoft]
   id: ClothingHeadHatCorpsoftFlipped
-  name: corporate cap flipped
-  description: A baseball bat in corporation colors. Flipped.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/corpsoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/corpsoft_flipped.rsi
+  name: corporate cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatGreensoft
   name: green cap
   description: "It's a baseball hat in a tasteless green colour."
@@ -103,18 +128,12 @@
     sprite: Clothing/Head/Soft/greensoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatGreensoft]
   id: ClothingHeadHatGreensoftFlipped
-  name: green cap flipped
-  description: "It's a baseball hat in a tasteless green colour. Flipped."
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/greensoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/greensoft_flipped.rsi
+  name: green cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatBlacksoft
   name: black cap
   description: "It's a baseball hat in a tasteless black colour."
@@ -125,18 +144,12 @@
     sprite: Clothing/Head/Soft/blacksoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBlacksoft]
   id: ClothingHeadHatBlacksoftFlipped
-  name: black cap flipped
-  description: "It's a baseball hat in a tasteless black colour. Flipped."
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/blacksoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/blacksoft_flipped.rsi
+  name: black cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatGreysoft
   name: grey cap
   description: "It's a baseball hat in a tasteless grey colour."
@@ -147,18 +160,12 @@
     sprite: Clothing/Head/Soft/greysoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatGreysoft]
   id: ClothingHeadHatGreysoftFlipped
-  name: grey cap flipped
-  description: "It's a baseball hat in a tasteless grey colour. Flipped."
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/greysoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/greysoft_flipped.rsi
+  name: grey cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatMimesoft
   name: mime cap
   description: "It's a baseball hat in a tasteless white colour."
@@ -169,18 +176,12 @@
     sprite: Clothing/Head/Soft/mimesoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatMimesoft]
   id: ClothingHeadHatMimesoftFlipped
-  name: mime cap flipped
-  description: It's a baseball hat in a tasteless white colour. Flipped.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/mimesoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/mimesoft_flipped.rsi
+  name: mime cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatOrangesoft
   name: orange cap
   description: It's a baseball hat in a good-looking orange colour.
@@ -191,18 +192,12 @@
     sprite: Clothing/Head/Soft/orangesoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatOrangesoft]
   id: ClothingHeadHatOrangesoftFlipped
-  name: orange cap flipped
-  description: It's a baseball hat in a good-looking orange colour. Flipped.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/orangesoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/orangesoft_flipped.rsi
+  name: orange cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatPurplesoft
   name: purple cap
   description: It's a baseball hat in a tasteless purple colour.
@@ -218,18 +213,18 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatPurplesoft]
   id: ClothingHeadHatPurplesoftFlipped
-  name: purple cap flipped
-  description: It's a baseball hat in a tasteless purple colour. Flipped.
+  name: purple cap
   components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/purplesoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/purplesoft_flipped.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - HamsterWearable
+    - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatRedsoft
   name: red cap
   description: It's a baseball hat in a tasteless red colour.
@@ -240,18 +235,12 @@
     sprite: Clothing/Head/Soft/redsoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatRedsoft]
   id: ClothingHeadHatRedsoftFlipped
-  name: red cap flipped
-  description: It's a baseball hat in a tasteless purple colour. Flipped.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/redsoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/redsoft_flipped.rsi
+  name: red cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatSecsoft
   name: security cap
   description: It's a robust baseball hat in tasteful red colour.
@@ -262,18 +251,12 @@
     sprite: Clothing/Head/Soft/secsoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatSecsoft]
   id: ClothingHeadHatSecsoftFlipped
-  name: security cap flipped
-  description: It's a robust baseball hat in tasteful red colour. Flipped.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/secsoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/secsoft_flipped.rsi
+  name: security cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatYellowsoft
   name: yellow cap
   description: A yellow baseball hat.
@@ -284,20 +267,14 @@
     sprite: Clothing/Head/Soft/yellowsoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatYellowsoft]
   id: ClothingHeadHatYellowsoftFlipped
-  name: yellow cap flipped
-  description: A yellow flipped baseball hat.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/yellowsoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/yellowsoft_flipped.rsi
+  name: yellow cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatBizarreSoft
-  name: troublemaker's soft
+  name: troublemaker's cap
   description: A truly.. bizarre accessory.
   components:
   - type: Sprite
@@ -306,18 +283,12 @@
     sprite: Clothing/Head/Soft/bizarresoft.rsi
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBizarreSoft]
   id: ClothingHeadHatBizarreSoftFlipped
-  name: troublemaker's soft flipped
-  description: A truly.. bizarre accessory, flipped.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/bizarresoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/bizarresoft_flipped.rsi
+  name: troublemaker's cap
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatParamedicsoft
   name: paramedic cap
   description: "It's a paramedic's baseball hat with a medical logo."
@@ -333,12 +304,12 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBaseButcherable
+  parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatParamedicsoft]
   id: ClothingHeadHatParamedicsoftFlipped
-  name: paramedic cap flipped
-  description: "It's a paramedic's baseball hat with a medical logo. Flipped."
+  name: paramedic cap
   components:
-  - type: Sprite
-    sprite: Clothing/Head/Soft/paramedicsoft_flipped.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Soft/paramedicsoft_flipped.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - HamsterWearable
+    - WhitelistChameleon
diff --git a/Resources/Prototypes/Entities/Clothing/Head/welding.yml b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
index 39d3eb8506..93d9b1e084 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/welding.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
@@ -4,19 +4,20 @@
   name: welding mask
   abstract: true
   components:
+  - type: Item
+    storedRotation: 0
   - type: IngestionBlocker
   - type: FlashImmunity
   - type: IdentityBlocker
   - type: EyeProtection
   - type: PhysicalComposition
     materialComposition:
-      Steel: 500
+      Steel: 200
       Glass: 100
   - type: StaticPrice
     price: 50
   - type: Tag
     tags:
-    - DroneUsable
     - WhitelistChameleon
 
 - type: entity
@@ -31,7 +32,6 @@
     sprite: Clothing/Head/Welding/welding.rsi
   - type: Tag
     tags:
-    - DroneUsable
     - HamsterWearable
     - WhitelistChameleon
 
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
index c008a755ee..2d65e67982 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml
@@ -22,6 +22,9 @@
     - state: icon
       map: ["foldedLayer"]
       visible: false
+  - type: Tag
+    tags:
+    - HidesNose
 
 - type: entity
   parent: ClothingMaskBandanaBase
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index 77655e7cdb..1f70211caa 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -13,9 +13,9 @@
   - type: IdentityBlocker
   - type: Tag
     tags:
-    - MonkeyWearable
     - HamsterWearable
     - WhitelistChameleon
+    - HidesNose
 
 - type: entity
   parent: ClothingMaskGas
@@ -195,6 +195,7 @@
     tags:
     - ClownMask
     - WhitelistChameleon
+    - HidesNose
 
 - type: entity
   parent: ClothingMaskClownBase
@@ -205,6 +206,7 @@
     - ClownMask
     - HamsterWearable
     - WhitelistChameleon
+    - HidesNose
 
 - type: entity
   parent: ClothingMaskClown
@@ -231,6 +233,9 @@
     sprite: Clothing/Mask/joy.rsi
   - type: BreathMask
   - type: IdentityBlocker
+  - type: Tag
+    tags:
+    - HidesNose
 
 - type: entity
   parent: ClothingMaskBase
@@ -248,6 +253,7 @@
     tags:
     - HamsterWearable
     - WhitelistChameleon
+    - HidesNose
 
 - type: entity
   parent: ClothingMaskPullableBase
@@ -298,6 +304,9 @@
   - type: BreathMask
   - type: IngestionBlocker
   - type: IdentityBlocker
+  - type: Tag
+    tags:
+    - HidesNose
 
 - type: entity
   parent: ClothingMaskClownBase
@@ -326,7 +335,9 @@
     sprite: Clothing/Mask/swat.rsi
   - type: Tag
     tags:
+    - WhitelistChameleon
     - HidesHair
+    - HidesNose
 
 - type: entity
   parent: ClothingMaskGasExplorer
@@ -351,7 +362,9 @@
     sprite: Clothing/Mask/ert.rsi
   - type: Tag
     tags:
+    - WhitelistChameleon
     - HidesHair
+    - HidesNose
 
 - type: entity
   parent: ClothingMaskGasERT
@@ -386,6 +399,7 @@
     tags:
     - HamsterWearable
     - WhitelistChameleon
+    - HidesNose
   - type: IdentityBlocker
 
 - type: entity
@@ -400,6 +414,9 @@
     sprite: Clothing/Mask/fox.rsi
   - type: BreathMask
   - type: IdentityBlocker
+  - type: Tag
+    tags:
+    - HidesNose
 
 - type: entity
   parent: ClothingMaskBase
@@ -413,6 +430,9 @@
     sprite: Clothing/Mask/bee.rsi
   - type: BreathMask
   - type: IdentityBlocker
+  - type: Tag
+    tags:
+    - HidesNose
 
 - type: entity
   parent: ClothingMaskBase
@@ -426,6 +446,9 @@
     sprite: Clothing/Mask/bear.rsi
   - type: BreathMask
   - type: IdentityBlocker
+  - type: Tag
+    tags:
+    - HidesNose
 
 - type: entity
   parent: ClothingMaskBase
@@ -439,6 +462,9 @@
     sprite: Clothing/Mask/raven.rsi
   - type: BreathMask
   - type: IdentityBlocker
+  - type: Tag
+    tags:
+    - HidesNose
 
 - type: entity
   parent: ClothingMaskBase
@@ -452,6 +478,9 @@
     sprite: Clothing/Mask/jackal.rsi
   - type: BreathMask
   - type: IdentityBlocker
+  - type: Tag
+    tags:
+    - HidesNose
 
 - type: entity
   parent: ClothingMaskBase
@@ -465,6 +494,9 @@
     sprite: Clothing/Mask/bat.rsi
   - type: BreathMask
   - type: IdentityBlocker
+  - type: Tag
+    tags:
+    - HidesNose
 
 - type: entity
   parent: ClothingMaskBase
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
index e60c29d212..1e85073da9 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: ClothingMaskBase
   id: ClothingMaskGasChameleon
   name: gas mask
@@ -6,7 +6,8 @@
   suffix: Chameleon
   components:
     - type: Tag
-      tags: [] # ignore "WhitelistChameleon" tag
+      tags: # ignore "WhitelistChameleon" tag
+        - HidesNose
     - type: Sprite
       sprite: Clothing/Mask/gas.rsi
     - type: Clothing
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml
index 51b1fb5693..e76a4b3ee3 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml
@@ -1,6 +1,16 @@
-
 - type: entity
   parent: ClothingNeckBase
+  id: ClothingNeckMedalBase
+  abstract: true
+  name: medal
+  description: not given to anyone
+  components:
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+  
+- type: entity
+  parent: ClothingNeckMedalBase
   id: ClothingNeckBronzeheart
   name: bronzeheart medal
   description: Given to crewmates for exemplary bravery in the face of danger.
@@ -11,7 +21,7 @@
     sprite: Clothing/Neck/Medals/bronzeheart.rsi
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingNeckMedalBase
   id: ClothingNeckGoldmedal
   name: gold medal of crewmanship
   description: Given to crewmates who display excellent crewmanship.
@@ -24,7 +34,7 @@
     stealGroup: ClothingNeckGoldmedal
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingNeckMedalBase
   id: ClothingNeckCargomedal
   name: logistics medal # DeltaV - Logistics Department replacing Cargo
   description: Whether it's for superior accountancy, courageous salvage work, or just being a friendly technician - this medal is to be assigned only for the best work in the logistics department. # DeltaV - Logistics Department replacing Cargo. Updated description for flavour
@@ -35,7 +45,7 @@
     sprite: DeltaV/Clothing/Neck/Medals/cargomedal.rsi # DeltaV - resprite
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingNeckMedalBase
   id: ClothingNeckEngineermedal
   name: engineer medal
   description: Whether it's by keeping the crew breathing, meticulous rewiring and upgrading, or just having plenty of materials on-hand - this medal is to be assigned only for the best work in the engineering department. # DeltaV - Updated description for flavour
@@ -46,7 +56,7 @@
     sprite: DeltaV/Clothing/Neck/Medals/engineermedal.rsi # DeltaV - resprite
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingNeckMedalBase
   id: ClothingNeckMedicalmedal
   name: medical medal
   description: Whether it's being the first on the scene of an accident, the most caring bedside manner, or just making sure the patients don't go mad - this medal is to be assigned only for the best work in the medical department. # DeltaV - Updated description for flavour
@@ -57,7 +67,7 @@
     sprite: DeltaV/Clothing/Neck/Medals/medicalmedal.rsi # DeltaV - resprite
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingNeckMedalBase
   id: ClothingNeckSciencemedal
   name: epistemics medal # DeltaV - Epistemics Department replacing Science
   description: Whether it's pushing the edges of modern science and technology, foraying into the vast expanses of the noosphere, or just fetching the coffee - this medal is to be assigned only for the best work in the epistemics department. # DeltaV - Epistemics Department replacing Science. Updated description for flavour
@@ -68,7 +78,7 @@
     sprite: DeltaV/Clothing/Neck/Medals/sciencemedal.rsi # DeltaV - resprite
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingNeckMedalBase
   id: ClothingNeckSecuritymedal
   name: security medal
   description: Whether it's catching armed terrorists, guarding the crew from alien threats, or just having a conversation in the corridor - this medal is to be assigned only for the best work in the security department. # DeltaV - Updated description for flavour
@@ -79,7 +89,7 @@
     sprite: DeltaV/Clothing/Neck/Medals/securitymedal.rsi # DeltaV - resprite
 
 - type: entity
-  parent: ClothingNeckBase
+  parent: ClothingNeckMedalBase
   id: ClothingNeckClownmedal
   name: bravado medal # DeltaV - Updated title so it's not just a joke medal.
   description: Given to crewmates who laugh in the face of death, lift their peers' spirits, and uplift themselves and their friends to success. # DeltaV - Updated description for flavour and to reflect title.
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
index 3fe71bf7f3..41d6990baa 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -398,3 +398,14 @@
     sprite: Clothing/OuterClothing/Coats/space_asshole.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/space_asshole.rsi
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatExpensive
+  name: expensive coat
+  description: Very fluffy pink coat, made out of very expensive fur (clearly).
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Coats/expensive_coat.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Coats/expensive_coat.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index 3deecf089b..a05d346c2f 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -511,6 +511,11 @@
     newItem: ClothingOuterHardsuitSyndieReverseEngineered
     recipes:
       - ClothingOuterHardsuitSyndieReverseEngineered
+  - type: Tag
+    tags:
+    - MonkeyWearable
+    - Hardsuit
+    - WhitelistChameleon
 
 # Syndicate Medic Hardsuit
 - type: entity
@@ -525,6 +530,10 @@
     sprite: Clothing/OuterClothing/Hardsuits/syndiemedic.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSyndieMedic
+  - type: Tag
+    tags:
+    - Hardsuit
+    - WhitelistChameleon
 
 #Syndicate Elite Hardsuit
 - type: entity
@@ -553,6 +562,8 @@
         Heat: 0.2
         Radiation: 0.01
         Caustic: 0.5
+  - type: Item
+    size: Huge
   - type: ClothingSpeedModifier
     walkModifier: 1.0
     sprintModifier: 1.0
@@ -807,6 +818,10 @@
     sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitERTSecurity
+  - type: Tag
+    tags:
+    - Hardsuit
+    - WhitelistChameleon
 
 #ERT Janitor Hardsuit
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
index 45f170dcb7..58faf26847 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@@ -12,6 +12,7 @@
   - type: Tag
     tags:
     - SuitEVA
+    - MonkeyWearable
     - WhitelistChameleon
 
 #Syndicate EVA
@@ -28,6 +29,7 @@
   - type: Tag
     tags:
     - SuitEVA
+    - MonkeyWearable
     - WhitelistChameleon
 
 #Emergency EVA
@@ -68,6 +70,7 @@
   - type: Tag
     tags:
     - SuitEVA
+    - MonkeyWearable
     - WhitelistChameleon
 
 #NTSRA Voidsuit / Ancient Voidsuit
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
index 9a5e0211f3..9f98e396ca 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
@@ -62,3 +62,5 @@
   - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts
     tags:
     - Skirt
+    - ClothMade
+    - WhitelistChameleon
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index 9a8c1c2a5c..d98207da37 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -276,11 +276,6 @@
     controlsLocked: true
     randomMode: false
     mode: SensorCords
-  - type: Tag
-    tags:
-    - ClothMade
-    - WhitelistChameleon
-    - PrisonUniform
 
 - type: entity
   parent: ClothingUniformSkirtBase
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index 46827f8b60..7c38f720a3 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -493,6 +493,19 @@
     - type: Clothing
       sprite: Clothing/Uniforms/Jumpsuit/qmturtle.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitQMFormal
+  # DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer
+  name: logistics officer's formal suit
+  description: Inspired by the logistics officers of military's past, the perfect outfit for supplying a formal occasion.
+  # End of modified code
+  components:
+    - type: Sprite
+      sprite: Clothing/Uniforms/Jumpsuit/qmformal.rsi
+    - type: Clothing
+      sprite: Clothing/Uniforms/Jumpsuit/qmformal.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitResearchDirector
@@ -1447,4 +1460,4 @@
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi
\ No newline at end of file
+    sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi
diff --git a/Resources/Prototypes/Entities/Debugging/options_visualizer.yml b/Resources/Prototypes/Entities/Debugging/options_visualizer.yml
new file mode 100644
index 0000000000..229ffa00cc
--- /dev/null
+++ b/Resources/Prototypes/Entities/Debugging/options_visualizer.yml
@@ -0,0 +1,24 @@
+- type: entity
+  id: OptionsVisualizerTest
+  suffix: DEBUG
+  components:
+  - type: Tag
+    tags:
+    - Debug
+  - type: Sprite
+    sprite: Effects/optionsvisualizertest.rsi
+    layers:
+    - state: none
+      map: [ "layer" ]
+  - type: OptionsVisualizer
+    visuals:
+      layer:
+      - options: Default
+        data: { state: none }
+      - options: Test
+        data: { state: test }
+      - options: ReducedMotion
+        data: { state: motion }
+      - options: [Test, ReducedMotion]
+        data: { state: both }
+
diff --git a/Resources/Prototypes/Entities/Effects/acidifer.yml b/Resources/Prototypes/Entities/Effects/acidifier.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Effects/acidifer.yml
rename to Resources/Prototypes/Entities/Effects/acidifier.yml
diff --git a/Resources/Prototypes/Entities/Effects/portal.yml b/Resources/Prototypes/Entities/Effects/portal.yml
index 653d3f608d..eb69ac821f 100644
--- a/Resources/Prototypes/Entities/Effects/portal.yml
+++ b/Resources/Prototypes/Entities/Effects/portal.yml
@@ -68,3 +68,58 @@
     lifetime: 120
   - type: Portal
     canTeleportToOtherMaps: true
+
+- type: entity
+  id: PortalGatewayBlue
+  parent: BasePortal
+  components:
+  - type: Sprite
+    noRot: true
+    sprite: Structures/Machines/gateway.rsi
+    color: SkyBlue
+    layers:
+    - state: portal
+  - type: PointLight
+    color: SkyBlue
+    radius: 3
+    energy: 1
+    netsync: false
+
+- type: entity
+  id: PortalGatewayOrange
+  parent: BasePortal
+  components:
+  - type: Sprite
+    noRot: true
+    sprite: Structures/Machines/gateway.rsi
+    color: OrangeRed
+    layers:
+    - state: portal
+  - type: PointLight
+    color: OrangeRed
+    radius: 3
+    energy: 1
+    netsync: false
+
+- type: entity
+  id: ShadowPortal
+  name: shadow rift
+  description: Looks unstable.
+  parent: [ BasePortal, BaseShadow ]
+  components:
+  - type: Portal
+    arrivalSound: /Audio/Items/hiss.ogg
+    departureSound: /Audio/Items/hiss.ogg
+  - type: Sprite
+    state: portal-artifact
+    color: "#793a80dd"
+  - type: PointLight
+    color: "#793a80dd"
+    radius: 3
+    energy: 1
+    netsync: false
+  - type: AmbientSound
+    range: 6
+    volume: -3
+    sound:
+      path: /Audio/Ambience/anomaly_scary.ogg
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
index c81c840fb0..d4edbe9fc0 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
@@ -19,6 +19,7 @@
     - RandomRockAnomalySpawner
     - AnomalyLiquid
     - AnomalyFlora
+    - AnomalyShadow
     chance: 1
     offset: 0.15 # not to put it higher. The anomaly sychnronizer looks for anomalies within this radius, and if the radius is higher, the anomaly can be attracted from a neighboring tile.
 
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/curtains.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/curtains.yml
new file mode 100644
index 0000000000..83ab633ac7
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/curtains.yml
@@ -0,0 +1,33 @@
+- type: entity
+  name: random curtain spawner
+  id: CurtainSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Structures/Decoration/Curtains/hospital.rsi
+          state: closed
+    - type: RandomSpawner
+      prototypes:
+        - HospitalCurtains
+        - CurtainsBlack
+        - CurtainsBlue
+        - CurtainsCyan
+        - CurtainsGreen
+        - CurtainsOrange
+        - CurtainsPink
+        - CurtainsPurple
+        - CurtainsRed
+        - CurtainsWhite
+        - CurtainsWhiteOpen
+        - CurtainsRedOpen
+        - CurtainsPurpleOpen
+        - CurtainsPinkOpen
+        - CurtainsOrangeOpen
+        - CurtainsGreenOpen
+        - CurtainsCyanOpen
+        - CurtainsBlueOpen
+        - CurtainsBlackOpen
+        - HospitalCurtainsOpen
+      offset: 0.0
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index 9af68e8d2e..879c168929 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -33,6 +33,7 @@
         - Basketball
         - Football
         - BalloonCorgi
+        - BalloonNT
         - PonderingOrb
         - Skub
         - DrinkMugDog
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/mineshaft.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/mineshaft.yml
new file mode 100644
index 0000000000..8d1b36c022
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/mineshaft.yml
@@ -0,0 +1,93 @@
+- type: entity
+  id: RandomWoodenSupport
+  name: wooden support spawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - sprite: Objects/Decoration/mines.rsi
+        state: support
+  - type: RandomSpawner
+    prototypes:
+      - WoodenSupport
+      - WoodenSupportBeam
+      - WoodenSupportBeam
+      - WoodenSupportBeam
+    chance: 0.9
+
+- type: entity
+  id: RandomWoodenWall
+  name: wooden wall spawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - sprite: Objects/Decoration/mines.rsi
+        state: support_wall
+  - type: RandomSpawner
+    prototypes:
+      - WoodenSupportWall
+      - WoodenSupportWallBroken
+    chance: 0.9
+
+- type: entity
+  id: RandomStalagmiteOrCrystal
+  name: stalagmite or crystal spawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+        state: stalagmite2
+  - type: RandomSpawner
+    offset: 0.3
+    prototypes:
+      - RandomBrownStalagmite
+      - RandomGreyStalagmite
+      - CrystalSpawner
+    chance: 0.9
+
+- type: entity
+  id: RandomBrownStalagmite
+  name: brown stalagmite spawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+        state: stalagmite2
+  - type: RandomSpawner
+    offset: 0.3
+    prototypes:
+      - FloraStalagmite1
+      - FloraStalagmite2
+      - FloraStalagmite3
+      - FloraStalagmite4
+      - FloraStalagmite5
+      - FloraStalagmite6
+    chance: 0.9
+
+- type: entity
+  id: RandomGreyStalagmite
+  name: grey stalagmite spawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+        state: grey_stalagmite3
+  - type: RandomSpawner
+    offset: 0.3
+    prototypes:
+      - FloraGreyStalagmite1
+      - FloraGreyStalagmite2
+      - FloraGreyStalagmite3
+      - FloraGreyStalagmite4
+      - FloraGreyStalagmite5
+      - FloraGreyStalagmite6
+    chance: 0.9
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
index 6b385f2401..f6e27c3d18 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
@@ -95,6 +95,7 @@
       - PosterContrabandBreadLies # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
       - PosterContrabandGotWood # DeltaV Poster, see Resources/Prototypes/DeltaV/Entities/Structures/Wallmount/Signs/posters.yml
       - PosterContrabandAyaya # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
+      - PosterContrabandMissingSpacepen
     chance: 1
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/shadowkudzu.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/shadowkudzu.yml
new file mode 100644
index 0000000000..95a24157f9
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/shadowkudzu.yml
@@ -0,0 +1,26 @@
+- type: entity
+  id: ShadowKudzuLootSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+      - state: red
+      - sprite: Structures/Specific/Anomalies/shadow_anom.rsi
+        state: anom
+    - type: RandomSpawner
+      offset: 0.05
+      chance: 0.7
+      prototypes:
+        - CrystalPink
+        - CrystalPink
+        - ShadowPortal
+        - ShadowTree01
+        - ShadowTree02
+        - ShadowTree03
+        - ShadowTree04
+        - ShadowTree05
+        - ShadowTree06
+      rareChance: 0.05
+      rarePrototypes:
+        - MobCatShadow
+        - ArtifactFragment
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/human.yml b/Resources/Prototypes/Entities/Markers/Spawners/human.yml
new file mode 100644
index 0000000000..e725576f77
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/human.yml
@@ -0,0 +1,35 @@
+- type: entity
+  name: syndicate footsoldier spawner
+  id: SpawnMobSyndicateFootSoldier
+  parent: MarkerBase
+  components:
+#God forgive me for what I'm about to do
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Species/Human/parts.rsi
+      state: full
+    - sprite: Clothing/Shoes/Boots/combatboots.rsi
+      state: equipped-FEET
+    - sprite: Clothing/Uniforms/Jumpsuit/operative.rsi
+      state: equipped-INNERCLOTHING
+    - sprite: Clothing/OuterClothing/Armor/security.rsi
+      state: equipped-OUTERCLOTHING
+    - sprite: Clothing/Hands/Gloves/Color/black.rsi
+      state: equipped-HAND
+    - sprite: Clothing/Mask/gas.rsi
+      state: equipped-MASK
+    - sprite: Clothing/Head/Helmets/swat_syndicate.rsi
+      state: equipped-HELMET
+  - type: ConditionalSpawner
+    prototypes:
+    - MobSyndicateFootsoldier
+
+- type: entity
+  name: syndicate shuttle pilot spawner
+  id: SpawnMobSyndicateFootsoldierPilot
+  parent: SpawnMobSyndicateFootSoldier
+  components:
+  - type: ConditionalSpawner
+    prototypes:
+    - MobSyndicateFootsoldierPilot
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
index 1d2ace1062..168026a5a7 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
@@ -84,9 +84,6 @@
       - state: green
       - sprite: Mobs/Silicon/drone.rsi
         state: shell
-  - type: ConditionalSpawner
-    prototypes:
-      - Drone
 
 - type: entity
   name: Fox Renault Spawner
@@ -778,8 +775,8 @@
   - type: ConditionalSpawner
     prototypes:
     - MobPenguin
-    
-    
+
+
 - type: entity
   name: Hellspawn Spawner
   id: SpawnMobHellspawn
@@ -793,7 +790,7 @@
   - type: ConditionalSpawner
     prototypes:
       - MobHellspawn
-      
+
 - type: entity
   name: ore crab spawner
   id: SpawnMobOreCrab
diff --git a/Resources/Prototypes/Entities/Markers/shuttle.yml b/Resources/Prototypes/Entities/Markers/shuttle.yml
index 9ef9c0de5a..0e9117951c 100644
--- a/Resources/Prototypes/Entities/Markers/shuttle.yml
+++ b/Resources/Prototypes/Entities/Markers/shuttle.yml
@@ -3,6 +3,16 @@
   parent: MarkerBase
   name: FTL point
   components:
-    - type: FTLDestination
+    - type: FTLBeacon
+    - type: Sprite
+      state: pink
+
+- type: entity
+  id: FTLExclusion
+  parent: MarkerBase
+  name: FTL exclusion point
+  components:
+    - type: FTLExclusion
+      range: 32
     - type: Sprite
       state: pink
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index bb9d6d2b29..af4114ce48 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -110,6 +110,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bob4
+- type: marking
+  id: HumanHairBob5
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: bob5
 - type: marking
   id: HumanHairBobcurl
   bodyPart: Hair
@@ -677,6 +684,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: long3
+- type: marking
+  id: HumanHairLongWithBundles
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: longbundled
 - type: marking
   id: HumanHairLongovereye
   bodyPart: Hair
@@ -1307,3 +1321,10 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: uneven
+- type: marking
+  id: HumanHairTailed
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: tailed
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml
new file mode 100644
index 0000000000..51fc2fd15a
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml
@@ -0,0 +1,54 @@
+- type: marking
+  id: HumanNoseSchnozz
+  bodyPart: Snout
+  markingCategory: Snout
+  followSkinColor: true
+  forcedColoring: true
+  speciesRestriction: [Human, Dwarf]
+  sprites:
+  - sprite: Mobs/Customization/human_noses.rsi
+    state: schnozz
+
+- type: marking
+  id: HumanNoseNubby
+  bodyPart: Snout
+  markingCategory: Snout
+  followSkinColor: true
+  forcedColoring: true
+  speciesRestriction: [Human, Dwarf]
+  sprites:
+  - sprite: Mobs/Customization/human_noses.rsi
+    state: nubby
+
+- type: marking
+  id: HumanNoseDroop
+  bodyPart: Snout
+  markingCategory: Snout
+  followSkinColor: true
+  forcedColoring: true
+  speciesRestriction: [Human, Dwarf]
+  sprites:
+  - sprite: Mobs/Customization/human_noses.rsi
+    state: droop
+
+- type: marking
+  id: HumanNoseBlob
+  bodyPart: Snout
+  markingCategory: Snout
+  followSkinColor: true
+  forcedColoring: true
+  speciesRestriction: [Human, Dwarf]
+  sprites:
+  - sprite: Mobs/Customization/human_noses.rsi
+    state: blob
+
+- type: marking
+  id: HumanNoseUppie
+  bodyPart: Snout
+  markingCategory: Snout
+  followSkinColor: true
+  forcedColoring: true
+  speciesRestriction: [Human, Dwarf]
+  sprites:
+  - sprite: Mobs/Customization/human_noses.rsi
+    state: uppie
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
index 5cabe9edf5..728a203489 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
@@ -124,7 +124,9 @@
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
-    state: tail_smooth
+    state: tail_smooth_primary
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: tail_smooth_secondary
 
 - type: marking
   id: LizardTailLarge
@@ -316,7 +318,9 @@
   speciesRestriction: []
   sprites:
     - sprite: Mobs/Customization/reptilian_parts.rsi
-      state: tail_smooth_wagging
+      state: tail_smooth_wagging_primary
+    - sprite: Mobs/Customization/reptilian_parts.rsi
+      state: tail_smooth_wagging_secondary
 
 - type: marking
   id: LizardTailSpikesAnimated
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
index cca16443e2..f418629590 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml
@@ -3,11 +3,7 @@
   bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni] # Delta V - Felinid, Oni, Harpy
-  coloring:
-    default:
-      type:
-        !type:TattooColoring
-      fallbackColor: "#FFFFFF"
+  followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
     state: scar_eye_right
@@ -17,11 +13,7 @@
   bodyPart: Head
   markingCategory: Head
   speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni] # Delta V - Felinid, Oni, Harpy
-  coloring:
-    default:
-      type:
-        !type:TattooColoring
-      fallbackColor: "#FFFFFF"
+  followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
     state: scar_eye_left
@@ -30,7 +22,7 @@
   id: ScarTopSurgeryShort
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human]
+  speciesRestriction: [Human, Dwarf]
   sexRestriction: [Male]
   followSkinColor: true
   sprites:
@@ -41,9 +33,19 @@
   id: ScarTopSurgeryLong
   bodyPart: Chest
   markingCategory: Chest
-  speciesRestriction: [Human]
+  speciesRestriction: [Human, Dwarf]
   sexRestriction: [Male]
   followSkinColor: true
   sprites:
   - sprite: Mobs/Customization/scars.rsi
     state: scar_top_surgery_long
+
+- type: marking
+  id: ScarChest
+  bodyPart: Chest
+  markingCategory: Chest
+  speciesRestriction: [Human, Dwarf]
+  followSkinColor: true
+  sprites:
+  - sprite: Mobs/Customization/scars.rsi
+    state: scar_chest
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml
index 3f96789473..77a21b11fe 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml
@@ -18,7 +18,7 @@
 
 - type: marking
   id: SlimeGradientLeftLeg
-  bodyPart: LFoot
+  bodyPart: LLeg
   markingCategory: Legs
   speciesRestriction: [ Reptilian, SlimePerson, Shadowkin ] # Parkstation-WideUseMarkings
   sprites:
@@ -27,13 +27,31 @@
 
 - type: marking
   id: SlimeGradientRightLeg
-  bodyPart: RFoot
+  bodyPart: RLeg
   markingCategory: Legs
   speciesRestriction: [ Reptilian, SlimePerson, Shadowkin ] # Parkstation-WideUseMarkings
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
     state: gradient_r_leg
 
+- type: marking
+  id: SlimeGradientLeftFoot
+  bodyPart: LFoot
+  markingCategory: Legs
+  speciesRestriction: [SlimePerson]
+  sprites:
+  - sprite: Mobs/Customization/slime_parts.rsi
+    state: gradient_l_foot
+
+- type: marking
+  id: SlimeGradientRightFoot
+  bodyPart: RFoot
+  markingCategory: Legs
+  speciesRestriction: [SlimePerson]
+  sprites:
+  - sprite: Mobs/Customization/slime_parts.rsi
+    state: gradient_r_foot
+
 - type: marking
   id: SlimeGradientLeftHand
   bodyPart: LHand
@@ -50,4 +68,4 @@
   speciesRestriction: [ Reptilian, SlimePerson, Shadowkin ] # Parkstation-WideUseMarkings
   sprites:
   - sprite: Mobs/Customization/slime_parts.rsi
-    state: gradient_r_hand
\ No newline at end of file
+    state: gradient_r_hand
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
index 80089ab4b1..6191e61250 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -118,6 +118,8 @@
     access: [["Engineering"], ["Command"], ["Research"]]
   - type: Inventory
     templateId: borgShort
+  - type: SiliconLawProvider # Delta-V - Adds custom lawset for Engineering Cyborg
+    laws: Engineer 
 
 - type: entity
   id: BorgChassisJanitor
@@ -169,6 +171,8 @@
     access: [["Service"], ["Command"], ["Research"]]
   - type: Inventory
     templateId: borgShort
+  - type: SiliconLawProvider # Delta-V Adds custom lawset for Janitor Cyborg
+    laws: Janitor
 
 - type: entity
   id: BorgChassisMedical
@@ -221,6 +225,8 @@
   - type: Inventory
     templateId: borgDutch
   - type: FabricateCandy # Nyanotrasen - The medical cyborg can generate candies filled with medicine.
+  - type: SiliconLawProvider # Delta-V - Adds custom lawset for Medical cyborg
+    laws: Medical
 
 - type: entity
   id: BorgChassisService
@@ -282,6 +288,8 @@
           shader: unshaded
           map: ["light"]
           visible: false
+    - type: PointLight
+      color: "#dd200b"
     - type: BorgChassis
       maxModules: 3
       moduleWhitelist:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 1b39b79c01..bd2f09d92f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2294,6 +2294,9 @@
         collection: FootstepClownFast
     - type: Speech
       speechVerb: Cluwne
+    - type: Bloodstream
+      bloodMaxVolume: 150
+      bloodReagent: Laughter
 
 - type: entity
   name: possum
@@ -3180,3 +3183,91 @@
     factions:
     - Passive
   - type: RandomBark # Parkstation-RandomBark
+
+- type: entity
+  name: diona nymph
+  parent: SimpleMobBase
+  id: MobDionaNymph
+  description: It's like a cat, only.... branch-ier.
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: nymph
+      sprite: Mobs/Animals/nymph.rsi
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 100 # High, because wood is heavy.
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: Inventory
+    speciesId: cat
+    templateId: pet
+  - type: InventorySlots
+  - type: Strippable
+  - type: Bloodstream
+    bloodReagent: Water
+    bloodMaxVolume: 60
+  - type: UserInterface
+    interfaces:
+    - key: enum.StrippingUiKey.Key
+      type: StrippableBoundUserInterface
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: nymph
+      Critical:
+        Base: nymph_sleep
+      Dead:
+        Base: nymph_dead
+  - type: Butcherable
+    spawned:
+    - id: MaterialWoodPlank1
+      amount: 2
+  - type: InteractionPopup
+    successChance: 0.7
+    interactSuccessString: petting-success-nymph
+    interactFailureString: petting-failure-nymph
+    interactSuccessSound:
+      path: /Audio/Animals/nymph_chirp.ogg
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      30: Critical
+      60: Dead
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 2.5
+    baseSprintSpeed : 4.5
+  - type: Grammar
+    attributes:
+      gender: epicene
+  - type: Speech
+    speechVerb: Plant
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+    - VimPilot
+  - type: Emoting
+  - type: BodyEmotes
+    soundsId: Nymph
+  - type: Reform
+    actionPrototype: DionaReformAction
+    reformTime: 10
+    popupText: diona-reform-attempt
+    reformPrototype: MobDionaReformed
+
+- type: entity
+  parent: MobDionaNymph
+  id: MobDionaNymphAccent # No talky. For non-brain & wild nymphs
+  suffix: Accent
+  components:
+  - type: ReplacementAccent
+    accent: nymph
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
index 472daed59b..39e68b63a7 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
@@ -23,7 +23,7 @@
     bloodlossDamage:
       types:
         Bloodloss:
-          1
+          0.5
     bloodlossHealDamage:
       types:
         Bloodloss:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
index 3b3b9b4412..bc63deeac3 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
@@ -112,6 +112,9 @@
           Radiation: 10
     - type: Input
       context: "human"
+    - type: Bloodstream
+      bloodMaxVolume: 300
+      bloodReagent: Laughter
 
 - type: entity
   name: behonker
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index 9694148287..01fce382e3 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -99,6 +99,8 @@
   - type: NpcFactionMember
     factions:
       - SimpleHostile
+  - type: Damageable
+    damageContainer: StructuralInorganic
 
 - type: entity
   parent: MobOreCrab
@@ -226,6 +228,8 @@
   parent: [ MobAdultSlimes, MobCombat ]
   description: It consists of a liquid, and it wants to dissolve you in itself.
   components:
+  - type: GhostRole
+    description: ghost-role-information-angry-slimes-description
   - type: NpcFactionMember
     factions:
     - SimpleHostile
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
index 14b75f6c1a..75da5cce39 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/human.yml
@@ -47,6 +47,28 @@
     rootTask:
       task: SimpleHumanoidHostileCompound
 
+- type: entity
+  name: syndicate footsoldier 
+  parent: BaseMobHuman
+  id: MobSyndicateFootsoldier
+  components:
+    - type: NpcFactionMember
+      factions:
+        - Syndicate
+    - type: Loadout
+      prototypes:
+        - SyndicateFootsoldierGearRuin
+    - type: InputMover
+    - type: MobMover
+    - type: HTN
+      rootTask:
+        task: SimpleHumanoidHostileCompound
+
+- type: entity
+  name: syndicate shuttle pilot
+  parent: MobSyndicateFootsoldier
+  id: MobSyndicateFootsoldierPilot
+
 - type: entity
   parent: BaseMobHuman
   suffix: Dead
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml b/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml
index cc75405e10..9b90d202f3 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/living_light.yml
@@ -30,10 +30,6 @@
       state: glow
       shader: unshaded
   - type: MobState
-  - type: MobThresholds
-    thresholds:
-      0: Alive
-      50: Dead
   - type: SlowOnDamage
     speedModifierThresholds:
       20: 0.5
@@ -94,7 +90,7 @@
     thresholds:
       - trigger:
           !type:DamageTrigger
-          damage: 50
+          damage: 25
         behaviors:
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
@@ -128,10 +124,6 @@
     - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
       state: glow
       shader: unshaded
-  - type: MobThresholds
-    thresholds:
-      0: Alive
-      50: Dead
   - type: DamageStateVisuals
     states:
       Alive:
@@ -159,10 +151,6 @@
     - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
       state: glow
       shader: unshaded
-  - type: MobThresholds
-    thresholds:
-      0: Alive
-      40: Dead
   - type: DamageStateVisuals
     states:
       Alive:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml b/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
new file mode 100644
index 0000000000..f08fe36544
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
@@ -0,0 +1,67 @@
+- type: entity
+  id: BaseShadowMob
+  abstract: true
+  parent: [ BaseMob, BaseShadow ]
+  components:
+  - type: Sprite
+    color: "#793a80dd"
+  - type: PointLight
+    color: "#793a80dd"
+    radius: 1.1
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 2
+    baseSprintSpeed: 2
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 120
+        mask:
+        - Opaque
+        layer:
+        - None
+  - type: StandingState
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+  - type: NpcFactionMember
+    factions:
+    - SimpleNeutral
+  - type: HTN
+    rootTask:
+      task: IdleCompound
+  - type: SlowOnDamage
+    speedModifierThresholds:
+      60: 0.7
+      80: 0.5
+      
+- type: entity
+  name: shadow cat
+  parent: BaseShadowMob
+  id: MobCatShadow
+  description: A lovely piece of darkness. Hope he doesn't bring you a curse.
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: Mobs/Pets/cat.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: cat
+  - type: Physics
+  - type: ReplacementAccent
+    accent: cat
+  - type: InteractionPopup
+    successChance: 0.01 # you cant pet shadow cat... almost
+    interactSuccessString: petting-success-cat
+    interactFailureString: petting-failure-shadow
+    interactSuccessSpawn: EffectHearts
+    interactSuccessSound:
+      path: /Audio/Animals/cat_meow.ogg
+  - type: Grammar
+    attributes:
+      gender: epicene
+  - type: Tag
+    tags:
+    - VimPilot
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index b9ab0cf6f8..c64479369a 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -64,7 +64,7 @@
     bloodlossDamage:
       types:
         Bloodloss:
-          1
+          0.5
     bloodlossHealDamage:
       types:
         Bloodloss:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 0dd89e1166..39460be3f3 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -64,13 +64,13 @@
     radius: 1.2
     energy: 2
     color: "#4faffb"
-  #- type: GhostTakeoverAvailable # Delta V: Moves ghost takeover to child
+  - type: GhostTakeoverAvailable
   - type: Speech
     speechVerb: LargeMob
 
 - type: entity
   name: space bear
-  id: MobBearSpaceNPC # Delta V : remove ghosttakeover comps
+  id: MobBearSpace
   parent: MobSpaceBasic
   description: It looks friendly. Why don't you give it a hug?
   components:
@@ -110,23 +110,17 @@
     interactFailureString: petting-failure-bear
     interactSuccessSound:
       path: /Audio/Animals/sloth_squeak.ogg
-  # Moved to Nyanotrasen\Entities\Mobs\NPCs\space.yml
 
 - type: entity
   id: MobBearSpaceSalvage
   parent: MobBearSpace
   suffix: "Salvage Ruleset"
   components:
-  - type: GhostRole
-    prob: 0.25
-    name: ghost-role-information-salvage-bear-name
-    description: ghost-role-information-salvage-bear-description
-    rules: deltav-ghost-role-information-salvageantag-rules #DeltaV
   - type: SalvageMobRestrictions
 
 - type: entity
   name: space kangaroo
-  id: MobKangarooSpaceNPC # Delta V : remove ghosttakeover comps
+  id: MobKangarooSpace
   parent: MobSpaceBasic
   description: It looks friendly. Why don't you give it a hug?
   components:
@@ -179,23 +173,17 @@
     interfaces:
     - key: enum.StrippingUiKey.Key
       type: StrippableBoundUserInterface
-  # Moved to Nyanotrasen\Entities\Mobs\NPCs\space.yml
 
 - type: entity
   id: MobKangarooSpaceSalvage
   parent: MobKangarooSpace
   suffix: "Salvage Ruleset"
   components:
-  - type: GhostRole
-    prob: 0.25
-    name: ghost-role-information-salvage-kangaroo-name
-    description: ghost-role-information-salvage-kangaroo-description
-    rules: deltav-ghost-role-information-salvageantag-rules #DeltaV
   - type: SalvageMobRestrictions
 
 - type: entity
   name: space spider
-  id: MobSpiderSpaceNPC # Delta V : remove ghosttakeover comps
+  id: MobSpiderSpace
   parent: MobSpaceBasic
   description: It's so glowing, it looks dangerous.
   components:
@@ -272,7 +260,6 @@
     color: "#4faffb"
   - type: NoSlip
   - type: IgnoreSpiderWeb
-  # Moved to Nyanotrasen\Entities\Mobs\NPCs\space.yml
   - type: Speech
     speechVerb: Arachnid
     speechSounds: Arachnid
@@ -289,16 +276,11 @@
   parent: MobSpiderSpace
   suffix: "Salvage Ruleset"
   components:
-  - type: GhostRole
-    prob: 0.30
-    name: ghost-role-information-salvage-spider-name
-    description: ghost-role-information-salvage-spider-description
-    rules: deltav-ghost-role-information-salvageantag-rules #DeltaV
   - type: SalvageMobRestrictions
 
 - type: entity
   name: space cobra
-  id: MobCobraSpaceNPC # Delta V : remove ghosttakeover comps
+  id: MobCobraSpace
   parent: MobSpaceBasic
   description: Long fangs and a glowing hood, and the alluring look begs to come closer.
   components:
@@ -379,7 +361,6 @@
       radius: 1.1
       energy: 1.5
       color: "#4faffb"
-    # Moved to Nyanotrasen\Entities\Mobs\NPCs\space.yml
     - type: Stealth
       enabledOnDeath: false
       maxVisibility: 1.2
@@ -392,8 +373,4 @@
   parent: MobCobraSpace
   suffix: "Salvage Ruleset"
   components:
-    - type: GhostRole
-      prob: 0.25
-      name: ghost-role-information-salvage-cobra-name
-      description: ghost-role-information-salvage-cobra-description
-    - type: SalvageMobRestrictions
+    - type: SalvageMobRestrictions
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index 740277a0d9..d0ac6fc026 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -72,6 +72,7 @@
     critThreshold: 200
   - type: Bloodstream
     bloodReagent: FluorosulfuricAcid
+    bloodMaxVolume: 650
   - type: MeleeWeapon
     altDisarm: false
     angle: 0
@@ -427,7 +428,7 @@
     tags:
     - DoorBumpOpener
     - FootstepSound
-    
+
 - type: entity
   name: space adder
   parent: MobPurpleSnake
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 4b4adbfd00..d60c055ac5 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -73,6 +73,7 @@
     title: comms-console-announcement-title-centcom
     color: "#228b22"
   - type: RadarConsole
+    followEntity: true
   - type: CargoOrderConsole
   - type: CrewMonitoringConsole
     snap: false
diff --git a/Resources/Prototypes/Entities/Mobs/Player/diona.yml b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
index 7fbe0453b3..28687c68bf 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
@@ -11,4 +11,14 @@
       damageRecovery:
         types:
           Asphyxiation: -1.0
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
+    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
+
+# Reformed Diona
+- type: entity
+  parent: MobDiona
+  noSpawn: true
+  id: MobDionaReformed
+  name: Reformed Diona
+  components:
+    - type: IsDeadIC
+    - type: RandomHumanoidAppearance
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index d188070b26..aa10a631b5 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -6,6 +6,8 @@
   description: A flying leviathan, loosely related to space carps.
   abstract: true
   components:
+  - type: Bloodstream
+    bloodMaxVolume: 650
   - type: GhostRole
     allowMovement: true
     allowSpeech: true
diff --git a/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml b/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml
new file mode 100644
index 0000000000..5a45bff295
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml
@@ -0,0 +1,94 @@
+- type: entity
+  abstract: true
+  id: MobRatvarBase #can't have the clockwork justiciar be associated with his (im)mortal enemy
+  name: Ratvar
+  description: Your mind aches as it fails to understand the complex mechanics of what is before you.
+  components:
+  - type: Sprite
+    sprite: Mobs/Demons/ratvar.rsi
+    drawdepth: Ghosts
+    scale: 1.15,1.15
+    layers:
+    - state: ratvar
+      shader: unshaded
+
+- type: entity
+  parent: MobRatvarBase
+  id: MobRatvarSpawn
+  suffix: Spawn
+  components:
+  - type: Sprite
+    layers:
+    - state: spawn
+      shader: unshaded
+  - type: TimedDespawn
+    lifetime: 3.5
+  - type: SpawnOnDespawn
+    prototype: MobRatvar
+
+- type: entity
+  parent: [MobRatvarBase, BaseMob]
+  id: MobRatvar
+  components:
+  - type: AnnounceOnSpawn
+    message: ratvar-has-risen
+    sender: ratvar-has-risen-sender
+    sound:
+      path: /Audio/Misc/ratvar_reveal.ogg
+    color: "#BE8700"
+  - type: CargoSellBlacklist
+  - type: ContentEye
+    maxZoom: 2.0,2.0
+  - type: Fixtures
+    fixtures:
+      EventHorizonCollider:
+        shape:
+          !type:PhysShapeCircle
+            radius: 5
+        hard: false
+        restitution: 0.8
+        density: 1
+        mask:
+        - AllMask
+        layer:
+        - AllMask
+      EventHorizonConsumer:
+        shape:
+          !type:PhysShapeCircle
+            radius: 5
+        hard: false
+        mask:
+        - AllMask
+        layer:
+        - AllMask
+  - type: Input
+    context: "ghost"
+  - type: MovementIgnoreGravity
+  - type: IntrinsicRadioReceiver
+  - type: ActiveRadio
+    channels:
+    - Binary
+    - Common
+    - Command
+    - CentCom
+    - Engineering
+    - Medical
+    - Science
+    - Security
+    - Service
+    - Supply
+    - Syndicate
+    globalReceive: true
+  - type: Physics
+    bodyType: Dynamic
+    bodyStatus: InAir
+  - type: CanMoveInAir
+  - type: EventHorizon
+    radius: 5
+    canBreachContainment: true
+  - type: GravityWell
+    baseRadialAcceleration: 6
+    maxRange: 8
+  - type: WarpPoint
+    follow: true
+    location: Ratvar
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index baa4154d84..0f8998bdec 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -1,249 +1,3 @@
-- type: entity
-  save: false
-  abstract: true
-  id: PlayerSiliconBase #for player controlled silicons
-  components:
-  - type: Reactive
-    groups:
-      Acidic: [Touch]
-  - type: Input
-    context: "human"
-  - type: DamageOnHighSpeedImpact
-    damage:
-      types:
-        Blunt: 5
-    soundHit:
-      collection: MetalThud
-  - type: Clickable
-  - type: Damageable
-    damageContainer: Inorganic
-  - type: Bloodstream
-    bloodReagent: Oil
-    bloodlossDamage:
-      types:
-        Bloodloss:
-          1
-    bloodlossHealDamage:
-      types:
-        Bloodloss:
-          -1
-  - type: InteractionOutline
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          # Circles, cuz rotation of rectangles looks very bad
-          !type:PhysShapeCircle
-          radius: 0.35
-        density: 50
-        mask:
-        - MobMask
-        layer:
-        - MobLayer
-  - type: MovementSpeedModifier
-    baseWalkSpeed : 4
-    baseSprintSpeed : 3
-  - type: Sprite
-    noRot: true
-    drawdepth: Mobs
-  - type: Physics
-    bodyType: KinematicController
-  - type: Hands
-    showInHands: false
-  - type: Body
-    prototype: Drone
-  - type: IntrinsicRadioReceiver
-  - type: IntrinsicRadioTransmitter
-    channels:
-    - Binary
-  - type: ActiveRadio
-    channels:
-    - Binary
-    - Common
-  - type: DoAfter
-  - type: Pullable
-  - type: Examiner
-  - type: Puller
-  - type: StandingState
-  - type: Alerts
-  - type: Tag
-    tags:
-      - ShoesRequiredStepTriggerImmune
-  - type: Eye
-    visMask:
-      - PsionicInvisibility
-      - Normal
-
-- type: entity
-  name: drone
-  id: Drone
-  parent: PlayerSiliconBase
-  components:
-  - type: Drone
-  - type: InnateTool
-    tools:
-      - id: ClothingBackpackSatchelDrone
-      - id: trayScanner
-      - id: Omnitool
-      - id: WelderExperimental
-  - type: NameIdentifier
-    group: Drone
-  - type: Inventory
-    templateId: drone
-  - type: InventorySlots
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-    - key: enum.StrippingUiKey.Key
-      type: StrippableBoundUserInterface
-    - key: enum.SiliconLawsUiKey.Key
-      type: SiliconLawBoundUserInterface
-  #- type: GhostRole
-  #  makeSentient: true
-  #  name: Maintenance Drone
-  #  description: Maintain the station. Ignore other beings except drones.
-  #  rules: |
-  #   You are bound by these laws both in-game and out-of-character:
-  #   1. You may not involve yourself in the matters of another being, even if such matters conflict with Law Two or Law Three, unless the other being is another Drone.
-  #   2. You may not harm any being, regardless of intent or circumstance.
-  #   3. Your goals are to build, maintain, repair, improve, and power to the best of your abilities, You must never actively work against these goals.
-  #- type: GhostTakeoverAvailable
-  - type: SiliconLawBound
-  - type: SiliconLawProvider
-    laws: Drone
-  - type: MovementSpeedModifier
-    baseWalkSpeed : 5
-    baseSprintSpeed : 5
-  - type: MobState
-    allowedStates:
-      - Alive
-      - Dead
-  - type: MobThresholds
-    thresholds:
-      0: Alive
-      60: Dead
-  - type: Flashable
-  - type: NoSlip
-  - type: StatusEffects
-    allowed:
-    - Stun
-    - KnockedDown
-    - SlowedDown
-  - type: SlowOnDamage
-    speedModifierThresholds:
-      30: 0.7
-      50: 0.5
-  - type: Temperature
-    heatDamageThreshold: 5000
-    currentTemperature: 310.15
-    specificHeat: 42
-    heatDamage:
-      types:
-        Heat : 1 #per second, scales with temperature & other constants
-  - type: Sprite
-    drawdepth: SmallMobs
-    layers:
-    - state: shell
-      sprite: Mobs/Silicon/drone.rsi
-      map: ["base"]
-  - type: MovementIgnoreGravity
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.35
-        density: 50
-        mask:
-        - SmallMobMask
-        layer:
-        - SmallMobLayer
-  - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.DroneVisuals.Status:
-        base:
-          Off: { state: shell }
-          On: { state: drone }
-  - type: ReplacementAccent
-    accent: silicon
-  - type: Repairable
-    fuelcost: 15
-    doAfterDelay: 8
-  - type: Actions
-  - type: UnpoweredFlashlight
-  - type: PointLight
-    enabled: false
-    radius: 3.5
-    softness: 1
-    mask: /Textures/Effects/LightMasks/cone.png
-    autoRot: true
-  - type: Tag
-    tags:
-      - ShoesRequiredStepTriggerImmune
-      - CannotSuicide
-
-- type: entity
-  name: onestar mecha
-  id: Onestar
-  parent: PlayerSiliconBase
-  components:
-  - type: InnateTool
-    tools:
-      - id: WeaponMinigun
-      - id: EnergySword
-      - id: WeaponLauncherMultipleRocket
-      - id: WeaponXrayCannon
-  - type: UserInterface
-    interfaces:
-    - key: enum.StrippingUiKey.Key
-      type: StrippableBoundUserInterface
-  - type: GhostRole
-    makeSentient: true
-    name: ghost-role-information-onestar-mecha-name
-    description: ghost-role-information-onestar-mecha-description
-    rules: ghost-role-information-onestar-mecha-rules
-  - type: GhostTakeoverAvailable
-  - type: MovementSpeedModifier
-    baseWalkSpeed : 3
-    baseSprintSpeed : 2
-  - type: MobState
-    allowedStates:
-      - Alive
-      - Dead
-  - type: MobThresholds
-    thresholds:
-      0: Alive
-      1000: Dead
-  - type: Sprite
-    drawdepth: Mobs
-    layers:
-    - state: onestar_boss
-      sprite: Mobs/Silicon/onestar.rsi
-    - state: onestar_boss_screen
-      sprite: Mobs/Silicon/onestar.rsi
-      shader: unshaded
-  - type: FootstepModifier
-    footstepSoundCollection:
-      path: /Audio/Mecha/sound_mecha_powerloader_step.ogg
-  - type: MovementIgnoreGravity
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeCircle
-          radius: 1
-        density: 160
-        mask:
-        - LargeMobMask
-        layer:
-        - MobLayer
-  - type: Appearance
-  - type: CombatMode
-  - type: Tag
-    tags:
-      - FootstepSound
-
 - type: entity
   id: PlayerBorgGeneric
   parent: BorgChassisGeneric
@@ -252,9 +6,9 @@
   - type: ContainerFill
     containers:
       borg_brain:
-      - PositronicBrain
+        - PositronicBrain
       borg_module:
-      - BorgModuleTool
+        - BorgModuleTool
   - type: ItemSlots
     slots:
       cell_slot:
@@ -271,7 +25,7 @@
   - type: ContainerFill
     containers:
       borg_brain:
-      - MMIFilled
+        - MMIFilled
   - type: ItemSlots
     slots:
       cell_slot:
@@ -283,17 +37,17 @@
   parent: BorgChassisSyndicateAssault
   suffix: Battery, Module, Operative
   components:
-    - type: NukeOperative
-    - type: ContainerFill
-      containers:
-        borg_brain:
-          - PositronicBrain
-        borg_module:
-          - BorgModuleOperative
-          - BorgModuleL6C
-          - BorgModuleEsword
-    - type: ItemSlots
-      slots:
-        cell_slot:
-          name: power-cell-slot-component-slot-name-default
-          startingItem: PowerCellHyper
+  - type: NukeOperative
+  - type: ContainerFill
+    containers:
+      borg_brain:
+        - PositronicBrain
+      borg_module:
+        - BorgModuleOperative
+        - BorgModuleL6C
+        - BorgModuleEsword
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHyper
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
index 6a92a6cc6b..d6a6087266 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -40,6 +40,10 @@
       - !type:WearableReaction
         slot: head
         prototypeID: WaterDropletHat
+    - reagents: [Water, SpaceCleaner]
+      methods: [Touch]
+      effects:
+      - !type:WashCreamPieReaction
   # Damage (Self)
   - type: Bloodstream
     bloodReagent: CopperBlood
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index e8c475907e..a610e04d6d 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -60,7 +60,7 @@
       state: "creampie_human"
       visible: false
   - type: DamageVisuals
-    thresholds: [ 20, 40, 100 ]
+    thresholds: [ 10, 20, 30, 50, 70, 100 ]
     targetLayers:
     - "enum.HumanoidVisualLayers.Chest"
     - "enum.HumanoidVisualLayers.Head"
diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
index 3f46005635..3d405c4dd9 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -95,6 +95,13 @@
   - type: BodyEmotes
     soundsId: DionaBodyEmotes
   - type: IgnoreKudzu
+  - type: IgniteOnHeatDamage
+    fireStacks: 1
+    threshold: 12
+  - type: GibAction
+    actionPrototype: DionaGibAction
+    allowedStates:
+    - Dead
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index e17b2f7080..184711ec1e 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -8,105 +8,45 @@
   - type: Icon
     sprite: Mobs/Species/Vox/parts.rsi
     state: vox_m
-  - type: Sprite
-    layers:
-      - map: [ "enum.HumanoidVisualLayers.Chest" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: torso_m
-      - map: [ "enum.HumanoidVisualLayers.Head" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: head_m
-      - map: [ "enum.HumanoidVisualLayers.Eyes" ]
-        color: "#008800"
-        sprite: Mobs/Customization/eyes.rsi
-        state: vox_eyes_s
-      - map: [ "enum.HumanoidVisualLayers.RArm" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: r_arm
-      - map: [ "enum.HumanoidVisualLayers.LArm" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: l_arm
-      - map: [ "enum.HumanoidVisualLayers.RLeg" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: r_leg
-      - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: l_leg
-      # Vox don't have female clothing masks.
-      #- shader: StencilClear
-      #  sprite: Mobs/Species/Vox/parts.rsi
-      #  state: l_leg
-      #- shader: StencilMask
-      #  map: [ "enum.HumanoidVisualLayers.FemaleStencilMask" ]
-      #  sprite: Mobs/Customization/masking_helpers.rsi
-      #  state: female_full
-      #  visible: false
-      #- map: [ "jumpsuit" ]
-      #  shader: StencilDraw
-      - map: [ "enum.HumanoidVisualLayers.LHand" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: l_hand
-      - map: [ "enum.HumanoidVisualLayers.RHand" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: r_hand
-      - map: [ "enum.HumanoidVisualLayers.LFoot" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: l_foot
-      - map: [ "enum.HumanoidVisualLayers.RFoot" ]
-        sprite: Mobs/Species/Vox/parts.rsi
-        state: r_foot
-      - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
-        color: "#ffffff"
-        sprite: Objects/Misc/handcuffs.rsi
-        state: body-overlay-2
-        visible: false
-      - map: [ "gloves" ]
-      - map: [ "shoes" ]
-      - map: [ "ears" ]
-      - map: [ "outerClothing" ]
-      - map: [ "eyes" ]
-      - map: [ "belt" ]
-      - map: [ "id" ]
-      - map: [ "neck" ]
-      - map: [ "back" ]
-      - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
-        state: shaved
-        sprite: Mobs/Customization/human_facial_hair.rsi
-      - map: [ "enum.HumanoidVisualLayers.Hair" ]
-        state: bald
-        sprite: Mobs/Customization/human_hair.rsi
-      - map: [ "mask" ]
-      - map: [ "head" ]
-      - map: [ "pocket1" ]
-      - map: [ "pocket2" ]
   - type: Body
     prototype: Vox
     requiredLegs: 2
-  # Vox nitrogen stuff is handled in their metabolism
-  - type: Respirator
-    damage:
-      types:
-        Asphyxiation: 2
-    damageRecovery:
-      types:
-        Asphyxiation: -1.0
   - type:  HumanoidAppearance
     species: Vox
-    # canColorHair: false
-    # canColorFacialHair: false
-  - type: Inventory
-    speciesId: vox
-  - type: InventorySlots
-  - type: Butcherable
-    butcheringType: Spike
-    spawned:
-    - id: FoodMeatChicken
-      amount: 5
+    #- type: VoxAccent # Not yet coded
+  - type: Speech
+    speechVerb: Vox
+    speechSounds: Vox
+  - type: TypingIndicator
+    proto: vox
   - type: Vocal
     sounds:
       Male: UnisexVox
       Female: UnisexVox
       Unsexed: UnisexVox
+  - type: Butcherable
+    butcheringType: Spike
+    spawned:
+    - id: FoodMeatChicken
+      amount: 5
+  - type: Damageable
+    damageContainer: Biological
+    damageModifierSet: Vox
+  - type: DamageVisuals
+    damageOverlayGroups:
+      Brute:
+        sprite: Mobs/Effects/brute_damage.rsi
+        color: "#7a8bf2"
+  - type: Bloodstream
+    bloodReagent: AmmoniaBlood
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Weapons/pierce.ogg
+    angle: 30
+    animation: WeaponArcClaw
+    damage:
+      types:
+        Slash: 5 # Reduce?
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index 788b14f322..d4e9a561c5 100644
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -207,7 +207,7 @@
   - type: Bloodstream
     bloodlossDamage:
       types:
-        Bloodloss: 1
+        Bloodloss: 0.5
     bloodlossHealDamage:
       types:
         Bloodloss: -1
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
index cab95b0803..f232bf1d34 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -6,6 +6,10 @@
   - type: Openable
     sound:
       collection: bottleOpenSounds #Could use a new sound someday ¯\_(ツ)_/¯
+    closeable: true
+    closeSound:
+      collection: bottleCloseSounds
+  - type: Sealable
   - type: SolutionContainerManager
     solutions:
       drink:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index c6dfc37385..33646b50bb 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -23,8 +23,6 @@
         Blunt: 0
   - type: Spillable
     solution: drink
-  - type: FitsInDispenser
-    solution: drink
   - type: DrawableSolution
     solution: drink
   - type: RefillableSolution
@@ -76,6 +74,8 @@
       Glass: 25
   - type: ExaminableSolution
     solution: drink
+  - type: FitsInDispenser
+    solution: drink
 
 # Transformable container - normal glass
 - type: entity
@@ -134,10 +134,9 @@
       fillBaseName: fill
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAbsintheGlass
-  name: absinthe glass
-  description: Wormwood, anise, oh my.
+  suffix: absinthe
   components:
   - type: SolutionContainerManager
     solutions:
@@ -146,14 +145,14 @@
         reagents:
         - ReagentId: Absinthe
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/absintheglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAcidSpitGlass
-  name: acid spit glass
-  description: A drink from the company archives. Made from live aliens.
+  suffix: acid spit
   components:
   - type: SolutionContainerManager
     solutions:
@@ -162,14 +161,14 @@
         reagents:
         - ReagentId: AcidSpit
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/acidspitglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAleGlass
-  name: ale glass
-  description: A freezing pint of delicious ale
+  suffix: ale
   components:
   - type: SolutionContainerManager
     solutions:
@@ -178,14 +177,14 @@
         reagents:
         - ReagentId: Ale
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/aleglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAlliesCocktail
-  name: allies cocktail
-  description: A drink made from your allies.
+  suffix: allies cocktail
   components:
   - type: SolutionContainerManager
     solutions:
@@ -194,14 +193,14 @@
         reagents:
         - ReagentId: AlliesCocktail
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/alliescocktail.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAloe
-  name: aloe glass
-  description: Very, very, very good.
+  suffix: aloe
   components:
   - type: SolutionContainerManager
     solutions:
@@ -210,14 +209,14 @@
         reagents:
         - ReagentId: Aloe
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/aloe.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAmasecGlass
-  name: amasec glass
-  description: Always handy before COMBAT!!!
+  suffix: amasec
   components:
   - type: SolutionContainerManager
     solutions:
@@ -226,14 +225,14 @@
         reagents:
         - ReagentId: Amasec
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/amasecglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAndalusia
-  name: andalusia glass
-  description: A nice drink with a strange name.
+  suffix: andalusia
   components:
   - type: SolutionContainerManager
     solutions:
@@ -242,14 +241,14 @@
         reagents:
         - ReagentId: Andalusia
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/andalusia.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAntifreeze
-  name: anti-freeze glass
-  description: The ultimate refreshment.
+  suffix: antifreeze
   components:
   - type: SolutionContainerManager
     solutions:
@@ -258,15 +257,11 @@
         reagents:
         - ReagentId: Antifreeze
           Quantity: 30
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/antifreeze.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkAtomicBombGlass
-  name: atomic bomb glass
-  description: We cannot take legal responsibility for your actions after imbibing.
+  suffix: atomic bomb
   components:
   - type: SolutionContainerManager
     solutions:
@@ -275,15 +270,14 @@
         reagents:
         - ReagentId: AtomicBomb
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/atomicbombglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkB52Glass
-  name: b-52 glass
-  description: Coffee, Irish Cream, and cognac. You will get bombed.
+  suffix: b-52
   components:
   - type: SolutionContainerManager
     solutions:
@@ -292,15 +286,14 @@
         reagents:
         - ReagentId: B52
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/b52glass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBahamaMama
-  name: bahama mama glass
-  description: Tropical cocktail.
+  suffix: bahama mama
   components:
   - type: SolutionContainerManager
     solutions:
@@ -309,15 +302,14 @@
         reagents:
         - ReagentId: BahamaMama
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/bahama_mama.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBananaHonkGlass
-  name: banana honk glass
-  description: A drink from Banana Heaven.
+  suffix: banana honk
   components:
   - type: SolutionContainerManager
     solutions:
@@ -326,15 +318,14 @@
         reagents:
         - ReagentId: BananaHonk
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/bananahonkglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBarefootGlass
-  name: barefoot glass
-  description: Barefoot and pregnant.
+  suffix: barefoot
   components:
   - type: SolutionContainerManager
     solutions:
@@ -343,15 +334,14 @@
         reagents:
         - ReagentId: Barefoot
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/b&p.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBeepskySmashGlass
-  name: beepsky smash glass
-  description: Heavy, hot and strong. Just like the Iron fist of the LAW.
+  suffix: beepsky smash
   components:
   - type: SolutionContainerManager
     solutions:
@@ -360,15 +350,14 @@
         reagents:
         - ReagentId: BeepskySmash
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/beepskysmashglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBeerglass
-  name: beer glass
-  description: A freezing pint of beer.
+  suffix: beer
   components:
   - type: SolutionContainerManager
     solutions:
@@ -377,16 +366,15 @@
         reagents:
         - ReagentId: Beer
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/beerglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBerryJuice
-  name: berry juice
-  description: Berry juice. Or maybe it's jam. Who cares?
+  suffix: berry juice
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -394,14 +382,14 @@
         reagents:
         - ReagentId: JuiceBerry
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/berryjuice.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBlackRussianGlass
-  name: black russian glass
-  description: For the lactose-intolerant. Still as classy as a White Russian.
+  suffix: black russian
   components:
   - type: SolutionContainerManager
     solutions:
@@ -410,17 +398,15 @@
         reagents:
         - ReagentId: BlackRussian
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/blackrussianglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBlueCuracaoGlass
-  name: blue curacao
-  description: Exotically blue, fruity drink, distilled from oranges.
+  suffix: blue curacao
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -428,14 +414,14 @@
         reagents:
         - ReagentId: BlueCuracao
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/curacaoglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBloodyMaryGlass
-  name: bloody mary glass
-  description: Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder.
+  suffix: bloody mary
   components:
   - type: SolutionContainerManager
     solutions:
@@ -444,15 +430,14 @@
         reagents:
         - ReagentId: BloodyMary
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/bloodymaryglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBooger
-  name: booger
-  description: Ewww...
+  suffix: booger
   components:
   - type: SolutionContainerManager
     solutions:
@@ -461,15 +446,14 @@
         reagents:
         - ReagentId: Booger
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/booger.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBraveBullGlass
-  name: brave bull glass
-  description: Tequilla and coffee liquor, brought together in a mouthwatering mixture. Drink up.
+  suffix: brave bull
   components:
   - type: SolutionContainerManager
     solutions:
@@ -478,17 +462,15 @@
         reagents:
         - ReagentId: BraveBull
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/bravebullglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkCarrotJuice
-  name: carrot juice
-  description: It's just like a carrot but without crunching.
+  suffix: carrot juice
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -496,18 +478,15 @@
         reagents:
         - ReagentId: JuiceCarrot
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/carrotjuice.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkChocolateGlass
-  name: hot chocolate
-  description: A heated drink consisting melted chocolate and heated milk.
+  suffix: chocolate
   components:
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/chocolateglass.rsi
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -515,12 +494,14 @@
         reagents:
         - ReagentId: HotCocoa
           Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/chocolateglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkCoffee
-  name: coffee
-  description: Don't drop it, or you'll send scalding liquid and glass shards everywhere.
+  suffix: coffee
   components:
   - type: SolutionContainerManager
     solutions:
@@ -529,14 +510,14 @@
         reagents:
         - ReagentId: Coffee
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/coffee.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkCognacGlass
-  name: cognac glass
-  description: Damn, you feel like some kind of French aristocrat just by holding this.
+  suffix: cognac
   components:
   - type: SolutionContainerManager
     solutions:
@@ -545,14 +526,14 @@
         reagents:
         - ReagentId: Cognac
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/cognacglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkCream
-  name: cream
-  description: Ewwww...
+  suffix: cream
   components:
   - type: SolutionContainerManager
     solutions:
@@ -561,14 +542,11 @@
         reagents:
         - ReagentId: Cream
           Quantity: 30
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/cream.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkCubaLibreGlass
-  name: cuba libre glass
-  description: A classic mix of rum and cola.
+  suffix: cuba libre
   components:
   - type: SolutionContainerManager
     solutions:
@@ -577,14 +555,14 @@
         reagents:
         - ReagentId: CubaLibre
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/cubalibreglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkDeadRumGlass
-  name: deadrum glass
-  description: Popular with the sailors. Not very popular with everyone else.
+  suffix: dead rum
   components:
   - type: SolutionContainerManager
     solutions:
@@ -593,15 +571,14 @@
         reagents:
         - ReagentId: DeadRum
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/rumglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkDemonsBlood
-  name: demons blood
-  description: Just looking at this thing makes the hair at the back of your neck stand up.
+  suffix: demon's blood
   components:
   - type: SolutionContainerManager
     solutions:
@@ -610,15 +587,14 @@
         reagents:
         - ReagentId: DemonsBlood
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/demonsblood.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkDevilsKiss
-  name: devil's kiss
-  description: Creepy time!
+  suffix: devil's kiss
   components:
   - type: SolutionContainerManager
     solutions:
@@ -627,15 +603,14 @@
         reagents:
         - ReagentId: DevilsKiss
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/devilskiss.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkDoctorsDelightGlass
-  name: the doctor's delight
-  description: A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place.
+  suffix: doctor's delight
   components:
   - type: SolutionContainerManager
     solutions:
@@ -644,15 +619,14 @@
         reagents:
         - ReagentId: DoctorsDelight
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/doctorsdelightglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkDriestMartiniGlass
-  name: driest martini glass
-  description: Only for the experienced. You think you see sand floating in the glass.
+  suffix: driest martini
   components:
   - type: SolutionContainerManager
     solutions:
@@ -661,15 +635,14 @@
         reagents:
         - ReagentId: DriestMartini
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/driestmartiniglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkDrGibbGlass
-  name: Dr. Gibb glass
-  description: Dr. Gibb. Not as dangerous as the name might imply.
+  suffix: dr gibb
   components:
   - type: SolutionContainerManager
     solutions:
@@ -678,15 +651,14 @@
         reagents:
         - ReagentId: DrGibb
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/dr_gibb_glass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkErikaSurprise
-  name: erika surprise
-  description: The surprise is, it's green!
+  suffix: erika surprise
   components:
   - type: SolutionContainerManager
     solutions:
@@ -695,15 +667,14 @@
         reagents:
         - ReagentId: ErikaSurprise
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/erikasurprise.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkFourteenLokoGlass
-  name: Fourteen Loko glass
-  description: This is a container of Fourteen Loko, it appears to be of the highest quality. The drink, not the container.
+  suffix: fourteen loko
   components:
   - type: SolutionContainerManager
     solutions:
@@ -712,15 +683,14 @@
         reagents:
         - ReagentId: FourteenLoko
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/fourteen_loko_glass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGargleBlasterGlass
-  name: pan-galactic gargle blaster
-  description: Does... does this mean that Arthur and Ford are on the ship? Oh joy.
+  suffix: pan-galactic gargle blaster
   components:
   - type: SolutionContainerManager
     solutions:
@@ -729,15 +699,14 @@
         reagents:
         - ReagentId: GargleBlaster
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGinGlass
-  name: gin
-  description: Crystal clear Griffeater gin.
+  suffix: gin
   components:
   - type: SolutionContainerManager
     solutions:
@@ -746,15 +715,14 @@
         reagents:
         - ReagentId: Gin
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGinFizzGlass
-  name: gin fizz glass
-  description: Refreshingly lemony, deliciously dry.
+  suffix: gin fizz
   components:
   - type: SolutionContainerManager
     solutions:
@@ -763,15 +731,14 @@
         reagents:
         - ReagentId: GinFizz
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/ginfizzglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGinTonicglass
-  name: gin and tonic
-  description: A mild but still great cocktail. Drink up, like a true Englishman.
+  suffix: gin and tonic
   components:
   - type: SolutionContainerManager
     solutions:
@@ -780,15 +747,14 @@
         reagents:
         - ReagentId: GinTonic
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/gintonicglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGildlagerGlass
-  name: gildlager glass
-  description: 100 proof that teen girls will drink anything with gold in it.
+  suffix: gildlager
   components:
   - type: SolutionContainerManager
     solutions:
@@ -797,17 +763,15 @@
         reagents:
         - ReagentId: Gildlager
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/gildlagerglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGrapeJuice
-  name: grape juice
-  description: It's grrrrrape!
+  suffix: grape juice
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -815,24 +779,30 @@
         reagents:
         - ReagentId: JuiceGrape
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/grapejuice.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGrapeSodaGlass
-  name: grape soda glass
-  description: Looks like a delicious drink!
+  suffix: grape soda
   components:
-  - type: Drink
-  - type: Sprite
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: GrapeSoda
+          Quantity: 30
+  - type: Icon
     sprite: Objects/Consumable/Drinks/gsodaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGreenTeaGlass
-  name: green tea glass
-  description: Tasty green tea. It has antioxidants; it's good for you!
+  suffix: green tea
   components:
   - type: SolutionContainerManager
     solutions:
@@ -841,15 +811,14 @@
         reagents:
         - ReagentId: GreenTea
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/glass_green.rsi #Placeholder
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGrenadineGlass
-  name: grenadine syrup glass
-  description: Sweet and tangy, a bar syrup used to add color or flavor to drinks.
+  suffix: grenadine
   components:
   - type: SolutionContainerManager
     solutions:
@@ -858,15 +827,14 @@
         reagents:
         - ReagentId: Grenadine
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/grenadineglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGrogGlass
-  name: grog glass
-  description: A fine and cepa drink for Space.
+  suffix: grog
   components:
   - type: SolutionContainerManager
     solutions:
@@ -875,24 +843,30 @@
         reagents:
         - ReagentId: Grog
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/grogglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkHippiesDelightGlass
-  name: hippies' delight glass
-  description: A drink enjoyed by people during the 1960's.
+  suffix: hippies' delight
   components:
-  - type: Drink
-  - type: Sprite
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: HippiesDelight
+          Quantity: 30
+  - type: Icon
     sprite: Objects/Consumable/Drinks/hippiesdelightglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkHoochGlass
-  name: hooch
+  suffix: hooch
   description: You've really hit rock bottom now... your liver packed its bags and left last night.
   components:
   - type: SolutionContainerManager
@@ -902,15 +876,14 @@
         reagents:
         - ReagentId: Hooch
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/glass_brown2.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkIcedCoffeeGlass
-  name: iced coffee glass
-  description: A drink to perk you up and refresh you!
+  suffix: iced coffee
   components:
   - type: SolutionContainerManager
     solutions:
@@ -919,15 +892,14 @@
         reagents:
         - ReagentId: IcedCoffee
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/icedcoffeeglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkIcedGreenTeaGlass
-  name: iced green tea glass
-  description: It looks like green tea with ice. One might even call it iced green tea.
+  suffix: iced green tea
   components:
   - type: SolutionContainerManager
     solutions:
@@ -936,15 +908,14 @@
         reagents:
         - ReagentId: IcedGreenTea
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/glass_green.rsi #Placeholder
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkIcedTeaGlass
-  name: iced tea
-  description: A refreshing southern beverage.
+  suffix: iced tea
   components:
   - type: SolutionContainerManager
     solutions:
@@ -953,25 +924,30 @@
         reagents:
         - ReagentId: IcedTea
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/icedteaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkIcedBeerGlass
-  name: iced beer glass
-  description: A beer so frosty, the air around it freezes.
+  suffix: iced beer
   components:
-  - type: Drink
-  - type: Sprite
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: IcedBeer
+          Quantity: 30
+  - type: Icon
     sprite: Objects/Consumable/Drinks/iced_beerglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkIceGlass
-  name: ice glass
-  description: Generally, you're supposed to put something else in there too...
+  suffix: ice
   components:
   - type: SolutionContainerManager
     solutions:
@@ -980,14 +956,14 @@
         reagents:
         - ReagentId: Ice
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/iceglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkIceCreamGlass
-  name: ice cream glass
-  description: A glass full of good old ice cream. Might want a spoon.
+  suffix: ice cream
   components:
   - type: SolutionContainerManager
     solutions:
@@ -996,16 +972,14 @@
         reagents:
         - ReagentId: IceCream
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/icecreamglass.rsi
     state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkIrishCarBomb
-  name: irish car bomb
-  description: An irish car bomb.
+  suffix: irish car bomb
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1014,14 +988,14 @@
         reagents:
         - ReagentId: IrishCarBomb
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/irishcarbomb.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkIrishCoffeeGlass
-  name: irish coffee glass
-  description: Coffee and alcohol. More fun than a Mimosa to drink in the morning.
+  suffix: irish coffee
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1030,14 +1004,14 @@
         reagents:
         - ReagentId: IrishCoffee
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/irishcoffeeglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkIrishCreamGlass
-  name: irish cream glass
-  description: It's cream, mixed with whiskey. What else would you expect from the Irish?
+  suffix: irish cream
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1046,14 +1020,14 @@
         reagents:
         - ReagentId: IrishCream
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/irishcreamglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkCoffeeLiqueurGlass
-  name: coffee liqueur glass
-  description: DAMN, THIS THING LOOKS ROBUST
+  suffix: coffee liqueur
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1062,14 +1036,14 @@
         reagents:
         - ReagentId: CoffeeLiqueur
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/coffeeliqueurglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkKiraSpecial
-  name: kira special
-  description: Long live the guy who everyone had mistaken for a girl. Baka!
+  suffix: kira special
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1078,15 +1052,14 @@
         reagents:
         - ReagentId: KiraSpecial
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/kiraspecial.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkLemonadeGlass
-  name: lemonade glass
-  description: Oh the nostalgia...
+  suffix: lemonade
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1095,17 +1068,15 @@
         reagents:
         - ReagentId: Lemonade
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/lemonadeglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkLemonJuice
-  name: lemon juice
-  description: Sour...
+  suffix: lemon juice
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -1113,16 +1084,15 @@
         reagents:
         - ReagentId: JuiceLemon
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/lemonjuice.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkLemonLime
-  name: lemon lime
-  description: A tangy substance made of 0.5% natural citrus!
+  suffix: lemon lime
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -1130,16 +1100,15 @@
         reagents:
         - ReagentId: LemonLime
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/lemonlime.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkLimeJuice
-  name: lime juice
-  description: It's some sweet-sour lime juice.
+  suffix: lime juice
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -1147,14 +1116,11 @@
         reagents:
         - ReagentId: JuiceLime
           Quantity: 30
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/limejuice.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkLongIslandIcedTeaGlass
-  name: long island iced tea glass
-  description: The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only.
+  suffix: long island iced tea
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1163,15 +1129,14 @@
         reagents:
         - ReagentId: LongIslandIcedTea
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/longislandicedteaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkManhattanGlass
-  name: manhattan glass
-  description: The Detective's undercover drink of choice. He never could stomach gin...
+  suffix: manhattan
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1180,15 +1145,14 @@
         reagents:
         - ReagentId: Manhattan
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/manhattanglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkManhattanProjectGlass
-  name: manhattan project glass
-  description: A scientist's drink of choice, for pondering ways to blow up the station.
+  suffix: manhattan project
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1197,15 +1161,14 @@
         reagents:
         - ReagentId: ManhattanProject
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/proj_manhattanglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkManlyDorfGlass
-  name: the manly dorf glass
-  description: A manly concotion made from Ale and Beer. Intended for true men only.
+  suffix: manly dorf
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1214,14 +1177,14 @@
         reagents:
         - ReagentId: ManlyDorf
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/manlydorfglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkMargaritaGlass
-  name: margarita glass
-  description: On the rocks with salt on the rim. Arriba~!
+  suffix: margarita
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1230,15 +1193,14 @@
         reagents:
         - ReagentId: Margarita
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/margaritaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkMartiniGlass
-  name: classic martini glass
-  description: Damn, the bartender even stirred it, not shook it.
+  suffix: classic martini
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1247,15 +1209,14 @@
         reagents:
         - ReagentId: Martini
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/martiniglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkMeadGlass
-  name: mead glass
-  description: A Viking's beverage, though a cheap one.
+  suffix: mead
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1264,25 +1225,23 @@
         reagents:
         - ReagentId: Mead
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/meadglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkMilkshake
-  name: milkshake
-  description: Glorious brainfreezing mixture.
+  suffix: milkshake
   components:
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/milkshake.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkMojito
-  name: mojito
-  description: Fresh from Spesscuba.
+  suffix: mojito
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1291,15 +1250,14 @@
         reagents:
         - ReagentId: Mojito
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/mojito.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkNeurotoxinGlass
-  name: neurotoxin glass
-  description: A drink that is guaranteed to knock you silly.
+  suffix: neurotoxin
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1308,15 +1266,14 @@
         reagents:
         - ReagentId: Neurotoxin
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/neurotoxinglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkNothing
-  name: nothing
-  description: Absolutely nothing.
+  suffix: nothing
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1325,15 +1282,14 @@
         reagents:
         - ReagentId: Nothing
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/nothing.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkNTCahors
-  name: neotheology cahors whine
-  description: It looks like wine, but more dark.
+  suffix: neotheology cahors whine
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1342,15 +1298,14 @@
         reagents:
         - ReagentId: NTCahors
           Quantity: 30
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/ntcahors.rsi
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/wineglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkNuclearColaGlass
-  name: nuclear cola glass
-  description: Don't cry, Don't raise your eye, It's only nuclear wasteland.
+  suffix: nuclear cola
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1359,17 +1314,15 @@
         reagents:
         - ReagentId: NuclearCola
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/nuclear_colaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkOrangeJuice
-  name: orange juice
-  description: Vitamins! Yay!
+  suffix: orange juice
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -1377,14 +1330,14 @@
         reagents:
         - ReagentId: JuiceOrange
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/orangejuice.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkPatronGlass
-  name: patron glass
-  description: Drinking patron in the bar, with all the subpar ladies.
+  suffix: patron
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1393,17 +1346,15 @@
         reagents:
         - ReagentId: Patron
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/patronglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkPoisonBerryJuice
-  name: poison berry juice
-  description: Looks like some deadly juice.
+  suffix: poison berry juice
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -1411,14 +1362,14 @@
         reagents:
         - ReagentId: JuiceBerryPoison
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/poisonberryjuice.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkPoisonWineGlass
-  name: poison wine glass
-  description: A black ichor with an oily purple sheer on top. Are you sure you should drink this?
+  suffix: poison wine
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1427,15 +1378,14 @@
         reagents:
         - ReagentId: PoisonWine
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/pwineglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkPoscaGlass
-  name: posca glass
-  description: Poor warriors' drink from a forgotten era.
+  suffix: posca
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1444,15 +1394,14 @@
         reagents:
         - ReagentId: Posca
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/glass_light_yellow.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkRedMeadGlass
-  name: red mead glass
-  description: A true Viking's beverage, though its color is strange.
+  suffix: red mead
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1461,15 +1410,14 @@
         reagents:
         - ReagentId: RedMead
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/red_meadglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkRewriter
-  name: rewriter
-  description: The secret of the sanctuary of the Libarian...
+  suffix: rewriter
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1478,15 +1426,14 @@
         reagents:
         - ReagentId: Rewriter
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/rewriter.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkRootBeerGlass
-  name: root beer glass
-  description: Fizzy, foamy, and full of sweet, non-caffienated goodness.
+  suffix: root beer
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1495,16 +1442,14 @@
         reagents:
         - ReagentId: RootBeer
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/rootbeerglass.rsi
     state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkRootBeerFloatGlass
-  name: root beer float glass
-  description: Fizzy, foamy, and now with ice cream on top! Amazing!
+  suffix: root beer float
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1513,16 +1458,14 @@
         reagents:
         - ReagentId: RootBeerFloat
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/rootbeerfloatglass.rsi
     state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkRumGlass
-  name: rum glass
-  description: Now you want to Pray for a pirate suit, don't you?
+  suffix: rum
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1531,16 +1474,15 @@
         reagents:
         - ReagentId: Rum
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/rumglass.rsi
+    state: icon
 
 ##Commented out in favor of Nyano sake/soju
 #- type: entity
-#  parent: DrinkGlassBase
+#  parent: DrinkGlass
 #  id: DrinkSakeGlass
-#  name: sake glass
-#  description: Wine made from rice, it's sake!
+#  suffix: sake
 #  components:
 #  - type: SolutionContainerManager
 #    solutions:
@@ -1549,15 +1491,11 @@
 #        reagents:
 #        - ReagentId: Sake
 #          Quantity: 30
-#  - type: Drink
-#  - type: Sprite
-#    sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSbitenGlass
-  name: sbiten glass
-  description: A spicy mix of Vodka and Spice. Very hot.
+  suffix: sbiten
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1566,15 +1504,14 @@
         reagents:
         - ReagentId: Sbiten
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/sbitenglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkScrewdriverCocktailGlass
-  name: screwdriver glass
-  description: A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer.
+  suffix: screwdriver
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1583,15 +1520,14 @@
         reagents:
         - ReagentId: ScrewdriverCocktail
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/screwdriverglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkCogChampBase
-  name: cogchamp glass
-  description: This mix of Cognac, Screwdriver and Welding Fuel will have you seeing His light surely!
+  suffix: cogchamp
   components:
     - type: SolutionContainerManager
       solutions:
@@ -1600,15 +1536,14 @@
           reagents:
             - ReagentId: CogChamp
               Quantity: 30
-    - type: Drink
-    - type: Sprite
+    - type: Icon
       sprite: Objects/Consumable/Drinks/cogchamp.rsi
+      state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSuiDreamGlass
-  name: sui dream glass
-  description: A froofy, fruity, and sweet mixed drink. Understanding the name only brings shame.
+  suffix: sui dream
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1617,15 +1552,14 @@
         reagents:
         - ReagentId: SuiDream
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/sdreamglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkEmeraldGlass
-  name: melon liquor
-  description: A relatively sweet and fruity 46 proof liquor.
+  suffix: melon liquor
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1634,15 +1568,14 @@
         reagents:
         - ReagentId: MelonLiquor
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/emeraldglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkMoonshineGlass
-  name: moonshine
-  description: You've really hit rock bottom now... your liver packed its bags and left last night.
+  suffix: moonshine
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1651,15 +1584,14 @@
         reagents:
         - ReagentId: Moonshine
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/glass_clear.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGlassWhite
-  name: milk
-  description: White and nutritious goodness!
+  suffix: milk
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1668,14 +1600,14 @@
         reagents:
         - ReagentId: Milk
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/glass_white.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSilencerGlass
-  name: silencer glass
-  description: A drink from Mime Heaven.
+  suffix: silencer
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1684,15 +1616,14 @@
         reagents:
         - ReagentId: Silencer
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/silencerglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSingulo
-  name: singulo
-  description: A blue-space beverage!
+  suffix: singulo
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1701,15 +1632,14 @@
         reagents:
         - ReagentId: Singulo
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/singulo.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSnowWhite
-  name: snow white
-  description: A cold refreshment.
+  suffix: snow white
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1718,15 +1648,14 @@
         reagents:
         - ReagentId: SnowWhite
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/snowwhite.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSoyLatte
-  name: soy latte
-  description: A nice and refreshing beverage while you are reading.
+  suffix: soy latte
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1735,15 +1664,14 @@
         reagents:
         - ReagentId: SoyLatte
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/soy_latte.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSpaceUpGlass
-  name: space-up glass
-  description: Space-up. It helps keep your cool.
+  suffix: space-up
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1752,15 +1680,14 @@
         reagents:
         - ReagentId: SpaceUp
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/space-up_glass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSpaceMountainWindGlass
-  name: space mountain wind glass
-  description: Space Mountain Wind. As you know, there are no mountains in space, only wind.
+  suffix: space mountain wind
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1769,15 +1696,14 @@
         reagents:
         - ReagentId: SpaceMountainWind
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/space_mountain_wind_glass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkSyndicatebomb
-  name: syndicate bomb
-  description: Tastes like terrorism!
+  suffix: syndicate bomb
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1786,14 +1712,14 @@
         reagents:
         - ReagentId: SyndicateBomb
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/syndicatebomb.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkTeaGlass
-  name: tea glass
-  description: Tasty black tea. It has antioxidants; it's good for you!
+  suffix: tea
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1802,8 +1728,9 @@
         reagents:
         - ReagentId: Tea
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/teaglass.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -1822,10 +1749,9 @@
     sprite: Objects/Consumable/Drinks/teapot.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkTequilaGlass
-  name: tequila glass
-  description: Now all that's missing is the weird colored shades!
+  suffix: tequila
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1834,15 +1760,14 @@
         reagents:
         - ReagentId: Tequila
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/tequillaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkTequilaSunriseGlass
-  name: tequila sunrise glass
-  description: Oh great, now you feel nostalgic about sunrises back on Terra...
+  suffix: tequila sunrise
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1851,15 +1776,14 @@
         reagents:
         - ReagentId: TequilaSunrise
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/tequillasunriseglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkTheMartinez
-  name: The Martinez glass
-  description: The edgerunner legend.  Remembered by a drink, Forgotten by a drunk.
+  suffix: The Martinez
   components:
     - type: SolutionContainerManager
       solutions:
@@ -1868,14 +1792,14 @@
           reagents:
             - ReagentId: TheMartinez
               Quantity: 30
-    - type: Sprite
+    - type: Icon
       sprite: Objects/Consumable/Drinks/the_martinez.rsi
+      state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkThreeMileIslandGlass
-  name: three mile island glass
-  description: A glass of this is sure to prevent a meltdown.
+  suffix: three mile island
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1884,15 +1808,14 @@
         reagents:
         - ReagentId: ThreeMileIsland
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/threemileislandglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkTomatoJuice
-  name: tomato juice
-  description: Are you sure this is tomato juice?
+  suffix: tomato juice
   components:
   - type: Drink
   - type: SolutionContainerManager
@@ -1902,14 +1825,11 @@
         reagents:
         - ReagentId: JuiceTomato
           Quantity: 30
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/tomatojuice.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkToxinsSpecialGlass
-  name: toxins special glass
-  description: Woah, this thing is on FIRE
+  suffix: toxins special
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1918,15 +1838,14 @@
         reagents:
         - ReagentId: ToxinsSpecial
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/toxinsspecialglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkVermouthGlass
-  name: vermouth glass
-  description: You wonder why you're even drinking this straight.
+  suffix: vermouth
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1935,15 +1854,14 @@
         reagents:
         - ReagentId: Vermouth
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/vermouthglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkVodkaGlass
-  name: vodka glass
-  description: Number one drink and fueling choice for Russians worldwide.
+  suffix: vodka
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1952,15 +1870,14 @@
         reagents:
         - ReagentId: Vodka
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkVodkaMartiniGlass
-  name: vodka martini glass
-  description: A bastardisation of the classic martini. Still great.
+  suffix: vodka martini
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1969,15 +1886,14 @@
         reagents:
         - ReagentId: VodkaMartini
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/martiniglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkVodkaTonicGlass
-  name: vodka tonic glass
-  description: For when a gin and tonic isn't russian enough.
+  suffix: vodka tonic
   components:
   - type: SolutionContainerManager
     solutions:
@@ -1986,9 +1902,9 @@
         reagents:
         - ReagentId: VodkaTonic
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/vodkatonicglass.rsi
+    state: icon
 
 - type: entity
   parent: DrinkGlassBase
@@ -2008,12 +1924,10 @@
     sprite: Objects/Consumable/Drinks/water.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkWatermelonJuice
-  name: watermelon juice
-  description: Delicious juice made from watermelon.
+  suffix: watermelon juice
   components:
-  - type: Drink
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -2021,14 +1935,11 @@
         reagents:
         - ReagentId: JuiceWatermelon
           Quantity: 30
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/watermelon.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkWhiskeyColaGlass
-  name: whiskey cola glass
-  description: An innocent-looking mixture of cola and Whiskey. Delicious.
+  suffix: whiskey cola
   components:
   - type: SolutionContainerManager
     solutions:
@@ -2037,14 +1948,14 @@
         reagents:
         - ReagentId: WhiskeyCola
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/whiskeycolaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkWhiskeyGlass
-  name: whiskey glass
-  description: The silky, smoky whiskey goodness inside makes the drink look very classy.
+  suffix: whiskey
   components:
   - type: SolutionContainerManager
     solutions:
@@ -2053,14 +1964,14 @@
         reagents:
         - ReagentId: Whiskey
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/whiskeyglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkWhiskeySodaGlass
-  name: whiskey soda glass
-  description: Ultimate refreshment.
+  suffix: whiskey soda
   components:
   - type: SolutionContainerManager
     solutions:
@@ -2069,15 +1980,14 @@
         reagents:
         - ReagentId: WhiskeySoda
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/whiskeysodaglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkWhiteRussianGlass
-  name: white russian glass
-  description: A very nice looking drink. But that's just, like, your opinion, man.
+  suffix: white russian
   components:
   - type: SolutionContainerManager
     solutions:
@@ -2086,15 +1996,14 @@
         reagents:
         - ReagentId: WhiteRussian
           Quantity: 30
-  - type: Drink
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/whiterussianglass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkWineGlass
-  name: wine glass
-  description: A very classy looking drink.
+  suffix: wine
   components:
   - type: SolutionContainerManager
     solutions:
@@ -2103,8 +2012,9 @@
         reagents:
         - ReagentId: Wine
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: Objects/Consumable/Drinks/wineglass.rsi
+    state: icon
 
 # TODO: MOVE
 
@@ -2197,10 +2107,9 @@
           Quantity: 5
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkBloodGlass
-  name: blood glass
-  description: Drink like a vampire!
+  suffix: blood
   components:
     - type: SolutionContainerManager
       solutions:
@@ -2209,5 +2118,6 @@
           reagents:
             - ReagentId: Blood
               Quantity: 30
-    - type: Sprite
+    - type: Icon
       sprite: Objects/Consumable/Drinks/bloodglass.rsi
+      state: icon
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index b0b2c2729f..07828ff5ba 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -10,6 +10,9 @@
   - type: Openable
     sound:
       collection: bottleOpenSounds
+    closeable: true
+    closeSound:
+      collection: bottleCloseSounds
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -131,6 +134,7 @@
           Quantity: 100
   - type: Sprite
     sprite: Objects/Consumable/Drinks/absinthebottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -170,6 +174,7 @@
           Quantity: 100
   - type: Sprite
     sprite: Objects/Consumable/Drinks/bottleofnothing.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
@@ -185,6 +190,8 @@
           Quantity: 100
   - type: Sprite
     sprite: Objects/Consumable/Drinks/champagnebottle.rsi
+  - type: Openable
+    closeable: false # Champagne corks are fat. Not worth the effort.
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -202,6 +209,7 @@
     currentLabel: cognac
   - type: Sprite
     sprite: Objects/Consumable/Drinks/cognacbottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull]
@@ -219,6 +227,7 @@
     currentLabel: cola
   - type: Sprite
     sprite: Objects/Consumable/Drinks/colabottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -256,6 +265,7 @@
     currentLabel: gin
   - type: Sprite
     sprite: Objects/Consumable/Drinks/ginbottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -271,6 +281,7 @@
           Quantity: 100
   - type: Sprite
     sprite: Objects/Consumable/Drinks/gildlagerbottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
@@ -288,6 +299,7 @@
     currentLabel: coffee liqueur
   - type: Sprite
     sprite: Objects/Consumable/Drinks/coffeeliqueurbottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -342,6 +354,7 @@
           Quantity: 100
   - type: Sprite
     sprite: Objects/Consumable/Drinks/pwinebottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -359,6 +372,7 @@
     currentLabel: rum
   - type: Sprite
     sprite: Objects/Consumable/Drinks/rumbottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull]
@@ -377,6 +391,7 @@
     currentLabel: space mountain wind
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull]
@@ -395,6 +410,7 @@
     currentLabel: space-up
   - type: Sprite
     sprite: Objects/Consumable/Drinks/space-up_bottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -412,6 +428,7 @@
     currentLabel: tequila
   - type: Sprite
     sprite: Objects/Consumable/Drinks/tequillabottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -429,6 +446,7 @@
     currentLabel: vermouth
   - type: Sprite
     sprite: Objects/Consumable/Drinks/vermouthbottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -446,6 +464,7 @@
     currentLabel: vodka
   - type: Sprite
     sprite: Objects/Consumable/Drinks/vodkabottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -463,6 +482,7 @@
     currentLabel: whiskey
   - type: Sprite
     sprite: Objects/Consumable/Drinks/whiskeybottle.rsi
+  - type: Sealable
 
 - type: entity
   parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
@@ -480,6 +500,7 @@
     currentLabel: wine
   - type: Sprite
     sprite: Objects/Consumable/Drinks/winebottle.rsi
+  - type: Sealable
 
 # Small Bottles
 
@@ -500,6 +521,8 @@
           Quantity: 50
   - type: Sprite
     sprite: Objects/Consumable/Drinks/beer.rsi
+  - type: Openable
+    closeable: false
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
@@ -518,6 +541,8 @@
     currentLabel: beer
   - type: Sprite
     sprite: Objects/Consumable/Drinks/beer.rsi
+  - type: Openable
+    closeable: false
 
 
 - type: entity
@@ -535,9 +560,10 @@
         reagents:
         - ReagentId: Ale
           Quantity: 50
-
   - type: Sprite
     sprite: Objects/Consumable/Drinks/alebottle.rsi
+  - type: Openable
+    closeable: false
 
 - type: entity
   parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull]
@@ -556,6 +582,8 @@
     currentLabel: ale
   - type: Sprite
     sprite: Objects/Consumable/Drinks/alebottle.rsi
+  - type: Openable
+    closeable: false
 
 - type: entity
   parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
@@ -587,6 +615,7 @@
     fillBaseName: icon-
     inHandsMaxFillLevels: 2
     inHandsFillBaseName: -fill-
+  - type: Sealable
 
 - type: entity
   parent: DrinkWaterBottleFull
@@ -684,7 +713,7 @@
 - type: entity
   parent: DrinkBottlePlasticBaseFull
   id: DrinkSugarJug
-  name: sugar
+  name: sugar jug
   suffix: for drinks
   description: some people put this in their coffee...
   components:
@@ -700,7 +729,7 @@
 - type: entity
   parent: DrinkBottlePlasticBaseFull
   id: DrinkLemonLimeJug
-  name: lemon lime
+  name: lemon lime jug
   description: a dual citrus sensation.
   components:
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index a23acbe932..4fc2e170d5 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -184,6 +184,9 @@
         reagents:
         - ReagentId: HotCocoa
           Quantity: 20
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/hot_coco.rsi
+    state: icon-vend
   - type: Sprite
     sprite: Objects/Consumable/Drinks/hot_coco.rsi
     layers:
@@ -209,6 +212,9 @@
         reagents:
         - ReagentId: Coffee
           Quantity: 20
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/hot_coffee.rsi
+    state: icon-vend
   - type: Sprite
     sprite: Objects/Consumable/Drinks/hot_coffee.rsi
     layers:
@@ -236,7 +242,15 @@
           Quantity: 20
   - type: Sprite
     sprite: Objects/Consumable/Drinks/cafe_latte.rsi
+    layers:
+      - state: icon_empty
+      - state: fill-1
+        map: ["enum.SolutionContainerLayers.Fill"]
   - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    fillBaseName: fill-
+    changeColor: false
   - type: TrashOnSolutionEmpty
     solution: drink
 
@@ -252,6 +266,9 @@
         reagents:
         - ReagentId: Tea
           Quantity: 20
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/teacup.rsi
+    state: icon-vend-tea
   - type: Sprite
     sprite: Objects/Consumable/Drinks/teacup.rsi
     layers:
@@ -277,6 +294,9 @@
         reagents:
         - ReagentId: GreenTea
           Quantity: 20
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/teacup.rsi
+    state: icon-vend-green-tea
   - type: Sprite
     sprite: Objects/Consumable/Drinks/teacup.rsi
     layers:
@@ -330,7 +350,6 @@
   - type: Tag
     tags:
     - Trash
-    - DroneUsable
     - WhitelistChameleon
   - type: TrashOnSolutionEmpty
     solution: drink
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
index cc8aba31e9..0b2af4c97f 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
@@ -7,6 +7,8 @@
   - type: PhysicalComposition
     materialComposition:
       Steel: 300
+  - type: FitsInDispenser
+    solution: drink
 
 - type: entity
   parent: FlaskBase
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index d63a4c6ac9..c80398e349 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -41,7 +41,7 @@
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 7
+        maxVol: 5
   - type: SolutionTransfer
     transferAmount: 10
     minTransferAmount: 10
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
index 9cf32f30b4..45164b8de6 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
@@ -182,14 +182,14 @@
 # Tastes like donut, bitterness.
 
 - type: entity
-  name: blumpkin donut
+  name: blorbo donut
   parent: FoodDonutBase
   id: FoodDonutBlumpkin
-  description: Goes great with a mug of soothing drunken blumpkin.
+  description: Goes great with a mug of BLORBO.
   components:
   - type: Sprite
     state: blue
-# Tastes like donut, blumpkin.
+# Tastes like donut, blorbo.
 
 - type: entity
   name: bungo donut
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
index ba70efb205..fe88859584 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -6,6 +6,8 @@
   id: FoodPieBase
   abstract: true
   components:
+  - type: Item
+    storedRotation: -90
   - type: FlavorProfile
     flavors:
       - sweet
@@ -34,6 +36,8 @@
   abstract: true
   description: A slice of pie. Tasty!
   components:
+  - type: Item
+    size: Tiny
   - type: FlavorProfile
     flavors:
       - sweet
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
index eb05133a38..4595329635 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
@@ -6,13 +6,19 @@
   id: FoodBowlBig
   description: A simple bowl, used for soups and salads.
   components:
+  - type: Item
+    storedRotation: -90
   - type: SolutionContainerManager
     solutions:
       food:
         maxVol: 50 # enough to make cheese in.
   - type: Sprite
     sprite: Objects/Consumable/Food/bowl.rsi
-    state: bowl
+    layers:
+    - state: bowl
+    - map: ["enum.SolutionContainerLayers.Fill"]
+      state: fill-1
+      visible: false
   - type: DamageOnLand
     damage:
       types:
@@ -21,6 +27,10 @@
     damage:
       types:
         Blunt: 5
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 5
+    fillBaseName: fill-
   - type: SolutionTransfer
     canChangeTransferAmount: true
   - type: UserInterface
@@ -74,4 +84,9 @@
   description: A fancy bowl, used for SPECIAL soups and salads.
   components:
   - type: Sprite
-    state: bowl2
+    sprite: Objects/Consumable/Food/bowl.rsi
+    layers:
+    - state: bowl2
+    - map: ["enum.SolutionContainerLayers.Fill"]
+      state: fill-1
+      visible: false
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index fb6bd2e024..966ae86db1 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -214,6 +214,8 @@
   - type: Item
     sprite: Objects/Consumable/Food/Baked/pizza.rsi
     heldPrefix: box
+    shape:
+    - 0,0,1,1
   - type: Appearance
   - type: EntityStorageVisuals
     stateDoorOpen: box-open
@@ -486,6 +488,7 @@
     sprite: Objects/Storage/Happyhonk/clown.rsi
     heldPrefix: box
   - type: Storage
+    maxItemSize: Normal
     grid:
     - 0,0,3,3
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
index 197e7ea982..58fe2a3415 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -337,6 +337,7 @@
   - type: Openable
     sound:
       collection: pop
+    closeable: true
   - type: SolutionContainerManager
     solutions:
       food:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index b623956d38..1df6615a9f 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -614,7 +614,7 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 2
-        - ReagentId: Toxin
+        - ReagentId: GastroToxin
           Quantity: 3
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
index 4edc843651..5fbfe9c09b 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
@@ -10,6 +10,8 @@
   abstract: true
   description: A delicious meal, cooked with love.
   components:
+  - type: Item
+    storedRotation: -90
   - type: Food
   - type: Sprite
     sprite: Objects/Consumable/Food/meals.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index c6fd35932a..f8565a793e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -452,7 +452,7 @@
         reagents:
         - ReagentId: UncookedAnimalProteins
           Quantity: 5
-        - ReagentId: Toxin
+        - ReagentId: GastroToxin
           Quantity: 4
         - ReagentId: Fat
           Quantity: 4
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
index d8817ab86d..6e588a3efc 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
@@ -7,6 +7,8 @@
   abstract: true
   description: Now that's a nice pasta!
   components:
+  - type: Item
+    storedRotation: -90
   - type: Sprite
     sprite: Objects/Consumable/Food/noodles.rsi
   - type: SolutionContainerManager
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index 5c7516f2da..eec7711d4a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -52,9 +52,9 @@
           Quantity: 10
   - type: Produce
     seedId: wheat
-  - type: Tag # Delta V straw hat
+  - type: Tag
     tags:
-    - Wheat # End of Delta V straw hat
+    - Wheat
 
 - type: entity
   name: oat bushel
@@ -95,6 +95,36 @@
   - type: Produce
     seedId: sugarcane
 
+- type: entity
+  parent: FoodProduceBase
+  id: FoodLaughinPeaPod
+  name: laughin' pea pod
+  description: The clown's favorite plant.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - peas
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 7
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Sugar
+          Quantity: 5
+        - ReagentId: Laughter
+          Quantity: 5
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: LaughinSyrup
+        Quantity: 5
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/laughin_pea.rsi
+  - type: Produce
+    seedId: laughinPea
+
 - type: entity
   name: tower-cap log
   description: It's better than bad, it's good!
@@ -152,11 +182,11 @@
       food:
         reagents:
         - ReagentId: Histamine
-          Quantity: 25
+          Quantity: 3
   - type: Produce
     seedId: nettle
   - type: MeleeChemicalInjector
-    transferAmount: 6 #To OD someone you would need 2 nettles and about 6-7 hits, the DOT is likely to crit them if they are running away with almost no health
+    transferAmount: 3 #To OD someone you would need 2 nettles and about 6-7 hits, the DOT is likely to crit them if they are running away with almost no health
     solution: food
     pierceArmor: false
   - type: Extractable
@@ -177,22 +207,22 @@
   - type: MeleeWeapon
     damage:
       types:
-        Heat: 7.5
-        Caustic: 7.5
+        Heat: 8.5
+        Caustic: 8.5
   - type: SolutionContainerManager
     solutions:
       food:
         reagents:
         - ReagentId: SulfuricAcid
-          Quantity: 15
+          Quantity: 3
         - ReagentId: FluorosulfuricAcid
-          Quantity: 15
+          Quantity: 3
   - type: Produce
     seedId: deathNettle
   - type: MeleeChemicalInjector
-    transferAmount: 6
+    transferAmount: 2
     solution: food
-    pierceArmor: true # We do a little trolling
+    pierceArmor: false
   - type: Extractable
     grindableSolutionName: food
 
@@ -957,7 +987,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 14
+        maxVol: 18
         reagents:
         - ReagentId: Nutriment
           Quantity: 10
@@ -970,7 +1000,7 @@
   - type: Produce
     seedId: onionred
   - type: SliceableFood
-    count: 4
+    count: 5
     slice: FoodOnionRedSlice
 
 - type: entity
@@ -1043,7 +1073,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 3
+        maxVol: 5
         reagents:
         - ReagentId: Nutriment
           Quantity: 2
@@ -1066,7 +1096,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 3
+        maxVol: 5
         reagents:
         - ReagentId: Nutriment
           Quantity: 2
@@ -1179,6 +1209,34 @@
     tags:
     - Flower # TODO add "RedFlower" or "Poppy" tag, when other color flowers will be
 
+- type: entity
+  name: lily
+  parent: FoodPoppy
+  id: FoodLily
+  description: A beautiful orange flower.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - medicine
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 22
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2
+        - ReagentId: Bicaridine
+          Quantity: 20
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/lily.rsi
+  - type: Produce
+    seedId: lily
+  - type: Extractable
+    grindableSolutionName: food
+  - type: Tag
+    tags:
+    - Flower
+
 - type: entity
   name: lingzhi
   parent: FoodProduceBase
@@ -1402,6 +1460,34 @@
       - ReagentId: MilkSoy
         Quantity: 5
 
+- type: entity
+  name: spaceman's trumpet
+  description: A vivid flower that smells faintly of freshly cut grass. Touching the flower seems to stain the skin some time after contact, yet most other surfaces seem to be unaffected by this phenomenon.
+  id: FoodSpacemansTrumpet
+  parent: FoodProduceBase
+  components:
+  - type: FlavorProfile
+    flavors:
+      - violets
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/spacemans_trumpet.rsi
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 4
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 1
+        - ReagentId: PolypyryliumOligomers
+          Quantity: 3
+  - type: Produce
+    seedId: spacemansTrumpet
+  - type: Tag
+    tags:
+    - Flower
+  - type: Instrument #hehe trumpet
+    program: 56
+
 - type: entity
   name: koibean
   description: These beans seem a little bit fishy.
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
index c313f2d046..51bf229f2c 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
@@ -19,6 +19,7 @@
           Quantity: 8
   - type: Item
     size: Small
+    storedRotation: -90
 
 # Kebabs
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index b4d9e84cc6..9438735d96 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -385,6 +385,9 @@
       - nutribrick
   - type: Item
     size: Small
+  - type: Tag
+    tags:
+      - ReptilianFood
   - type: Sprite
     state: nutribrick-open
   - type: Food
@@ -453,6 +456,7 @@
   - type: Item
     sprite: Objects/Consumable/Food/snacks.rsi
     heldPrefix: packet
+    size: Tiny
   - type: Tag
     tags:
     - Trash
@@ -471,7 +475,6 @@
   components:
   - type: Sprite
     state: boritos-trash
-  - type: Item
 
 - type: entity
   noSpawn: true
@@ -481,7 +484,6 @@
   components:
   - type: Sprite
     state: cnds-trash
-  - type: Item
 
 - type: entity
   noSpawn: true
@@ -491,7 +493,6 @@
   components:
   - type: Sprite
     state: cheesiehonkers-trash
-  - type: Item
 
 - type: entity
   noSpawn: true
@@ -501,7 +502,6 @@
   components:
   - type: Sprite
     state: chips-trash
-  - type: Item
 
 - type: entity
   noSpawn: true
@@ -511,7 +511,6 @@
   components:
   - type: Sprite
     state: chocolatebar-trash
-  - type: Item
 
 - type: entity
   noSpawn: true
@@ -521,7 +520,6 @@
   components:
   - type: Sprite
     state: energybar-trash
-  - type: Item
 
 - type: entity
   noSpawn: true
@@ -531,7 +529,6 @@
   components:
   - type: Sprite
     state: pistachio-trash
-  - type: Item
 
 - type: entity
   noSpawn: true
@@ -541,7 +538,6 @@
   components:
   - type: Sprite
     state: popcorn-trash
-  - type: Item
 
 - type: entity
   noSpawn: true
@@ -551,7 +547,6 @@
   components:
   - type: Sprite
     state: raisins-trash
-  - type: Item
 
 - type: entity
   noSpawn: true
@@ -561,7 +556,6 @@
   components:
   - type: Sprite
     state: semki-trash
-  - type: Item
 
 - type: entity
   noSpawn: true
@@ -571,7 +565,6 @@
   components:
   - type: Sprite
     state: susjerky-trash
-  - type: Item
 
 - type: entity
   noSpawn: true
@@ -581,7 +574,6 @@
   components:
   - type: Sprite
     state: syndicakes-trash
-  - type: Item
 
 - type: entity
   noSpawn: true
@@ -591,7 +583,6 @@
   components:
   - type: Sprite
     state: chinese1
-  - type: Item
 
 - type: entity
   noSpawn: true
@@ -601,7 +592,6 @@
   components:
   - type: Sprite
     state: chinese2
-  - type: Item
 
 - type: entity
   noSpawn: true
@@ -623,5 +613,18 @@
   name: MRE wrapper
   description: A general purpose wrapper for a variety of military food goods.
   components:
+  - type: Food
+    requiresSpecialDigestion: true
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: Fiber
+          Quantity: 40
+  - type: Tag
+    tags:
+    - ClothMade
+    - Trash
   - type: Sprite
     state: mre-wrapper
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
index 0dca39ea48..3b080e843b 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
@@ -5,6 +5,8 @@
   id: FoodBowlBase
   abstract: true
   components:
+  - type: Item
+    storedRotation: -90
   - type: Food
     trash: FoodBowlBig
     utensil: Spoon
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
index 72d20624a4..9df2f3039e 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
@@ -6,6 +6,8 @@
   id: FoodTacoShell
   description: A taco shell, easy to hold, but falls on its side when put down.
   components:
+  - type: Item
+    storedRotation: -90
   - type: Food
   - type: Sprite
     sprite: Objects/Consumable/Food/taco.rsi
@@ -44,6 +46,7 @@
           Quantity: 4
   - type: Item
     sprite: Objects/Consumable/Food/taco.rsi
+    storedRotation: -90
   - type: Tag
     tags:
       - Meat
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
index 791127170f..a2dda827be 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
@@ -173,6 +173,17 @@
   parent: BaseRock
   id: FloraStalagmite1
   components:
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 5
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              collection: GlassBreak
   - type: Sprite
     sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
     state: stalagmite1
@@ -217,6 +228,55 @@
     sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
     state: stalagmite6
 
+- type: entity
+  parent: FloraStalagmite1
+  id: FloraGreyStalagmite1
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+    state: grey_stalagmite1
+
+- type: entity
+  parent: FloraGreyStalagmite1
+  id: FloraGreyStalagmite2
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+    state: grey_stalagmite2
+
+- type: entity
+  parent: FloraGreyStalagmite1
+  id: FloraGreyStalagmite3
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+    state: grey_stalagmite3
+
+- type: entity
+  parent: FloraGreyStalagmite1
+  id: FloraGreyStalagmite4
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+    state: grey_stalagmite4
+
+- type: entity
+  parent: FloraGreyStalagmite1
+  id: FloraGreyStalagmite5
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+    state: grey_stalagmite5
+
+- type: entity
+  parent: FloraGreyStalagmite1
+  id: FloraGreyStalagmite6
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_stalagmite.rsi
+    state: grey_stalagmite6
+
+
 - type: entity
   parent: BaseTree
   id: FloraTree01
@@ -484,3 +544,87 @@
   components:
   - type: Sprite
     state: tree06
+
+- type: entity
+  parent: BaseTree
+  id: LightTree01
+  name: glowing tree
+  description: a marvelous tree filled with strange energy.
+  components:
+  - type: PointLight
+    radius: 2.0
+    energy: 4.5
+    color: "#6270bb"
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_treeslight.rsi
+    state: tree01
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 400
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 25
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/tree_fell.ogg
+          params:
+            volume: 5
+            variation: 0.05
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          Log:
+            min: 0
+            max: 1
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MobLuminousObject:
+            min: 0
+            max: 1
+
+- type: entity
+  parent: LightTree01
+  id: LightTree02
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_treeslight.rsi
+    state: tree02
+
+- type: entity
+  parent: LightTree01
+  id: LightTree03
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_treeslight.rsi
+    state: tree03
+
+- type: entity
+  parent: LightTree01
+  id: LightTree04
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_treeslight.rsi
+    state: tree04
+
+- type: entity
+  parent: LightTree01
+  id: LightTree05
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_treeslight.rsi
+    state: tree05
+
+- type: entity
+  parent: LightTree01
+  id: LightTree06
+  components:
+  - type: Sprite
+    sprite: Objects/Decoration/Flora/flora_treeslight.rsi
+    state: tree06
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/mining.yml b/Resources/Prototypes/Entities/Objects/Decoration/mining.yml
index fb5afcd3f5..ac18362a05 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/mining.yml
@@ -30,7 +30,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 50
+        damage: 10
       behaviors:
       - !type:DoActsBehavior
           acts: [ "Destruction" ]
@@ -56,7 +56,13 @@
   placement:
     mode: SnapgridCenter
   components:
+  - type: PlacementReplacement
+    key: walls
+  - type: Tag
+    tags:
+    - Wooden
   - type: Sprite
+    noRot: true
     sprite: Objects/Decoration/mines.rsi
     state: support
   - type: Damageable
@@ -85,7 +91,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 150
+        damage: 50
       behaviors:
       - !type:DoActsBehavior
           acts: [ "Destruction" ]
@@ -124,7 +130,14 @@
   placement:
     mode: SnapgridCenter
   components:
+  - type: PlacementReplacement
+    key: walls
+  - type: Tag
+    tags:
+    - Wall
+    - Wooden
   - type: Sprite
+    noRot: true
     sprite: Objects/Decoration/mines.rsi
     state: support_wall
   - type: Damageable
@@ -147,7 +160,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 250
+        damage: 75
       behaviors:
       - !type:DoActsBehavior
           acts: [ "Destruction" ]
@@ -168,7 +181,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 150
+        damage: 50
       behaviors:
       - !type:DoActsBehavior
           acts: [ "Destruction" ]
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base_machineboard.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base_machineboard.yml
index 4e6dced060..164777284f 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base_machineboard.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base_machineboard.yml
@@ -11,9 +11,6 @@
       state: generic
     - type: Item
       storedRotation: -90
-    - type: Tag
-      tags:
-        - DroneUsable
     - type: StaticPrice
       price: 100
     - type: PhysicalComposition
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 0a121ca33a..c2a1fe6e7d 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -491,7 +491,7 @@
   id: PortableScrubberMachineCircuitBoard
   parent: BaseMachineCircuitboard
   name: portable scrubber machine board
-  description: A PCB for a portable scrubber.
+  description: A machine printed circuit board for a portable scrubber.
   components:
   - type: Sprite
     state: engineering
@@ -507,6 +507,22 @@
     difficulty: 2
     recipes:
 
+- type: entity
+  id: SpaceHeaterMachineCircuitBoard
+  parent: BaseMachineCircuitboard
+  name: space heater machine board
+  description: A machine printed circuit board for a space heater.
+  components:
+  - type: Sprite
+    state: engineering
+  - type: MachineBoard
+    prototype: SpaceHeater
+    requirements:
+      MatterBin: 1
+      Capacitor: 2
+    materialRequirements:
+      Cable: 5
+
 - type: entity
   id: CloningPodMachineCircuitboard
   parent: BaseMachineCircuitboard
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index c5e4b9e130..ffff8847ed 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -10,9 +10,6 @@
       state: cpuboard
     - type: Item
       storedRotation: -90
-    - type: Tag
-      tags:
-        - DroneUsable
     - type: StaticPrice
       price: 100
     - type: PhysicalComposition
@@ -89,9 +86,6 @@
       prototype: ComputerCargoOrders
     - type: StaticPrice
       price: 750
-    - type: Tag
-      tags:
-      - DroneUsable
 
 - type: entity
   id: CargoBountyComputerCircuitboard
@@ -104,9 +98,6 @@
   - type: ComputerBoard
     prototype: ComputerCargoBounty
   - type: StaticPrice
-  - type: Tag
-    tags:
-    - DroneUsable
 
 - type: entity
   parent: BaseComputerCircuitboard
@@ -164,7 +155,6 @@
       prototype: ComputerSurveillanceCameraMonitor
     - type: Tag
       tags:
-        - DroneUsable
         - SurveillanceCameraMonitorCircuitboard
 
 - type: entity
@@ -186,7 +176,6 @@
       prototype: ComputerTelevision
     - type: Tag
       tags:
-        - DroneUsable
         - ComputerTelevisionCircuitboard
 
 - type: entity
@@ -257,7 +246,6 @@
       price: 750
     - type: Tag
       tags:
-      - DroneUsable
       - HighRiskItem
 
 - type: entity
@@ -399,7 +387,7 @@
 - type: entity
   parent: BaseComputerCircuitboard
   id: ComputerMassMediaCircuitboard
-  name: mass-media console board
+  name: news manager console board
   description: Write your message to the world!
   components:
     - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml
index aca34b9ad0..cb35219eb0 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/misc.yml
@@ -4,12 +4,13 @@
   name: station map electronics
   description: An electronics board used in station maps.
   components:
+  - type: Item
+    storedRotation: 0
   - type: Sprite
     sprite: Objects/Misc/module.rsi
     state: airalarm_electronics
   - type: Tag
     tags:
-      - DroneUsable
       - StationMapElectronics
   - type: StaticPrice
-    price: 15 
\ No newline at end of file
+    price: 15
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml
index 37f56f4ca3..730b591c0a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml
@@ -9,7 +9,6 @@
     state: airalarm_electronics
   - type: Tag
     tags:
-      - DroneUsable
       - AirAlarmElectronics
   - type: ReverseEngineering # Nyano
     recipes:
@@ -23,12 +22,13 @@
   name: fire alarm electronics
   description: An electronics board used in fire alarms
   components:
+  - type: Item
+    storedRotation: 0
   - type: Sprite
     sprite: Objects/Misc/module.rsi
     state: airalarm_electronics
   - type: Tag
     tags:
-      - DroneUsable
       - FireAlarmElectronics
   - type: ReverseEngineering # Nyano
     recipes:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml
index d55b5a1098..7848d987e5 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml
@@ -1,20 +1,19 @@
-- type: entity
+- type: entity
   id: BaseElectronics
   parent: BaseItem
   name: base electronics
   abstract: true
   suffix: Electronics
   components:
-    - type: Sprite
-      sprite: Objects/Misc/module.rsi
-      state: generic
-    - type: Tag
-      tags:
-        - DroneUsable
-    - type: StaticPrice
-      price: 100
-    - type: PhysicalComposition
-      materialComposition:
-        Glass: 200
-      chemicalComposition:
-        Silicon: 20
+  - type: Item
+    storedRotation: -90
+  - type: Sprite
+    sprite: Objects/Misc/module.rsi
+    state: generic
+  - type: StaticPrice
+    price: 100
+  - type: PhysicalComposition
+    materialComposition:
+      Glass: 200
+    chemicalComposition:
+      Silicon: 20
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml
index bfc00dcbf8..009736707d 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml
@@ -9,7 +9,6 @@
       state: net_wired
     - type: Tag
       tags:
-        - DroneUsable
         - MailingUnitElectronics
     - type: ReverseEngineering # Nyano
       recipes:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
index a444afe3a4..fef98a457e 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
@@ -11,7 +11,6 @@
     - type: Tag
       tags:
         - DoorElectronics
-        - DroneUsable
     - type: ReverseEngineering # Nyano
       recipes:
         - DoorElectronics
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml
index 3a8c6f3e02..679c3e4dda 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml
@@ -4,12 +4,13 @@
   name: firelock electronics
   description: An electronics board used to detect differences in pressure, temperature and gas concentrations between the two sides of the door.
   components:
+    - type: Item
+      storedRotation: 0
     - type: Sprite
       sprite: Objects/Misc/module.rsi
       state: mainboard
     - type: Tag
       tags:
-      - DroneUsable
       - FirelockElectronics
     - type: ReverseEngineering # Nyano
       recipes:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml
index 2a77d228a8..2196c9d365 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml
@@ -9,7 +9,6 @@
     state: id_mod
   - type: Tag
     tags:
-      - DroneUsable
       - IntercomElectronics
   - type: ReverseEngineering # Nyano
     recipes:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/mech.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/mech.yml
index 6657418488..f224c1c2bf 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/mech.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/mech.yml
@@ -6,6 +6,8 @@
   name: ripley central control module
   description: The electrical control center for the ripley mech.
   components:
+    - type: Item
+      storedRotation: 0
     - type: Sprite
       sprite: Objects/Misc/module.rsi
       state: mainboard
@@ -40,6 +42,8 @@
   name: H.O.N.K. central control module
   description: The electrical control center for the H.O.N.K. mech.
   components:
+    - type: Item
+      storedRotation: 0
     - type: Sprite
       sprite: Objects/Misc/module.rsi
       state: mainboard
@@ -90,6 +94,8 @@
   name: HAMTR central control module
   description: The electrical control center for the HAMTR mech.
   components:
+    - type: Item
+      storedRotation: 0
     - type: Sprite
       sprite: Objects/Misc/module.rsi
       state: mainboard
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml
index 5aa7f79544..24da64964c 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml
@@ -34,7 +34,6 @@
       price: 40
     - type: Tag
       tags:
-        - DroneUsable
         - WallmountSubstationElectronics
 
 # Wallmount Generator
@@ -54,7 +53,6 @@
       Glass: 90
   - type: Tag
     tags:
-      - DroneUsable
       - WallmountGeneratorElectronics
 
 # APU
@@ -71,7 +69,6 @@
       price: 40
     - type: Tag
       tags:
-        - DroneUsable
         - WallmountGeneratorAPUElectronics
 
 # Solar Tracker Electronics
@@ -88,5 +85,4 @@
       price: 85
     - type: Tag
       tags:
-        - DroneUsable
         - SolarTrackerElectronics
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
index 2a0b5ba118..aa889341b1 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml
@@ -4,7 +4,7 @@
   parent: BaseItem
   id: RemoteSignaller
   name: remote signaller
-  description: A handheld device used for remotely sending signals to objects.
+  description: A handheld device used for remotely sending signals to objects within a small radius of about 15 meters.
   components:
   - type: Sprite
     sprite: Objects/Devices/signaller.rsi
@@ -19,3 +19,21 @@
   - type: Tag
     tags:
     - Payload
+  - type: DeviceNetwork
+    deviceNetId: Wireless
+    receiveFrequencyId: BasicDevice
+  - type: WirelessNetworkConnection
+    range: 15
+
+- type: entity
+  parent: RemoteSignaller
+  id: RemoteSignallerAdvanced
+  name: advanced remote signaller
+  description: A handheld device used for remotely sending signals to objects within a small radius of about 50 meters.
+  components:
+  - type: Sprite
+    state: signaller2
+  - type: WirelessNetworkConnection
+    range: 50
+  - type: StaticPrice
+    price: 30
\ No newline at end of file
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 da4f4710cc..08e96d1de2 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/war_declarator.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/war_declarator.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: BaseItem
   id: NukeOpsDeclarationOfWar
-  name: declaration of war
+  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.
   components:
     - type: Sprite
@@ -22,4 +22,5 @@
           type: WarDeclaratorBoundUserInterface
     - type: WarDeclarator
       message: war-declarator-default-message
-#    - type: WarConditionOnExamine
+    - type: AccessReader
+      access: [["NuclearOperative"]]
diff --git a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
index b9b70e6aca..ae454e43a2 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
@@ -18,7 +18,7 @@
 
 - type: entity
   parent: BaseItem
-  id: NewsReadCartridge
+  id: NewsReaderCartridge
   name: news cartridge
   description: A program for reading news
   components:
@@ -26,13 +26,13 @@
     sprite: Objects/Devices/cartridge.rsi
     state: cart-y
   - type: UIFragment
-    ui: !type:NewsReadUi
+    ui: !type:NewsReaderUi
   - type: Cartridge
     programName: news-read-program-name
     icon:
       sprite: Interface/Misc/program_icons.rsi
       state: news_read
-  - type: NewsReadCartridge
+  - type: NewsReaderCartridge
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
index 1c8a14dc76..d270c93e50 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
@@ -72,6 +72,7 @@
     - Security
     - Service
     - Supply
+    - Prison #DeltaV
     defaultChannel: Command
   - type: Sprite
     layers:
@@ -178,6 +179,7 @@
   - type: EncryptionKey
     channels:
     - Security
+    - Prison #deltaV
     defaultChannel: Security
   - type: Sprite
     layers:
@@ -203,7 +205,7 @@
   parent: EncryptionKey
   id: EncryptionKeySyndie
   name: blood-red encryption key
-  description: An encryption key used by... wait... Who is owner of this chip?
+  description: An encryption key used by... wait... Who is the owner of this chip?
   components:
   - type: EncryptionKey
     channels:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
index 974918a068..5499348bd1 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
@@ -35,6 +35,149 @@
       cpu_supply: "#A46106"
   - type: StaticPrice
     price: 250
-  - type: Tag
-    tags:
-    - DroneUsable
+
+- type: entity
+  parent: BaseFlatpack
+  id: SolarAssemblyFlatpack
+  name: solar assembly flatpack
+  description: A flatpack used for constructing a solar assembly.
+  components:
+  - type: Flatpack
+    entity: SolarAssembly
+  - type: Sprite
+    layers:
+    - state: solar-assembly-part
+  - type: StaticPrice
+    price: 75
+
+- type: entity
+  parent: BaseFlatpack
+  id: AmePartFlatpack
+  name: AME flatpack
+  description: A flatpack used for constructing an antimatter engine reactor.
+  components:
+  - type: Sprite
+    layers:
+    - state: ame-part
+  - type: Flatpack
+    entity: AmeShielding
+  - type: StaticPrice
+    price: 500
+  - type: GuideHelp
+    guides: [ AME, Power ]
+  - type: StealTarget
+    stealGroup: AmePartFlatpack
+
+- type: entity
+  parent: BaseFlatpack
+  id: SingularityGeneratorFlatpack
+  name: singularity generator flatpack
+  description: A flatpack used for constructing a singularity generator.
+  components:
+  - type: Flatpack
+    entity: SingularityGenerator
+  - type: Sprite
+    layers:
+    - state: singularity-generator
+  - type: GuideHelp
+    guides: [ Singularity, Power ]
+
+- type: entity
+  parent: BaseFlatpack
+  id: RadiationCollectorFlatpack
+  name: radiation collector flatpack
+  description: A flatpack used for constructing a radiation collector.
+  components:
+  - type: Flatpack
+    entity: RadiationCollectorNoTank
+  - type: Sprite
+    layers:
+    - state: radiation-collector
+  - type: GuideHelp
+    guides: [ Singularity, Power ]
+
+- type: entity
+  parent: BaseFlatpack
+  id: ContainmentFieldGeneratorFlatpack
+  name: containment field generator flatpack
+  description: A flatpack used for constructing a containment field generator.
+  components:
+  - type: Flatpack
+    entity: ContainmentFieldGenerator
+  - type: Sprite
+    layers:
+    - state: containment-field-generator
+  - type: GuideHelp
+    guides: [ Singularity, Power ]
+
+- type: entity
+  parent: BaseFlatpack
+  id: TeslaGeneratorFlatpack
+  name: tesla generator flatpack
+  description: A flatpack used for constructing a tesla generator.
+  components:
+  - type: Flatpack
+    entity: TeslaGenerator
+  - type: Sprite
+    layers:
+    - state: tesla-generator
+  - type: GuideHelp
+    guides: [ Power ] # TODO add tesla guide
+
+- type: entity
+  parent: BaseFlatpack
+  id: TeslaCoilFlatpack
+  name: tesla coil flatpack
+  description: A flatpack used for constructing a tesla coil.
+  components:
+  - type: Flatpack
+    entity: TeslaCoil
+  - type: Sprite
+    layers:
+    - state: tesla-coil
+  - type: GuideHelp
+    guides: [ Power ] # TODO add tesla guide
+
+- type: entity
+  parent: BaseFlatpack
+  id: TeslaGroundingRodFlatpack
+  name: grounding rod flatpack
+  description: A flatpack used for constructing a grounding rod.
+  components:
+  - type: Flatpack
+    entity: TeslaGroundingRod
+  - type: Sprite
+    layers:
+    - state: grounding-rod
+  - type: GuideHelp
+    guides: [ Power ] # TODO add tesla guide
+
+- type: entity
+  parent: BaseFlatpack
+  id: GyroscopeFlatpack
+  name: gyroscope flatpack
+  description: A flatpack used for constructing a gyroscope.
+  components:
+  - type: Flatpack
+    entity: Gyroscope
+  - type: Sprite
+    layers:
+    - state: base
+    - state: overlay
+      color: "#cec8ac"
+    - state: icon-default
+
+- type: entity
+  parent: BaseFlatpack
+  id: ThrusterFlatpack
+  name: thruster flatpack
+  description: A flatpack used for constructing a thruster.
+  components:
+  - type: Flatpack
+    entity: Thruster
+  - type: Sprite
+    layers:
+    - state: base
+    - state: overlay
+      color: "#cec8ac"
+    - state: icon-default
diff --git a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
index bb5bf806bb..57c542f31b 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
@@ -4,6 +4,8 @@
   name: holographic sign projector
   description: A handy-dandy holographic projector that displays a janitorial sign.
   components:
+  - type: Item
+    storedRotation: -90
   - type: HolosignProjector
   - type: UseDelay
   - type: ContainerContainer
diff --git a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
index 440bc4dd8a..c3bd74dd75 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
@@ -54,9 +54,6 @@
           mask:
             - ItemMask
     - type: Rotatable
-    - type: Tag
-      tags:
-        - DroneUsable
 
 - type: entity
   name: mousetrap
diff --git a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml b/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
index d120621559..811210d429 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/nuke.yml
@@ -11,6 +11,11 @@
     noRot: true
     layers:
     - state: nuclearbomb_base
+      map: ["enum.NukeVisualLayers.Base"]
+    - state: nuclearbomb_deployed_unlit
+      map: ["enum.NukeVisualLayers.Unlit"]
+      shader: unshaded
+      visible: false
     - state: nukefestive
       map: ["christmas"]
       visible: false
@@ -24,6 +29,18 @@
       enum.HolidayVisuals.Holiday:
         christmas:
           festive: { visible: true }
+      enum.NukeVisuals.Deployed:
+        enum.NukeVisualLayers.Base:
+          False: { state: nuclearbomb_base }
+          True:  { state: nuclearbomb_deployed }
+        enum.NukeVisualLayers.Unlit:
+          True:  { visible: true }
+          False: { visible: false }
+      enum.NukeVisuals.State:
+        enum.NukeVisualLayers.Unlit:
+          Idle:        { state: nuclearbomb_deployed_unlit }
+          Armed:       { state: nuclearbomb_timing }
+          YoureFucked: { state: nuclearbomb_exploding }
   - type: Physics
     bodyType: Static
   - type: Fixtures
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index b10f779fef..706cbd5dbb 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -74,7 +74,7 @@
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
-      - NewsReadCartridge
+      - NewsReaderCartridge
     cartridgeSlot:
       priority: -1
       name: device-pda-slot-component-slot-name-cartridge
@@ -177,7 +177,7 @@
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
-      - NewsReadCartridge
+      - NewsReaderCartridge
       - CrimeAssistCartridge
 
 - type: entity
@@ -434,7 +434,7 @@
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
-      - NewsReadCartridge
+      - NewsReaderCartridge
       - CrimeAssistCartridge
 
 - type: entity
@@ -605,7 +605,7 @@
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
-      - NewsReadCartridge
+      - NewsReaderCartridge
       - GlimmerMonitorCartridge
 
 - type: entity
@@ -626,7 +626,7 @@
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
-      - NewsReadCartridge
+      - NewsReaderCartridge
       - GlimmerMonitorCartridge
 
 - type: entity
@@ -647,7 +647,7 @@
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
-      - NewsReadCartridge
+      - NewsReaderCartridge
       - CrimeAssistCartridge
 
 - type: entity
@@ -668,7 +668,7 @@
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
-      - NewsReadCartridge
+      - NewsReaderCartridge
       - CrimeAssistCartridge
 
 - type: entity
@@ -688,7 +688,7 @@
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
-      - NewsReadCartridge
+      - NewsReaderCartridge
       - CrimeAssistCartridge
 
 - type: entity
@@ -725,7 +725,7 @@
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
-      - NewsReadCartridge
+      - NewsReaderCartridge
       - LogProbeCartridge
 
 - type: entity
@@ -821,7 +821,7 @@
 - type: entity
   parent: BasePDA
   id: ERTLeaderPDA
-  name: ERT PDA
+  name: ERT Leader PDA
   suffix: Leader
   description: Red for firepower.
   components:
@@ -838,8 +838,9 @@
 - type: entity
   parent: ERTLeaderPDA
   id: ERTChaplainPDA
-  name: ERT PDA
+  name: ERT Chaplain PDA
   suffix: Chaplain
+  description: Red for firepower, it's blessed.
   components:
   - type: Pda
     id: ERTChaplainIDCard
@@ -847,7 +848,9 @@
 - type: entity
   parent: ERTLeaderPDA
   id: ERTEngineerPDA
+  name: ERT Engineer PDA
   suffix: Engineer
+  description: Red for firepower, it's well-worn.
   components:
   - type: Pda
     id: ERTEngineerIDCard
@@ -855,7 +858,9 @@
 - type: entity
   parent: ERTLeaderPDA
   id: ERTJanitorPDA
+  name: ERT Janitor PDA
   suffix: Janitor
+  description: Red for firepower, it's squeaky clean.
   components:
   - type: Pda
     id: ERTJanitorIDCard
@@ -863,15 +868,23 @@
 - type: entity
   parent: ERTLeaderPDA
   id: ERTMedicPDA
+  name: ERT Medic PDA
   suffix: Medic
+  description: Red for firepower, it's shiny and sterile. Has a built-in rapid health analyzer.
   components:
   - type: Pda
     id: ERTMedicIDCard
+  - type: HealthAnalyzer
+    scanDelay: 1
+    scanningEndSound:
+      path: "/Audio/Items/Medical/healthscanner.ogg"
 
 - type: entity
   parent: ERTLeaderPDA
   id: ERTSecurityPDA
+  name: ERT Security PDA
   suffix: Security
+  description: Red for firepower, it has tally marks etched on the side.
   components:
   - type: Pda
     id: ERTSecurityIDCard
@@ -970,7 +983,7 @@
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
-      - NewsReadCartridge
+      - NewsReaderCartridge
       - CrimeAssistCartridge
 
 - type: entity
@@ -992,7 +1005,7 @@
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
-      - NewsReadCartridge
+      - NewsReaderCartridge
       - CrimeAssistCartridge
 
 - type: entity
@@ -1083,7 +1096,7 @@
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
-      - NewsReadCartridge
+      - NewsReaderCartridge
       - CrimeAssistCartridge
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
index 6cf66ba042..b68257083c 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
@@ -219,7 +219,7 @@
     text: station-beacon-courtroom
 
 - type: entity
-  parent: DefaultStationBeaconSecurity
+  parent: DefaultStationBeaconService #Delta V - Lawer is Service until Justice Dept is a thing
   id: DefaultStationBeaconLawOffice
   suffix: Law Office
   components:
@@ -294,10 +294,10 @@
 - type: entity
   parent: DefaultStationBeacon
   id: DefaultStationBeaconScience
-  suffix: Science
+  suffix: Epistemics #Delta V - Renamed
   components:
   - type: NavMapBeacon
-    text: station-beacon-science
+    text: station-beacon-epistemics #Delta V - Renamed
     color: "#D381C9"
 
 - type: entity
@@ -319,10 +319,10 @@
 - type: entity
   parent: DefaultStationBeaconScience
   id: DefaultStationBeaconRDRoom
-  suffix: RD's Room
+  suffix: MG's Room
   components:
   - type: NavMapBeacon
-    text: station-beacon-research-director
+    text: station-beacon-mystagogue  #Delta V - Renamed
 
 - type: entity
   parent: DefaultStationBeaconScience
@@ -351,19 +351,19 @@
 - type: entity
   parent: DefaultStationBeacon
   id: DefaultStationBeaconSupply
-  suffix: Supply
+  suffix: Logistics #Delta V - Renamed
   components:
   - type: NavMapBeacon
-    text: station-beacon-supply
+    text: station-beacon-logistics #Delta V - Renamed
     color: "#A46106"
 
 - type: entity
   parent: DefaultStationBeaconSupply
   id: DefaultStationBeaconCargoReception
-  suffix: Cargo Reception
+  suffix: Logistics Reception #Delta V - Renamed
   components:
   - type: NavMapBeacon
-    text: station-beacon-cargo
+    text: station-beacon-logistics-reception #Delta V - Renamed
 
 - type: entity
   parent: DefaultStationBeaconSupply
@@ -376,10 +376,10 @@
 - type: entity
   parent: DefaultStationBeaconSupply
   id: DefaultStationBeaconQMRoom
-  suffix: QM's Room
+  suffix: LO #Delta V - Renamed
   components:
   - type: NavMapBeacon
-    text: station-beacon-qm
+    text: station-beacon-lo #Delta V - Renamed
 
 - type: entity
   parent: DefaultStationBeaconSupply
@@ -517,7 +517,7 @@
   suffix: Janitor's Closet
   components:
   - type: NavMapBeacon
-    text: station-beacon-janitor
+    text: station-beacon-janitor-closet #Delta V - Add for closet/outpost
 
 - type: entity
   parent: DefaultStationBeacon
@@ -569,7 +569,7 @@
     text: station-beacon-eva-storage
 
 - type: entity
-  parent: DefaultStationBeacon
+  parent: DefaultStationBeaconScience #Delta V - Chapel in Epi
   id: DefaultStationBeaconChapel
   suffix: Chapel
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_map.yml b/Resources/Prototypes/Entities/Objects/Devices/station_map.yml
index d048d44db5..c37d8935f3 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/station_map.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_map.yml
@@ -43,6 +43,16 @@
       useRate: 20
     - type: ActivatableUIRequiresPowerCell
 
+- type: entity
+  id: HandheldStationMapEmpty
+  parent: HandheldStationMap
+  suffix: Handheld, Empty
+  components:
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+
 - type: entity
   id: HandheldStationMapUnpowered
   parent: BaseHandheldStationMap
diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
index 7d91b7fbcc..391823dc52 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
@@ -28,6 +28,7 @@
     sprite: Objects/Fun/Darts/dart_red.rsi
     state: icon
   - type: MeleeWeapon
+    wideAnimationRotation: -45
     damage:
       types:
         Piercing: 2
diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
index dd702cb024..6a5d3c36f5 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
@@ -159,8 +159,8 @@
 - type: entity
   parent: BaseFigurine
   id: ToyFigurineSalvage
-  name: salvage technican figure
-  description: A figurine depicting a Salvage Technician holding a survival knife.
+  name: salvage specialist figure
+  description: A figurine depicting a Salvage Specialist holding a survival knife.
   components:
   - type: Sprite
     state: salvage
diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
index 522f892a44..36e20c22a9 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml
@@ -150,6 +150,6 @@
   components:
     - type: InstantAction
       checkCanInteract: false
-      icon: Interface/home.png
+      icon: { sprite: Interface/Actions/pai-map.rsi, state: icon }
       event: !type:OpenUiActionEvent
         key: enum.StationMapUiKey.Key
diff --git a/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml b/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml
new file mode 100644
index 0000000000..a39c2f881a
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml
@@ -0,0 +1,61 @@
+- type: entity
+  parent: BaseItem
+  id: SnapPop
+  name: snap pop
+  description: Throw it at the floor and listen to it POP!
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: snappop
+  - type: Item
+    size: Tiny
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/snap.ogg
+      - !type:ExplodeBehavior
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 3
+  - type: Explosive
+    explosionType: Default
+    # Cosmetic explosion :tf:
+    maxIntensity: 0.01
+    intensitySlope: 1
+    totalIntensity: 0.01
+  - type: Tag
+    tags:
+      - SnapPop
+
+- type: entity
+  parent: BaseStorageItem
+  id: SnapPopBox
+  name: snap pop box
+  description: Contains twenty snap pops for a few minutes of popping fun!
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: spbox
+  - type: Storage
+    grid:
+    - 0,0,4,3
+    areaInsert: true
+    maxItemSize: Tiny
+  - type: StorageFill
+    contents:
+      - id: SnapPop
+        amount: 20
+  - type: Dumpable
+
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 75259bfaf7..ccb67b5ae1 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -10,6 +10,7 @@
   - type: Tag
     tags:
       - Payload
+      - ClothMade
   - type: EmitSoundOnUse
     sound:
       collection: ToySqueak
@@ -28,6 +29,7 @@
   - type: UseDelay
     delay: 1.0
   - type: MeleeWeapon
+    wideAnimationRotation: 180
     soundHit:
       collection: ToySqueak
     damage:
@@ -38,6 +40,18 @@
       Cloth: 100
   - type: StaticPrice
     price: 5
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      collection: ToySqueak
+    delay: 2
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: Fiber
+          Quantity: 10
 
 - type: entity
   parent: BasePlushie
@@ -114,8 +128,15 @@
     solutions:
       bee:
         reagents:
-          - ReagentId: GroundBee
-            Quantity: 10
+        - ReagentId: GroundBee
+          Quantity: 10
+      food:
+        maxVol: 10
+        reagents:
+        - ReagentId: GroundBee
+          Quantity: 5
+        - ReagentId: Fiber
+          Quantity: 5
   - type: Clothing
     quickEquip: false
     sprite: Objects/Fun/toys.rsi
@@ -143,6 +164,10 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/mousesqueek.ogg
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/Items/Toys/mousesqueek.ogg
   - type: MeleeWeapon
     wideAnimationRotation: 180
     soundHit:
@@ -212,6 +237,10 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Voice/Arachnid/arachnid_laugh.ogg
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/Voice/Arachnid/arachnid_laugh.ogg
   - type: MeleeWeapon
     wideAnimationRotation: 180
     soundHit:
@@ -237,10 +266,19 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/weh.ogg
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/Items/Toys/weh.ogg
   - type: MeleeWeapon
     wideAnimationRotation: 180
     soundHit:
       path: /Audio/Items/Toys/weh.ogg
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceThatMakesYouWeh
+        Quantity: 30
 
 - type: entity
   parent: PlushieLizard
@@ -271,10 +309,19 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/muffled_weh.ogg
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/Items/Toys/muffled_weh.ogg
   - type: MeleeWeapon
     wideAnimationRotation: 180
     soundHit:
       path: /Audio/Items/Toys/muffled_weh.ogg
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: JuiceThatMakesYouWeh
+        Quantity: 30
 
 - type: entity
   parent: BasePlushie
@@ -304,10 +351,20 @@
       wideAnimationRotation: 180
       soundHit:
         path: /Audio/Items/Toys/toy_rustle.ogg
+    - type: Food
+      requiresSpecialDigestion: true
+      useSound:
+        path: /Audio/Items/Toys/toy_rustle.ogg
     - type: SolutionContainerManager
       solutions:
         plushie:
           maxVol: 1
+        food:
+          maxVol: 10
+          reagents:
+          - ReagentId: Fiber
+            Quantity: 10
+
     - type: RefillableSolution
       solution: plushie
     - type: SolutionContainerVisuals
@@ -352,6 +409,7 @@
     state: blue
   - type: Item
     heldPrefix: blue
+    storedRotation: -90
   - type: Tag
     tags:
       - PlushieSharkBlue
@@ -421,6 +479,7 @@
     state: carpplush
   - type: Item
     heldPrefix: carpplush
+    storedRotation: -90
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Effects/bite.ogg
@@ -433,12 +492,19 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Effects/bite.ogg
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/Effects/bite.ogg
   - type: MeleeWeapon
     wideAnimationRotation: -90
     soundHit:
       path: /Audio/Effects/bite.ogg
     angle: 0
     animation: WeaponArcBite # Rrrr!
+  - type: Tag
+    tags:
+    - PlushieCarp # DeltaV - fish labeler craft
 
 - type: entity
   parent: BasePlushie
@@ -463,6 +529,10 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/rattle.ogg
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/Items/Toys/rattle.ogg
   - type: MeleeWeapon
     wideAnimationRotation: 180
     soundHit:
@@ -482,6 +552,10 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/mousesqueek.ogg
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/Items/Toys/mousesqueek.ogg
   - type: MeleeWeapon
     wideAnimationRotation: -90
     soundHit:
@@ -515,6 +589,10 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/quack.ogg
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/Items/Toys/mousesqueek.ogg
 
 - type: entity
   parent: BasePlushie
@@ -533,6 +611,10 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Voice/Vox/shriek1.ogg
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/Voice/Vox/shriek1.ogg
   - type: MeleeWeapon
     wideAnimationRotation: 180
     soundHit:
@@ -569,11 +651,83 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/Items/Toys/mousesqueek.ogg
   - type: MeleeWeapon
     wideAnimationRotation: 180
     soundHit:
       path: /Audio/Weapons/Xeno/alien_spitacid.ogg
 
+- type: entity
+  parent: BasePlushie
+  id: PlushiePenguin
+  name: penguin plushie
+  description: I use arch btw!
+  components:
+  - type: Sprite
+    state: plushie_penguin
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieHuman
+  name: human plushie
+  description: This is a felt plush of a human. All craftsmanship is of the lowest quality. The human is naked. The human is crying. The human is screaming.
+  components:
+  - type: Sprite
+    state: plushie_human
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/Voice/Human/malescream_1.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Voice/Human/malescream_2.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Voice/Human/malescream_3.ogg
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/Voice/Human/malescream_1.ogg
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Voice/Human/malescream_4.ogg
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Voice/Human/malescream_5.ogg
+
+- type: entity
+  parent: BasePlushie
+  id: PlushieMoth
+  name: moth plushie
+  description: Cute and fluffy moth plushie. Enjoy, bz!
+  components:
+  - type: Sprite
+    state: plushie_moth
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/Voice/Moth/moth_squeak.ogg # DeltaV - Give back the mothplushie the squeak
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Voice/Moth/moth_scream.ogg # DeltaV - Make the mothplushie scream on landing
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Voice/Moth/moth_squeak.ogg # DeltaV - Give back the mothplushie the squeak
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Voice/Moth/moth_scream.ogg # DeltaV - Make the mothplushie scream on trigger
+  - type: MeleeWeapon
+    soundHit:
+      path: /Audio/Voice/Moth/moth_squeak.ogg # DeltaV - Give back the mothplushie the squeak
+  - type: Construction # DeltaV - Mothroach hide craft, see Prototypes/Nyanotrasen/Recipes/Crafting/Graphs/fun/mothplushie.yml
+    graph: MothPlushie
+    node: plush
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/Voice/Moth/moth_chitter.ogg
+
 ## Cheapo Figurines
 
 - type: entity
@@ -654,6 +808,10 @@
   - type: MeleeWeapon
     soundHit:
       path: /Audio/Items/Toys/ian.ogg
+  - type: Food
+    requiresSpecialDigestion: true
+    useSound:
+      path: /Audio/Items/Toys/ian.ogg
 
 ## Toyweapons
 
@@ -778,6 +936,7 @@
     attackRate: 1.5
     angle: 0
     animation: WeaponArcThrust
+    wideAnimationRotation: 90
     damage:
       types:
         Blunt: 0
@@ -860,6 +1019,25 @@
     tags:
     - Balloon
 
+- type: entity
+  parent: BaseItem
+  id: BalloonNT
+  name: nanotrasen balloon
+  description: Specially designed to inflict maximum psychological damage to Syndicate operatives.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: ntb
+  - type: Item
+    size: Small
+    sprite: Objects/Fun/toys.rsi
+    heldPrefix: ntb
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Tag
+    tags:
+    - Balloon
+
 - type: entity
   parent: BaseItem
   id: BalloonCorgi
@@ -1232,71 +1410,11 @@
       drink:
         maxVol: 100
         reagents:
-        - ReagentId: SpaceGlue
-          Quantity: 100
+          - ReagentId: SpaceGlue
+            Quantity: 100
   - type: TrashOnSolutionEmpty
     solution: drink
 
-- type: entity
-  parent: BasePlushie
-  id: PlushieMoth
-  name: moth plushie
-  description: Cute and fluffy moth plushie. Enjoy, bz!
-  components:
-  - type: Sprite
-    state: plushie_moth
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Voice/Moth/moth_squeak.ogg # DeltaV - Give back the mothplushie the squeak
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Voice/Moth/moth_scream.ogg # DeltaV - Make the mothplushie scream on landing
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Voice/Moth/moth_squeak.ogg # DeltaV - Give back the mothplushie the squeak
-  - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Voice/Moth/moth_scream.ogg # DeltaV - Make the mothplushie scream on trigger
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Voice/Moth/moth_squeak.ogg # DeltaV - Give back the mothplushie the squeak
-  - type: Construction # DeltaV - Mothroach hide craft, see Prototypes/Nyanotrasen/Recipes/Crafting/Graphs/fun/mothplushie.yml
-    graph: MothPlushie
-    node: plush
-
-- type: entity
-  parent: BasePlushie
-  id: PlushiePenguin
-  name: penguin plushie
-  description: I use arch btw!
-  components:
-  - type: Sprite
-    state: plushie_penguin
-
-- type: entity
-  parent: BasePlushie
-  id: PlushieHuman
-  name: human plushie
-  description: This is a felt plush of a human. All craftsmanship is of the lowest quality. The human is naked. The human is crying. The human is screaming.
-  components:
-  - type: Sprite
-    state: plushie_human
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Voice/Human/malescream_1.ogg
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Voice/Human/malescream_2.ogg
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Voice/Human/malescream_3.ogg
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Voice/Human/malescream_4.ogg
-  - type: EmitSoundOnTrigger
-    sound:
-      path: /Audio/Voice/Human/malescream_5.ogg
-
 - type: entity
   parent: BaseItem
   id: NewtonCradle
@@ -1317,9 +1435,11 @@
           True: { state: icon }
           False: { state: icon-off }
   - type: ItemToggle
-  - type: ItemToggleActiveSound
-    activeSound:
-      path: /Audio/Items/newton_cradle.ogg
-      params:
-        volume: -7
-        maxDistance: 5
+  - type: UseDelay
+    delay: 1
+#  - type: ItemToggleActiveSound # DeltaV - No more annoying clicking
+#    activeSound:
+#      path: /Audio/Items/newton_cradle.ogg
+#      params:
+#        volume: -9
+#        maxDistance: 3
diff --git a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml
index 4281f0c4d4..10c41efc54 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml
@@ -13,7 +13,7 @@
   - type: UseDelay
     delay: 3
   - type: EmitSoundOnUse
-    sound: 
+    sound:
       collection: BaseWhistle
   - type: Whistle
     distance: 5
@@ -27,4 +27,24 @@
     sprite: Objects/Fun/whistle.rsi
     state: securityWhistle
   - type: Item
-    sprite: Objects/Fun/whistle.rsi
\ No newline at end of file
+    sprite: Objects/Fun/whistle.rsi
+
+- type: entity
+  parent: BaseWhistle
+  id: SyndicateWhistle
+  name: trench whistle
+  description: A whistle used by Syndicate commanders to draw attention. Avanti!
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Misc/whistles.rsi
+    state: icon
+  - type: Clothing
+    sprite: Clothing/Neck/Misc/whistles.rsi
+    quickEquip: False
+    slots:
+    - neck
+  - type: EmitSoundOnUse
+    sound:
+      collection: TrenchWhistle
+  - type: Whistle
+    distance: 15 # Let your enemies hear the sound of death approaching
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
index 7fd7569585..89613efe14 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
@@ -16,7 +16,6 @@
   - type: Tag
     tags:
     - Sheet
-    - DroneUsable
   - type: Material
   - type: Damageable
     damageContainer: Inorganic
@@ -48,7 +47,7 @@
         acts: [ "Destruction" ]
   - type: SolutionContainerManager
     solutions:
-      glass: 
+      glass:
         canReact: false
 
 - type: entity
@@ -198,7 +197,7 @@
         - ReagentId: Carbon
           Quantity: 0.5
         canReact: false
-        
+
 - type: entity
   parent: SheetGlassBase
   id: SheetPGlass
@@ -444,8 +443,8 @@
           Quantity: 4.5
         - ReagentId: Carbon
           Quantity: 0.5
-        canReact: false 
-    
+        canReact: false
+
 - type: entity
   parent: SheetRUGlass
   id: SheetRUGlass1
@@ -457,3 +456,80 @@
   - type: Stack
     stackType: ReinforcedUraniumGlass
     count: 1
+
+- type: entity
+  parent: SheetGlassBase
+  id: SheetClockworkGlass
+  name: clockwork glass
+  description: A sheet of brass-hardened glass, primarily used by clockwork enthusiasts and remnants of Ratvarian cults.
+  suffix: Full
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      BrassGlass: 100
+  - type: Stack
+    stackType: ClockworkGlass
+    baseLayer: base
+    layerStates:
+    - cglass
+    - cglass_2
+    - cglass_3
+  - type: Sprite
+    state: cglass_3
+    layers:
+    - state: cglass_3
+      map: ["base"]
+  - type: Item
+    heldPrefix: cglass
+  - type: Construction
+    graph: Glass
+    node: SheetClockworkGlass
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+          params:
+            volume: -4
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassClockwork:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Extractable
+    grindableSolutionName: brassglass
+  - type: SolutionContainerManager
+    solutions:
+      cglass:
+        reagents:
+        - ReagentId: Silicon
+          Quantity: 10
+        - ReagentId: Zinc
+          Quantity: 3.3
+        - ReagentId: Copper
+          Quantity: 6.7
+        canReact: false
+
+- type: entity
+  parent: SheetClockworkGlass
+  id: SheetClockworkGlass1
+  name: clockwork glass
+  suffix: Single
+  components:
+  - type: Sprite
+    state: cglass
+  - type: Stack
+    stackType: ClockworkGlass
+    count: 1
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
index db173ffc47..8cd965676c 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
@@ -16,7 +16,6 @@
     tags:
     - Sheet
     - Metal
-    - DroneUsable
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
@@ -105,6 +104,70 @@
     lingering: true
     count: 0
 
+- type: entity
+  parent: SheetMetalBase
+  id: SheetBrass
+  name: brass
+  description: A sheet of brass, primarily used by clockwork enthusiasts and the remnants of Ratvarian cults.
+  suffix: Full
+  components:
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      Brass: 100
+  - type: Stack
+    stackType: Brass
+    baseLayer: base
+    layerStates:
+    - brass
+    - brass_2
+    - brass_3
+  - type: Sprite
+    state: brass_3
+    layers:
+    - state: brass_3
+      map: ["base"]
+  - type: Item
+    heldPrefix: brass
+  - type: Appearance
+  - type: FloorTile
+    outputs:
+    - PlatingBrass
+  - type: Extractable
+    grindableSolutionName: brass
+  - type: SolutionContainerManager
+    solutions:
+      brass:
+        reagents:
+        - ReagentId: Zinc
+          Quantity: 3.3
+        - ReagentId: Copper
+          Quantity: 6.7
+
+- type: entity
+  parent: SheetBrass
+  id: SheetBrass10
+  name: brass
+  suffix: 10
+  components:
+  - type: Sprite
+    state: brass
+  - type: Stack
+    stackType: Brass
+    count: 10
+
+- type: entity
+  parent: SheetBrass
+  id: SheetBrass1
+  name: brass
+  suffix: Single
+  components:
+  - type: Sprite
+    state: brass
+  - type: Stack
+    stackType: Brass
+    count: 1
+
 - type: entity
   parent: SheetMetalBase
   id: SheetPlasteel
diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
index 94bc3daf9f..8c9c2c4b3b 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -13,7 +13,6 @@
   - type: Tag
     tags:
     - Sheet
-    - DroneUsable
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
@@ -134,7 +133,6 @@
     tags:
     - Plastic
     - Sheet
-    - DroneUsable
   - type: Material
   - type: PhysicalComposition
     materialComposition:
@@ -251,7 +249,6 @@
     - type: Tag
       tags:
       - Sheet
-      - DroneUsable
     - type: Material
     - type: PhysicalComposition
       materialComposition:
diff --git a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
index 47e0a5f0f2..4897d6ff39 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
@@ -20,6 +20,7 @@
           shard3: ""
   - type: SpaceGarbage
   - type: MeleeWeapon
+    wideAnimationRotation: -22.5
     attackRate: 1.5
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Objects/Materials/ingots.yml b/Resources/Prototypes/Entities/Objects/Materials/ingots.yml
index 75bf2597f5..ef96dc9e95 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/ingots.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ingots.yml
@@ -60,7 +60,7 @@
         reagents:
         - ReagentId: Gold
           Quantity: 10
-          
+
 - type: entity
   parent: IngotGold
   id: IngotGold1
@@ -114,3 +114,5 @@
   components:
   - type: Sprite
     state: silver
+  - type: Stack
+    count: 1
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 9cdea9ecfb..d30702e3d7 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -12,7 +12,6 @@
     size: Normal
   - type: Tag
     tags:
-      - DroneUsable
       - RawMaterial
   - type: Damageable
     damageContainer: Inorganic
@@ -129,7 +128,6 @@
   - type: Tag
     tags:
       - ClothMade
-      - DroneUsable
       - Gauze
       - RawMaterial
   - type: Construction
@@ -178,7 +176,7 @@
     layers:
     - state: durathread_3
       map: ["base"]
-    scale: 1, 1 # Parkstation-SmallerMaterials - Durathread looks fine normally
+    scale: 1, 1 # Parkstation-SmallerMaterials # Durathread looks fine normally
   - type: Appearance
   - type: Construction
     graph: Durathread
@@ -195,7 +193,6 @@
   - type: Tag
     tags:
       - ClothMade
-      - DroneUsable
       - RawMaterial
 
 - type: entity
@@ -243,7 +240,6 @@
   - type: Tag
     tags:
     - Wooden
-    - DroneUsable
     - RawMaterial
   - type: Extractable
     grindableSolutionName: wood
@@ -287,7 +283,7 @@
     sprite: /Textures/Objects/Misc/monkeycube.rsi
     state: cube
     color: "#8A9A5B"
-    scale: 1, 1 # Parkstation-SmallerMaterials - Biomass looks fine normally
+    scale: 1, 1 # Parkstation-SmallerMaterials # Biomass looks fine normally
   - type: GuideHelp
     guides:
     - Cloning
@@ -414,10 +410,8 @@
   - type: Tag
     tags:
       - ClothMade
-      - DroneUsable
       - RawMaterial
 
-
 - type: entity
   parent: MaterialCotton
   id: MaterialCotton1
@@ -492,7 +486,7 @@
   parent: MaterialBase
   id: MaterialWebSilk
   name: silk
-  description: A webby material
+  description: A webby material.
   suffix: Full
   components:
   - type: PhysicalComposition
@@ -526,7 +520,6 @@
   - type: Tag
     tags:
       - ClothMade
-      - DroneUsable
       - RawMaterial
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
index 2fed6498bd..bf7dbfad5a 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
@@ -312,3 +312,36 @@
   components:
   - type: Stack
     count: 1
+
+- type: entity
+  parent: OreBase
+  id: SaltOre
+  name: salt
+  suffix: Full
+  components:
+  - type: Stack
+    stackType: SaltOre
+  - type: Sprite
+    state: salt
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      RawSalt: 500
+  - type: Extractable
+    grindableSolutionName: saltore
+  - type: SolutionContainerManager
+    solutions:
+      saltore:
+        reagents:
+        - ReagentId: TableSalt
+          Quantity: 10
+        - ReagentId: Iodine
+          Quantity: 5
+
+- type: entity
+  parent: SaltOre
+  id: Salt1
+  suffix: Single
+  components:
+  - type: Stack
+    count: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
index 3da3fcb7da..726048478e 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
@@ -9,9 +9,6 @@
     scale: 0.65, 0.65 # Parkstation-SmallerMaterials
   - type: Item
     sprite: Objects/Materials/parts.rsi
-  - type: Tag
-    tags:
-      - DroneUsable
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: FlimsyMetallic
@@ -82,7 +79,6 @@
   - type: Tag
     tags:
     - RodMetal1
-    - DroneUsable
   - type: Sprite
     state: rods
   - type: Stack
@@ -97,7 +93,6 @@
   - type: Tag
     tags:
     - RodMetal1
-    - DroneUsable
   - type: Sprite
     state: rods
   - type: Stack
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index 1a89b2c1d6..b234bf1e7c 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -107,7 +107,7 @@
         - ReagentId: Silicon
           Quantity: 5 #Half of the value of regular glass. TECHNICALLY, welding a single shard of glass gives you the full thing back with just 1 sheet, but that is stupid so I am making it half.
   - type: Construction
-    graph: Shiv
+    graph: ShivConstruct
     node: start
 
 - type: entity
@@ -139,7 +139,7 @@
         - ReagentId: Silicon
           Quantity: 5 #I don't care enough to divide all of the reinforced glass materials by 2 because reinforced glass shards are due for removal anyways.
   - type: Construction
-    graph: ReinforcedShiv
+    graph: ReinforcedShivConstruct
     node: start
 
 - type: entity
@@ -173,7 +173,7 @@
         - ReagentId: Plasma
           Quantity: 5
   - type: Construction
-    graph: PlasmaShiv
+    graph: PlasmaShivConstruct
     node: start
 
 - type: entity
@@ -208,5 +208,38 @@
         - ReagentId: Uranium
           Quantity: 5
   - type: Construction
-    graph: UraniumShiv
+    graph: UraniumShivConstruct
     node: start
+
+- type: entity
+  parent: ShardBase
+  id: ShardGlassClockwork
+  name: clockwork glass shard
+  description: A small piece of brass-infused glass.
+  components:
+  - type: Sprite
+    color: "#e0aa36"
+  - type: WelderRefinable
+    refineResult:
+    - SheetGlass1
+    - SheetBrass1
+  - type: DamageUserOnTrigger
+    damage:
+      types:
+        Piercing: 5
+  - type: Tag
+    tags:
+      - ClockworkGlassShard
+      - Trash
+  - type: Extractable
+    grindableSolutionName: shardcglass
+  - type: SolutionContainerManager
+    solutions:
+      shardcglass:
+        reagents:
+        - ReagentId: Silicon
+          Quantity: 5
+        - ReagentId: Zinc
+          Quantity: 1.65
+        - ReagentId: Copper
+          Quantity: 3.35
diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
index f4892c0279..209d0b8cc2 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
@@ -270,7 +270,7 @@
 - type: entity
   id: BedsheetRD
   parent: BedsheetBase
-  name: RD's bedsheet
+  name: Mystagogue's bedsheet # DeltaV - Epistemics Department - Replace Research Director with Mystagogue
   description: It appears to have a beaker emblem, and is made out of fire-resistant material, although it probably won't protect you in the event of fires you're familiar with every day.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml
index 7a0e76552f..ab6beb70af 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml
@@ -143,7 +143,7 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book0 # no science book sprite so this is a placeholder
+    - state: book_science
   - type: Tag
     tags:
     - Book
@@ -161,7 +161,7 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book_detective # maybe a proper sprite is needed
+    - state: book_security
   - type: Tag
     tags:
     - Book
@@ -220,7 +220,7 @@
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
-    - state: book0 # no medical book sprite so this is a placeholder
+    - state: book_medical
   - type: Tag
     tags:
     - Book
@@ -294,6 +294,7 @@
       layers:
         - state: book2
     - type: MeleeWeapon
+      wideAnimationRotation: 180
       damage:
         types:
           Blunt: 6
@@ -311,6 +312,7 @@
       layers:
         - state: book2
     - type: MeleeWeapon
+      wideAnimationRotation: 180
       damage:
         types:
           Blunt: 6
diff --git a/Resources/Prototypes/Entities/Objects/Misc/candy_bowl.yml b/Resources/Prototypes/Entities/Objects/Misc/candy_bowl.yml
index 843b402a6c..fe275e3be3 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/candy_bowl.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/candy_bowl.yml
@@ -55,9 +55,11 @@
         shape:
           !type:PhysShapeAabb
           bounds: "-0.10,-0.10,0.10,0.10"
-        density: 3
+        density: 20
         mask:
-          - TabletopMachineMask
+        - TabletopMachineMask
+        restitution: 0.3
+        friction: 0.2
   - type: InteractionOutline
   - type: ItemMapper
     sprite: Objects/Misc/candy_bowl.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Misc/carpets.yml b/Resources/Prototypes/Entities/Objects/Misc/carpets.yml
index b3d53f6e1d..d8f3266730 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/carpets.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/carpets.yml
@@ -1,8 +1,9 @@
 # TODO once tiles can be smoothed and carpets ported over to that, add them to the FloorTile outputs
 - type: entity
-  name: red carpet
+  name: carpet
   parent: FloorTileItemBase
   id: FloorCarpetItemRed
+  suffix: Red
   components:
   - type: Sprite
     state: carpet-red
@@ -13,108 +14,178 @@
       - Plating
   - type: Stack
     stackType: FloorCarpetRed
+  - type: Tag
+    tags: 
+    - CarpetRed
+  - type: SpawnAfterInteract #Nuke after convert to FloorTile
+    prototype: Carpet
+    doAfter: 0.5
+    removeOnInteract: true
 
 - type: entity
-  name: black carpet
-  parent: FloorTileItemBase
+  parent: FloorCarpetItemRed
   id: FloorCarpetItemBlack
+  suffix: Black
   components:
   - type: Sprite
     state: carpet-black
   - type: Item
     heldPrefix: carpet-black
-  - type: FloorTile
-    outputs:
-      - Plating
   - type: Stack
     stackType: FloorCarpetBlack
+  - type: Tag
+    tags: 
+    - CarpetBlack
+  - type: SpawnAfterInteract #Nuke after convert to FloorTile
+    prototype: CarpetBlack
+    doAfter: 0.5
+    removeOnInteract: true
 
 - type: entity
-  name: blue carpet
-  parent: FloorTileItemBase
+  parent: FloorCarpetItemRed
   id: FloorCarpetItemBlue
+  suffix: Blue
   components:
   - type: Sprite
     state: carpet-blue
   - type: Item
     heldPrefix: carpet-blue
-  - type: FloorTile
-    outputs:
-      - Plating
   - type: Stack
     stackType: FloorCarpetBlue
+  - type: Tag
+    tags: 
+    - CarpetBlue
+  - type: SpawnAfterInteract #Nuke after convert to FloorTile
+    prototype: CarpetBlue
+    doAfter: 0.5
+    removeOnInteract: true
 
 - type: entity
-  name: green carpet
-  parent: FloorTileItemBase
+  parent: FloorCarpetItemRed
   id: FloorCarpetItemGreen
+  suffix: Green
   components:
   - type: Sprite
     state: carpet-green
   - type: Item
     heldPrefix: carpet-green
-  - type: FloorTile
-    outputs:
-      - Plating
   - type: Stack
     stackType: FloorCarpetGreen
+  - type: Tag
+    tags: 
+    - CarpetGreen
+  - type: SpawnAfterInteract #Nuke after convert to FloorTile
+    prototype: CarpetGreen
+    doAfter: 0.5
+    removeOnInteract: true
 
 - type: entity
-  name: orange carpet
-  parent: FloorTileItemBase
+  parent: FloorCarpetItemRed
   id: FloorCarpetItemOrange
+  suffix: Orange
   components:
   - type: Sprite
     state: carpet-orange
   - type: Item
     heldPrefix: carpet-orange
-  - type: FloorTile
-    outputs:
-      - Plating
   - type: Stack
     stackType: FloorCarpetOrange
+  - type: Tag
+    tags: 
+    - CarpetOrange
+  - type: SpawnAfterInteract #Nuke after convert to FloorTile
+    prototype: CarpetOrange
+    doAfter: 0.5
+    removeOnInteract: true
 
 - type: entity
-  name: sky blue carpet
-  parent: FloorTileItemBase
+  parent: FloorCarpetItemRed
   id: FloorCarpetItemSkyBlue
+  suffix: Sky Blue
   components:
   - type: Sprite
     state: carpet-skyblue
   - type: Item
     heldPrefix: carpet-skyblue
-  - type: FloorTile
-    outputs:
-      - Plating
   - type: Stack
     stackType: FloorCarpetSkyBlue
+  - type: SpawnAfterInteract #Nuke after convert to FloorTile
+    prototype: CarpetSBlue
+    doAfter: 0.5
+    removeOnInteract: true
 
 - type: entity
-  name: purple carpet
-  parent: FloorTileItemBase
+  parent: FloorCarpetItemRed
   id: FloorCarpetItemPurple
+  suffix: Purple
   components:
   - type: Sprite
     state: carpet-purple
   - type: Item
     heldPrefix: carpet-purple
-  - type: FloorTile
-    outputs:
-      - Plating
   - type: Stack
     stackType: FloorCarpetPurple
+  - type: Tag
+    tags: 
+    - CarpetPurple
+  - type: SpawnAfterInteract #Nuke after convert to FloorTile
+    prototype: CarpetPurple
+    doAfter: 0.5
+    removeOnInteract: true
 
 - type: entity
-  name: pink carpet
-  parent: FloorTileItemBase
+  parent: FloorCarpetItemRed
   id: FloorCarpetItemPink
+  suffix: Pink
   components:
   - type: Sprite
     state: carpet-pink
   - type: Item
     heldPrefix: carpet-pink
-  - type: FloorTile
-    outputs:
-      - Plating
   - type: Stack
     stackType: FloorCarpetPink
+  - type: Tag
+    tags: 
+    - CarpetPink
+  - type: SpawnAfterInteract #Nuke after convert to FloorTile
+    prototype: CarpetPink
+    doAfter: 0.5
+    removeOnInteract: true
+
+- type: entity
+  parent: FloorCarpetItemRed
+  id: FloorCarpetItemCyan
+  suffix: Cyan
+  components:
+  - type: Sprite
+    state: carpet-cyan
+  - type: Item
+    heldPrefix: carpet-cyan
+  - type: Stack
+    stackType: FloorCarpetCyan
+  - type: Tag
+    tags: 
+    - CarpetCyan
+  - type: SpawnAfterInteract #Nuke after convert to FloorTile
+    prototype: CarpetCyan
+    doAfter: 0.5
+    removeOnInteract: true
+
+- type: entity
+  parent: FloorCarpetItemRed
+  id: FloorCarpetItemWhite
+  suffix: White
+  components:
+  - type: Sprite
+    state: carpet-white
+  - type: Item
+    heldPrefix: carpet-white
+  - type: Stack
+    stackType: FloorCarpetWhite
+  - type: Tag
+    tags: 
+    - CarpetWhite
+  - type: SpawnAfterInteract #Nuke after convert to FloorTile
+    prototype: CarpetWhite
+    doAfter: 0.5
+    removeOnInteract: true
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index 799e2921e4..a42b2fa113 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -163,6 +163,7 @@
   - type: AutoRecharge
     rechargeDuration: 30
   - type: MeleeWeapon
+    wideAnimationRotation: 180
     damage:
       types:
         Blunt: 0 # melee weapon to allow flashing individual targets
diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
index 2e33ef24a3..5f970da184 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -17,6 +17,7 @@
     tags:
     - Handcuffs
   - type: MeleeWeapon
+    wideAnimationRotation: 90
     resetOnHandSelected: false
     animation: WeaponArcDisarm
     damage:
@@ -25,6 +26,8 @@
   - type: GuideHelp
     guides:
     - Security
+  - type: UseDelay
+    delay: 6
 
 - type: entity
   name: makeshift handcuffs
@@ -33,7 +36,7 @@
   parent: Handcuffs
   components:
   - type: Handcuff
-    breakoutTime: 15
+    breakoutTime: 3
     cuffedRSI: Objects/Misc/cablecuffs.rsi
     bodyIconState: body-overlay
     color: forestgreen
@@ -75,7 +78,7 @@
     size: Tiny
     storedRotation: 0
   - type: Handcuff
-    breakoutTime: 20  # halfway between improvised cablecuffs and metal ones
+    breakoutTime: 3
     cuffedRSI: Objects/Misc/cablecuffs.rsi  # cablecuffs will look fine
     bodyIconState: body-overlay
     breakOnRemove: true
@@ -148,9 +151,6 @@
   - type: Handcuff
     cuffedRSI: Clothing/OuterClothing/Misc/straight_jacket.rsi
     breakoutTime: 100
-    damageOnResist:
-      types:
-        Blunt: 0
     cuffTime: 10
     uncuffTime: 10
     stunBonus: 4
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 4c9427ea87..1c6a003cc5 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -316,19 +316,6 @@
       job: Bartender
       name: Pun Pun
 
-- type: entity # DeltaV - Security dog Laika ID card
-  parent: IDCardStandard
-  id: SecDogIDCard
-  name: Security Dog ID card
-  components:
-    - type: Sprite
-      layers:
-        - state: default
-        - state: idsecurityofficer
-    - type: PresetIdCard
-      job: SecurityOfficer
-      name: Laika
-
 - type: entity
   parent: IDCardStandard
   id: ChefIDCard
diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
index eefce3a851..5de1f0b7f9 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
@@ -1,11 +1,26 @@
 - type: entity
-  id: Kudzu
-  name: kudzu
-  description: A rapidly growing, dangerous plant. WHY ARE YOU STOPPING TO LOOK AT IT?!
+  id: BaseKudzu
+  abstract: true
   placement:
     mode: SnapgridCenter
     snap:
       - Wall
+  components:
+    - type: Appearance
+    - type: Transform
+      anchored: true
+    - type: Physics
+    - type: Kudzu
+    - type: GrowingKudzu
+    - type: ActiveEdgeSpreader
+    - type: EdgeSpreader
+      id: Kudzu
+
+- type: entity
+  id: Kudzu
+  name: kudzu
+  parent: BaseKudzu
+  description: A rapidly growing, dangerous plant. WHY ARE YOU STOPPING TO LOOK AT IT?!
   components:
     - type: MeleeSound
       soundGroups:
@@ -16,12 +31,8 @@
       sprite: Objects/Misc/kudzu.rsi
       state: kudzu_11
       drawdepth: Overdoors
-    - type: Appearance
     - type: KudzuVisuals
     - type: Clickable
-    - type: Transform
-      anchored: true
-    - type: Physics
     - type: Fixtures
       fixtures:
         fix1:
@@ -69,19 +80,14 @@
             types:
               Heat: 10
     - type: AtmosExposed
-    - type: Kudzu
       growthTickChance: 0.3
       spreadChance: 0.4
-    - type: GrowingKudzu
     - type: SlowContacts
       walkSpeedModifier: 0.2
       sprintSpeedModifier: 0.2
       ignoreWhitelist:
         components:
         - IgnoreKudzu
-    - type: ActiveEdgeSpreader
-    - type: EdgeSpreader
-      id: Kudzu
     - type: Food
       requiredStomachs: 2 # ruminants have 4 stomachs but i dont care to give them literally 4 stomachs. 2 is good
       delay: 0.5
@@ -129,15 +135,12 @@
       offset: 0.2
       chance: 0.05
       prototypes:
-      - FloraTree01
-      - FloraTree02
-      - FloraTree03
-      - FloraTree04
-      - FloraTree05
-      - FloraTree06
-      - FloraTreeLarge01
-      - FloraTreeLarge02
-      - FloraTreeLarge03
+      - LightTree01
+      - LightTree02
+      - LightTree03
+      - LightTree04
+      - LightTree05
+      - LightTree06
       - CrystalCyan
       rarePrototypes:
       - AnomalyFloraBulb
@@ -148,17 +151,20 @@
   parent: KudzuFlowerFriendly
   components:
     - type: Kudzu
-      spreadChance: 0.4
+      spreadChance: 0.2
     - type: RandomSpawner
-      chance: 0.1
+      chance: 0.05
       rarePrototypes:
       - AnomalyFloraBulb
+      - AnomalyFloraBulb
       - MobLuminousEntity
       - MobLuminousObject
+      - MobLuminousPerson
 
 - type: entity
   id: FleshKudzu
   name: tendons
+  parent: BaseKudzu
   description: A rapidly growing cluster of meaty tendons. WHY ARE YOU STOPPING TO LOOK AT IT?!
   placement:
     mode: SnapgridCenter
@@ -174,12 +180,8 @@
       sprite: Objects/Misc/fleshkudzu.rsi
       state: kudzu_11
       drawdepth: Overdoors
-    - type: Appearance
     - type: KudzuVisuals
     - type: Clickable
-    - type: Transform
-      anchored: true
-    - type: Physics
     - type: Fixtures
       fixtures:
         fix1:
@@ -233,12 +235,8 @@
       damage:
        types:
          Heat: 3
-    - type: GrowingKudzu
       growthTickChance: 0.3
     - type: AtmosExposed
-    - type: ActiveEdgeSpreader
-    - type: EdgeSpreader
-      id: Kudzu
     - type: SlowContacts
       walkSpeedModifier: 0.3
       sprintSpeedModifier: 0.3
@@ -261,3 +259,50 @@
         types:
           Asphyxiation: -0.25
 
+- type: entity
+  name: dark haze
+  id: ShadowKudzu
+  parent: [ BaseKudzu, BaseShadow ]
+  components:
+    - type: Physics
+      canCollide: false
+    - type: Occluder
+    - type: Sprite
+      drawdepth: Effects
+      sprite: Effects/spookysmoke.rsi
+      layers:
+      - state: spookysmoke
+        color: "#793a80dd"
+        map: [base]
+    - type: Kudzu
+      growthTickChance: 0.2
+      spreadChance: 0.99
+    - type: RandomSpawner
+      deleteSpawnerAfterSpawn: false
+      rareChance: 0.05
+      offset: 0.2
+      chance: 0.45
+      prototypes:
+      - ShadowBasaltRandom
+      rarePrototypes:
+      - ShadowPortal
+      - ShadowKudzuLootSpawner
+    - type: Tag
+      tags:
+        - HideContextMenu
+        - SpookyFog
+    - type: OptionsVisualizer
+      visuals:
+        base:
+        - options: Default
+          data: { state: spookysmoke }
+        - options: ReducedMotion
+          data: { state: spookysmoke_static }
+
+- type: entity
+  name: Haze
+  id: ShadowKudzuWeak
+  parent: ShadowKudzu
+  components:
+    - type: Kudzu
+      spreadChance: 0 #appears during pulsation. It shouldnt spreading.
diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
index d4d214f0e2..58457ebb7f 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -18,6 +18,7 @@
   - type: ActivatableUI
     key: enum.PaperUiKey.Key
     closeOnHandDeselect: false
+    requireHands: false
   - type: UserInterface
     interfaces:
     - key: enum.PaperUiKey.Key
@@ -61,6 +62,7 @@
     solution: food
     delay: 7
     forceFeedDelay: 7
+  - type: BadFood
   - type: SolutionContainerManager
     solutions:
       food:
@@ -668,6 +670,7 @@
     - key: enum.StorageUiKey.Key
       type: StorageBoundUserInterface
   - type: MeleeWeapon
+    wideAnimationRotation: 180
     damage:
       types:
         Blunt: 10
diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
index cbd960acc7..e88ed48fe5 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
@@ -245,3 +245,16 @@
     stampState: "paper_stamp-deny"
   - type: Sprite
     state: stamp-deny
+
+- type: entity
+  name: detective's rubber stamp
+  parent: RubberStampBase
+  id: RubberStampDetective
+  suffix: DO NOT MAP
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-detective
+    stampedColor: "#FC0A0A"
+    stampState: "paper_stamp-detective"
+  - type: Sprite
+    state: stamp-detective
diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
index 092b013f5b..dcdb316b7e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -177,7 +177,7 @@
       range: 1.75
       energyConsumption: 50000
       disableDuration: 10
-      
+
 - type: entity
   parent: BaseSubdermalImplant
   id: ScramImplant
@@ -210,7 +210,7 @@
   parent: BaseSubdermalImplant
   id: MicroBombImplant
   name: micro-bomb implant
-  description: This implant detonates the user upon death.
+  description: This implant detonates the user upon activation or upon death.
   noSpawn: true
   components:
     - type: SubdermalImplant
diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
index 361efb5266..8e29c3c27e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml
@@ -15,9 +15,6 @@
         Blunt: 5
   - type: Stack
     count: 1
-  - type: Tag
-    tags:
-      - DroneUsable
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
@@ -229,6 +226,44 @@
   - type: Stack
     stackType: FloorTileLino
 
+- type: entity
+  name: filled brass plate
+  parent: FloorTileItemBase
+  id: FloorTileItemBrassFilled
+  components:
+  - type: Sprite
+    state: brass-filled
+  - type: Item
+    heldPrefix: brass
+  - type: FloorTile
+    outputs:
+      - PlatingBrass
+      - FloorBrassFilled
+  - type: Stack
+    stackType: FloorTileBrassFilled
+  - type: Construction
+    graph: TilesBrass
+    node: filledPlate
+
+- type: entity
+  name: smooth brass plate
+  parent: FloorTileItemBase
+  id: FloorTileItemBrassReebe
+  components:
+  - type: Sprite
+    state: reebe
+  - type: Item
+    heldPrefix: brass
+  - type: FloorTile
+    outputs:
+      - PlatingBrass
+      - FloorBrassReebe
+  - type: Stack
+    stackType: FloorTileBrassReebe
+  - type: Construction
+    graph: TilesBrass
+    node: reebe
+
 - type: entity
   name: dirty tile
   parent: FloorTileItemBase
@@ -745,6 +780,38 @@
   - type: Stack
     stackType: FloorTileStackShuttleRed
 
+- type: entity
+  name: grey shuttle floor
+  parent: FloorTileItemBase
+  id: FloorTileItemShuttleGrey
+  components:
+  - type: Sprite
+    state: shuttlegrey
+  - type: Item
+    heldPrefix: shuttlegrey
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorShuttleGrey
+  - type: Stack
+    stackType: FloorTileStackShuttleGrey
+
+- type: entity
+  name: black shuttle floor
+  parent: FloorTileItemBase
+  id: FloorTileItemShuttleBlack
+  components:
+  - type: Sprite
+    state: shuttleblack
+  - type: Item
+    heldPrefix: shuttleblack
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorShuttleBlack
+  - type: Stack
+    stackType: FloorTileStackShuttleBlack
+
 # Materials
 - type: entity
   name: gold floor
@@ -997,3 +1064,22 @@
     - FloorAstroIce
   - type: Stack
     stackType: FloorTileAstroIce
+
+- type: entity
+  name: large wood floor
+  parent: FloorTileItemBase
+  id: FloorTileItemWoodLarge
+  components:
+  - type: Sprite
+    state: wood-large
+  - type: Item
+    heldPrefix: wood
+  - type: FloorTile
+    outputs:
+      - Plating
+      - FloorWoodLarge
+  - type: Stack
+    stackType: FloorTileWoodLarge
+  - type: Construction
+    graph: TileWoodLarge
+    node: woodtilelarge
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml b/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml
deleted file mode 100644
index 62aa0dccdd..0000000000
--- a/Resources/Prototypes/Entities/Objects/Power/antimatter_part.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: AmePart
-  name: AME flatpack
-  description: A flatpack used for constructing an antimatter engine reactor.
-  components:
-  - type: Item
-    size: Normal
-    sprite: Objects/Power/AME/ame_part.rsi
-  - type: Sprite
-    sprite: Objects/Power/AME/ame_part.rsi
-    state: box
-  - type: Flatpack
-    entity: AmeShielding
-  - type: StaticPrice
-    price: 500
-  - type: GuideHelp
-    guides: [ AME, Power ]
-  - type: Tag
-    tags:
-      - DroneUsable
-  - type: StealTarget
-    stealGroup: AmePart
diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
index 0dbee48110..c8089cd22d 100644
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -127,6 +127,21 @@
     lightRadius: 6
     lightSoftness: 1.1
 
+- type: entity
+  parent: BaseLightbulb
+  name: led light bulb
+  id: LedLightBulb
+  description: A power efficient light bulb.
+  components:
+  - type: LightBulb
+    bulb: Bulb
+    color: "#EEEEFF"
+    lightEnergy: 1
+    lightRadius: 8
+    lightSoftness: 1
+    BurningTemperature: 350 #LEDs are colder than incandescent bulbs
+    PowerUse: 6 #LEDs are more power efficient than incandescent bulbs
+
 - type: entity
   parent: LightBulb
   name: old incandescent light bulb
diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
index 758d5f7b42..7397bcaa51 100644
--- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -3,6 +3,8 @@
   abstract: true
   parent: BaseItem
   components:
+  - type: Item
+    storedRotation: -90
   - type: Battery
     pricePerJoule: 0.15
   - type: PowerCell
@@ -27,7 +29,6 @@
           Quantity: 5
   - type: Tag
     tags:
-      - DroneUsable
       - PowerCell
   - type: Appearance
   - type: PowerCellVisuals
@@ -50,7 +51,6 @@
     startingCharge: 70
   - type: Tag
     tags:
-      - DroneUsable
       - PotatoBattery
   - type: Construction
     graph: PowerCellPotato
@@ -315,7 +315,7 @@
   - type: Battery
     maxCharge: 1400
     startingCharge: 1400
-    
+
 - type: entity
   id: PowerCageMedium
   parent: BasePowerCage
@@ -333,7 +333,7 @@
   - type: Battery
     maxCharge: 2700
     startingCharge: 2700
-    
+
 - type: entity
   id: PowerCageHigh
   parent: BasePowerCage
@@ -351,7 +351,7 @@
   - type: Battery
     maxCharge: 6200
     startingCharge: 6200
-    
+
 - type: entity
   id: PowerCageSmallEmpty
   parent: PowerCageSmall
@@ -369,7 +369,7 @@
   - type: Battery
     maxCharge: 1400
     startingCharge: 0
-    
+
 - type: entity
   id: PowerCageMediumEmpty
   parent: PowerCageMedium
@@ -386,7 +386,7 @@
       visible: false
   - type: Battery
     startingCharge: 0
-    
+
 - type: entity
   id: PowerCageHighEmpty
   parent: PowerCageHigh
@@ -402,4 +402,4 @@
       shader: unshaded
       visible: false
   - type: Battery
-    startingCharge: 0
\ No newline at end of file
+    startingCharge: 0
diff --git a/Resources/Prototypes/Entities/Objects/Power/solar_parts.yml b/Resources/Prototypes/Entities/Objects/Power/solar_parts.yml
deleted file mode 100644
index 0fcd11f9b0..0000000000
--- a/Resources/Prototypes/Entities/Objects/Power/solar_parts.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: SolarAssemblyPart
-  name: solar assembly flatpack
-  description: A flatpack used for constructing a solar assembly.
-  components:
-  - type: Item
-    size: Normal
-  - type: Flatpack
-    entity: SolarAssembly
-  - type: Sprite
-    sprite: Objects/Power/solar_parts.rsi
-    state: solar_assembly_parts
-  - type: Tag
-    tags:
-    - DroneUsable
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index 7427b7f87a..b794e42ff7 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -439,7 +439,7 @@
               acts: [ "Destruction" ]
         - trigger:
             !type:DamageTrigger
-            damage: 150
+            damage: 100
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
index 4802485654..925e036e09 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
@@ -6,6 +6,8 @@
   components:
   - type: InteractionOutline
   - type: Anchorable
+    flags:
+    - Anchorable
   - type: CollideOnAnchor
   - type: Physics
     canCollide: false
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index 2bbb720259..2b232d643d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -82,6 +82,17 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/garlic.rsi
 
+- type: entity
+  parent: SeedBase
+  id: LaughinPeaSeeds
+  name: packet of laughin' pea pods
+  description: "These seeds give off a very soft purple glow.. they should grow into Laughin' Peas."
+  components:
+    - type: Seed
+      seedId: laughinPea
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/laughin_pea.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of lemon seeds
@@ -340,6 +351,17 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/poppy.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of lily seeds
+  description: "These seeds grow into lilies."
+  id: LilySeeds
+  components:
+    - type: Seed
+      seedId: lily
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/lily.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of lingzhi spores
@@ -437,6 +459,16 @@
     - type: Sprite
       sprite: Objects/Specific/Hydroponics/soybeans.rsi
 
+- type: entity
+  parent: SeedBase
+  name: packet of spaceman's trumpet seeds
+  id: SpacemansTrumpetSeeds
+  components:
+    - type: Seed
+      seedId: spacemansTrumpet
+    - type: Sprite
+      sprite: Objects/Specific/Hydroponics/spacemans_trumpet.rsi
+
 - type: entity
   parent: SeedBase
   name: packet of koibean seeds
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 06cf99cc31..8d3c83e3e1 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -30,7 +30,6 @@
     delay: 1
   - type: Tag
     tags:
-      - DroneUsable #No bucket because it holds chems, they can drag the cart or use a drain
       - Mop
       - MopBasic
   - type: GuideHelp
@@ -81,7 +80,6 @@
           maxVol: 100
     - type: Tag
       tags:
-        - DroneUsable #No bucket because it holds chems, they can drag the cart or use a drain
         - Mop
         - MopAdv
 
@@ -172,6 +170,16 @@
   - type: GuideHelp
     guides:
     - Janitorial
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 70
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
 
 - type: entity
   name: mop bucket
@@ -639,7 +647,6 @@
       delay: 1.5
     - type: Tag
       tags:
-        - DroneUsable
         - Mop
     - type: CleansForensics
     - type: Fiber
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
index e9eb18f926..0e19c03dee 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -91,8 +91,6 @@
   - type: Tag
     tags:
       - Spray
-      - DroneUsable #They don't have any other chem stuff on their whitelist so they can't refill it
-
 # Vapor
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
index 1a97b607bb..f802ae1c5c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
@@ -9,7 +9,7 @@
       - state: icon-0
         map: ["enum.StorageFillLayers.Fill"]
   - type: Storage
-    maxItemSize: Small
+    maxItemSize: Normal
     grid:
     - 0,0,7,5
     quickInsert: true
@@ -25,7 +25,6 @@
   - type: Tag
     tags:
     - TrashBag
-    - DroneUsable
   - type: Appearance
   - type: StorageFillVisualizer
     maxFillLevels: 4
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
index 637d0b56ca..0e132541e1 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
@@ -230,7 +230,7 @@
   parent: BaseMech
   id: MechVim
   name: Vim
-  description: A minature exosuit from Nanotrasen, developed to let the irreplacable station pets live a little longer.
+  description: A miniature exosuit from Nanotrasen, developed to let the irreplaceable station pets live a little longer.
   components:
   - type: Sprite
     drawdepth: Mobs
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
index ba0b5a1926..e2e9328342 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
@@ -1,5 +1,6 @@
 - type: entity
   name: handheld crew monitor
+  suffix: DO NOT MAP
   parent:
   - BaseItem
   - PowerCellSlotSmallItem
@@ -33,6 +34,11 @@
       - HandheldCrewMonitor
   - type: StaticPrice
     price: 500
+  - type: Tag
+    tags:
+    - HighRiskItem
+  - type: StealTarget
+    stealGroup: HandheldCrewMonitor
 
 - type: entity
   id: HandheldCrewMonitorEmpty
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index ebb32ae5b4..bd789214f9 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -69,6 +69,7 @@
   description: Used to treat even the nastiest burns. Also effective against caustic burns.
   parent: BaseHealingItem
   id: RegenerativeMesh
+  suffix: Full
   components:
   - type: Tag
     tags:
@@ -99,6 +100,7 @@
 - type: entity
   id: OintmentAdvanced1
   parent: RegenerativeMesh
+  suffix: Single
   components:
   - type: Stack
     stackType: RegenerativeMesh
@@ -155,6 +157,7 @@
   description: A suture soaked in medicine, treats blunt-force trauma effectively and closes wounds.
   parent: BaseHealingItem
   id: MedicatedSuture
+  suffix: Full
   components:
   - type: Tag
     tags:
@@ -163,6 +166,7 @@
     state: medicated-suture
   - type: Item
     heldPrefix: medicated-suture
+    storedRotation: -90
   - type: Healing
     damageContainers:
       - Biological
@@ -183,6 +187,7 @@
 - type: entity
   id: BrutepackAdvanced1
   parent: MedicatedSuture
+  suffix: Single
   components:
   - type: Stack
     stackType: MedicatedSuture
@@ -225,6 +230,32 @@
   - type: Stack
     lingering: true
 
+- type: entity
+  parent: BaseHealingItem
+  id: Tourniquet
+  name: tourniquet
+  description: Stops bleeding! Hopefully.
+  components:
+    - type: Tag
+      tags:
+        - SecBeltEquip
+    - type: Sprite
+      state: tourniquet
+    - type: Healing
+      damageContainers:
+        - Biological
+      damage:
+        groups:
+          Brute: 5 # Tourniquets HURT!
+        types:
+          Asphyxiation: 5 # Essentially Stopping all blood reaching a part of your body
+      bloodlossModifier: -10 # Tourniquets stop bleeding
+      delay: 0.5
+      healingBeginSound:
+        path: "/Audio/Items/Medical/brutepack_begin.ogg"
+      healingEndSound:
+        path: "/Audio/Items/Medical/brutepack_end.ogg"
+
 - type: entity
   name: roll of gauze
   description: Some sterile gauze to wrap around bloody stumps.
@@ -316,10 +347,16 @@
 
 # Pills
 - type: entity
-  name: dexalin pill (10u)
+  name: pill (dexalin 10u)
   parent: Pill
   id: PillDexalin
   components:
+  - type: Pill
+    pillType: 15
+  - type: Sprite
+    state: pill16
+  - type: Label
+    currentLabel: dexalin 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -330,20 +367,29 @@
 
 
 - type: entity
+  name: pill canister (dexalin 10u)
   parent: PillCanister
   id: PillCanisterDexalin
   suffix: Dexalin, 7
   components:
+  - type: Label
+    currentLabel: dexalin 10u
   - type: StorageFill
     contents:
     - id: PillDexalin
       amount: 7
 
 - type: entity
-  name: dylovene pill (10u)
+  name: pill (dylovene 10u)
   parent: Pill
   id: PillDylovene
   components:
+  - type: Pill
+    pillType: 9
+  - type: Sprite
+    state: pill10
+  - type: Label
+    currentLabel: dylovene 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -353,20 +399,29 @@
           Quantity: 10
 
 - type: entity
+  name: pill canister (dylovene 10u)
   parent: PillCanister
   id: PillCanisterDylovene
   suffix: Dylovene, 5
   components:
+  - type: Label
+    currentLabel: dylovene 10u
   - type: StorageFill
     contents:
     - id: PillDylovene
       amount: 5
 
 - type: entity
-  name: hyronalin pill (10u)
+  name: pill (hyronalin 10u)
   parent: Pill
   id: PillHyronalin
   components:
+  - type: Pill
+    pillType: 16
+  - type: Sprite
+    state: pill17
+  - type: Label
+    currentLabel: hyronalin 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -376,20 +431,29 @@
           Quantity: 10
 
 - type: entity
+  name: pill canister (hyronalin 10u)
   parent: PillCanister
   id: PillCanisterHyronalin
   suffix: Hyronalin, 5
   components:
+  - type: Label
+    currentLabel: hyronalin 10u
   - type: StorageFill
     contents:
     - id: PillHyronalin
       amount: 5
 
 - type: entity
-  name: iron pill (10u)
+  name: pill (iron 10u)
   parent: Pill
   id: PillIron
   components:
+  - type: Pill
+    pillType: 13
+  - type: Sprite
+    state: pill14
+  - type: Label
+    currentLabel: iron 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -399,10 +463,16 @@
           Quantity: 10
 
 - type: entity
-  name: copper pill (10u)
+  name: pill (copper 10u)
   parent: Pill
   id: PillCopper
   components:
+  - type: Pill
+    pillType: 12
+  - type: Sprite
+    state: pill13
+  - type: Label
+    currentLabel: copper 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -412,30 +482,42 @@
           Quantity: 10
 
 - type: entity
+  name: pill canister (iron 10u)
   parent: PillCanister
   id: PillCanisterIron
   suffix: Iron, 5
   components:
+  - type: Label
+    currentLabel: iron 10u
   - type: StorageFill
     contents:
     - id: PillIron
       amount: 5
 
 - type: entity
+  name: pill canister (copper 10u)
   parent: PillCanister
   id: PillCanisterCopper
   suffix: Copper, 5
   components:
+  - type: Label
+    currentLabel: copper 10u
   - type: StorageFill
     contents:
     - id: PillCopper
       amount: 5
 
 - type: entity
-  name: kelotane pill (10u)
+  name: pill (kelotane 10u)
   parent: Pill
   id: PillKelotane
   components:
+  - type: Pill
+    pillType: 3
+  - type: Sprite
+    state: pill4
+  - type: Label
+    currentLabel: kelotane 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -445,20 +527,29 @@
           Quantity: 10
 
 - type: entity
+  name: pill canister (kelotane 10u)
   parent: PillCanister
   id: PillCanisterKelotane
   suffix: Kelotane, 5
   components:
+  - type: Label
+    currentLabel: kelotane 10u
   - type: StorageFill
     contents:
     - id: PillKelotane
       amount: 5
 
 - type: entity
-  name: dermaline pill (10u)
+  name: pill (dermaline 10u)
   parent: Pill
   id: PillDermaline
   components:
+  - type: Pill
+    pillType: 7
+  - type: Sprite
+    state: pill8
+  - type: Label
+    currentLabel: dermaline 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -468,10 +559,13 @@
           Quantity: 10
 
 - type: entity
+  name: pill canister (dermaline 10u)
   parent: PillCanister
   id: PillCanisterDermaline
   suffix: Dermaline, 5
   components:
+  - type: Label
+    currentLabel: dermaline 10u
   - type: StorageFill
     contents:
     - id: PillDermaline
@@ -491,10 +585,16 @@
           Quantity: 15
 
 - type: entity
-  name: tricordrazine pill (10u)
+  name: pill (tricordrazine 10u)
   parent: Pill
   id: PillTricordrazine
   components:
+  - type: Pill
+    pillType: 2
+  - type: Sprite
+    state: pill3
+  - type: Label
+    currentLabel: tricordrazine 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -504,20 +604,29 @@
           Quantity: 10
 
 - type: entity
+  name: pill canister (tricordrazine 10u)
   parent: PillCanister
   id: PillCanisterTricordrazine
   suffix: Tricordrazine, 5
   components:
+  - type: Label
+    currentLabel: tricordrazine 10u
   - type: StorageFill
     contents:
     - id: PillTricordrazine
       amount: 5
 
 - type: entity
-  name: bicaridine pill (10u)
+  name: pill (bicaridine 10u)
   parent: Pill
   id: PillBicaridine
   components:
+  - type: Pill
+    pillType: 4
+  - type: Sprite
+    state: pill5
+  - type: Label
+    currentLabel: bicaridine 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -527,23 +636,29 @@
           Quantity: 10
 
 - type: entity
+  name: pill canister (bicaridine 10u)
   parent: PillCanister
   id: PillCanisterBicaridine
   suffix: Bicaridine, 5
   components:
+  - type: Label
+    currentLabel: bicaridine 10u
   - type: StorageFill
     contents:
     - id: PillBicaridine
       amount: 5
 
 - type: entity
-  name: charcoal pill (10u)
+  name: pill (charcoal 10u)
   parent: Pill
   id: PillCharcoal
   components:
+  - type: Pill
+    pillType: 20
   - type: Sprite
-    sprite: Objects/Specific/Chemistry/pills.rsi
     state: pill21
+  - type: Label
+    currentLabel: charcoal 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -553,10 +668,13 @@
           Quantity: 10
 
 - type: entity
+  name: pill canister (charcoal 10u)
   parent: PillCanister
   id: PillCanisterCharcoal
   suffix: Charcoal, 3
   components:
+  - type: Label
+    currentLabel: charcoal 10u
   - type: StorageFill
     contents:
     - id: PillCharcoal
@@ -601,6 +719,70 @@
             - ReagentId: AmbuzolPlus
               Quantity: 5
 
+- type: entity
+  parent: PillCanister
+  id: PillCanisterRandom
+  suffix: Random
+  components:
+  - type: StorageFill
+    contents:
+    - id: PillDexalin
+      prob: 0.10
+      maxAmount: 7
+      orGroup: RandomPill
+    - id: PillDylovene
+      prob: 0.10
+      maxAmount: 7
+      orGroup: RandomPill
+    - id: PillHyronalin
+      prob: 0.10
+      maxAmount: 7
+      orGroup: RandomPill
+    - id: PillIron
+      prob: 0.10
+      maxAmount: 7
+      orGroup: RandomPill
+    - id: PillCopper
+      prob: 0.10
+      maxAmount: 7
+      orGroup: RandomPill
+    - id: PillKelotane
+      prob: 0.10
+      maxAmount: 7
+      orGroup: RandomPill
+    - id: PillDermaline
+      prob: 0.10
+      maxAmount: 7
+      orGroup: RandomPill
+    - id: PillTricordrazine
+      prob: 0.10
+      maxAmount: 7
+      orGroup: RandomPill
+    - id: PillBicaridine
+      prob: 0.10
+      maxAmount: 7
+      orGroup: RandomPill
+    - id: PillCharcoal
+      prob: 0.10
+      maxAmount: 7
+      orGroup: RandomPill
+    - id: PillAmbuzol
+      prob: 0.075
+      maxAmount: 7
+      orGroup: RandomPill
+    - id: PillAmbuzolPlus
+      prob: 0.075
+      maxAmount: 7
+      orGroup: RandomPill
+    - id: PillSpaceDrugs
+      prob: 0.075
+      maxAmount: 7
+      orGroup: RandomPill
+    - id: StrangePill
+      prob: 0.075
+      maxAmount: 7
+      orGroup: RandomPill
+
 # Syringes
 - type: entity
   name: ephedrine syringe
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
index 1ce3cc2698..f664c3a811 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -102,6 +102,8 @@
   name: ash
   description: This used to be something, but now it's not.
   components:
+  - type: Item
+    size: Tiny
   - type: Sprite
     sprite: Objects/Materials/materials.rsi
     state: ash
@@ -141,7 +143,7 @@
           reagents:
             - ReagentId: Ash
               Quantity: 5
-            - ReagentId: SpaceLube
+            - ReagentId: Necrosol
               Quantity: 5
             - ReagentId: Ectoplasm  # DeltaV - for normality crystals
               Quantity: 30          # DeltaV
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
index 7ae55be8e3..6dc78455ea 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
@@ -75,6 +75,8 @@
     sprite: Objects/Specific/Medical/Surgery/scalpel.rsi
     storedRotation: 90
   - type: MeleeWeapon
+    wideAnimationRotation: 90
+    swingLeft: true
     attackRate: 1.5
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 56fe96973d..8d195a25be 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -5,6 +5,8 @@
   description: A piece of tech that gives cyborgs new abilities.
   abstract: true
   components:
+  - type: Item
+    storedRotation: -90
   - type: Sprite
     sprite: Objects/Specific/Robotics/borgmodule.rsi
   - type: BorgModule
@@ -143,6 +145,7 @@
   - type: ItemBorgModule
     items:
     - HandheldGPSBasic
+    - HandHeldMassScannerBorg
     - HandheldStationMapUnpowered
 
 - type: entity
@@ -238,7 +241,7 @@
     - WelderExperimental
     - NetworkConfigurator
     - RemoteSignaller
-    - GasAnalyzer   
+    - GasAnalyzer
     - GeigerCounter
 
 - type: entity
@@ -319,7 +322,7 @@
 
 # medical modules
 - type: entity
-  id: BorgModuleDiagnosis
+  id: BorgModuleDiagnosis # todo: reuse when med refractor is finished
   parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
   name: diagnosis cyborg module
   components:
@@ -374,6 +377,7 @@
     - state: icon-chemist
   - type: ItemBorgModule
     items:
+    - HandheldHealthAnalyzerUnpowered
     - Beaker
     - Beaker
     - BorgDropper
@@ -489,7 +493,7 @@
     - BikeHorn
     - ClownRecorder
     - BikeHornInstrument
-   
+
 #syndicate modules
 - type: entity
   id: BorgModuleSyndicateWeapon
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml b/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
index 3a31edf7f1..9277497e4f 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
@@ -10,15 +10,11 @@
   - type: Sprite
     sprite: Objects/Specific/Security/barrier.rsi
     layers:
-    - state: "idle"
-      map: ["deployableBarrierBase"]
+    - state: idle
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
   - type: Appearance
-  - type: GenericVisualizer
-    visuals:
-      enum.DeployableBarrierVisuals.State:
-        deployableBarrierBase:
-          enum.DeployableBarrierState.Idle: {state: "idle"}
-          enum.DeployableBarrierState.Deployed: {state: "deployed"}
+  - type: LockVisuals
   - type: InteractionOutline
   - type: Physics
     bodyType: Dynamic
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Security/evidence-marker.yml b/Resources/Prototypes/Entities/Objects/Specific/Security/evidence-marker.yml
new file mode 100644
index 0000000000..0773813461
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Specific/Security/evidence-marker.yml
@@ -0,0 +1,100 @@
+- type: entity
+  abstract: true
+  parent: BaseItem
+  id: EvidenceMarker
+  name: evidence marker
+  description: A numbered yellow marker, useful for labeling evidence on a crime scene.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Detective/evidence_marker.rsi
+  - type: Item
+    sprite: Objects/Specific/Detective/evidence_marker.rsi
+    size: Tiny
+
+- type: entity
+  parent: EvidenceMarker
+  id: EvidenceMarkerOne
+  components:
+  - type: Sprite
+    state: one
+
+- type: entity
+  parent: EvidenceMarker
+  id: EvidenceMarkerTwo
+  components:
+  - type: Sprite
+    state: two
+
+- type: entity
+  parent: EvidenceMarker
+  id: EvidenceMarkerThree
+  components:
+  - type: Sprite
+    state: three
+
+- type: entity
+  parent: EvidenceMarker
+  id: EvidenceMarkerFour
+  components:
+  - type: Sprite
+    state: four
+
+- type: entity
+  parent: EvidenceMarker
+  id: EvidenceMarkerFive
+  components:
+  - type: Sprite
+    state: five
+
+- type: entity
+  parent: EvidenceMarker
+  id: EvidenceMarkerSix
+  components:
+  - type: Sprite
+    state: six
+
+- type: entity
+  parent: EvidenceMarker
+  id: EvidenceMarkerSeven
+  components:
+  - type: Sprite
+    state: seven
+
+- type: entity
+  parent: EvidenceMarker
+  id: EvidenceMarkerEight
+  components:
+  - type: Sprite
+    state: eight
+
+- type: entity
+  parent: EvidenceMarker
+  id: EvidenceMarkerNine
+  components:
+  - type: Sprite
+    state: nine
+
+- type: entity
+  name: evidence marker box
+  parent: BoxCardboard
+  id: BoxEvidenceMarkers
+  description: A pack of numbered yellow markers, useful for labeling evidence on a crime scene.
+  components:
+    - type: Item
+      shape:
+      - 0,0,1,1
+    - type: StorageFill
+      contents:
+        - id: EvidenceMarkerOne
+        - id: EvidenceMarkerTwo
+        - id: EvidenceMarkerThree
+        - id: EvidenceMarkerFour
+        - id: EvidenceMarkerFive
+        - id: EvidenceMarkerSix
+        - id: EvidenceMarkerSeven
+        - id: EvidenceMarkerEight
+        - id: EvidenceMarkerNine
+    - type: Sprite
+      layers:
+        - state: box_security
+        - state: evidence_markers
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
index 3f47ad6916..4a16603541 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
@@ -20,7 +20,7 @@
     - key: enum.MagicMirrorUiKey.Key
       type: MagicMirrorBoundUserInterface
   - type: MeleeWeapon
-    wideAnimationRotation: -90
+    wideAnimationRotation: -135
     attackRate: 1
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
index 659145562f..4abeea3812 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
@@ -22,7 +22,7 @@
         visible: false
         map: ["enum.WeldableLayers.BaseWelded"]
       - state: locked
-        map: ["enum.StorageVisualLayers.Lock"]
+        map: ["enum.LockVisualLayers.Lock"]
         shader: unshaded
     - type: InteractionOutline
     - type: Physics
@@ -34,7 +34,7 @@
             radius: 0.45
           density: 50
           mask:
-          - MachineMask
+          - SmallMobMask #this is so they can go under plastic flaps
           layer:
           - MachineLayer
     - type: Icon
@@ -73,6 +73,7 @@
     - type: EntityStorageVisuals
       stateDoorOpen: artifact_container_open
       stateDoorClosed: artifact_container_door
+    - type: LockVisuals
     - type: ItemSlots
     - type: ContainerContainer
       containers:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
index ff946aefe9..0dc714aba0 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
@@ -26,9 +26,6 @@
           enabled:
             True: { state: working }
             False: { state: icon }
-  - type: Tag
-    tags:
-      - DroneUsable
   - type: StaticPrice
     price: 80
   - type: PhysicalComposition
diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
index 2adce1e66b..b51517786f 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
@@ -204,6 +204,8 @@
     handle: false
     sound:
       path: /Audio/Effects/bite.ogg
+  - type: Tag
+    tags: [] # DeltaV - remove PlushieCarp tag to prevent wasting
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
index e1e565cc18..bfb3069efb 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
@@ -12,7 +12,6 @@
   - type: Tag
     tags:
     - CableCoil
-    - DroneUsable
   - type: Stack
     stackType: Cable
   - type: Sprite
@@ -221,4 +220,4 @@
   - type: Sprite
     state: coillv-10
   - type: Stack
-    count: 1
\ No newline at end of file
+    count: 1
diff --git a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
index 286078ae87..ddd3592d49 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
@@ -11,6 +11,7 @@
     sprite: Objects/Tools/Cowtools/haycutters.rsi
     state: haycutters
   - type: MeleeWeapon
+    wideAnimationRotation: -90
     damage:
       types:
         Pierce: 0
diff --git a/Resources/Prototypes/Entities/Objects/Tools/decoys.yml b/Resources/Prototypes/Entities/Objects/Tools/decoys.yml
new file mode 100644
index 0000000000..0074fe517d
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Tools/decoys.yml
@@ -0,0 +1,169 @@
+
+# Operative Balloons, looks just like the real thing!
+
+- type: entity
+  parent: [BaseItem, BaseFoldable]
+  id: BaseDecoy
+  abstract: true
+  components:
+  - type: Rotatable
+  - type: Sprite
+    sprite: Objects/Tools/Decoys/operative_decoy.rsi
+    layers:
+    - state: oballoon
+      map: ["unfoldedLayer"]
+    - state: folded
+      map: ["foldedLayer"]
+      visible: false
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+        - !type:PlaySoundBehavior
+          sound:
+            path: /Audio/Effects/pop_high.ogg
+  - type: Appearance
+  - type: Item
+    size: Normal
+  - type: RandomMetadata # No metagaming these, jimbo.
+    nameSegments:
+    - SyndicateNamesPrefix
+    - SyndicateNamesNormal
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: ToggleableLightVisuals
+  - type: Foldable
+    folded: true
+  - type: PowerCellSlot
+    cellSlotId: cell_slot
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHigh
+  - type: ContainerContainer
+    containers:
+      cell_slot: !type:ContainerSlot
+  - type: Tag
+    tags:
+    - Balloon
+    - Flashlight
+
+- type: entity
+  parent: BaseDecoy
+  id: BalloonOperative
+  name: operative balloon
+  description: Upon closer inspection, this Syndicate operative is actually a balloon.
+  components:
+  - type: HandheldLight
+    addPrefix: false
+  - type: Sprite
+    sprite: Objects/Tools/Decoys/operative_decoy.rsi
+    layers:
+    - state: oballoon
+      map: ["unfoldedLayer"]
+    - state: folded
+      map: ["foldedLayer"]
+      visible: false
+  - type: PointLight # Just like the real thing...
+    autoRot: true
+    radius: 1.5
+    energy: 2.3
+    offset: 0, -1
+    color: green
+    netsync: false
+
+- type: entity
+  parent: BaseDecoy
+  id: BalloonAgent
+  name: agent balloon
+  description: Upon closer inspection, this Syndicate agent is actually a balloon.
+  components:
+  - type: HandheldLight
+    addPrefix: false
+  - type: Sprite
+    sprite: Objects/Tools/Decoys/agent_decoy.rsi
+    layers:
+    - state: aballoon
+      map: ["unfoldedLayer"]
+    - state: folded
+      map: ["foldedLayer"]
+      visible: false
+  - type: PointLight
+    radius: 1.5
+    energy: 2.3
+    offset: 0, -1
+    color: green
+    netsync: false
+
+- type: entity
+  parent: BaseDecoy
+  id: BalloonElite
+  name: elite operative balloon
+  description: Upon closer inspection, this Syndicate elite operative is actually a balloon.
+  components:
+  - type: HandheldLight
+    addPrefix: false
+  - type: Sprite
+    sprite: Objects/Tools/Decoys/elite_decoy.rsi
+    layers:
+    - state: eballoon
+      map: ["unfoldedLayer"]
+    - state: folded
+      map: ["foldedLayer"]
+      visible: false
+  - type: PointLight
+    radius: 1.5
+    energy: 2.3
+    offset: 0, -1
+    color: red
+    netsync: false
+
+- type: entity
+  parent: BaseDecoy
+  id: BalloonJuggernaut
+  name: juggernaut balloon
+  description: Upon closer inspection, this Syndicate juggernaut is actually a balloon.
+  components:
+  - type: HandheldLight
+    addPrefix: false
+  - type: Sprite
+    sprite: Objects/Tools/Decoys/juggernaut_decoy.rsi
+    layers:
+    - state: jballoon
+      map: ["unfoldedLayer"]
+    - state: folded
+      map: ["foldedLayer"]
+      visible: false
+  - type: PointLight # Inbuilt flashlight, I guess?
+    radius: 1.5
+    energy: 2.3
+    offset: 0, -1
+    netsync: false
+
+- type: entity
+  parent: BaseDecoy
+  id: BalloonCommander
+  name: commander balloon
+  description: Upon closer inspection, this Syndicate commander is actually a balloon.
+  components:
+  - type: HandheldLight
+    addPrefix: false
+  - type: Sprite
+    sprite: Objects/Tools/Decoys/commander_decoy.rsi
+    layers:
+    - state: cballoon
+      map: ["unfoldedLayer"]
+    - state: folded
+      map: ["foldedLayer"]
+      visible: false
+  - type: PointLight
+    radius: 1.5
+    energy: 2.3
+    offset: 0, -1
+    color: green
+    netsync: false
diff --git a/Resources/Prototypes/Entities/Objects/Tools/emag.yml b/Resources/Prototypes/Entities/Objects/Tools/emag.yml
index 702b7c86be..0117d44d6d 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/emag.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/emag.yml
@@ -1,28 +1,22 @@
 - type: entity
   parent: BaseItem
-  id: Emag
+  id: EmagUnlimited
+  suffix: Unlimited
   name: cryptographic sequencer
   description: The all-in-one hacking solution. The thinking man's lockpick. The iconic EMAG.
   components:
   - type: Emag
-  - type: LimitedCharges
-  - type: AutoRecharge
   - type: Sprite
     sprite: Objects/Tools/emag.rsi
     state: icon
   - type: Item
     sprite: Objects/Tools/emag.rsi
+    storedRotation: -90
 
 - type: entity
-  parent: BaseItem
-  id: EmagUnlimited
-  suffix: Unlimited
-  name: cryptographic sequencer
-  description: The all-in-one hacking solution. The thinking man's lockpick. The iconic EMAG.
+  parent: EmagUnlimited
+  id: Emag
+  suffix: Limited
   components:
-  - type: Emag
-  - type: Sprite
-    sprite: Objects/Tools/emag.rsi
-    state: icon
-  - type: Item
-    sprite: Objects/Tools/emag.rsi
+  - type: LimitedCharges
+  - type: AutoRecharge
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
index 3f63989fff..cbc42b7587 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -7,7 +7,6 @@
   - type: Tag
     tags:
     - Flashlight
-    - DroneUsable
   - type: HandheldLight
     addPrefix: false
     blinkingBehaviourId: blinking
@@ -108,6 +107,7 @@
         visible: false
         map: [ "light" ]
   - type: MeleeWeapon
+    wideAnimationRotation: 90
     damage:
       types:
         Blunt: 10
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index e750b211a3..2f281e141a 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -39,7 +39,7 @@
         Blunt: 10
   - type: PhysicalComposition
     materialComposition:
-      Steel: 400
+      Steel: 185
   - type: StaticPrice
     price: 20
 
diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
index 5aea0d8a29..2320764d9f 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: green glowstick
   parent: BaseItem
   id: GlowstickBase
@@ -60,6 +60,9 @@
           maxDuration: 10 # 300.0
           startValue: 5.0
           endValue: 1.5
+    - type: Tag
+      tags:
+      - Trash
 
 - type: entity
   name: red glowstick
diff --git a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
index 1d9bb47e0e..7e88395336 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
@@ -25,3 +25,6 @@
           - Item
         tags:
           - Structure
+    - type: Tag
+      tags:
+      - HandLabeler # DeltaV - fish labeler
diff --git a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml b/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
new file mode 100644
index 0000000000..5647737219
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
@@ -0,0 +1,72 @@
+- type: entity
+  name: handheld mass scanner
+  parent: [ BaseItem, PowerCellSlotSmallItem]
+  id: HandHeldMassScanner
+  description: A hand-held mass scanner.
+  components:
+  - type: Item
+  - type: Sprite
+    sprite: Objects/Tools/handheld_mass_scanner.rsi
+    state: icon
+    layers:
+      - state: icon
+      - state: scanner
+        shader: unshaded
+        visible: true
+        map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+  - type: RadarConsole
+    maxRange: 64
+    followEntity: true
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.PowerCellSlotVisuals.Enabled:
+        enum.PowerDeviceVisualLayers.Powered:
+          True: { visible: true }
+          False: { visible: false }
+  - type: PowerCellDraw
+    drawRate: 3
+    useRate: 100
+  - type: ActivatableUIRequiresPowerCell
+  - type: ActivatableUI
+    key: enum.RadarConsoleUiKey.Key
+    inHandsOnly: true
+    singleUser: true
+  - type: UserInterface
+    interfaces:
+      - key: enum.RadarConsoleUiKey.Key
+        type: RadarConsoleBoundUserInterface
+  - type: StaticPrice
+    price: 150
+
+- type: entity
+  id: HandHeldMassScannerEmpty
+  parent: HandHeldMassScanner
+  suffix: Empty
+  components:
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+  - type: Sprite
+    sprite: Objects/Tools/handheld_mass_scanner.rsi
+    state: icon
+    layers:
+      - state: icon
+      - state: scanner
+        shader: unshaded
+        visible: false
+        map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+
+- type: entity
+  id: HandHeldMassScannerBorg
+  parent: HandHeldMassScanner
+  suffix: Borg
+  components:
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellMicroreactor
+        disableEject: true
+        swap: false
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
index 5c30cfdea3..86163aad67 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
@@ -19,9 +19,6 @@
       doAfter: 1
       removeOnInteract: true
     - type: Clickable
-    - type: Tag
-      tags:
-        - DroneUsable
 # TODO: Add stack sprites + visuals.
 
 - type: entity
@@ -45,9 +42,6 @@
       doAfter: 1
       removeOnInteract: true
     - type: Clickable
-    - type: Tag
-      tags:
-        - DroneUsable
 # TODO: Add stack sprites + visuals.
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
index f305eba369..bb8545d91f 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -43,6 +43,7 @@
         useSound: /Audio/Items/jaws_cut.ogg
         changeSound: /Audio/Items/change_jaws.ogg
   - type: MeleeWeapon
+    wideAnimationRotation: 90
     damage:
       types:
         Blunt: 10
diff --git a/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml b/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml
index 442e939d42..646f6a6378 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml
@@ -15,9 +15,6 @@
       amount: 8
     - id: LightBulb
       amount: 5
-  - type: Tag
-    tags:
-      - DroneUsable
   - type: StaticPrice
     price: 100
   - type: ContainerContainer
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
index dff367dc99..631e2a247e 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -74,6 +74,7 @@
           Quantity: 8
         maxVol: 8 #uses less fuel than a welder, so this isnt as bad as it looks
   - type: MeleeWeapon
+    wideAnimationRotation: 180
     damage:
       types:
         Blunt: 0
@@ -191,6 +192,7 @@
       - state: zippo-inhand-right-flame
         shader: unshaded
   - type: MeleeWeapon
+    wideAnimationRotation: 180
     damage:
       types:
         Blunt: 1 # does a little bit of damage on hit when off
diff --git a/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml b/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml
index 71032290b1..c467974b74 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml
@@ -19,8 +19,5 @@
         base:
           On: { state: tray-on }
           Off: { state: tray-off }
-  - type: Tag
-    tags:
-      - DroneUsable
   - type: StaticPrice
     price: 60
diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
index 250f570c5f..667d855997 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -24,7 +24,6 @@
       path: "/Audio/Weapons/smash.ogg"
   - type: Tag
     tags:
-    - DroneUsable
     - Toolbox
   - type: GenericVisualizer
     visuals:
@@ -170,4 +169,4 @@
   - type: UserInterface
     interfaces:
       - key: enum.ThiefBackpackUIKey.Key
-        type: ThiefBackpackBoundUserInterface
\ No newline at end of file
+        type: ThiefBackpackBoundUserInterface
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index 72f044cd89..c0a6a6a980 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -221,7 +221,6 @@
   - type: Tag
     tags:
       - Multitool
-      - DroneUsable
   - type: PhysicalComposition
     materialComposition:
       Steel: 100
@@ -271,9 +270,6 @@
           type: NetworkConfiguratorBoundUserInterface
         - key: enum.NetworkConfiguratorUiKey.Link
           type: NetworkConfiguratorBoundUserInterface
-    - type: Tag
-      tags:
-        - DroneUsable
     - type: StaticPrice
       price: 56
     - type: GuideHelp
@@ -504,7 +500,7 @@
     sprite: Objects/Tools/shovel.rsi
     state: icon
   - type: MeleeWeapon
-    wideAnimationRotation: -135
+    wideAnimationRotation: 45
     damage:
       types:
         Blunt: 14
diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
index 60dfe0f136..42b16ba053 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -183,8 +183,8 @@
       Welder:
         reagents:
         - ReagentId: WeldingFuel
-          Quantity: 25
-        maxVol: 25
+          Quantity: 50
+        maxVol: 50
   - type: Tool
     speed: 0.7
   - type: PointLight
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
index 4a8e64d9a1..8d7b94a50a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
@@ -36,6 +36,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletCaselessRiflePractice
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#dbdbdb"
 
 - type: entity
   id: CartridgeCaselessRifleRubber
@@ -44,3 +51,10 @@
   components:
   - type: CartridgeAmmo
     proto: BulletCaselessRifleRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
index 729b1e6fc0..cda812ed03 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
@@ -33,6 +33,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletLightRiflePractice
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#dbdbdb"
 
 - type: entity
   id: CartridgeLightRifleRubber
@@ -41,6 +48,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletLightRifleRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
 
 - type: entity
   id: CartridgeLightRifleIncendiary
@@ -49,6 +63,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletLightRifleIncendiary
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#ff6e52"
 
 - type: entity
   id: CartridgeLightRifleUranium
@@ -57,4 +78,10 @@
   components:
   - type: CartridgeAmmo
     proto: BulletLightRifleUranium
-
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#65fe08"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
index 950b9c7563..c5c5ad1f8d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
@@ -33,6 +33,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletMagnumPractice
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#dbdbdb"
 
 - type: entity
   id: CartridgeMagnumRubber
@@ -41,6 +48,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletMagnumRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
 
 - type: entity
   id: CartridgeMagnumIncendiary
@@ -49,6 +63,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletMagnumIncendiary
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#ff6e52"
 
 - type: entity
   id: CartridgeMagnumAP
@@ -57,6 +78,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletMagnumAP
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#0a0a0a"
 
 - type: entity
   id: CartridgeMagnumUranium
@@ -65,3 +93,11 @@
   components:
   - type: CartridgeAmmo
     proto: BulletMagnumUranium
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#65fe08"
+
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
index 50ca07cebc..69aa8664aa 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
@@ -13,8 +13,8 @@
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
     layers:
-    - state: base
-      map: ["enum.AmmoVisualLayers.Base"]
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
   - type: Appearance
   - type: SpentAmmoVisuals
 
@@ -33,6 +33,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletPistolPractice
+  -  type: Sprite
+     layers:
+       - state: base
+         map: [ "enum.AmmoVisualLayers.Base" ]
+       - state: tip
+         map: [ "enum.AmmoVisualLayers.Tip" ]
+         color: "#dbdbdb"
 
 - type: entity
   id: CartridgePistolRubber
@@ -41,6 +48,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletPistolRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
 
 - type: entity
   id: CartridgePistolIncendiary
@@ -49,6 +63,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletPistolIncendiary
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#ff6e52"
 
 - type: entity
   id: CartridgePistolUranium
@@ -57,3 +78,10 @@
   components:
   - type: CartridgeAmmo
     proto: BulletPistolUranium
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#65fe08"
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
index 98443d890d..c47688ab01 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
@@ -33,6 +33,14 @@
   components:
   - type: CartridgeAmmo
     proto: BulletRiflePractice
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#dbdbdb"
+
 
 - type: entity
   id: CartridgeRifleRubber
@@ -41,6 +49,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletRifleRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
 
 - type: entity
   id: CartridgeRifleIncendiary
@@ -49,6 +64,13 @@
   components:
   - type: CartridgeAmmo
     proto: BulletRifleIncendiary
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#ff6e52"
 
 - type: entity
   id: CartridgeRifleUranium
@@ -56,4 +78,11 @@
   parent: BaseCartridgeRifle
   components:
   - type: CartridgeAmmo
-    proto: BulletRifleUranium
\ No newline at end of file
+    proto: BulletRifleUranium
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#65fe08"
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 ec62121c6b..7f0507d686 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
@@ -12,8 +12,6 @@
     damage:
       types:
         Blunt: 4
-  - type: CanPenetrate
-    penetrationLayer: MobLayer
   - type: StaminaDamageOnCollide
     damage: 55
   - type: TimedDespawn
@@ -33,8 +31,6 @@
     damage:
       types:
         Piercing: 45
-  - type: CanPenetrate
-    penetrationLayer: MobLayer
   - type: TimedDespawn
     lifetime: 0.25
 
@@ -53,8 +49,6 @@
       types:
         Blunt: 1
         Heat: 2
-  - type: CanPenetrate
-    penetrationLayer: MobLayer
   - type: IgniteOnCollide
     fireStacks: 3
     count: 10
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
index 36b1b2a99f..e62fb9115e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: PelletShotgunSlug
   name: pellet (.50 slug)
   noSpawn: true
@@ -26,7 +26,7 @@
       types:
         Blunt: 10
   - type: StaminaDamageOnCollide
-    damage: 55 # 2 hits to stun
+    damage: 40 # 3 hits to stun
 
 - type: entity
   id: PelletShotgun
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 389b3f517b..00d1260684 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -427,6 +427,7 @@
       sprite: Objects/Weapons/Guns/Battery/disabler.rsi
       quickEquip: false
       slots:
+        - suitStorage
         - Belt
     - type: Gun
       fireRate: 2
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index ecabe2a4ab..8b31bf40ed 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -158,6 +158,8 @@
   id: WeaponTetherGun
   description: Manipulates gravity around objects to fling them at high velocities.
   components:
+    - type: Item
+      storedRotation: -90
     - type: TetherGun
       frequency: 5
       dampingRatio: 4
@@ -195,6 +197,8 @@
   id: WeaponForceGun
   description: Manipulates gravity around objects to fling them at high velocities.
   components:
+    - type: Item
+      storedRotation: -90
     - type: ForceGun
       frequency: 15
       dampingRatio: 4
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 7ca185a0e8..935e335c2a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -738,7 +738,7 @@
   - type: PointLight
     radius: 3.5
     color: blue
-    energy: 0.5 
+    energy: 0.5
 
 - type: entity
   id: BulletCap
@@ -810,8 +810,6 @@
         mask:
         - Impassable
         - BulletImpassable
-  - type: CanPenetrate
-    penetrationLayer: MobLayer
   - type: Vapor
     active: true
   - type: Appearance
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index cb10e26a3c..bc376df5ea 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -78,6 +78,8 @@
     malus: 0
   - type: Reflect
     enabled: false
+  - type: IgnitionSource
+    temperature: 700
 
 - type: entity
   name: pen
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
index 106e8bf440..b5d597715a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
@@ -59,7 +59,7 @@
     sprite: Objects/Weapons/Melee/cleaver.rsi
     state: butch
   - type: MeleeWeapon
-    wideAnimationRotation: -135
+    wideAnimationRotation: -115
     attackRate: 1.5
     damage:
       types:
@@ -130,6 +130,44 @@
   - type: Item
     sprite: Objects/Weapons/Melee/kukri_knife.rsi
 
+- type: entity
+  parent: ClothingHeadHatGreyFlatcap
+  id: BladedFlatcapGrey
+  name: grey flatcap
+  description: Fashionable for both the working class and old man Jenkins. It has glass shards hidden in the brim.
+  suffix: Bladed
+  components:
+  - type: Construction
+    graph: BladedFlatcapGrey
+    node: icon
+  - type: MeleeWeapon
+    wideAnimationRotation: 90
+    attackRate: 1.2
+    damage:
+      types:
+        Slash: 5
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Slash: 10
+  - type: Sprite
+    sprite: Clothing/Head/Hats/greyflatcap.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/greyflatcap.rsi
+
+- type: entity
+  parent: BladedFlatcapGrey
+  id: BladedFlatcapBrown
+  name: brown flatcap
+  description: Stupid clown! You made me look bad! It has glass shards hidden in the brim.
+  components:
+  - type: Construction
+    graph: BladedFlatcapBrown
+  - type: Sprite
+    sprite: Clothing/Head/Hats/brownflatcap.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/brownflatcap.rsi
+
 - type: entity
   name: shiv
   parent: BaseKnife
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
index 58452b8598..324d4ee878 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -42,9 +42,11 @@
   id: MiningDrill
   description: Powerful tool used to quickly drill through rocks
   components:
+  - type: Item
+    storedRotation: -90
   - type: Tag
     tags:
-      - Pickaxe
+    - Pickaxe
   - type: Sprite
     sprite: Objects/Tools/handdrill.rsi
     state: handdrill
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
index 51025f1645..e566f90968 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
@@ -8,6 +8,7 @@
     sprite: Objects/Weapons/Melee/sledgehammer.rsi
     state: icon
   - type: MeleeWeapon
+    wideAnimationRotation: -135
     damage:
       types:
         Blunt: 10
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 90cb751e40..326fd41aca 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -67,7 +67,7 @@
     sprite: Objects/Weapons/Grenades/flashbang.rsi
   - type: FlashOnTrigger
     range: 7
-  - type: EmitSoundOnTrigger
+  - type: SoundOnTrigger
     sound:
       path: "/Audio/Effects/flash_bang.ogg"
   - type: DeleteOnTrigger
@@ -379,3 +379,42 @@
       reagents:
       - ReagentId: TearGas
         Quantity: 50
+
+# Non-explosive "dummy" grenades to use as a distraction.
+
+- type: entity
+  name: trick grenade
+  description: All the grenade without any of the boom.
+  parent: GrenadeBase
+  id: GrenadeDummy
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Grenades/grenade.rsi
+  - type: DeleteOnTrigger
+  - type: SpawnOnTrigger
+    proto: GrenadeFlashEffect
+  - type: SoundOnTrigger
+    sound:
+      path: /Audio/Effects/Emotes/parp1.ogg
+  - type: Appearance
+  - type: TimerTriggerVisuals
+    primingSound:
+      path: /Audio/Effects/countdown.ogg
+
+- type: entity
+  name: syndicate trickybomb
+  description: A syndicate-manufactured explosive used to make an excellent distraction.
+  parent: GrenadeDummy
+  id: SyndieTrickyBomb
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Grenades/syndgrenade.rsi
+  - type: SoundOnTrigger
+    sound:
+      path: /Audio/Effects/Emotes/parp1.ogg
+  - type: Appearance
+  - type: TimerTriggerVisuals
+    primingSound:
+      path: /Audio/Effects/minibombcountdown.ogg
+      params:
+        volume: 12
diff --git a/Resources/Prototypes/Entities/Objects/base_item.yml b/Resources/Prototypes/Entities/Objects/base_item.yml
index 528069106b..55c4bbd6b7 100644
--- a/Resources/Prototypes/Entities/Objects/base_item.yml
+++ b/Resources/Prototypes/Entities/Objects/base_item.yml
@@ -23,8 +23,6 @@
     soundHit:
       collection: MetalThud
   - type: CollisionWake
-  - type: TileFrictionModifier
-    modifier: 0.5
   - type: Physics
     bodyType: Dynamic
     fixedRotation: false
diff --git a/Resources/Prototypes/Entities/Objects/base_shadow.yml b/Resources/Prototypes/Entities/Objects/base_shadow.yml
new file mode 100644
index 0000000000..2375855bf9
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/base_shadow.yml
@@ -0,0 +1,26 @@
+- type: entity
+  id: BaseShadow
+  abstract: true
+  components:
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 10
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+          - !type:PlaySoundBehavior
+            sound:
+              path: /Audio/Items/hiss.ogg
+              params:
+                variation: 0.08
+  - type: Flashable
+    collisionGroup:
+    - None
+  - type: DamagedByFlashing
+    flashDamage:
+      types:
+        Heat: 10
+  - type: Damageable
+    damageContainer: ShadowHaze
diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml
index 9d7f26cfab..5cbe349416 100644
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -38,7 +38,6 @@
   components:
     - type: GatewayGenerator
 
-
 - type: entity
   id: BaseStationShuttles
   abstract: true
@@ -47,9 +46,16 @@
       path: /Maps/Shuttles/cargo.yml
     - type: GridSpawn
       groups:
-        mining:
-          paths:
-          - /Maps/Shuttles/mining.yml
+#        trade:
+#          addComponents:
+#          - type: ProtectedGrid
+#          - type: TradeStation
+#          paths:
+#          - /Maps/Shuttles/trading_outpost.yml
+#        mining:
+#          paths:
+#          - /Maps/Shuttles/mining.yml
+        # Spawn last
         ruins:
           hide: true
           nameGrid: true
@@ -65,8 +71,6 @@
           - /Maps/Ruins/DeltaV/whiteship_ancient.yml #Delta V - Move to DV folder
           - /Maps/Ruins/DeltaV/whiteship_bluespacejumper.yml #Delta V - Move to DV folder
 
-
-
 - type: entity
   id: BaseStationShuttlesCore
   abstract: true
@@ -76,9 +80,9 @@
         cargo:
           paths:
           - /Maps/Shuttles/cargo_core.yml
-        mining:
-          paths:
-          - /Maps/Shuttles/mining.yml
+#        mining:
+#          paths:
+#          - /Maps/Shuttles/mining.yml
         ruins:
           hide: true
           nameGrid: true
@@ -132,6 +136,12 @@
   - type: SiliconLawProvider
     laws: Crewsimov
 
+- type: entity
+  id: BaseStationNews
+  abstract: true
+  components:
+    - type: StationNews
+
 - type: entity
   id: BaseStationAllEventsEligible
   abstract: true
diff --git a/Resources/Prototypes/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/Entities/Stations/nanotrasen.yml
index 0c9d50bd61..6adbeae529 100644
--- a/Resources/Prototypes/Entities/Stations/nanotrasen.yml
+++ b/Resources/Prototypes/Entities/Stations/nanotrasen.yml
@@ -10,6 +10,7 @@
   id: StandardNanotrasenStation
   parent:
     - BaseStation
+    - BaseStationNews
     - BaseStationCargo
     - BaseStationJobsSpawning
     - BaseStationRecords
diff --git a/Resources/Prototypes/Entities/Stations/syndicate.yml b/Resources/Prototypes/Entities/Stations/syndicate.yml
new file mode 100644
index 0000000000..a649416914
--- /dev/null
+++ b/Resources/Prototypes/Entities/Stations/syndicate.yml
@@ -0,0 +1,16 @@
+- type: entity
+  abstract: true
+  id: BaseStationSyndicate
+  components:
+    - type: NpcFactionMember
+      factions:
+        - Syndicate
+
+- type: entity
+  id: StandardNukieOutpost
+  parent:
+  - BaseStation
+  - BaseStationSyndicate
+  noSpawn: true
+  components:
+    - type: Transform
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
index 22aef79340..7777153bba 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
@@ -5,6 +5,7 @@
   description: What can be better then late evening under the sky with guitar and friends.
   components:
   - type: Sprite
+    noRot: true
     sprite: Structures/Decoration/bonfire.rsi
     layers:
       - state: bonfire
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
index ed35fb0110..85c9bdae3d 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
@@ -1,16 +1,13 @@
 - type: entity
-  id: HospitalCurtains
+  id: BaseCurtains
   parent: BaseStructure
   name: curtains
-  description: Contains less than 1% mercury.
+  description: Hides what others shouldn't see.
+  abstract: true
+  placement:
+    mode: SnapgridCenter
   components:
   - type: Occluder
-  - type: Sprite
-    snapCardinals: true
-    sprite: Structures/Decoration/curtains.rsi
-    layers:
-    - state: closed
-      map: ["enum.DoorVisualLayers.Base"]
   - type: AnimationPlayer
   - type: Fixtures
     fixtures:
@@ -39,10 +36,7 @@
   - type: Appearance
   - type: Damageable
     damageContainer: Inorganic
-    damageModifierSet: Wood
-  - type: Construction
-    graph: Curtains
-    node: Curtains
+    damageModifierSet: Wood  
   - type: Destructible
     thresholds:
     - trigger:
@@ -56,20 +50,304 @@
           MaterialCloth1:
             min: 1
             max: 2
-  placement:
-    mode: SnapgridCenter
+        
+- type: entity
+  id: HospitalCurtains
+  parent: BaseCurtains
+  suffix: Hospital
+  description: Contains less than 1% mercury.
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/hospital.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: Curtains
 
 - type: entity
   id: HospitalCurtainsOpen
   parent: HospitalCurtains
-  suffix: Open
+  suffix: Open, Hospital
   components:
   - type: Door
     state: Open
   - type: Occluder
     enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsOpen
   - type: Physics
     canCollide: false
+
+- type: entity
+  id: CurtainsBlack
+  parent: BaseCurtains
+  suffix: Fancy black
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/black.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
   - type: Construction
     graph: Curtains
-    node: CurtainsOpen
+    node: CurtainsBlack
+
+- type: entity
+  id: CurtainsBlackOpen
+  parent: CurtainsBlack
+  suffix: Open, Fancy black
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsBlackOpen
+  - type: Physics
+    canCollide: false
+
+- type: entity
+  id: CurtainsBlue
+  parent: BaseCurtains
+  suffix: Fancy blue
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/blue.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: CurtainsBlue
+
+- type: entity
+  id: CurtainsBlueOpen
+  parent: CurtainsBlue
+  suffix: Open, Fancy blue
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsBlueOpen
+  - type: Physics
+    canCollide: false
+
+- type: entity
+  id: CurtainsCyan
+  parent: BaseCurtains
+  suffix: Fancy cyan
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/cyan.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: CurtainsCyan
+
+- type: entity
+  id: CurtainsCyanOpen
+  parent: CurtainsCyan
+  suffix: Open, Fancy cyan
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsCyanOpen
+  - type: Physics
+    canCollide: false
+
+- type: entity
+  id: CurtainsGreen
+  parent: BaseCurtains
+  suffix: Fancy green
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/green.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: CurtainsGreen
+
+- type: entity
+  id: CurtainsGreenOpen
+  parent: CurtainsGreen
+  suffix: Open, Fancy green
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsGreenOpen
+  - type: Physics
+    canCollide: false
+
+- type: entity
+  id: CurtainsOrange
+  parent: BaseCurtains
+  suffix: Fancy orange
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/orange.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: CurtainsOrange
+
+- type: entity
+  id: CurtainsOrangeOpen
+  parent: CurtainsOrange
+  suffix: Open, Fancy orange
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsOrangeOpen
+  - type: Physics
+    canCollide: false
+
+- type: entity
+  id: CurtainsPink
+  parent: BaseCurtains
+  suffix: Fancy pink
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/pink.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: CurtainsPink
+
+- type: entity
+  id: CurtainsPinkOpen
+  parent: CurtainsPink
+  suffix: Open, Fancy pink
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsPinkOpen
+  - type: Physics
+    canCollide: false
+
+- type: entity
+  id: CurtainsPurple
+  parent: BaseCurtains
+  suffix: Fancy purple
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/purple.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: CurtainsPurple
+
+- type: entity
+  id: CurtainsPurpleOpen
+  parent: CurtainsPurple
+  suffix: Open, Fancy purple
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsPurpleOpen
+  - type: Physics
+    canCollide: false
+
+- type: entity
+  id: CurtainsRed
+  parent: BaseCurtains
+  suffix: Fancy red
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/red.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: CurtainsRed
+
+- type: entity
+  id: CurtainsRedOpen
+  parent: CurtainsRed
+  suffix: Open, Fancy red
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsRedOpen
+  - type: Physics
+    canCollide: false
+
+- type: entity
+  id: CurtainsWhite
+  parent: BaseCurtains
+  suffix: Fancy white
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: Structures/Decoration/Curtains/white.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+  - type: Construction
+    graph: Curtains
+    node: CurtainsWhite
+
+- type: entity
+  id: CurtainsWhiteOpen
+  parent: CurtainsWhite
+  suffix: Open, Fancy white
+  components:
+  - type: Door
+    state: Open
+  - type: Occluder
+    enabled: false
+  - type: Construction
+    graph: Curtains
+    node: CurtainsWhiteOpen
+  - type: Physics
+    canCollide: false
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/statues.yml b/Resources/Prototypes/Entities/Structures/Decoration/statues.yml
index c8806c5d95..1781190e29 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/statues.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/statues.yml
@@ -6,6 +6,7 @@
   description: An ancient marble statue. The subject is depicted with a floor-length braid and is wielding a red toolbox.
   components:
   - type: Sprite
+    noRot: true
     sprite: Structures/Decoration/statues.rsi
     state: venus_red
     drawdepth: Mobs
@@ -19,6 +20,7 @@
   description: An ancient marble statue. The subject is depicted with a floor-length braid and is wielding a blue toolbox.
   components:
   - type: Sprite
+    noRot: true
     sprite: Structures/Decoration/statues.rsi
     state: venus_blue
     drawdepth: Mobs
@@ -31,6 +33,7 @@
   description: A bananium statue. It portrays the return of the savior who will rise up and lead the clowns to the great honk.
   components:
   - type: Sprite
+    noRot: true
     sprite: Structures/Decoration/statues.rsi
     state: bananium_clown
     drawdepth: Mobs
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index f0cb0b80a2..82cdcde7c0 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -465,6 +465,14 @@
   - type: AccessReader
     access: [["Lawyer"]]
 
+- type: entity
+  parent: AirlockGlass
+  id: AirlockTheatreGlassLocked
+  suffix: Theatre, Locked
+  components:
+  - type: AccessReader
+    access: [["Theatre"]]
+
 - type: entity
   parent: AirlockGlass
   id: AirlockBarGlassLocked
@@ -529,6 +537,14 @@
   - type: AccessReader
     access: [["Kitchen"]]
 
+- type: entity
+  parent: AirlockGlass
+  id: AirlockJanitorGlassLocked
+  suffix: Janitor, Locked
+  components:
+  - type: AccessReader
+    access: [["Janitor"]]
+
 - type: entity
   parent: AirlockGlass
   id: AirlockHydroGlassLocked
@@ -584,7 +600,7 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
-    
+
 - type: entity
   parent: AirlockChemistryGlass
   id: AirlockChemistryGlassLocked
@@ -1283,3 +1299,14 @@
   components:
   - type: AccessReader
     access: [["Armory"]]
+
+#Airtight hatch
+
+- type: entity
+  parent: AirlockHatch
+  id: AirlockHatchSyndicate
+  suffix: Syndicate, Locked
+  components:
+  - type: AccessReader
+    access: [["SyndicateAgent"]]
+
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
index 2fc5817287..c464c70a15 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml
@@ -2,7 +2,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyAtmospherics
-  name: airlock assembly
   suffix: Atmospherics
   components:
   - type: Sprite
@@ -12,7 +11,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyAtmosphericsGlass
-  name: airlock assembly
   suffix: Atmospherics, Glass
   components:
   - type: Sprite
@@ -23,7 +21,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCargo
-  name: airlock assembly
   suffix: Cargo
   components:
   - type: Sprite
@@ -33,18 +30,41 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCargoGlass
-  name: airlock assembly
   suffix: Cargo, Glass
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/cargo.rsi
     state: "assembly"
 
+#Clockwork
+- type: entity
+  id: PinionAirlockAssembly
+  name: airlock assembly
+  suffix: Pinion, Clockwork
+  parent: AirlockAssembly
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi
+    state: "assembly"
+  - type: Construction
+    graph: PinionAirlock
+    node: assembly
+  placement:
+    mode: SnapgridCenter
+
+- type: entity
+  parent: PinionAirlockAssembly
+  id: PinionAirlockAssemblyGlass
+  suffix: Pinion, Clockwork, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi
+    state: "assembly"
+
 #Command
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCommand
-  name: airlock assembly
   suffix: Command
   components:
   - type: Sprite
@@ -54,7 +74,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCommandGlass
-  name: airlock assembly
   suffix: Command, Glass
   components:
   - type: Sprite
@@ -65,7 +84,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyEngineering
-  name: airlock assembly
   suffix: Engineering
   components:
   - type: Sprite
@@ -75,7 +93,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyEngineeringGlass
-  name: airlock assembly
   suffix: Engineering, Glass
   components:
   - type: Sprite
@@ -86,7 +103,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyExternal
-  name: airlock assembly
   suffix: External
   components:
   - type: Sprite
@@ -96,7 +112,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyExternalGlass
-  name: airlock assembly
   suffix: External, Glass
   components:
   - type: Sprite
@@ -107,7 +122,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyGlass
-  name: airlock assembly
   suffix: Glass
   components:
   - type: Sprite
@@ -118,7 +132,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyFreezer
-  name: airlock assembly
   suffix: Freezer
   components:
   - type: Sprite
@@ -129,7 +142,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyMaintenance
-  name: airlock assembly
   suffix: Maintenance
   components:
   - type: Sprite
@@ -139,7 +151,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyMaintenanceGlass
-  name: airlock assembly
   suffix: Maintenance, Glass
   components:
   - type: Sprite
@@ -150,7 +161,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyMedical
-  name: airlock assembly
   suffix: Medical
   components:
   - type: Sprite
@@ -160,7 +170,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyMedicalGlass
-  name: airlock assembly
   suffix: Medical, Glass
   components:
   - type: Sprite
@@ -171,7 +180,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyScience
-  name: airlock assembly
   suffix: Science
   components:
   - type: Sprite
@@ -181,7 +189,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyScienceGlass
-  name: airlock assembly
   suffix: Science, Glass
   components:
   - type: Sprite
@@ -192,7 +199,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblySecurity
-  name: airlock assembly
   suffix: Security
   components:
   - type: Sprite
@@ -202,7 +208,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblySecurityGlass
-  name: airlock assembly
   suffix: Security, Glass
   components:
   - type: Sprite
@@ -213,7 +218,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyShuttle
-  name: airlock assembly
   suffix: Shuttle
   components:
   - type: Sprite
@@ -223,7 +227,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyShuttleGlass
-  name: airlock assembly
   suffix: Shuttle, Glass
   components:
   - type: Sprite
@@ -234,7 +237,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyVirology
-  name: airlock assembly
   suffix: Virology
   components:
   - type: Sprite
@@ -244,7 +246,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyVirologyGlass
-  name: airlock assembly
   suffix: Virology, Glass
   components:
   - type: Sprite
@@ -255,7 +256,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCentralCommand
-  name: airlock assembly
   suffix: CentralCommand
   components:
   - type: Sprite
@@ -265,7 +265,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyCentralCommandGlass
-  name: airlock assembly
   suffix: CentralCommand, Glass
   components:
   - type: Sprite
@@ -276,7 +275,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyMining
-  name: airlock assembly
   suffix: Mining
   components:
   - type: Sprite
@@ -286,7 +284,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyMiningGlass
-  name: airlock assembly
   suffix: Mining, Glass
   components:
   - type: Sprite
@@ -297,7 +294,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblySyndicate
-  name: airlock assembly
   suffix: Syndicate
   components:
   - type: Sprite
@@ -307,7 +303,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblySyndicateGlass
-  name: airlock assembly
   suffix: Syndicate, Glass
   components:
   - type: Sprite
@@ -318,7 +313,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyShuttleSyndicate
-  name: airlock assembly
   suffix: ShuttleSyndicate
   components:
   - type: Sprite
@@ -328,7 +322,6 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyShuttleSyndicateGlass
-  name: airlock assembly
   suffix: ShuttleSyndicate, Glass
   components:
   - type: Sprite
@@ -339,9 +332,8 @@
 - type: entity
   parent: AirlockAssembly
   id: AirlockAssemblyHighSec
-  name: airlock assembly
   suffix: HighSec
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/highsec/highsec.rsi
-    state: "assembly"
\ No newline at end of file
+    state: "assembly"
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
index 9930e6631d..a185d45353 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -95,6 +95,8 @@
   - type: DeviceLinkSource
     ports:
       - DoorStatus
+    lastSignals:
+      DoorStatus: false
   - type: SoundOnOverload
   - type: SpawnOnOverload
   - type: UserInterface
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml
new file mode 100644
index 0000000000..2269358a30
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/clockwork.yml
@@ -0,0 +1,25 @@
+- type: entity
+  parent: Airlock
+  id: PinionAirlock
+  suffix: Pinion, Clockwork
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi
+  - type: Construction
+    graph: PinionAirlock
+    node: airlock
+    containers:
+    - board
+
+- type: entity
+  parent: AirlockGlass
+  id: PinionAirlockGlass
+  suffix: Pinion, Clockwork
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi
+  - type: Construction
+    graph: PinionAirlock
+    node: glassAirlock
+    containers:
+    - board
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
index f4a5debeac..87fd8ef010 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
@@ -90,6 +90,8 @@
   - type: DeviceLinkSource
     ports:
     - DoorStatus
+    lastSignals:
+      DoorStatus: false
   - type: InteractionPopup
     interactSuccessString: comp-window-knock
     messagePerceivedByOthers: comp-window-knock
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
index a86c7a44b9..8d9cedac03 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: WindoorAssembly
   name: windoor assembly
   description: It opens, it closes, and you can see through it!
@@ -73,3 +73,154 @@
     graph: Windoor
     node: assemblySecure
 
+- type: entity
+  id: WindoorAssemblyClockwork
+  name: clockwork windoor assembly
+  description: It opens, it closes, and you can see through it! This one looks tough.
+  parent: WindoorAssembly
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Windoors/clockwork_windoor.rsi
+    layers:
+    - state: open
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 450
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetBrass1:
+            min: 1
+            max: 2
+  - type: Construction
+    graph: Windoor
+    node: assemblyClockwork
+
+#plasma windoor assemblies
+- type: entity
+  id: WindoorAssemblyPlasma
+  name: Plasma windoor assembly
+  description: It opens, it closes, and you can see through it! This one looks purp-, no, pink. Wait...
+  parent: WindoorAssembly
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Windoors/plasma.rsi
+    layers:
+    - state: assembly
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 360
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 2
+          SheetPGlass1:
+            min: 1
+            max: 3
+  - type: Construction
+    graph: Windoor
+    node: pglass
+
+- type: entity
+  id: WindoorAssemblySecurePlasma
+  name: Secure Plasma windoor assembly
+  description: It opens, it closes, and you can see through it! This one looks strong and pin-, no, purple. Hold on...
+  parent: WindoorAssembly
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Windoors/plasma.rsi
+    layers:
+    - state: secure_underlay
+    - state: assembly
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlasteel1:
+            min: 1
+            max: 2
+          SheetRPGlass1:
+            min: 1
+            max: 3
+  - type: Construction
+    graph: Windoor
+    node: pglassSecure
+
+#uranium windoor assemblies
+- type: entity
+  id: WindoorAssemblyUranium
+  name: Uranium windoor assembly
+  description: It opens, it closes, and you can see through it! This one looks sickly green...
+  parent: WindoorAssembly
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Windoors/uranium.rsi
+    layers:
+    - state: assembly
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 300
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 2
+          SheetUGlass1:
+            min: 1
+            max: 3
+  - type: Construction
+    graph: Windoor
+    node: uglass
+
+- type: entity
+  id: WindoorAssemblySecureUranium
+  name: Secure Uranium windoor assembly
+  description: It opens, it closes, and you can see through it! This one looks strong and radioactive-lime-green!
+  parent: WindoorAssembly
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Windoors/uranium.rsi
+    layers:
+    - state: secure_underlay
+    - state: assembly
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlasteel1:
+            min: 1
+            max: 2
+          SheetRUGlass1:
+            min: 1
+            max: 3
+  - type: Construction
+    graph: Windoor
+    node: uglassSecure
+
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
index 4281177b4b..56167c178e 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -1,4 +1,5 @@
-- type: entity
+#Normal windoors
+- type: entity
   id: BaseWindoor
   parent: BaseStructure
   abstract: true
@@ -59,6 +60,8 @@
   - type: DeviceLinkSource
     ports:
     - DoorStatus
+    lastSignals:
+      DoorStatus: false
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Glass
@@ -192,3 +195,223 @@
     node: windoorSecure
   - type: StaticPrice
     price: 200
+
+#Plasma Windoors
+- type: entity
+  id: BasePlasmaWindoor
+  parent: BaseWindoor
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Windoors/plasma.rsi
+    layers:
+    - state: closed
+      map: [ "enum.DoorVisualLayers.Base" ]
+    - state: closed_unlit
+      shader: unshaded
+      map: [ "enum.DoorVisualLayers.BaseUnlit" ]
+    - state: welded
+      map: [ "enum.WeldableLayers.BaseWelded" ]
+    - state: bolted_unlit
+      shader: unshaded
+      map: [ "enum.DoorVisualLayers.BaseBolted" ]
+    - state: emergency_unlit
+      shader: unshaded
+      map: [ "enum.DoorVisualLayers.BaseEmergencyAccess" ]
+    - state: panel_open
+      map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+      visible: false
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 480
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 240
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassPlasma:
+            min: 1
+            max: 2
+          SheetSteel1:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Construction
+    graph: Windoor
+    node: pwindoor
+  - type: StaticPrice
+    price: 170
+  - type: RadiationBlocker
+    resistance: 2
+
+- type: entity
+  id: BaseSecurePlasmaWindoor
+  parent: BaseWindoor
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Windoors/plasma.rsi
+    layers:
+    - state: secure_underlay
+    - state: closed
+      map: [ "enum.DoorVisualLayers.Base" ]
+    - state: closed_unlit
+      shader: unshaded
+      map: [ "enum.DoorVisualLayers.BaseUnlit" ]
+    - state: welded
+      map: [ "enum.WeldableLayers.BaseWelded" ]
+    - state: bolted_unlit
+      shader: unshaded
+      map: [ "enum.DoorVisualLayers.BaseBolted" ]
+    - state: emergency_unlit
+      shader: unshaded
+      map: [ "enum.DoorVisualLayers.BaseEmergencyAccess" ]
+    - state: panel_open
+      map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+      visible: false
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 800
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 530
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassPlasma:
+            min: 1
+            max: 2
+          SheetPlasteel1:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Construction
+    graph: Windoor
+    node: pwindoorSecure
+  - type: StaticPrice
+    price: 312
+  - type: RadiationBlocker
+    resistance: 4
+
+#Uranium Windoors
+- type: entity
+  id: BaseUraniumWindoor
+  parent: BaseWindoor
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Windoors/uranium.rsi
+    layers:
+    - state: closed
+      map: [ "enum.DoorVisualLayers.Base" ]
+    - state: closed_unlit
+      shader: unshaded
+      map: [ "enum.DoorVisualLayers.BaseUnlit" ]
+    - state: welded
+      map: [ "enum.WeldableLayers.BaseWelded" ]
+    - state: bolted_unlit
+      shader: unshaded
+      map: [ "enum.DoorVisualLayers.BaseBolted" ]
+    - state: emergency_unlit
+      shader: unshaded
+      map: [ "enum.DoorVisualLayers.BaseEmergencyAccess" ]
+    - state: panel_open
+      map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+      visible: false
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 400
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 240
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassUranium:
+            min: 1
+            max: 2
+          SheetSteel1:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Construction
+    graph: Windoor
+    node: uwindoor
+  - type: StaticPrice
+    price: 180
+  - type: RadiationBlocker
+    resistance: 3
+
+- type: entity
+  id: BaseSecureUraniumWindoor
+  parent: BaseWindoor
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Windoors/uranium.rsi
+    layers:
+    - state: secure_underlay
+    - state: closed
+      map: [ "enum.DoorVisualLayers.Base" ]
+    - state: closed_unlit
+      shader: unshaded
+      map: [ "enum.DoorVisualLayers.BaseUnlit" ]
+    - state: welded
+      map: [ "enum.WeldableLayers.BaseWelded" ]
+    - state: bolted_unlit
+      shader: unshaded
+      map: [ "enum.DoorVisualLayers.BaseBolted" ]
+    - state: emergency_unlit
+      shader: unshaded
+      map: [ "enum.DoorVisualLayers.BaseEmergencyAccess" ]
+    - state: panel_open
+      map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+      visible: false
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 400
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassUranium:
+            min: 1
+            max: 2
+          SheetPlasteel1:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Construction
+    graph: Windoor
+    node: uwindoorSecure
+  - type: StaticPrice
+    price: 462
+  - type: RadiationBlocker
+    resistance: 5
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml
new file mode 100644
index 0000000000..196d45306c
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/clockwork.yml
@@ -0,0 +1,34 @@
+- type: entity
+  id: BaseClockworkWindoor
+  name: clockwork windoor
+  parent: BaseWindoor
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Windoors/clockwork_windoor.rsi
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 400
+      behaviors: #excess damage (nuke?). avoid computational cost of spawning entities.
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassClockwork:
+            min: 1
+            max: 2
+          SheetBrass1:
+            min: 2
+            max: 4
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Construction
+    graph: Windoor
+    node: windoorClockwork
+    containers:
+    - board
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
index 5d20da09e0..2b4b2c5fe0 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
@@ -1,15 +1,45 @@
-- type: entity
+- type: entity
   id: Windoor
   parent: BaseWindoor
-  name: windoor
+  name: Windoor
   description: It's a window and a sliding door. Wow!
 
 - type: entity
   id: WindoorSecure
   parent: BaseSecureWindoor
-  name: secure windoor
+  name: Secure Windoor
+  description: It's a sturdy window and a sliding door. Wow!
+
+- type: entity
+  id: WindoorClockwork
+  parent: BaseClockworkWindoor
+  name: clockwork windoor
   description: It's a sturdy window and a sliding door. Wow!
 
+- type: entity
+  id: WindoorPlasma
+  parent: BasePlasmaWindoor
+  name: Plasma Windoor
+  description: It's a pink window *and* a sliding door. Amazing!
+
+- type: entity
+  id: WindoorSecurePlasma
+  parent: BaseSecurePlasmaWindoor
+  name: Secure Plasma Windoor
+  description: It's a sturdy purple window *and* a sliding door. Spectacular!
+
+- type: entity
+  id: WindoorUranium
+  parent: BaseUraniumWindoor
+  name: Uranium Windoor
+  description: It's a window and a sliding door. Huh? Oh, and it's green!
+
+- type: entity
+  id: WindoorSecureUranium
+  parent: BaseSecureUraniumWindoor
+  name: Secure Uranium Windoor
+  description: It's a sturdy window and a sliding door. It's so neon green, it might even taste like limes!
+
 # TODO remove these with parameterized prototypes/whatever we end up doing
 # Windoors (alphabetical)
 
@@ -61,6 +91,14 @@
   - type: AccessReader
     access: [["Janitor"]]
 
+- type: entity
+  parent: WindoorPlasma
+  id: PlasmaWindoorJanitorLocked
+  suffix: Janitor, Locked, Plasma
+  components:
+  - type: AccessReader
+    access: [["Janitor"]]
+
 - type: entity
   parent: Windoor
   id: WindoorKitchenLocked
@@ -103,6 +141,22 @@
   - type: AccessReader
     access: [["Armory"]]
 
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureAtmosphericsLocked
+  suffix: Atmospherics, Locked
+  components:
+  - type: AccessReader
+    access: [["Atmospherics"]]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureBarLocked
+  suffix: Bar, Locked
+  components:
+  - type: AccessReader
+    access: [["Bar"]]
+
 #Delta V: Removed Brig Access
 #- type: entity
 #  parent: WindoorSecureSecurityLocked
@@ -136,6 +190,14 @@
   - type: AccessReader
     access: [["Chemistry"]]
 
+- type: entity
+  parent: WindoorSecurePlasma
+  id: PlasmaWindoorSecureChemistryLocked
+  suffix: Chemistry, Locked, Plasma
+  components:
+  - type: AccessReader
+    access: [["Chemistry"]]
+
 - type: entity
   parent: WindoorSecure
   id: WindoorSecureCentralCommandLocked
@@ -144,6 +206,22 @@
   - type: AccessReader
     access: [["CentralCommand"]]
 
+- type: entity
+  parent: WindoorSecurePlasma
+  id: PlasmaWindoorSecureCentralCommandLocked
+  suffix: Central Command, Locked, Plasma
+  components:
+  - type: AccessReader
+    access: [["CentralCommand"]]
+
+- type: entity
+  parent: WindoorSecureUranium
+  id: UraniumWindoorSecureCentralCommandLocked
+  suffix: Central Command, Locked, Uranium
+  components:
+  - type: AccessReader
+    access: [["CentralCommand"]]
+
 - type: entity
   parent: WindoorSecure
   id: WindoorSecureCommandLocked
@@ -152,6 +230,14 @@
   - type: AccessReader
     access: [["Command"]]
 
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureDetectiveLocked
+  suffix: Detective, Locked
+  components:
+  - type: AccessReader
+    access: [["Detective"]]
+
 - type: entity
   parent: WindoorSecure
   id: WindoorSecureEngineeringLocked
@@ -160,6 +246,22 @@
   - type: AccessReader
     access: [["Engineering"]]
 
+- type: entity
+  parent: WindoorSecurePlasma
+  id: PlasmaWindoorSecureEngineeringLocked
+  suffix: Engineering, Locked, Plasma
+  components:
+  - type: AccessReader
+    access: [["Engineering"]]
+
+- type: entity
+  parent: WindoorSecureUranium
+  id: UraniumWindoorSecureEngineeringLocked
+  suffix: Engineering, Locked, Uranium
+  components:
+  - type: AccessReader
+    access: [["Engineering"]]
+
 - type: entity
   parent: WindoorSecure
   id: WindoorSecureExternalLocked
@@ -176,6 +278,14 @@
   - type: AccessReader
     access: [["Janitor"]]
 
+- type: entity
+  parent: WindoorSecurePlasma
+  id: PlasmaWindoorSecureJanitorLocked
+  suffix: Janitor, Locked, Plasma
+  components:
+  - type: AccessReader
+    access: [["Janitor"]]
+
 - type: entity
   parent: WindoorSecure
   id: WindoorSecureKitchenLocked
@@ -224,18 +334,26 @@
   - type: AccessReader
     access: [["Research"]]
 
+- type: entity
+  parent: WindoorSecurePlasma
+  id: PlasmaWindoorSecureScienceLocked
+  suffix: Science, Locked, Plasma
+  components:
+  - type: AccessReader
+    access: [["Research"]]
+
 - type: entity
   parent: WindoorSecure
-  id: WindoorSecureHeadOfPersonnelLocked
-  suffix: HeadOfPersonnel, Locked
+  id: WindoorSecureServiceLocked
+  suffix: Service, Locked
   components:
   - type: AccessReader
-    access: [["HeadOfPersonnel"]]
+    access: [["Service"]]
 
 - type: entity
   parent: WindoorSecure
-  id: WindoorSecureAtmosphericsLocked
-  suffix: Atmospherics, Locked
+  id: WindoorSecureHeadOfPersonnelLocked
+  suffix: HeadOfPersonnel, Locked
   components:
   - type: AccessReader
-    access: [["Atmospherics"]]
+    access: [["HeadOfPersonnel"]]
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
index 63d950969d..e424b1b40b 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -403,6 +403,47 @@
     footstepSoundCollection:
       collection: FootstepTile
 
+- type: entity
+  id: TableBrass
+  parent: TableBase
+  name: brass table
+  description: A shiny, corrosion resistant brass table. Steampunk!
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/Tables/brass.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Tables/brass.rsi
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 125
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 25
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+          params:
+            volume: -6
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetBrass1:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Construction
+    graph: Table
+    node: TableBrass
+    
 - type: entity
   id: TableWood
   parent: TableBase
@@ -548,6 +589,162 @@
     footstepSoundCollection:
       collection: FootstepCarpet
 
+# Fancy tables
+
+- type: entity
+  id: TableFancyBase
+  abstract: true
+  parent: TableBase
+  name: fancy table
+  description: Expensive and rich.
+  components:
+  - type: Damageable
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 25 
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank:
+            min: 1
+            max: 1
+          MaterialCloth1:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Tag
+    tags:
+    - Wooden
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepCarpet
+
+- type: entity
+  id: TableFancyBlue
+  parent: TableFancyBase
+  suffix: Blue
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/Tables/Fancy/blue.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Tables/Fancy/blue.rsi
+  - type: Construction
+    graph: Table
+    node: TableFancyBlue
+
+- type: entity
+  id: TableFancyCyan
+  parent: TableFancyBase
+  suffix: Cyan
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/Tables/Fancy/cyan.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Tables/Fancy/cyan.rsi
+  - type: Construction
+    graph: Table
+    node: TableFancyCyan
+
+- type: entity
+  id: TableFancyBlack
+  parent: TableFancyBase
+  suffix: Black
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/Tables/Fancy/black.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Tables/Fancy/black.rsi
+  - type: Construction
+    graph: Table
+    node: TableFancyBlack
+
+- type: entity
+  id: TableFancyRed
+  parent: TableFancyBase
+  suffix: Red
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/Tables/Fancy/red.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Tables/Fancy/red.rsi
+  - type: Construction
+    graph: Table
+    node: TableFancyRed
+    
+- type: entity
+  id: TableFancyPurple
+  parent: TableFancyBase
+  suffix: Purple
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/Tables/Fancy/purple.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Tables/Fancy/purple.rsi
+  - type: Construction
+    graph: Table
+    node: TableFancyPurple
+    
+- type: entity
+  id: TableFancyPink
+  parent: TableFancyBase
+  suffix: Pink
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/Tables/Fancy/pink.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Tables/Fancy/pink.rsi
+  - type: Construction
+    graph: Table
+    node: TableFancyPink
+    
+- type: entity
+  id: TableFancyGreen
+  parent: TableFancyBase
+  suffix: Green
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/Tables/Fancy/green.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Tables/Fancy/green.rsi  
+  - type: Construction
+    graph: Table
+    node: TableFancyGreen
+    
+- type: entity
+  id: TableFancyOrange
+  parent: TableFancyBase
+  suffix: Orange
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/Tables/Fancy/orange.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Tables/Fancy/orange.rsi
+  - type: Construction
+    graph: Table
+    node: TableFancyOrange
+    
+- type: entity
+  id: TableFancyWhite
+  parent: TableFancyBase
+  suffix: White
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/Tables/Fancy/white.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Tables/Fancy/white.rsi
+  - type: Construction
+    graph: Table
+    node: TableFancyWhite
+
+#Debug
+
 - type: entity
   id: TableDebug
   parent: TableBase
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/bench.yml b/Resources/Prototypes/Entities/Structures/Furniture/bench.yml
index 76bebd6166..c61f103dda 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/bench.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/bench.yml
@@ -49,3 +49,18 @@
   - type: Construction
     graph: Seat
     node: redComfBench
+
+- type: entity
+  id: BenchBlueComfy
+  suffix: Solo. Blue
+  parent: BenchComfy
+  components:
+  - type: Sprite
+    layers:
+    - state: bench_solo_base
+      color: "#767e82"
+    - state: bench_solo_cover
+      color: "#334e6d"
+  - type: Construction
+    graph: Seat
+    node: blueComfBench
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
index fa6a00623b..e6b0476618 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
@@ -2,6 +2,7 @@
 - type: entity
   id: CarpetBase
   parent: BaseStructure
+  name: carpet
   description: "Fancy walking surface."
   abstract: true
   components:
@@ -27,93 +28,311 @@
         behaviors:
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
+  - type: Butcherable
+    butcheringType: Knife
+    butcherDelay: 2
+    spawned:
+    - id: MaterialCloth1
+      amount: 1
 
 - type: entity
   id: Carpet
   parent: CarpetBase
-  name: "red carpet"
+  suffix: Red
   components:
   - type: Sprite
     sprite: Structures/Furniture/Carpets/red_carpet.rsi
   - type: Icon
     sprite: Structures/Furniture/Carpets/red_carpet.rsi
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        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:
+              FloorCarpetItemRed:
+                min: 1
+                max: 1
 
 - type: entity
   id: CarpetBlack
   parent: CarpetBase
-  name: "black carpet"
+  suffix: Black
   components:
   - type: Clickable
   - type: Sprite
     sprite: Structures/Furniture/Carpets/black_carpet.rsi
   - type: Icon
     sprite: Structures/Furniture/Carpets/black_carpet.rsi
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        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:
+              FloorCarpetItemBlack:
+                min: 1
+                max: 1
 
 - type: entity
   id: CarpetPink
   parent: CarpetBase
-  name: "pink carpet"
+  suffix: Pink
   components:
   - type: Clickable
   - type: Sprite
     sprite: Structures/Furniture/Carpets/pink_carpet.rsi
   - type: Icon
     sprite: Structures/Furniture/Carpets/pink_carpet.rsi
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        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:
+              FloorCarpetItemPink:
+                min: 1
+                max: 1
 
 - type: entity
   id: CarpetBlue
   parent: CarpetBase
-  name: "blue carpet"
+  suffix: Blue
   components:
   - type: Clickable
   - type: Sprite
     sprite: Structures/Furniture/Carpets/blue_carpet.rsi
   - type: Icon
     sprite: Structures/Furniture/Carpets/blue_carpet.rsi
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        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:
+              FloorCarpetItemBlue:
+                min: 1
+                max: 1
 
 - type: entity
   id: CarpetGreen
   parent: CarpetBase
-  name: "green carpet"
+  suffix: Green
   components:
   - type: Clickable
   - type: Sprite
     sprite: Structures/Furniture/Carpets/green_carpet.rsi
   - type: Icon
     sprite: Structures/Furniture/Carpets/green_carpet.rsi
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        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:
+              FloorCarpetItemGreen:
+                min: 1
+                max: 1
 
 - type: entity
   id: CarpetOrange
   parent: CarpetBase
-  name: "orange carpet"
+  suffix: Orange
   components:
   - type: Clickable
   - type: Sprite
     sprite: Structures/Furniture/Carpets/orange_carpet.rsi
   - type: Icon
     sprite: Structures/Furniture/Carpets/orange_carpet.rsi
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        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:
+              FloorCarpetItemOrange:
+                min: 1
+                max: 1
 
 - type: entity
   id: CarpetSBlue
   parent: CarpetBase
-  name: "skyblue carpet"
+  suffix: Sky Blue
   components:
   - type: Clickable
   - type: Sprite
     sprite: Structures/Furniture/Carpets/skyblue_carpet.rsi
   - type: Icon
     sprite: Structures/Furniture/Carpets/skyblue_carpet.rsi
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        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:
+              FloorCarpetItemSkyBlue:
+                min: 1
+                max: 1
 
 - type: entity
   id: CarpetPurple
   parent: CarpetBase
-  name: "purple carpet"
+  suffix: Purple
   components:
   - type: Clickable
   - type: Sprite
     sprite: Structures/Furniture/Carpets/purple_carpet.rsi
   - type: Icon
     sprite: Structures/Furniture/Carpets/purple_carpet.rsi
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        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:
+              FloorCarpetItemPurple:
+                min: 1
+                max: 1
+
+- type: entity
+  id: CarpetCyan
+  parent: CarpetBase
+  suffix: Cyan
+  components:
+  - type: Clickable
+  - type: Sprite
+    sprite: Structures/Furniture/Carpets/cyan_carpet.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Carpets/cyan_carpet.rsi
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        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:
+              FloorCarpetItemCyan:
+                min: 1
+                max: 1
+
+- type: entity
+  id: CarpetWhite
+  parent: CarpetBase
+  suffix: White
+  components:
+  - type: Clickable
+  - type: Sprite
+    sprite: Structures/Furniture/Carpets/white_carpet.rsi
+  - type: Icon
+    sprite: Structures/Furniture/Carpets/white_carpet.rsi
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 100
+        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:
+              FloorCarpetItemWhite:
+                min: 1
+                max: 1
 
 # TODO nuke this once tiles support rotating sprites
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index a235cd2546..cc8cc325fb 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -49,17 +49,55 @@
   - type: StaticPrice
     price: 10
 
+#Starts unanchored, cannot be rotated while anchored
 - type: entity
   name: chair
-  id: Chair
+  id: UnanchoredChairBase
   parent: SeatBase
+  abstract: true
   components:
+  - type: Anchorable
+  - type: Rotatable
+
+#Start anchored, cannot be rotated while anchored
+- type: entity
+  name: chair
+  id: ChairBase
+  abstract: true
+  parent: UnanchoredChairBase
+  components:
+  - type: Physics
+    bodyType: Static
   - type: Transform
     anchored: true
+
+#Starts unanchored, can be rotated while anchored
+- type: entity
+  name: chair
+  id: OfficeChairBase
+  parent: UnanchoredChairBase
+  abstract: true
+  components:
+  - type: Rotatable
+    rotateWhileAnchored: true
+
+#Starts anchored, can be rotated while anchored
+- type: entity
+  name: stool
+  id: StoolBase
+  parent: OfficeChairBase
+  abstract: true
+  components:
   - type: Physics
     bodyType: Static
-  - type: Anchorable
-  - type: Rotatable
+  - type: Transform
+    anchored: true
+
+- type: entity
+  name: chair
+  id: Chair
+  parent: ChairBase
+  components:
   - type: Sprite
     state: chair
   - type: Construction
@@ -78,11 +116,9 @@
 - type: entity
   name: stool
   id: Stool
-  parent: SeatBase
+  parent: ChairBase
   description: Apply butt.
   components:
-  - type: Anchorable
-  - type: Rotatable
   - type: Sprite
     state: stool
   - type: Construction
@@ -92,29 +128,30 @@
 - type: entity
   name: bar stool
   id: StoolBar
-  parent: SeatBase
+  parent: StoolBase
   components:
-  - type: Transform
-    anchored: true
-  - type: Rotatable
-    rotateWhileAnchored: true
-  - type: Physics
-    bodyType: Static
-  - type: Anchorable
   - type: Sprite
     state: bar
   - type: Construction
     graph: Seat
     node: stoolBar
 
+- type: entity
+  name: brass chair
+  id: ChairBrass
+  parent: StoolBase
+  components:
+  - type: Sprite
+    state: brass_chair
+  - type: Construction
+    graph: Seat
+    node: chairBrass
+
 - type: entity
   name: white office chair
   id: ChairOfficeLight
-  parent: SeatBase
+  parent: OfficeChairBase
   components:
-  - type: Anchorable
-  - type: Rotatable
-    rotateWhileAnchored: true
   - type: Sprite
     state: office-white
   - type: Construction
@@ -135,15 +172,9 @@
 - type: entity
   name: comfy chair
   id: ComfyChair
-  parent: SeatBase
+  parent: ChairBase
   description: It looks comfy.
   components:
-  - type: Transform
-    anchored: true
-  - type: Physics
-    bodyType: Static
-  - type: Anchorable
-  - type: Rotatable
   - type: Sprite
     state: comfy
   - type: Construction
@@ -153,15 +184,9 @@
 - type: entity
   name: pilot seat
   id: ChairPilotSeat
-  parent: SeatBase
+  parent: ChairBase
   description: The pilot seat of a prestigious ship.
   components:
-  - type: Transform
-    anchored: true
-  - type: Physics
-    bodyType: Static
-  - type: Anchorable
-  - type: Rotatable
   - type: Sprite
     state: shuttle
   - type: Construction
@@ -171,11 +196,10 @@
 - type: entity
   name: wooden chair
   id: ChairWood
-  parent: SeatBase
+  parent: UnanchoredChairBase
   components:
   - type: Sprite
     state: wooden
-  - type: Rotatable
   - type: Construction
     graph: Seat
     node: chairWood
@@ -217,11 +241,10 @@
 
 - type: entity
   id: ChairMeat
-  parent: SeatBase
+  parent: ChairBase
   name: meat chair
   description: Uncomfortably sweaty.
   components:
-  - type: Rotatable
   - type: Sprite
     state: meat
   - type: Construction
@@ -262,13 +285,8 @@
   name: web chair
   id: ChairWeb
   description: For true web developers.
-  parent: SeatBase
+  parent: ChairBase
   components:
-  - type: Transform
-    anchored: true
-  - type: Physics
-    bodyType: Static
-  - type: Rotatable
   - type: Sprite
     sprite: Structures/Web/chair.rsi
     state: icon
@@ -338,15 +356,9 @@
 - type: entity
   name: steel bench
   id: SteelBench
-  parent: SeatBase
+  parent: ChairBase
   description: A long chair made for a metro. Really standard design.
   components:
-  - type: Transform
-    anchored: true
-  - type: Physics
-    bodyType: Static
-  - type: Anchorable
-  - type: Rotatable
   - type: Sprite
     state: steel-bench
   - type: Construction
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
index 53d268facf..59fcc7cca5 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
@@ -229,8 +229,10 @@
 - type: entity
   id: PottedPlantRD #PottedPlant25
   parent: PottedPlantBase
-  name: "RD's potted plant"
-  description: "A gift from the botanical staff, presented after the RD's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..."
+  # DeltaV - Epistemics Department - Replace Research Director with Mystagogue
+  name: Mystagogue's potted plant
+  description: "A gift from the botanical staff, presented after the Mystagogue's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..."
+  # End of modified code
   components:
   - type: Sprite
     state: plant-25
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
index 353129c5a4..a6f14b383c 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -56,5 +56,5 @@
         reagents:
         - ReagentId: Water
           Quantity: 180
-        - ReagentId: Toxin
+        - ReagentId: GastroToxin
           Quantity: 20
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
index ede31b5e56..59def55d95 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -147,7 +147,12 @@
     hasLampOnSpawn: LedLightTube
     damage:
       types:
-        Heat: 5
+        Heat: 2.5
+  - type: PointLight
+    radius: 15
+    energy: 1
+    softness: 0.9
+    color: "#EEEEFF"
 
 - type: entity
   parent: AlwaysPoweredWallLight
@@ -197,6 +202,11 @@
     damage:
       types:
         Heat: 5
+  - type: PointLight
+    radius: 10
+    energy: 2.5
+    softness: 0.9
+    color: "#FFAF38"
 
 - type: entity
   parent: AlwaysPoweredWallLight
@@ -300,6 +310,25 @@
       - Off
       - Toggle
 
+- type: entity
+  id: PoweredLEDSmallLight
+  suffix: LED
+  parent: PoweredSmallLightEmpty
+  components:
+  - type: Sprite
+    state: base
+  - type: PointLight
+    enabled: true
+    radius: 8
+    energy: 1
+    softness: 1
+    color: "#EEEEFF"
+  - type: PoweredLight
+    hasLampOnSpawn: LedLightBulb
+    damage:
+      types:
+        Heat: 2.5
+
 - type: entity
   id: PoweredSmallLight
   suffix: ""
@@ -369,6 +398,22 @@
     damage:
       types:
         Heat: 5
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#47f8ff"
+
+- type: entity
+  id: AlwaysPoweredlightCyan
+  suffix: Always Powered, Cyan
+  parent: AlwaysPoweredWallLight
+  components:
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#47f8ff"
 
 - type: entity
   id: PoweredlightBlue
@@ -380,6 +425,22 @@
     damage:
       types:
         Heat: 5
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#39a1ff"
+
+- type: entity
+  id: AlwaysPoweredlightBlue
+  suffix: Always Powered, Blue
+  parent: AlwaysPoweredWallLight
+  components:
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#39a1ff"
 
 - type: entity
   id: PoweredlightPink
@@ -391,6 +452,22 @@
     damage:
       types:
         Heat: 5
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#ff66cc"
+
+- type: entity
+  id: AlwaysPoweredlightPink
+  suffix: Always Powered, Pink
+  parent: AlwaysPoweredWallLight
+  components:
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#ff66cc"
 
 - type: entity
   id: PoweredlightOrange
@@ -402,6 +479,22 @@
     damage:
       types:
         Heat: 5
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#ff8227"
+
+- type: entity
+  id: AlwaysPoweredlightOrange
+  suffix: Always Powered, Orange
+  parent: AlwaysPoweredWallLight
+  components:
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#ff8227"
 
 - type: entity
   id: PoweredlightRed
@@ -413,6 +506,22 @@
     damage:
       types:
         Heat: 5
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#fb4747"
+
+- type: entity
+  id: AlwaysPoweredlightRed
+  suffix: Always Powered, Red
+  parent: AlwaysPoweredWallLight
+  components:
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#fb4747"
 
 - type: entity
   id: PoweredlightGreen
@@ -424,4 +533,19 @@
     damage:
       types:
         Heat: 5
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#52ff39"
 
+- type: entity
+  id: AlwaysPoweredlightGreen
+  suffix: Always Powered, Green
+  parent: AlwaysPoweredWallLight
+  components:
+  - type: PointLight
+    radius: 8
+    energy: 3
+    softness: 0.5
+    color: "#52ff39"
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
index 470733ea18..34a6f08294 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
@@ -1,9 +1,22 @@
 - type: entity
-  abstract: true
+  id: LightPostSmall
+  name: post light
+  description: "An always powered light."
+  suffix: Always Powered
   parent: BaseStructure
-  id: BaseLightStructure
   components:
-  - type: InteractionOutline
+  - type: Sprite
+    sprite: Structures/Lighting/LightPosts/small_light_post.rsi
+    snapCardinals: true
+    drawdepth: Objects
+    noRot: true
+    layers:
+    - map: ["enum.PoweredLightLayers.Base"]
+      state: base
+    - map: ["enum.PoweredLightLayers.Glow"]
+      state: glow
+      shader: unshaded
+    state: base
   - type: Fixtures
     fixtures:
       fix1:
@@ -16,6 +29,13 @@
         layer:
         - MidImpassable
         - LowImpassable
+  - type: PointLight
+    radius: 10
+    energy: 2.5
+    softness: 0.9
+    color: "#EEEEFF"
+  - type: Anchorable
+  - type: InteractionOutline
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
@@ -43,41 +63,16 @@
         sound:
           collection: MetalGlassBreak
 
-- type: entity
-  parent: BaseLightStructure
-  id: LightPostSmall
-  name: post light
-  description: "An always powered light."
-  suffix: Always Powered
-  components:
-  - type: Construction
-    graph: LightFixture
-    node: groundLight
-  - type: Sprite
-    sprite: Structures/Lighting/LightPosts/small_light_post.rsi
-    snapCardinals: true
-    layers:
-    - state: on
-      map: ["enum.PoweredLightLayers.Base"]
-    state: on
-  - type: PointLight
-    radius: 10
-    energy: 0.8
-    softness: 1
-    offset: "0, -0.5"
-
 - type: entity
   id: PoweredLightPostSmallEmpty
   name: post light
   description: "A small light post."
   suffix: Empty
-  parent: BaseLightStructure
+  parent: LightPostSmall
   components:
   - type: Sprite
     sprite: Structures/Lighting/LightPosts/small_light_post.rsi
-    layers:
-    - state: off
-      map: ["enum.PoweredLightLayers.Base"]
+    state: empty
   - type: PointLight
     enabled: false
   - type: PoweredLight
@@ -107,6 +102,12 @@
   - type: PoweredLightVisuals
     blinkingSound:
       path: "/Audio/Machines/light_tube_on.ogg"
+    spriteStateMap:
+      empty: empty
+      off: base
+      on: base
+      broken: broken
+      burned: burned
 
 - type: entity
   id: PoweredLightPostSmall
@@ -116,16 +117,43 @@
   parent: PoweredLightPostSmallEmpty
   components:
   - type: Sprite
-    layers:
-    - state: off
-      map: [ "enum.PoweredLightLayers.Base" ]
+    state: base
+  - type: PointLight
+    enabled: true
   - type: PoweredLight
     hasLampOnSpawn: LightTube
     damage:
       types:
         Heat: 20
+  - type: StaticPrice
+    price: 25
+  - type: AmbientOnPowered
+  - type: AmbientSound
+    volume: -15
+    range: 3
+    sound:
+      path: /Audio/Ambience/Objects/light_hum.ogg
+
+- type: entity
+  id: PoweredLEDLightPostSmall
+  name: post light
+  description: "A light fixture. Draws power and produces light when equipped with a light tube."
+  suffix: LED
+  parent: PoweredLightPostSmallEmpty
+  components:
+  - type: Sprite
+    state: base
   - type: PointLight
     enabled: true
+    radius: 15
+    energy: 1
+    softness: 0.9
+    color: "#EEEEFF"
+  - type: PoweredLight
+    hasLampOnSpawn: LedLightTube
+    damage:
+      types:
+        Heat: 20
   - type: StaticPrice
     price: 25
   - type: AmbientOnPowered
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
index fbe640aded..37f22bbb62 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -72,6 +72,7 @@
     - PlushieRouny
     - PlushieBee
     - PlushieSlime
+    - BalloonNT
     - BalloonCorgi
     - ToySword
     - CrayonBox
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 5927602b4d..b9e75d9df8 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -103,7 +103,7 @@
     tags:
       - Syndicate
   - type: RadarConsole
-    maxRange: 1536
+    maxRange: 384
   - type: WorldLoader
     radius: 1536
   - type: PointLight
@@ -638,9 +638,6 @@
     radius: 1.5
     energy: 1.6
     color: "#e6e227"
-  - type: Tag
-    tags:
-      - DroneUsable
 
 - type: entity
   parent: BaseComputer
@@ -967,6 +964,9 @@
       state: request
     - map: ["computerLayerKeys"]
       state: tech_key
+  - type: Anchorable
+    flags:
+    - Anchorable
   - type: CargoPalletConsole
   - type: ActivatableUI
     key: enum.CargoPalletConsoleUiKey.Sale
@@ -987,7 +987,7 @@
 - type: entity
   parent: BaseComputer
   id: ComputerMassMedia
-  name: mass-media console
+  name: news manager console
   description: Write your message to the world!
   components:
   - type: Sprite
@@ -1003,18 +1003,18 @@
   - type: Computer
     board: ComputerMassMediaCircuitboard
   - type: DeviceNetworkRequiresPower
-  - type: NewsWrite
+  - type: NewsWriter
   - type: AccessReader
     access: [[ "Command" ]]
   - type: ActivatableUI
-    key: enum.NewsWriteUiKey.Key
+    key: enum.NewsWriterUiKey.Key
   - type: ActivatableUIRequiresVision
   - type: Transform
     anchored: true
   - type: UserInterface
     interfaces:
-      - key: enum.NewsWriteUiKey.Key
-        type: NewsWriteBoundUserInterface
+      - key: enum.NewsWriterUiKey.Key
+        type: NewsWriterBoundUserInterface
 
 - type: entity
   parent: BaseComputer
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
index f150a3f63b..6ac969171e 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
@@ -85,6 +85,8 @@
         whitelist:
           components:
             - FitsInDispenser
+  - type: HealthAnalyzer
+    scanDelay: 0
   - type: UserInterface
     interfaces:
       - key: enum.HealthAnalyzerUiKey.Key
diff --git a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
index 2697e00a70..cc9f8035fe 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/anomaly_equipment.yml
@@ -140,7 +140,7 @@
     - state: locked
       shader: unshaded
       visible: false
-      map: ["enum.StorageVisualLayers.Lock"]
+      map: ["enum.LockVisualLayers.Lock"]
   - type: Transform
     noRot: false
   - type: Fixtures
@@ -203,6 +203,7 @@
         enum.PowerDeviceVisualLayers.Powered:
           True: { visible: true }
           False: { visible: false }
+  - type: LockVisuals
   - type: DeviceNetwork
     deviceNetId: Wireless
     receiveFrequencyId: BasicDevice
diff --git a/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml b/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml
index 88169ecd67..3019b8adf8 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/anomaly_sync.yml
@@ -10,7 +10,7 @@
   - type: DeviceNetwork
     deviceNetId: Wireless
   - type: WirelessNetworkConnection
-    range: 300
+    range: 100
   - type: DeviceNetworkRequiresPower
   - type: DeviceLinkSource
     ports:
@@ -39,19 +39,15 @@
         shape:
           !type:PhysShapeAabb
           bounds: "-0.35,-0.35,0.35,0.35"
-        density: 190
+        density: 100
         mask:
-        - MachineMask
-        layer:
-        - Impassable
-        - MidImpassable
-        - LowImpassable
-        hard: False
+        - ItemMask 
+        hard: True
   - type: Transform
     anchored: true
     noRot: false
   - type: ApcPowerReceiver
-    powerLoad: 15000
+    powerLoad: 2500
     needsPower: true
   - type: ItemPlacer
     whitelist:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
index 30e42d59ab..72027d2243 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/crew_monitor_server.yml
@@ -22,13 +22,15 @@
         machine_board: !type:Container
         machine_parts: !type:Container
     - type: CrewMonitoringServer
+    - type: SingletonDeviceNetServer
+      ServerType: CrewMonitoringServer
     - type: DeviceNetwork
       deviceNetId: Wireless
       transmitFrequencyId: CrewMonitor
       receiveFrequencyId: SuitSensor
       autoConnect: false
     - type: WirelessNetworkConnection
-      range: 500
+      range: 10000 # Delta-V Maximises the range for the Crew Monitor Server to make it work for Listening Post
     - type: StationLimitedNetwork
     - type: ApcPowerReceiver
       powerLoad: 200
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 30cad0ea0a..02eeca1dd1 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -85,6 +85,8 @@
     runningState: building
     staticRecipes:
       - Wirecutter
+      - Igniter
+      - Signaller
       - Screwdriver
       - Welder
       - Wrench
@@ -98,6 +100,7 @@
       - CableHVStack
       - HandheldGPSBasic
       - TRayScanner
+      - AirTank
       - GasAnalyzer
       - UtilityBelt
       - Fulton
@@ -110,9 +113,11 @@
       - Syringe
       - HandLabeler
       - LightTube
+      - LedLightTube
       - SodiumLightTube
       - ExteriorLightTube
       - LightBulb
+      - LedLightBulb
       - Bucket
       - DrinkMug
       - DrinkMugMetal
@@ -155,10 +160,11 @@
       - CellRechargerCircuitboard
       - BorgChargerCircuitboard
       - WeaponCapacitorRechargerCircuitboard
+      - HandheldStationMap
+      - ClothingHeadHatWelding
   - type: EmagLatheRecipes
     emagStaticRecipes:
        - CartridgePistol
-       - CartridgeSpecial # DeltaV - .38 Special revolver
        - CartridgeMagnum
        - ShellShotgun
        - ShellShotgunFlare
@@ -170,9 +176,12 @@
        - MagazineBoxRifle
        - MagazineBoxLightRifle
        - GrenadeBlast
+       # DeltaV - .38 special ammo - Add .38 special lethals to emagged autolathe
+       - CartridgeSpecial
+       - MagazineBoxSpecial
+       # End of modified code
     emagDynamicRecipes:
       - CartridgePistolRubber
-      - CartridgeSpecialRubber # DeltaV - .38 Special revolver
       - CartridgeMagnumRubber
       - ShellShotgunBeanbag
       - CartridgeRifleRubber
@@ -205,6 +214,16 @@
       - MagazineGrenadeEmpty
       - GrenadeEMP
       - GrenadeFlash
+      # DeltaV - .38 special ammo - Add various .38 special ammo to emagged autolathe
+      - CartridgeSpecialRubber
+      - CartridgeSpecialIncendiary
+      - CartridgeSpecialUranium
+      - CartridgeSpecialMindbreaker
+      - MagazineBoxSpecialRubber
+      - MagazineBoxSpecialIncendiary
+      - MagazineBoxSpecialUranium
+      - MagazineBoxSpecialMindbreaker
+      # End of modified code
 
 - type: entity
   id: AutolatheHyperConvection
@@ -279,7 +298,6 @@
       - Implanter
       - PillCanister
       - ChemistryEmptyBottle01
-      - Drone
       - AdvMopItem
       - WeaponSprayNozzle
       - ClothingBackpackWaterTank
@@ -288,9 +306,11 @@
       - ChemicalPayload
       - FlashPayload
       - Signaller
+      - SignallerAdvanced
       - SignalTrigger
       - VoiceTrigger
       - Igniter
+      - HandHeldMassScanner
       - PowerCellMicroreactor
       - PowerCellHigh
       - WeaponPistolCHIMP
@@ -383,6 +403,13 @@
     - UniformPrinterMachineCircuitboard
     - FloorGreenCircuit
     - FloorBlueCircuit
+    - MicrowaveMachineCircuitboard
+    - ReagentGrinderMachineCircuitboard
+    - ElectricGrillMachineCircuitboard
+    - BoozeDispenserMachineCircuitboard
+    - SodaDispenserMachineCircuitboard
+    - DeepFryerMachineCircuitboard #Nyano - Summary: adds deep fryer circuit board
+    - SpaceHeaterMachineCircuitBoard
     dynamicRecipes:
       - ThermomachineFreezerMachineCircuitBoard
       - HellfireFreezerMachineCircuitBoard
@@ -408,9 +435,6 @@
       - PowerComputerCircuitboard
       - AutolatheHyperConvectionMachineCircuitboard
       - ProtolatheHyperConvectionMachineCircuitboard
-      - ReagentGrinderMachineCircuitboard
-      - MicrowaveMachineCircuitboard
-      - ElectricGrillMachineCircuitboard
       - FatExtractorMachineCircuitboard
       - FlatpackerMachineCircuitboard
       - SheetifierMachineCircuitboard
@@ -452,8 +476,6 @@
       - ArtifactAnalyzerMachineCircuitboard
       - TraversalDistorterMachineCircuitboard
       - ArtifactCrusherMachineCircuitboard
-      - BoozeDispenserMachineCircuitboard
-      - SodaDispenserMachineCircuitboard
       - TelecomServerCircuitboard
       - MassMediaCircuitboard
     # Begin Nyano additions
@@ -466,8 +488,7 @@
       - MailingUnitElectronics
       - SalvageMagnetMachineCircuitboard
       - StationMapElectronics
-#      - MetempsychoticMachineCircuitboard
-      - DeepFryerMachineCircuitboard
+      - MetempsychoticMachineCircuitboard
     # End Nyano additions
       - SalvageExpeditionsComputerCircuitboard # DeltaV
   - type: MaterialStorage
@@ -503,7 +524,6 @@
     - SciFlash
     - BorgModuleCable
     - BorgModuleFireExtinguisher
-    - BorgModuleGPS
     - BorgModuleRadiationDetection
     - BorgModuleTool
     - BorgModuleAppraisal
@@ -553,6 +573,7 @@
     - BorgModuleMining
     #- BorgModuleGrapplingGun
     - BorgModuleAdvancedTool
+    - BorgModuleGPS
     - BorgModuleRCD
     - BorgModuleArtifact
     - BorgModuleAnomaly
@@ -677,20 +698,16 @@
       - ShellShotgunSlug
       - ShellShotgunFlare
       - ShellTranquilizer
-      - MagazinePistolSpecial # DeltaV - .38 Special psi-breaker
       - MagazinePistol
       - MagazinePistolSubMachineGun
       - MagazinePistolSubMachineGunTopMounted
       - MagazineRifle
       - MagazineLightRifle
       - MagazineBoxPistol
-      - MagazineBoxSpecial # DeltaV - .38 Special revolver
-      - MagazineBoxSpecialPractice # DeltaV - .38 Special revolver
       - MagazineBoxMagnum
       - MagazineBoxRifle
       - MagazineBoxLightRifle
       - SpeedLoaderMagnum
-      - SpeedLoaderSpecial # DeltaV - .38 Special revolver
       - ClothingOuterArmorPlateCarrier # DeltaV - plate carrier body armour
       - ClothingOuterArmorDuraVest # DeltaV - stabproof vest body armour
       - TargetHuman
@@ -703,10 +720,14 @@
       - ShellShotgunPractice
       - WeaponLaserCarbinePractice
       - WeaponDisablerPractice
+      # DeltaV - .38 special ammo - Add various .38 special ammo to security techfab
+      - MagazineBoxSpecial
+      - MagazineBoxSpecialPractice
+      - SpeedLoaderSpecial
+      - MagazinePistolSpecial
+      # End of modified code
     dynamicRecipes:
-      - CartridgeSpecialRubber # DeltaV - .38 Special revolver
       - EncryptionKeySyndie # Nyano
-      - MagazineBoxSpecialRubber # DeltaV - .38 Special revolver
       - CartridgeLightRifleIncendiary
       - CartridgeMagnumIncendiary
       - CartridgePistolIncendiary
@@ -731,8 +752,6 @@
       - MagazineBoxMagnumUranium
       - MagazineBoxPistolUranium
       - MagazineBoxRifleUranium
-      - CartridgeSpecialHoly # DeltaV - .38 Special revolver, Holy ammo
-      - CartridgeSpecialMindbreaker # DeltaV - .38 Special revolver, Mindbreaker ammo
       - ShellSoulbreaker # Nyanotrasen - Shotgun shell to get rid of psionics
       - MagazineBoxLightRifleRubber
       - MagazineBoxMagnumRubber
@@ -770,6 +789,17 @@
       - WeaponEnergyGunMini #DeltaV - Energy Gun but miniature
       - WeaponEnergyGunPistol #DeltaV - Energy Gun Mini but with the power of a normal energy gun
       - WeaponGunLaserCarbineAutomatic #DeltaV - New Laser Projectiles with a 20 round carbine
+      # DeltaV - .38 special ammo - Add various .38 special ammo to security techfab
+      - CartridgeSpecialRubber
+      - CartridgeSpecialIncendiary
+      - CartridgeSpecialUranium
+      - CartridgeSpecialHoly
+      - CartridgeSpecialMindbreaker
+      - MagazineBoxSpecialRubber
+      - MagazineBoxSpecialIncendiary
+      - MagazineBoxSpecialUranium
+      - MagazineBoxSpecialMindbreaker
+      # End of modified code
   - type: MaterialStorage
     whitelist:
       tags:
@@ -804,7 +834,6 @@
       staticRecipes:
         - CartridgePistol
         - CartridgeMagnum
-        - CartridgeSpecial # DeltaV - .38 Special revolver
         - ShellShotgun
         - ShellShotgunSlug
         - ShellShotgunFlare
@@ -813,9 +842,12 @@
         - CartridgeRifle
         - MagazineBoxPistol
         - MagazineBoxMagnum
-        - MagazineBoxSpecial # DeltaV - .38 Special revolver
         - MagazineBoxRifle
         - MagazineBoxLightRifle
+        # DeltaV - .38 special ammo - Add lethal .38 special ammo to ammo techfab
+        - CartridgeSpecial
+        - MagazineBoxSpecial
+        # End of modified code
     - type: MaterialStorage
       whitelist:
         tags:
@@ -988,10 +1020,12 @@
       - ClothingUniformJumpsuitPrisoner
       - ClothingUniformJumpskirtPrisoner
       - ClothingHeadHatQMsoft
+      - ClothingHeadHatBeretQM
       - ClothingUniformJumpsuitQM
       - ClothingUniformJumpskirtQM
       - ClothingUniformJumpsuitQMTurtleneck
       - ClothingUniformJumpskirtQMTurtleneck
+      - ClothingUniformJumpsuitQMFormal
       - ClothingHeadHatBeretRND
       - ClothingUniformJumpsuitResearchDirector
       - ClothingUniformJumpskirtResearchDirector
@@ -1015,6 +1049,7 @@
       - ClothingUniformJumpskirtWardenBlue # DeltaV - alternate sec uniforms
       - ClothingUniformJumpsuitWardenGrey # DeltaV - alternate sec uniforms
       - ClothingUniformJumpskirtWardenGrey # DeltaV - alternate sec uniforms
+      - ClothingHeadHatParamedicsoft
       # Winter outfits
       - ClothingOuterWinterCap
       - ClothingOuterWinterCE
@@ -1064,6 +1099,16 @@
       - ClothingNeckScarfStripedOrange
       - ClothingNeckScarfStripedBlack
       - ClothingNeckScarfStripedPurple
+      # Carpets
+      - Carpet
+      - CarpetBlack
+      - CarpetPink
+      - CarpetBlue
+      - CarpetGreen
+      - CarpetOrange
+      - CarpetPurple
+      - CarpetCyan
+      - CarpetWhite
   - type: EmagLatheRecipes
     emagStaticRecipes:
       - ClothingHeadHatCentcomcap
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index d1c6079a5b..4c2217e6ff 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -296,9 +296,6 @@
   - type: Advertise
     pack: ClothesMateAds
   - type: Speech
-  - type: Tag
-    tags:
-      - DroneUsable
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/clothing.rsi
     layers:
@@ -329,9 +326,6 @@
   - type: Advertise
     pack: ClothesMateAds
   - type: Speech
-  - type: Tag
-    tags:
-    - DroneUsable
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/winterdrobe.rsi
     layers:
@@ -888,7 +882,7 @@
 - type: entity
   parent: VendingMachineSeedsUnlocked
   id: VendingMachineSeeds
-  suffix: Hyroponics
+  suffix: Hydroponics
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
@@ -1103,9 +1097,6 @@
     radius: 1.5
     energy: 1.6
     color: "#c73434"
-  - type: Tag
-    tags:
-      - DroneUsable
 
 - type: entity
   parent: VendingMachine
@@ -1201,9 +1192,6 @@
     radius: 1.5
     energy: 1.6
     color: "#d4ab33"
-  - type: Tag
-    tags:
-      - DroneUsable
 
 - type: entity
   parent: VendingMachine
@@ -1336,12 +1324,20 @@
   parent: VendingMachine
   name: vending machine
   abstract: true
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wallmount
   components:
+  - type: Physics
+    canCollide: false
+  - type: Fixtures
   - type: Sprite
     drawdepth: WallMountedItems
     snapCardinals: false
+  - type: Rotatable
   - type: WallMount
-    arc: 180
+    arc: 175
   - type: Transform
     noRot: false
 
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
index e3ae06fa50..0e2a5f6fe5 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
@@ -1,15 +1,15 @@
 - type: entity
   id: PortableScrubber
-  parent: BaseStructureDynamic
+  parent: [BaseMachinePowered, ConstructibleMachine]
   name: portable scrubber
   description: It scrubs, portably!
   components:
   - type: Transform
-    noRot: true
-  - type: InteractionOutline
+    anchored: false
   - type: Physics
     bodyType: Dynamic
-    canCollide: false
+  - type: AtmosDevice
+    joinSystem: true
   - type: Fixtures
     fixtures:
       fix1:
@@ -34,9 +34,6 @@
       shader: unshaded
       visible: false
       map: ["enum.PortableScrubberVisualLayers.IsDraining"]
-  - type: Pullable
-  - type: AtmosDevice
-    joinSystem: true
   - type: PortableScrubber
     gasMixture:
       volume: 1250
@@ -49,7 +46,6 @@
         volume: 1
   - type: ApcPowerReceiver
     powerLoad: 2000
-  - type: ExtensionCableReceiver
   - type: Appearance
   - type: GenericVisualizer
     visuals:
@@ -94,13 +90,109 @@
                 min: 1
                 max: 3
               SheetGlass1:
+                min: 1
+                max: 2
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+
+- type: entity
+  id: SpaceHeater
+  parent: [BaseMachinePowered, ConstructibleMachine]
+  name: space heater
+  description: A bluespace technology device that alters local temperature. Commonly referred to as a "Space Heater".
+  suffix: Unanchored
+  components:
+  - type: Transform
+    anchored: false
+  - type: Physics
+    bodyType: Dynamic
+  - type: AtmosDevice
+    joinSystem: true
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.15,-0.35,0.15,0.5"
+        density: 100
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+  - type: ApcPowerReceiver
+    powerDisabled: true #starts off 
+  - type: Sprite
+    sprite: Structures/Piping/Atmospherics/Portable/portable_sheater.rsi
+    noRot: true
+    layers:
+    - state: sheaterOff
+      map: ["enum.SpaceHeaterVisualLayers.Main"]
+    - state: sheaterPanelOpen
+      map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.SpaceHeaterVisuals.State:
+        SpaceHeaterVisualLayers.Main:
+          Off: { state: sheaterOff }
+          StandBy: { state: sheaterStandby }
+          Heating: { state: sheaterHeat }
+          Cooling: { state: sheaterCool }
+  - type: Machine
+    board: SpaceHeaterMachineCircuitBoard
+  - type: WiresPanel
+  - type: WiresVisuals
+  - type: UserInterface
+    interfaces:
+    - key: enum.SpaceHeaterUiKey.Key
+      type: SpaceHeaterBoundUserInterface
+  - type: ActivatableUI
+    inHandsOnly: false
+    key: enum.SpaceHeaterUiKey.Key
+  - type: SpaceHeater
+  - type: GasThermoMachine
+    temperatureTolerance: 0.2
+    atmospheric: true
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 600
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+      - trigger:
+          !type:DamageTrigger
+          damage: 300
+        behaviors:
+          - !type:PlaySoundBehavior
+            sound:
+              collection: MetalBreak
+          - !type:SpawnEntitiesBehavior
+            spawn:
+              SheetSteel1:
                 min: 1
                 max: 3
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
-  - type: CollideOnAnchor
-    enable: true
-  - type: ContainerContainer
-    containers:
-      machine_board: !type:Container
-      machine_parts: !type:Container
+
+- type: entity
+  parent: SpaceHeater
+  id: SpaceHeaterAnchored
+  suffix: Anchored
+  components:
+  - type: Transform
+    anchored: true
+  - type: Physics
+    bodyType: Static
+
+- type: entity
+  parent: SpaceHeaterAnchored
+  id: SpaceHeaterEnabled
+  suffix: Anchored, Enabled
+  components:
+  - type: ApcPowerReceiver
+    powerDisabled: false
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
index 8f89c900ca..8d889ee5cb 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
@@ -19,7 +19,6 @@
       damage:
         types:
           Radiation: 25
-    - type: CanPenetrate
     - type: Physics
     - type: Fixtures
       fixtures:
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
index e5604bea08..52698f62cc 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -31,10 +31,10 @@
       shader: unshaded
       visible: false
       map: ["enum.EmitterVisualLayers.Lights"]
-    - state: lock
+    - state: locked
       shader: unshaded
       visible: false
-      map: ["enum.StorageVisualLayers.Lock"]
+      map: ["enum.LockVisualLayers.Lock"]
   - type: Emitter
   - type: Gun
     showExamineText: false
@@ -83,6 +83,7 @@
   - type: Appearance
   - type: Lock
     locked: false
+  - type: LockVisuals
   - type: AccessReader
     access: [[ "Engineering" ]]
   - type: Machine
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
index 78fdaae01a..c88adca76d 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
@@ -50,6 +50,13 @@
   - type: Anchorable
   - type: Pullable
   - type: AmeController
+    fuelSlot:
+      whitelist:
+        components:
+        - AmeFuelContainer
+      whitelistFailPopup: ame-controller-component-fuel-slot-fail-whitelist
+      lockedFailPopup: ame-controller-component-fuel-slot-fail-locked
+      insertSuccessPopup: ame-controller-component-fuel-slot-success-insert
   - type: Explosive
     explosionType: Default
     intensitySlope: 5
@@ -86,9 +93,10 @@
     state: static
   - type: PowerSupplier
     supplyRate: 0
+  - type: ItemSlots
   - type: ContainerContainer
     containers:
-      AmeFuel: !type:ContainerSlot {}
+      fuelSlot: !type:ContainerSlot
   - type: GuideHelp
     guides: [ AME, Power ]
   - type: Electrified
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
index 4948231b90..ed70b31091 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
@@ -247,6 +247,10 @@
     range: 5
     sound:
       path: /Audio/Ambience/Objects/buzzing.ogg
+  - type: GuideHelp
+    guides:
+    - RTG
+    - Power
   - type: Destructible
     thresholds:
       - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
index fdf9a5cf8f..43c0bdce12 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
@@ -444,7 +444,7 @@
     color: "#fb4747"
   - type: EntitySpawnAnomaly
     entries:
-    - settings:  
+    - settings:
         spawnOnPulse: true
         minAmount: 8
         maxAmount: 15
@@ -562,7 +562,7 @@
         maxRange: 4.5
       spawns:
       - CrystalOrange
-    - settings: 
+    - settings:
         spawnOnSuperCritical: true
         minAmount: 30
         maxAmount: 40
@@ -628,21 +628,21 @@
         minAmount: 2
         maxAmount: 5
         maxRange: 2
-      spawns: 
+      spawns:
       - KudzuFlowerFriendly
     - settings:
         spawnOnSuperCritical: true
         minAmount: 5
         maxAmount: 10
         maxRange: 6
-      spawns: 
+      spawns:
       - KudzuFlowerAngry
 
 - type: entity
   id: AnomalyFloraBulb
   name: strange glowing berry
   parent: BaseStructure
-  description: It's a beautiful strange glowing berry. It seems to have something growing inside it... 
+  description: It's a beautiful strange glowing berry. It seems to have something growing inside it...
   suffix: Flora Anomaly
   components:
   - type: Transform
@@ -782,6 +782,7 @@
     - CogChamp
     - Honk
     - Carpetium
+    - JuiceThatMakesYouWeh
   - type: Drink
     solution: anomaly
   - type: DrainableSolution
@@ -794,3 +795,57 @@
     solution: anomaly
   - type: InjectableSolution
     solution: beaker
+
+- type: entity
+  id: AnomalyShadow
+  parent: BaseAnomaly
+  suffix: Shadow
+  components:
+  - type: Sprite
+    sprite: Structures/Specific/Anomalies/shadow_anom.rsi
+    layers:
+    - state: anom
+      map: ["enum.AnomalyVisualLayers.Base"]
+    - state: pulse
+      map: ["enum.AnomalyVisualLayers.Animated"]
+      visible: false
+  - type: PointLight
+    radius: 1.5
+    energy: 12.5
+    color: "#793a80"
+  - type: AmbientSound
+    range: 5
+    volume: -5
+    sound:
+      path: /Audio/Ambience/anomaly_scary.ogg
+  - type: Anomaly
+    corePrototype: AnomalyCoreShadow
+    coreInertPrototype: AnomalyCoreShadowInert
+    anomalyContactDamage:
+      types:
+        Cold: 10
+    animationTime: 4
+    offset: "-0.1,0.1"
+  - type: EntitySpawnAnomaly
+    entries:
+    - settings:
+        spawnOnPulse: true
+        spawnOnSuperCritical: true
+        minAmount: 10
+        maxAmount: 20
+        maxRange: 4
+      spawns:
+      - ShadowKudzuWeak
+    - settings:
+        spawnOnSuperCritical: true
+        minAmount: 30
+        maxAmount: 40
+        maxRange: 50
+      spawns:
+      - ShadowKudzu
+  - type: Portal
+    arrivalSound: /Audio/Items/hiss.ogg
+    departureSound: /Audio/Items/hiss.ogg
+  - type: Tag
+    tags:
+      - SpookyFog
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
index 6e6ee057de..97f4488fd4 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
@@ -155,6 +155,19 @@
     color: "#6270bb"
     castShadows: false
 
+- type: entity
+  parent: [ BaseAnomalyCore, BaseShadow ]
+  id: AnomalyCoreShadow
+  suffix: Shadow
+  components:
+  - type: Sprite
+    sprite: Structures/Specific/Anomalies/Cores/shadow_core.rsi
+  - type: PointLight
+    radius: 1.5
+    energy: 2.0
+    color: "#793a80"
+    castShadows: false
+
 # Inert cores
 
 - type: entity
@@ -288,3 +301,16 @@
     energy: 2.0
     color: "#6270bb"
     castShadows: false
+
+- type: entity
+  parent: [ BaseAnomalyInertCore, BaseShadow ]
+  id: AnomalyCoreShadowInert
+  suffix: Shadow, Inert
+  components:
+  - type: Sprite
+    sprite: Structures/Specific/Anomalies/Cores/shadow_core.rsi
+  - type: PointLight
+    radius: 1.5
+    energy: 2.0
+    color: "#793a80"
+    castShadows: false
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index 760eb31755..897b7be6ff 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -24,10 +24,10 @@
           tankInserted:
             False: { state: can-open, visible: false }
             True: { state: can-open, visible: true }
-        enum.GasCanisterVisuals.Locked:
+        enum.LockVisuals.Locked:
           locked:
-            False: { state: can-unlocked, shader: "unshaded" }
-            True: { state: can-locked, shader: "unshaded" }
+            False: { state: unlocked, shader: "unshaded" }
+            True: { state: locked, shader: "unshaded" }
         enum.GasCanisterVisuals.PressureState:
           pressureLight:
             0: { state: can-o0, shader: "unshaded" }
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 4448d551e3..7ab24f6b5c 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
@@ -5,6 +5,7 @@
   components:
   - type: AccessReader
   - type: Lock
+  - type: LockVisuals
   - type: Sprite
     sprite: Structures/Storage/closet.rsi
     noRot: true
@@ -14,7 +15,7 @@
     - state: generic_door
       map: ["enum.StorageVisualLayers.Door"]
     - state: locked
-      map: ["enum.StorageVisualLayers.Lock"]
+      map: ["enum.LockVisualLayers.Lock"]
       shader: unshaded
     - state: welded
       visible: false
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
index d1a60566d4..66647d168f 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -116,7 +116,7 @@
   - type: ResistLocker
   - type: Weldable
   - type: WallMount
-    arc: 180
+    arc: 175
   - type: StaticPrice
     price: 50
   - type: Transform
@@ -180,6 +180,7 @@
   components:
   - type: AccessReader
   - type: Lock
+  - type: LockVisuals
   - type: Sprite
     sprite: Structures/Storage/wall_locker.rsi
     layers:
@@ -188,7 +189,7 @@
     - state: generic_door
       map: ["enum.StorageVisualLayers.Door"]
     - state: locked
-      map: ["enum.StorageVisualLayers.Lock"]
+      map: ["enum.LockVisualLayers.Lock"]
       shader: unshaded
     - state: welded
       visible: false
@@ -222,7 +223,7 @@
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
     - state: locked
-      map: ["enum.StorageVisualLayers.Lock"]
+      map: ["enum.LockVisualLayers.Lock"]
       shader: unshaded
   - type: MovedByPressure
   - type: DamageOnHighSpeedImpact
@@ -282,7 +283,6 @@
   - type: Appearance
   - type: EntityStorageVisuals
     stateBase: base
-    stateLocked: locked
-    stateUnlocked: unlocked
     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 76a88e7858..403e20b43c 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -78,6 +78,7 @@
 - type: entity
   parent: CrateGeneric
   id: CrateBaseWeldable
+  noSpawn: true
   components:
   - type: Weldable
   - type: ResistLocker
@@ -85,8 +86,10 @@
 - type: entity
   parent: CrateBaseWeldable
   id: CrateBaseSecure
+  suffix: Secure
   components:
   - type: Lock
+  - type: LockVisuals
   - type: AccessReader
   - type: Icon
     sprite: Structures/Storage/Crates/secure.rsi
@@ -101,7 +104,7 @@
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
     - state: locked
-      map: ["enum.StorageVisualLayers.Lock"]
+      map: ["enum.LockVisualLayers.Lock"]
       shader: unshaded
   - type: Damageable
     damageContainer: StructuralInorganic
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index 582e17acdf..b854fb2fc6 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -337,7 +337,7 @@
           bounds: "-0.4,-0.4,0.4,0.29"
         density: 135
         mask:
-        - LargeMobMask
+        - SmallMobMask #this is so they can go under plastic flaps
         layer:
         - LargeMobLayer
   - type: Construction
diff --git a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
new file mode 100644
index 0000000000..bdb02d2bc3
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
@@ -0,0 +1,139 @@
+- type: entity
+  id: GlassBoxLaser
+  name: glass box
+  description: A sturdy showcase for an expensive exhibit.
+  parent: BaseStructureDynamic
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Anchorable
+    delay: 4
+  - type: Transform
+    anchored: true
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Glass
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        collection: GlassSmash
+  - type: Physics
+    bodyType: Static
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Sprite
+    sprite: Structures/Storage/glassbox.rsi
+    layers:
+    - state: glassbox
+    - state: caplaser
+      map: ["enum.ItemCabinetVisualLayers.ContainsItem"]
+      visible: true
+    - state: glass
+      map: ["enum.ItemCabinetVisualLayers.Door"]
+  - type: ItemCabinet
+    cabinetSlot:
+      ejectOnInteract: true
+      whitelist:
+        tags:
+        - WeaponAntiqueLaser
+    doorSound:
+      path: /Audio/Machines/machine_switch.ogg
+    openState: glass-up
+    closedState: glass
+  - type: Lock
+  - type: AccessReader
+    access: [["Captain"]]
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      ItemCabinet: !type:ContainerSlot
+  - type: Repairable
+  - type: Appearance
+  - type: DamageVisuals
+    thresholds: [4, 8, 12]
+    damageDivisor: 7.555
+    trackAllDamage: true
+    damageOverlay:
+      sprite: Structures/Storage/glassbox.rsi
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+        - !type:EmptyAllContainersBehaviour
+        - !type:PlaySoundBehavior
+          sound:
+            collection: WindowShatter
+        - !type:SpawnEntitiesBehavior
+          spawn:
+            ShardGlassReinforced:
+              min: 1
+              max: 1
+            GlassBoxLaserBroken:
+              min: 1
+              max: 1
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+
+- type: entity
+  id: GlassBoxLaserOpen
+  parent: GlassBoxLaser
+  suffix: Open
+  components:
+  - type: ItemCabinet
+    opened: true
+    doorSound:
+      path: /Audio/Machines/machine_switch.ogg
+    openState: glass-up
+    closedState: glass
+
+- type: entity
+  id: GlassBoxLaserFilled
+  parent: GlassBoxLaser
+  suffix: Filled
+  components:
+  - type: ItemCabinet
+    cabinetSlot:
+      startingItem: WeaponAntiqueLaser
+      ejectOnInteract: true
+      whitelist:
+        tags:
+        - WeaponAntiqueLaser
+    doorSound:
+      path: /Audio/Machines/machine_switch.ogg
+    openState: glass-up
+    closedState: glass
+
+- type: entity
+  id: GlassBoxLaserFilledOpen
+  parent: GlassBoxLaserFilled
+  suffix: Filled, Open
+  components:
+  - type: ItemCabinet
+    opened: true
+    doorSound:
+      path: /Audio/Machines/machine_switch.ogg
+    openState: glass-up
+    closedState: glass
+
+- type: entity
+  id: GlassBoxLaserBroken
+  name: broken glass box
+  description: A broken showcase for a stolen expensive exhibit.
+  parent: BaseStructureDynamic
+  suffix: Broken
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Transform
+    anchored: true
+  - type: Physics
+    bodyType: Static
+  - type: Sprite
+    sprite: Structures/Storage/glassbox.rsi
+    layers:
+    - state: glassbox
+    - state: glass-4
+  - type: Clickable
+  - type: InteractionOutline
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
index 030de6b254..1953ecd146 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
@@ -590,6 +590,15 @@
   components:
     - type: Sprite
       state: poster62_contraband
+      
+- type: entity
+  parent: PosterBase
+  id: PosterContrabandMissingSpacepen
+  name: "Missing Spacepen"
+  description: "This poster depicts something you will never find."
+  components:
+    - type: Sprite
+      state: poster63_contraband
 
 # Legit
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
index b847ed2b75..ceb9f94b58 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
@@ -97,6 +97,15 @@
   - type: Sprite
     state: direction_evac
 
+- type: entity
+  parent: BaseSignDirectional
+  id: SignDirectionalExam
+  name: exam sign
+  description: A direction sign, pointing out which way the examination room(s) are.
+  components:
+  - type: Sprite
+    state: direction_exam
+
 - type: entity
   parent: BaseSignDirectional
   id: SignDirectionalFood
@@ -133,6 +142,15 @@
   - type: Sprite
     state: direction_hydro
 
+- type: entity
+  parent: BaseSignDirectional
+  id: SignDirectionalIcu
+  name: icu sign
+  description: A direction sign, pointing out which way the ICU is.
+  components:
+  - type: Sprite
+    state: direction_icu
+
 - type: entity
   parent: BaseSignDirectional
   id: SignDirectionalJanitor
@@ -226,6 +244,15 @@
   - type: Sprite
     state: ai
 
+- type: entity
+  parent: BaseSign
+  id: SignArcade
+  name: arcade sign
+  description: A sign indicating the arcade.
+  components:
+  - type: Sprite
+    state: arcade
+
 - type: entity
   parent: BaseSign
   id: SignArmory
@@ -289,6 +316,15 @@
   - type: Sprite
     state: bar
 
+- type: entity
+  parent: BaseSign
+  id: SignBarbershop
+  name: barbershop sign
+  description: A sign indicating the barbershop.
+  components:
+  - type: Sprite
+    state: barbershop
+
 - type: entity
   parent: BaseSign
   id: SignBio
@@ -561,6 +597,15 @@
   - type: Sprite
     state: janitor
 
+- type: entity
+  parent: BaseSign
+  id: SignLaundromat
+  name: laundromat sign
+  description: A sign indicating the laundromat.
+  components:
+  - type: Sprite
+    state: laundromat
+
 - type: entity
   parent: BaseSign
   id: SignLawyer
@@ -615,6 +660,15 @@
   - type: Sprite
     state: morgue
 
+- type: entity
+  parent: BaseSign
+  id: SignNews
+  name: news sign
+  description: A sign indicating where the Reporter works.
+  components:
+  - type: Sprite
+    state: news
+
 - type: entity
   parent: BaseSign
   id: SignNosmoking
@@ -642,6 +696,15 @@
   - type: Sprite
     state: psychology
 
+- type: entity
+  parent: BaseSign
+  id: SignReception
+  name: reception sign
+  description: A sign indicating the reception.
+  components:
+  - type: Sprite
+    state: reception
+
 - type: entity
   parent: BaseSign
   id: SignRND
@@ -660,6 +723,15 @@
   - type: Sprite
     state: robo
 
+- type: entity
+  parent: BaseSign
+  id: SignSalvage
+  name: salvage sign
+  description: A sign indicating the salvage area.
+  components:
+  - type: Sprite
+    state: salvage
+
 - type: entity
   parent: BaseSign
   id: SignScience
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
index 80a8e8ea20..62f2000593 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
@@ -30,6 +30,10 @@
     - AirDanger
     - AirWarning
     - AirNormal
+    lastSignals:
+      AirDanger: false
+      AirWarning: false
+      AirNormal: false
   - type: AtmosAlarmable
     syncWith:
     - AirAlarm
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
index 517d2d697d..d9f4a827cc 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
@@ -4,7 +4,7 @@
   description: A small wall mounted cabinet designed to hold a defibrillator.
   components:
     - type: WallMount
-      arc: 90
+      arc: 175
     - type: Transform
       anchored: true
     - type: Clickable
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml
index 5b8e4a32f4..451495f58d 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml
@@ -5,6 +5,7 @@
   description: Finally, some decent reception around here...
   components:
   - type: Sprite
+    noRot: true
     drawdepth: SmallObjects
     layers:
     - map: ["computerLayerBody"]
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
index 1b285348d5..8fe6064b95 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
@@ -34,6 +34,8 @@
     - On
     - Off
     - Status
+    lastSignals:
+      Status: false
 
 - type: entity
   id: SignalButton
@@ -187,7 +189,7 @@
   parent: SignalSwitch
   components:
   - type: WallMount
-    arc: 180
+    arc: 175
   - type: Construction
     graph: SignalSwitchDirectionalGraph
     node: SignalSwitchDirectionalNode
@@ -199,7 +201,7 @@
   parent: SignalButton
   components:
   - type: WallMount
-    arc: 180
+    arc: 175
   - type: Construction
     graph: SignalButtonDirectionalGraph
     node: SignalButtonDirectionalNode
@@ -211,7 +213,342 @@
   parent: ApcNetSwitch
   components:
   - type: WallMount
-    arc: 180
+    arc: 175
   - type: Construction
     graph: LightSwitchDirectionalGraph
     node: LightSwitchDirectionalNode
+
+# lockable buttons
+
+- type: entity
+  id: LockableButton
+  name: lockable button
+  parent: SignalButtonDirectional
+  noSpawn: true
+  components:
+  - type: Appearance
+  - type: Lock
+  - type: LockVisuals
+  - type: AccessReader
+  - type: Sprite
+    drawdepth: WallMountedItems
+    sprite: Structures/Wallmounts/locked_switch.rsi
+    layers:
+    - state: base
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+
+- type: entity
+  id: LockableButtonCaptain
+  suffix: Captain
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Captain"]]
+
+- type: entity
+  id: LockableButtonHeadOfPersonnel
+  suffix: HeadOfPersonnel
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["HeadOfPersonnel"]]
+
+- type: entity
+  id: LockableButtonChiefEngineer
+  suffix: ChiefEngineer
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["ChiefEngineer"]]
+
+- type: entity
+  id: LockableButtonChiefMedicalOfficer
+  suffix: ChiefMedicalOfficer
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["ChiefMedicalOfficer"]]
+
+- type: entity
+  id: LockableButtonHeadOfSecurity
+  suffix: HeadOfSecurity
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["HeadOfSecurity"]]
+
+- type: entity
+  id: LockableButtonResearchDirector
+  suffix: ResearchDirector
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["ResearchDirector"]]
+
+- type: entity
+  id: LockableButtonCommand
+  suffix: Command
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Command"]]
+
+- type: entity
+  id: LockableButtonCryogenics
+  suffix: Cryogenics
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Cryogenics"]]
+
+- type: entity
+  id: LockableButtonSecurity
+  suffix: Security
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Security"]]
+
+- type: entity
+  id: LockableButtonDetective
+  suffix: Detective
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Detective"]]
+
+- type: entity
+  id: LockableButtonArmory
+  suffix: Armory
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Armory"]]
+
+#- type: entity
+#  id: LockableButtonBrig
+#  suffix: Brig
+#  parent: LockableButton
+#  components:
+#  - type: AccessReader
+#    access: [["Brig"]]
+
+- type: entity
+  id: LockableButtonLawyer
+  suffix: Lawyer
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Lawyer"]]
+
+- type: entity
+  id: LockableButtonEngineering
+  suffix: Engineering
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Engineering"]]
+
+- type: entity
+  id: LockableButtonMedical
+  suffix: Medical
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Medical"]]
+
+- type: entity
+  id: LockableButtonQuartermaster
+  suffix: Quartermaster
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Quartermaster"]]
+
+- type: entity
+  id: LockableButtonSalvage
+  suffix: Salvage
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Salvage"]]
+
+- type: entity
+  id: LockableButtonCargo
+  suffix: Cargo
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Cargo"]]
+
+- type: entity
+  id: LockableButtonResearch
+  suffix: Research
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Research"]]
+
+- type: entity
+  id: LockableButtonService
+  suffix: Service
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Service"]]
+
+- type: entity
+  id: LockableButtonMaintenance
+  suffix: Maintenance
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Maintenance"]]
+
+- type: entity
+  id: LockableButtonExternal
+  suffix: External
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["External"]]
+
+- type: entity
+  id: LockableButtonJanitor
+  suffix: Janitor
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Janitor"]]
+
+- type: entity
+  id: LockableButtonTheatre
+  suffix: Theatre
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Theatre"]]
+
+- type: entity
+  id: LockableButtonBar
+  suffix: Bar
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Bar"]]
+
+- type: entity
+  id: LockableButtonChemistry
+  suffix: Chemistry
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Chemistry"]]
+
+- type: entity
+  id: LockableButtonKitchen
+  suffix: Kitchen
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Kitchen"]]
+
+- type: entity
+  id: LockableButtonChapel
+  suffix: Chapel
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Chapel"]]
+
+- type: entity
+  id: LockableButtonHydroponics
+  suffix: Hydroponics
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Hydroponics"]]
+
+- type: entity
+  id: LockableButtonAtmospherics
+  suffix: Atmospherics
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["Atmospherics"]]
+
+# button frames
+
+- type: entity
+  id: ButtonFrame
+  name: button frame
+  noSpawn: true
+  description: It's a frame to help distinguish switches visually.
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wallmount
+  components:
+  - type: Clickable
+  - type: WallMount
+    arc: 360
+  - type: Physics
+    canCollide: false
+  - type: Sprite
+    drawdepth: SmallObjects
+    sprite: Structures/Wallmounts/switch_frame.rsi
+    state: grey
+  - type: Rotatable
+  - type: Fixtures
+
+- type: entity
+  id: ButtonFrameGrey
+  parent: ButtonFrame
+  suffix: grey
+  components:
+  - type: Sprite
+    drawdepth: SmallObjects
+    sprite: Structures/Wallmounts/switch_frame.rsi
+    state: grey
+
+- type: entity
+  id: ButtonFrameCaution
+  parent: ButtonFrame
+  suffix: caution
+  components:
+  - type: Sprite
+    drawdepth: SmallObjects
+    sprite: Structures/Wallmounts/switch_frame.rsi
+    state: caution
+
+- type: entity
+  id: ButtonFrameCautionSecurity
+  parent: ButtonFrame
+  suffix: caution
+  components:
+  - type: Sprite
+    drawdepth: SmallObjects
+    sprite: Structures/Wallmounts/switch_frame.rsi
+    state: caution_security
+
+- type: entity
+  id: ButtonFrameExit
+  parent: ButtonFrame
+  suffix: exit
+  components:
+  - type: Sprite
+    drawdepth: SmallObjects
+    sprite: Structures/Wallmounts/switch_frame.rsi
+    state: exit
+
+- type: entity
+  id: ButtonFrameJanitor
+  parent: ButtonFrame
+  suffix: janitor
+  components:
+  - type: Sprite
+    drawdepth: SmallObjects
+    sprite: Structures/Wallmounts/switch_frame.rsi
+    state: janitor
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
index c8778aea50..72ea308af0 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
@@ -8,7 +8,7 @@
     - Wallmount
   components:
   - type: WallMount
-    arc: 180
+    arc: 175
   - type: Sprite
     sprite: Structures/Storage/tanks.rsi
     state: cleanerdispenser
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index aa5f1421c7..d1a6587d19 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -4,17 +4,19 @@
 #Asteroid rock
 - type: entity
   id: AsteroidRock
-  parent: BaseStructure
+  parent: BaseWall
   name: asteroid rock
-  suffix: Low Ore Yield
   description: A rocky asteroid.
   components:
-  - type: PlacementReplacement
-    key: walls
+  - type: Transform
+    noRot: true
   - type: IconSmooth
     key: walls
     mode: NoSprite
   - type: SmoothEdge
+  - type: Icon
+    sprite: Structures/Walls/rock.rsi
+    state: rock_asteroid
   - type: Sprite
     sprite: Structures/Walls/rock.rsi
     layers:
@@ -43,21 +45,6 @@
           path: /Audio/Effects/break_stone.ogg
           params:
             volume: -6
-  - type: Occluder
-  - type: Airtight
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.5,-0.5,0.5,0.5"
-        density: 100
-        mask:
-        - FullTileMask
-        layer:
-        - WallLayer
-  - type: RadiationBlocker
-    resistance: 2
 
 # Ore veins
 - type: entity
@@ -191,7 +178,7 @@
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_asteroid_west
         - state: rock_silver
-        
+
 - type: entity
   id: AsteroidRockSilverCrab
   parent: AsteroidRockSilver
@@ -223,7 +210,7 @@
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_asteroid_west
         - state: rock_tin
-        
+
 - type: entity
   id: AsteroidRockTinCrab
   parent: AsteroidRockTin
@@ -343,6 +330,28 @@
       - map: [ "enum.EdgeLayer.West" ]
         state: ironrock_west
 
+- type: entity
+  id: AsteroidRockSalt
+  parent: AsteroidRock
+  description: An ore vein rich with salt.
+  suffix: Salt
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSalt
+    - type: Sprite
+      layers:
+        - state: rock_asteroid
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_asteroid_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_asteroid_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_asteroid_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_asteroid_west
+        - state: rock_salt
+
 - type: entity
   id: IronRockMining
   parent: IronRock
@@ -358,12 +367,12 @@
 # Rocks and ore veins
 - type: entity
   id: WallRock
-  parent: BaseStructure
+  parent: BaseWall
   name: rock
   suffix: planetmap
   components:
-    - type: PlacementReplacement
-      key: walls
+    - type: Transform
+      noRot: true
     - type: SoundOnGather
     - type: Gatherable
       whitelist:
@@ -380,22 +389,12 @@
           behaviors:
             - !type:DoActsBehavior
               acts: ["Destruction"]
-    - type: Occluder
-    - type: Airtight
-    - type: Fixtures
-      fixtures:
-        fix1:
-          shape:
-            !type:PhysShapeAabb
-            bounds: "-0.5,-0.5,0.5,0.5"
-          density: 100
-          mask:
-            - FullTileMask
-          layer:
-            - WallLayer
     - type: IconSmooth
       key: walls
       mode: NoSprite
+    - type: Icon
+      sprite: Structures/Walls/rock.rsi
+      state: rock
     - type: SmoothEdge
     - type: Sprite
       sprite: Structures/Walls/rock.rsi
@@ -409,8 +408,6 @@
           state: rock_north
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_west
-    - type: RadiationBlocker
-      resistance: 2
 
 # Ore veins
 - type: entity
@@ -613,12 +610,37 @@
           state: rock_west
         - state: rock_artifact_fragment
 
+- type: entity
+  id: WallRockSalt
+  parent: WallRock
+  description: An ore vein rich with salt.
+  suffix: Salt
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSalt
+    - type: Sprite
+      layers:
+        - state: rock
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_west
+        - state: rock_salt
+
 # Basalt variants
 - type: entity
   id: WallRockBasalt
   name: basalt
   parent: WallRock
   components:
+    - type: Icon
+      sprite: Structures/Walls/rock.rsi
+      state: rock_wall
     - type: Sprite
       sprite: Structures/Walls/rock.rsi
       layers:
@@ -831,12 +853,37 @@
           state: rock_wall_west
         - state: rock_artifact_fragment
 
+- type: entity
+  id: WallRockBasaltSalt
+  parent: WallRockBasalt
+  description: An ore vein rich with salt.
+  suffix: Salt
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSalt
+    - type: Sprite
+      layers:
+        - state: rock_wall
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_wall_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_wall_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_wall_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_wall_west
+        - state: rock_salt
+
 # Snow variants
 - type: entity
   id: WallRockSnow
   name: snowdrift
   parent: WallRock
   components:
+    - type: Icon
+      sprite: Structures/Walls/rock.rsi
+      state: rock_snow
     - type: Sprite
       sprite: Structures/Walls/rock.rsi
       layers:
@@ -1049,6 +1096,27 @@
           state: rock_snow_west
         - state: rock_artifact_fragment
 
+- type: entity
+  id: WallRockSnowSalt
+  parent: WallRockSnow
+  description: An ore vein rich with salt.
+  suffix: Salt
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSalt
+    - type: Sprite
+      layers:
+        - state: rock_snow
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_snow_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_snow_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_snow_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_snow_west
+        - state: rock_salt
 
 # Sand variants
 - type: entity
@@ -1056,6 +1124,9 @@
   name: sandstone
   parent: WallRock
   components:
+    - type: Icon
+      sprite: Structures/Walls/rock.rsi
+      state: rock_sand
     - type: Sprite
       sprite: Structures/Walls/rock.rsi
       layers:
@@ -1268,12 +1339,37 @@
           state: rock_sand_west
         - state: rock_artifact_fragment
 
+- type: entity
+  id: WallRockSandSalt
+  parent: WallRockSand
+  description: An ore vein rich with salt.
+  suffix: Salt
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSalt
+    - type: Sprite
+      layers:
+        - state: rock_sand
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_sand_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_sand_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_sand_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_sand_west
+        - state: rock_salt
+
 # Chromite variants
 - type: entity
   id: WallRockChromite
   name: chromite
   parent: WallRock
   components:
+    - type: Icon
+      sprite: Structures/Walls/rock.rsi
+      state: rock_chromite
     - type: Sprite
       sprite: Structures/Walls/rock.rsi
       layers:
@@ -1486,12 +1582,37 @@
           state: rock_chromite_west
         - state: rock_artifact_fragment
 
+- type: entity
+  id: WallRockChromiteSalt
+  parent: WallRockChromite
+  description: An ore vein rich with salt.
+  suffix: Salt
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSalt
+    - type: Sprite
+      layers:
+        - state: rock_chromite
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_chromite_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_chromite_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_chromite_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_chromite_west
+        - state: rock_salt
+
 # Andesite variants
 - type: entity
   id: WallRockAndesite
   name: andesite
   parent: WallRock
   components:
+    - type: Icon
+      sprite: Structures/Walls/rock.rsi
+      state: rock_andesite
     - type: Sprite
       sprite: Structures/Walls/rock.rsi
       layers:
@@ -1703,3 +1824,25 @@
         - map: [ "enum.EdgeLayer.West" ]
           state: rock_andesite_west
         - state: rock_artifact_fragment
+
+- type: entity
+  id: WallRockAndesiteSalt
+  parent: WallRockAndesite
+  description: An ore vein rich with salt.
+  suffix: Salt
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSalt
+    - type: Sprite
+      layers:
+        - state: rock_andesite
+        - map: [ "enum.EdgeLayer.South" ]
+          state: rock_andesite_south
+        - map: [ "enum.EdgeLayer.East" ]
+          state: rock_andesite_east
+        - map: [ "enum.EdgeLayer.North" ]
+          state: rock_andesite_north
+        - map: [ "enum.EdgeLayer.West" ]
+          state: rock_andesite_west
+        - state: rock_salt
diff --git a/Resources/Prototypes/Entities/Structures/Walls/girders.yml b/Resources/Prototypes/Entities/Structures/Walls/girders.yml
index 3c9a2e7033..f3e9c826d3 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/girders.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/girders.yml
@@ -97,3 +97,44 @@
                 collection: MetalBreak
     - type: StaticPrice
       price: 66
+
+- type: entity
+  id: ClockworkGirder
+  parent: ReinforcedGirder
+  name: wall gear
+  description: A large gear with mounting brackets for additional plating; This could be made into a wall with more brass plating.
+  components:
+    - type: Sprite
+      sprite: Structures/Walls/clock.rsi
+      state: wall_gear
+    - type: Construction
+      graph: ClockworkGirder
+      node: clockGirder
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 200
+          behaviors:
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+            - !type:PlaySoundBehavior
+              sound:
+                collection: MetalBreak
+        - trigger:
+            !type:DamageTrigger
+            damage: 50
+          behaviors:
+            - !type:SpawnEntitiesBehavior
+              spawn:
+                SheetBrass1:
+                  min: 1
+                  max: 2
+                PartRodMetal1:
+                  min: 1
+                  max: 2
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+            - !type:PlaySoundBehavior
+              sound:
+                collection: MetalBreak
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Walls/grille.yml b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
index 1d9e0b3a5c..b532db221d 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
@@ -87,6 +87,26 @@
             False: { visible: False }
     - type: AnimationPlayer
 
+- type: entity
+  id: ClockworkGrille
+  parent: Grille
+  name: clockwork grille
+  description: a flimsy framework of iron rods assembled in traditional Ratvarian fashion.
+  components:
+    - type: Sprite
+      drawdepth: Walls
+      sprite: Structures/Walls/clockwork_grille.rsi
+      state: ratvargrille
+      layers:
+        - state: ratvargrille
+    - type: Icon
+      sprite: Structures/Walls/clockwork_grille.rsi
+      state: ratvargrille
+    - type: Construction
+      graph: ClockGrille
+      node: clockGrille
+      deconstructionTarget: start
+
 - type: entity
   id: GrilleBroken
   parent: BaseStructure
@@ -125,6 +145,23 @@
             - !type:DoActsBehavior
               acts: ["Destruction"]
 
+- type: entity
+  id: ClockworkGrilleBroken
+  parent: GrilleBroken
+  name: clockwork grille
+  description: A flimsy framework of iron rods assembled in traditional Ratvarian fashion. It has seen better days.
+  components:
+    - type: Sprite
+      drawdepth: Walls
+      sprite: Structures/Walls/clockwork_grille.rsi
+      state: brokenratvargrille
+    - type: Icon
+      sprite: Structures/Walls/clockwork_grille.rsi
+      state: brokenratvargrille
+    - type: Construction
+      graph: ClockGrille
+      node: clockGrilleBroken
+
 - type: entity
   id: GrilleDiagonal
   parent: Grille
@@ -158,4 +195,40 @@
           - WallLayer
     - type: Construction
       graph: GrilleDiagonal
-      node: grilleDiagonal
\ No newline at end of file
+      node: grilleDiagonal
+
+- type: entity
+  id: ClockworkGrilleDiagonal
+  parent: ClockworkGrille
+  name: diagonal clockwork grille
+  components:
+    - type: Sprite
+      drawdepth: Walls
+      sprite: Structures/Walls/clockwork_grille.rsi
+      layers:
+        - state: ratvargrille_diagonal
+        - state: electrified_diagonal
+          sprite: Effects/electricity.rsi
+          map: ["enum.ElectrifiedLayers.Powered"]
+          shader: unshaded
+          visible: false
+    - type: Icon
+      sprite: Structures/Walls/clockwork_grille.rsi
+      state: ratvargrille_diagonal
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape:
+            !type:PolygonShape
+              vertices:
+              - "-0.5,-0.5"
+              - "0.5,0.5"
+              - "0.5,-0.5"
+          mask:
+          - FullTileMask
+          layer:
+          - WallLayer
+    - type: Construction
+      graph: GrilleDiagonal
+      node: clockworkGrilleDiagonal
+      
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index c0c027b8b2..a6b6b02361 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -78,7 +78,7 @@
         acts: [ "Destruction" ]
 
   - type: IconSmooth
-    key: walls
+    key: bricks
     base: brick
 
 - type: entity
@@ -94,6 +94,9 @@
     sprite: Structures/Walls/clock.rsi
   - type: Icon
     sprite: Structures/Walls/clock.rsi
+  - type: Construction
+    graph: ClockworkGirder
+    node: clockworkWall
   - type: Destructible
     thresholds:
     - trigger:
@@ -102,7 +105,7 @@
       behaviors:
       - !type:SpawnEntitiesBehavior
         spawn:
-          Girder:
+          ClockworkGirder:
             min: 1
             max: 1
       - !type:DoActsBehavior
@@ -569,7 +572,7 @@
     state: rgeneric
   - type: Construction
     graph: Girder
-    node: reinforcedWall
+    node: reinforcedWallRust
   - type: IconSmooth
     key: walls
     base: reinf_over
@@ -991,7 +994,7 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: IconSmooth
-    key: walls
+    key: woods
     base: wood
 
 - type: entity
@@ -1033,7 +1036,7 @@
         sound:
           collection: WoodDestroy
   - type: IconSmooth
-    key: walls
+    key: webs
     base: wall
   - type: Construction
     graph: WebStructures
@@ -1239,7 +1242,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: IconSmooth
-    key: walls
+    key: cobblebricks
     base: cobblebrick
 
 - type: entity
@@ -1252,7 +1255,7 @@
   - type: Icon
     sprite: Structures/Walls/cobblebrick_basalt.rsi
   - type: IconSmooth
-    key: walls
+    key: cobblebricks
     base: cobblebrick
 
 - type: entity
@@ -1266,7 +1269,7 @@
   - type: Icon
     sprite: Structures/Walls/cobblebrick_snow.rsi
   - type: IconSmooth
-    key: walls
+    key: cobblebricks
     base: cobblebrick
 
 - type: entity
@@ -1279,7 +1282,7 @@
   - type: Icon
     sprite: Structures/Walls/cobblebrick_asteroid.rsi
   - type: IconSmooth
-    key: walls
+    key: cobblebricks
     base: cobblebrick
 
 - type: entity
@@ -1292,7 +1295,7 @@
   - type: Icon
     sprite: Structures/Walls/cobblebrick_sand.rsi
   - type: IconSmooth
-    key: walls
+    key: cobblebricks
     base: cobblebrick
 
 - type: entity
@@ -1305,7 +1308,7 @@
   - type: Icon
     sprite: Structures/Walls/cobblebrick_chromite.rsi
   - type: IconSmooth
-    key: walls
+    key: cobblebricks
     base: cobblebrick
 
 - type: entity
@@ -1318,5 +1321,5 @@
   - type: Icon
     sprite: Structures/Walls/cobblebrick_andesite.rsi
   - type: IconSmooth
-    key: walls
+    key: cobblebricks
     base: cobblebrick
diff --git a/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml b/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml
new file mode 100644
index 0000000000..9902edda86
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml
@@ -0,0 +1,141 @@
+- type: entity
+  id: ClockworkWindow
+  name: clockwork window
+  description: Don't smudge up the brass down there.
+  parent: Window
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/clockwork_window.rsi
+  - type: Icon
+    sprite: Structures/Windows/clockwork_window.rsi
+  - type: Repairable
+    fuelCost: 10
+    doAfterDelay: 2
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: RGlass
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+    - trigger:
+        !type:DamageTrigger
+        damage: 75
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassClockwork:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: IconSmooth
+    base: cwindow
+  - type: Construction
+    graph: Window
+    node: clockworkWindow
+  - type: Appearance
+  - type: DamageVisuals
+    thresholds: [4, 8, 12]
+    damageDivisor: 4
+    trackAllDamage: true
+    damageOverlay:
+      sprite: Structures/Windows/cracks.rsi
+
+- type: entity
+  id: WindowClockworkDirectional
+  parent: WindowDirectional
+  name: directional clockwork window
+  description: Don't smudge up the brass down there.
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
+  components:
+  - type: Sprite
+    sprite: Structures/Windows/directional.rsi
+    state: clock_window
+  - type: Icon
+    sprite: Structures/Windows/directional.rsi
+    state: clock_window
+  - type: Construction
+    graph: WindowDirectional
+    node: windowClockworkDirectional
+  - type: Appearance
+  - type: DamageVisuals
+    thresholds: [4, 8, 12]
+    damageDivisor: 10
+    trackAllDamage: true
+    damageOverlay:
+      sprite: Structures/Windows/cracks_directional.rsi
+  - type: Damageable
+    damageModifierSet: RGlass
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassClockwork:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: StaticPrice
+    price: 22
+
+- type: entity
+  parent: ClockworkWindow
+  id: ClockworkWindowDiagonal
+  suffix: diagonal
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/clockwork_diagonal.rsi
+    state: state0
+  - type: IconSmooth
+    mode: Diagonal
+    key: windows
+    base: state
+  - type: Icon
+    sprite: Structures/Windows/clockwork_diagonal.rsi
+    state: state0
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PolygonShape
+            vertices:
+            - "-0.5,-0.5"
+            - "0.5,0.5"
+            - "0.5,-0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - GlassLayer
+  - type: DamageVisuals
+    damageOverlay:
+      sprite: Structures/Windows/cracks_diagonal.rsi
+  - type: Construction
+    graph: WindowDiagonal
+    node: clockworkWindowDiagonal
diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
index 70c1573fb8..5503ea856c 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml
@@ -92,7 +92,7 @@
         spawn:
           ShardGlassPlasma:
             min: 1
-            max: 2
+            max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
new file mode 100644
index 0000000000..915faa7f48
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
@@ -0,0 +1,89 @@
+- type: entity
+  id: PlastitaniumWindow
+  name: plastitanium window
+  parent: Window
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/plastitanium_window.rsi
+  - type: Icon
+    sprite: Structures/Windows/plastitanium_window.rsi
+  - type: Repairable
+    fuelCost: 15
+    doAfterDelay: 3
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: RGlass
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1000
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 500
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassReinforced:
+            min: 1
+            max: 2
+          PartRodMetal:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: IconSmooth
+    base: ptwindow
+  - type: Appearance
+  - type: DamageVisuals
+    thresholds: [4, 8, 12]
+    damageDivisor: 28
+    trackAllDamage: true
+    damageOverlay:
+      sprite: Structures/Windows/cracks.rsi
+  - type: StaticPrice
+    price: 100
+
+- type: entity
+  parent: ShuttleWindow
+  id: PlastitaniumWindowDiagonal
+  suffix: diagonal
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
+  components:
+  - type: Sprite
+    drawdepth: WallTops
+    sprite: Structures/Windows/plastitanium_window_diagonal.rsi
+    state: state0
+  - type: IconSmooth
+    mode: Diagonal
+    key: windows
+    base: state
+  - type: Icon
+    sprite: Structures/Windows/plastitanium_window_diagonal.rsi
+    state: state0
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PolygonShape
+            vertices:
+            - "-0.5,-0.5"
+            - "0.5,0.5"
+            - "0.5,-0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - GlassLayer
+  - type: DamageVisuals
+    damageOverlay:
+      sprite: Structures/Windows/cracks_diagonal.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
index e239965494..18da78f1b5 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
@@ -18,7 +18,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 150
+        damage: 150 #excess damage (nuke?). avoid computational cost of spawning entities.
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
@@ -103,7 +103,16 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 150
+        damage: 150 #excess damage (nuke?). avoid computational cost of spawning entities.
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
       behaviors:
       - !type:PlaySoundBehavior
         sound:
@@ -112,7 +121,7 @@
         spawn:
           ShardGlassReinforced:
             min: 1
-            max: 2
+            max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
index 67dfe028d9..9281e0c7ff 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
@@ -101,10 +101,10 @@
         spawn:
           ShardGlassPlasma:
             min: 1
-            max: 2
+            max: 1
           PartRodMetal:
             min: 1
-            max: 2
+            max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: StaticPrice
diff --git a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
index baf50e17d2..7b486dd3aa 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
@@ -53,6 +53,54 @@
   - type: RadiationBlocker
     resistance: 5
 
+- type: entity
+  id: UraniumReinforcedWindowDirectional
+  parent: WindowDirectional
+  name: directional reinforced uranium window
+  description: Don't smudge up the glass down there.
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
+  components:
+  - type: Sprite
+    sprite: Structures/Windows/directional.rsi
+    state: uranium_reinforced_window
+  - type: Icon
+    sprite: Structures/Windows/directional.rsi
+    state: uranium_reinforced_window
+  - type: Construction
+    graph: WindowDirectional
+    node: uraniumReinforcedWindowDirectional
+  - type: Appearance
+  - type: DamageVisuals
+    thresholds: [4, 8, 12]
+    damageDivisor: 3.333
+    trackAllDamage: true
+    damageOverlay:
+      sprite: Structures/Windows/cracks_directional.rsi
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassUranium:
+            min: 1
+            max: 2
+          PartRodMetal1:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: StaticPrice
+    price: 70
+
 - type: entity
   parent: ReinforcedUraniumWindow
   id: ReinforcedUraniumWindowDiagonal
diff --git a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
index 42ff0f4258..4152665fe0 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml
@@ -51,6 +51,51 @@
   - type: RadiationBlocker
     resistance: 3
 
+- type: entity
+  id: UraniumWindowDirectional
+  parent: WindowDirectional
+  name: directional uranium window
+  description: Don't smudge up the glass down there.
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
+  components:
+  - type: Sprite
+    sprite: Structures/Windows/directional.rsi
+    state: uranium_window
+  - type: Icon
+    sprite: Structures/Windows/directional.rsi
+    state: uranium_window
+  - type: Construction
+    graph: WindowDirectional
+    node: uraniumWindowDirectional
+  - type: Appearance
+  - type: DamageVisuals
+    thresholds: [4, 8, 12]
+    damageDivisor: 3.333
+    trackAllDamage: true
+    damageOverlay:
+      sprite: Structures/Windows/cracks_directional.rsi
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlassUranium:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: StaticPrice
+    price: 40
+
 - type: entity
   parent: UraniumWindow
   id: UraniumWindowDiagonal
diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml
index ee3a7d52b0..2ca6b51e5c 100644
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -46,7 +46,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 100
+        damage: 150 #excess damage (nuke?). avoid computational cost of spawning entities.
       behaviors:
       - !type:PlaySoundBehavior
         sound:
@@ -152,7 +152,7 @@
           collection: WindowShatter
     - trigger:
         !type:DamageTrigger
-        damage: 50
+        damage: 25
       behaviors:
       - !type:PlaySoundBehavior
         sound:
@@ -161,7 +161,7 @@
         spawn:
           ShardGlass:
             min: 1
-            max: 2
+            max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: Airtight
@@ -236,4 +236,4 @@
       sprite: Structures/Windows/cracks_diagonal.rsi
   - type: Construction
     graph: WindowDiagonal
-    node: windowDiagonal
+    node: windowDiagonal
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/gates.yml b/Resources/Prototypes/Entities/Structures/gates.yml
index 8fccb39b71..22ab745a1e 100644
--- a/Resources/Prototypes/Entities/Structures/gates.yml
+++ b/Resources/Prototypes/Entities/Structures/gates.yml
@@ -34,6 +34,8 @@
   - type: DeviceLinkSource
     ports:
     - Output
+    lastSignals:
+      Output: false
   - type: Construction
     graph: LogicGate
     node: logic_gate
@@ -65,6 +67,9 @@
     ports:
     - OutputHigh
     - OutputLow
+    lastSignals:
+      OutputHigh: false
+      OutputLow: false
   - type: Construction
     graph: LogicGate
     node: edge_detector
@@ -108,6 +113,9 @@
     ports:
     - PowerCharging
     - PowerDischarging
+    lastSignals:
+      PowerCharging: false
+      PowerDischarging: false
   - type: Construction
     graph: LogicGate
     node: power_sensor
diff --git a/Resources/Prototypes/Entities/Structures/stairs.yml b/Resources/Prototypes/Entities/Structures/stairs.yml
index f2e1ae62fa..628c933148 100644
--- a/Resources/Prototypes/Entities/Structures/stairs.yml
+++ b/Resources/Prototypes/Entities/Structures/stairs.yml
@@ -1,6 +1,7 @@
 - type: entity
   id: Stairs
   name: stairs
+  suffix: steel
   description: The greatest invention since rocket-propelled grenades.
   placement:
     mode: SnapgridCenter
@@ -8,7 +9,7 @@
   - type: Clickable
   - type: Sprite
     sprite: Structures/stairs.rsi
-    state: stairs
+    state: stairs_steel
     drawdepth: FloorTiles
   - type: Transform
     anchored: true
@@ -38,9 +39,49 @@
 - type: entity
   id: StairStage
   parent: Stairs
-  suffix: stage
+  suffix: steel, stage
   components:
   - type: Sprite
     sprite: Structures/stairs.rsi
-    state: stairs_stage
-    drawdepth: FloorTiles
\ No newline at end of file
+    state: stairs_stage_steel
+    drawdepth: FloorTiles
+
+- type: entity
+  id: StairWhite
+  parent: Stairs
+  suffix: white
+  components:
+  - type: Sprite
+    sprite: Structures/stairs.rsi
+    state: stairs_white
+    drawdepth: FloorTiles
+
+- type: entity
+  id: StairStageWhite
+  parent: Stairs
+  suffix: white, stage 
+  components:
+  - type: Sprite
+    sprite: Structures/stairs.rsi
+    state: stairs_stage_white
+    drawdepth: FloorTiles
+
+- type: entity
+  id: StairDark
+  parent: Stairs
+  suffix: dark
+  components:
+  - type: Sprite
+    sprite: Structures/stairs.rsi
+    state: stairs_dark
+    drawdepth: FloorTiles
+
+- type: entity
+  id: StairStageDark
+  parent: Stairs
+  suffix: dark, stage
+  components:
+  - type: Sprite
+    sprite: Structures/stairs.rsi
+    state: stairs_stage_dark
+    drawdepth: FloorTiles
diff --git a/Resources/Prototypes/Entities/Tiles/water.yml b/Resources/Prototypes/Entities/Tiles/water.yml
index 45079c0a37..e2c0421aef 100644
--- a/Resources/Prototypes/Entities/Tiles/water.yml
+++ b/Resources/Prototypes/Entities/Tiles/water.yml
@@ -17,6 +17,21 @@
     drawdepth: BelowFloor
     layers:
       - state: shoreline_water
+  - type: SolutionContainerManager
+    solutions:
+      pool:
+        maxVol: 9999999 #.inf seems to break the whole yaml file, but would definitely be preferable. 
+        reagents:
+        - ReagentId: Water
+          Quantity: 9999999
+  - type: SolutionRegeneration
+    solution: tank
+    generated:
+      reagents:
+      - ReagentId: Water
+        Quantity: 100
+  - type: DrainableSolution
+    solution: pool
   - type: SlowContacts
     walkSpeedModifier: 0.5
     sprintSpeedModifier: 0.5
diff --git a/Resources/Prototypes/Entities/World/Debris/asteroids.yml b/Resources/Prototypes/Entities/World/Debris/asteroids.yml
index 6cb0c35ef5..061288d010 100644
--- a/Resources/Prototypes/Entities/World/Debris/asteroids.yml
+++ b/Resources/Prototypes/Entities/World/Debris/asteroids.yml
@@ -26,6 +26,9 @@
           - id: WallRockQuartz
             prob: 0.15
             orGroup: rock
+          - id: WallRockSalt
+            prob: 0.15
+            orGroup: rock
           - id: WallRockGold
             prob: 0.05
             orGroup: rock
diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index bd22844e63..ed231e224b 100644
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -999,7 +999,17 @@
   flavorType: Complex
   description: flavor-complex-profits
 
+- type: flavor
+  id: weh
+  flavorType: Base
+  description: flavor-weh
+
 - type: flavor
   id: fishops
   flavorType: Complex
   description: flavor-complex-fishops
+
+- type: flavor
+  id: violets
+  flavorType: Complex
+  description: flavor-complex-violets
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 2dcf3603cf..db99266cba 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -198,9 +198,11 @@
       prob: 0.02
     - id: MobMouse2
       prob: 0.02
-    specialEntries:
-    - id: SpawnPointGhostRatKing
-      prob: 0.005
+    # DeltaV - Rat King spawns under MidRoundAntag - Comment out Rat King from spawning with MouseMigration gamerule
+    # specialEntries:
+    # - id: SpawnPointGhostRatKing
+    #   prob: 0.005
+    # End of modified code
 
 - type: entity
   id: CockroachMigration
@@ -462,7 +464,7 @@
   - type: StationEvent
     weight: 10
     earliestStart: 20
-    reoccurrenceDelay: 60
+    reoccurrenceDelay: 20
     duration: 1
   - type: IonStormRule
 
diff --git a/Resources/Prototypes/GameRules/midround.yml b/Resources/Prototypes/GameRules/midround.yml
index 28767e2c18..37fc4b44cd 100644
--- a/Resources/Prototypes/GameRules/midround.yml
+++ b/Resources/Prototypes/GameRules/midround.yml
@@ -28,13 +28,12 @@
     - CarpRiftsObjective
     - DragonSurviveObjective
 
-# need for admin panel antag create (because the rule doesn't have a roundstart entity like TraitorRule)
 - type: entity
-  id: Thief
-  parent: BaseGameRule
   noSpawn: true
+  parent: BaseGameRule
+  id: Thief
   components:
-  - type: ThiefRule 
+  - type: ThiefRule
 
 - type: entity
   noSpawn: true
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index 9961987cb4..9ed1889154 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -5,6 +5,16 @@
   components:
   - type: GameRule
 
+- type: entity
+  noSpawn: true
+  parent: BaseGameRule
+  id: SubGamemodesRule
+  components:
+  - type: SubGamemodes
+    rules:
+    - id: Thief
+      prob: 0.5
+
 - type: entity
   id: DeathMatch31
   parent: BaseGameRule
@@ -58,10 +68,10 @@
   parent: BaseGameRule
   noSpawn: true
   components:
+  - type: GameRule
+    minPlayers: 20
   - type: NukeopsRule
     faction: Syndicate
-  - type: ThiefRule #the thieves come as an extension of another gamemode
-    ruleChance: 0.5
 
 - type: entity
   id: Pirates
@@ -76,8 +86,6 @@
   noSpawn: true
   components:
   - type: TraitorRule
-  - type: ThiefRule #the thieves come as an extension of another gamemode
-    ruleChance: 0.5
 
 - type: entity
   id: Revolutionary
@@ -87,8 +95,6 @@
   - type: RevolutionaryRule
     maxHeadRevs: 2 # DeltaV
     playersPerHeadRev: 30 # DeltaV - need highpop readied up for multiple headrevs
-  - type: ThiefRule #the thieves come as an extension of another gamemode
-    ruleChance: 0.5
 
 - type: entity
   id: Sandbox
diff --git a/Resources/Prototypes/GameRules/variation.yml b/Resources/Prototypes/GameRules/variation.yml
index bb9649fddd..8721003c83 100644
--- a/Resources/Prototypes/GameRules/variation.yml
+++ b/Resources/Prototypes/GameRules/variation.yml
@@ -92,6 +92,7 @@
     - Gold
     - Silver
     - Sodium
+    - JuiceThatMakesYouWeh
 
 - type: weightedRandomFillSolution
   id: RandomFillTrashPuddleBloodbath
diff --git a/Resources/Prototypes/Guidebook/engineering.yml b/Resources/Prototypes/Guidebook/engineering.yml
index d8a260f9a1..21d17f0227 100644
--- a/Resources/Prototypes/Guidebook/engineering.yml
+++ b/Resources/Prototypes/Guidebook/engineering.yml
@@ -65,6 +65,7 @@
   - AME
   - Singularity
   - TEG
+  - RTG
 
 - type: guideEntry
   id: AME
@@ -81,6 +82,11 @@
   name: guide-entry-teg
   text: "/ServerInfo/Guidebook/Engineering/TEG.xml"
 
+- type: guideEntry
+  id: RTG
+  name: guide-entry-rtg
+  text: "/ServerInfo/Guidebook/Engineering/RTG.xml"
+
 - type: guideEntry
   id: PortableGenerator
   name: guide-entry-portable-generator
diff --git a/Resources/Prototypes/Guidebook/species.yml b/Resources/Prototypes/Guidebook/species.yml
new file mode 100644
index 0000000000..5b9efd0366
--- /dev/null
+++ b/Resources/Prototypes/Guidebook/species.yml
@@ -0,0 +1,47 @@
+- type: guideEntry
+  id: Species
+  name: guide-entry-species
+  text: "/ServerInfo/Guidebook/Mobs/Species.xml"
+  children:
+    - Arachnid
+    - Diona
+    - Dwarf
+    - Human
+    - Moth
+    - Reptilian
+    - SlimePerson
+
+- type: guideEntry
+  id: Arachnid
+  name: species-name-arachnid
+  text: "/ServerInfo/Guidebook/Mobs/Arachnid.xml"
+
+- type: guideEntry
+  id: Diona
+  name: species-name-diona
+  text: "/ServerInfo/Guidebook/Mobs/Diona.xml"
+
+- type: guideEntry
+  id: Dwarf
+  name: species-name-dwarf
+  text: "/ServerInfo/Guidebook/Mobs/Dwarf.xml"
+
+- type: guideEntry
+  id: Human
+  name: species-name-human
+  text: "/ServerInfo/Guidebook/Mobs/Human.xml"
+
+- type: guideEntry
+  id: Moth
+  name: species-name-moth
+  text: "/ServerInfo/Guidebook/Mobs/Moth.xml"
+
+- type: guideEntry
+  id: Reptilian
+  name: species-name-reptilian
+  text: "/ServerInfo/Guidebook/Mobs/Reptilian.xml"
+
+- type: guideEntry
+  id: SlimePerson
+  name: species-name-slime
+  text: "/ServerInfo/Guidebook/Mobs/SlimePerson.xml"
diff --git a/Resources/Prototypes/Guidebook/ss14.yml b/Resources/Prototypes/Guidebook/ss14.yml
index dfe072b3e0..c1017fefca 100644
--- a/Resources/Prototypes/Guidebook/ss14.yml
+++ b/Resources/Prototypes/Guidebook/ss14.yml
@@ -8,6 +8,7 @@
   - Survival
   - Chemicals
   - Antagonists
+  - Species
   - Writing
   - Glossary
 
diff --git a/Resources/Prototypes/Hydroponics/mutations.yml b/Resources/Prototypes/Hydroponics/mutations.yml
index dd37e0cda0..17617f5ee3 100644
--- a/Resources/Prototypes/Hydroponics/mutations.yml
+++ b/Resources/Prototypes/Hydroponics/mutations.yml
@@ -31,6 +31,7 @@
     - Neurotoxin
     - ChangelingSting
     - CogChamp
+    - JuiceThatMakesYouWeh
   - quantity: 5
     weight: 2
     reagents:
@@ -111,4 +112,4 @@
     - Soysauce
     - TableSalt
     - Chlorine
-    - Mercury
\ No newline at end of file
+    - Mercury
diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml
index 7c94546602..82a3fba5b4 100644
--- a/Resources/Prototypes/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Hydroponics/seeds.yml
@@ -136,6 +136,39 @@
       Max: 4
       PotencyDivisor: 25
 
+- type: seed
+  id: laughinPea
+  name: seeds-laughin-pea-name
+  noun: seeds-noun-seeds
+  displayName: seeds-laughin-pea-display-name
+  plantRsi: Objects/Specific/Hydroponics/laughin_pea.rsi
+  packetPrototype: LaughinPeaSeeds
+  productPrototypes:
+    - FoodLaughinPeaPod
+  lifespan: 25
+  growthStages: 3
+  maturation: 7
+  production: 5
+  yield: 3
+  potency: 20
+  idealLight: 8
+  harvestRepeat: Repeat
+  nutrientConsumption: 0.6
+  waterConsumption: 0.6
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 3
+      PotencyDivisor: 7
+    Sugar:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 5
+    Laughter:
+      Min: 1
+      Max: 10
+      PotencyDivisor: 5
+
 - type: seed
   id: lemon
   name: seeds-lemon-name
@@ -900,6 +933,8 @@
   packetPrototype: PoppySeeds
   productPrototypes:
     - FoodPoppy
+  mutationPrototypes:
+    - lily
   lifespan: 25
   maturation: 10
   production: 3
@@ -943,6 +978,34 @@
       Max: 10
       PotencyDivisor: 10
 
+- type: seed
+  id: lily
+  name: seeds-lily-name
+  noun: seeds-noun-seeds
+  displayName: seeds-lily-display-name
+  plantRsi: Objects/Specific/Hydroponics/lily.rsi
+  packetPrototype: LilySeeds
+  productPrototypes:
+    - FoodLily
+  mutationPrototypes:
+    - spacemansTrumpet
+  lifespan: 25
+  maturation: 10
+  production: 3
+  yield: 3
+  potency: 10
+  growthStages: 3
+  waterConsumption: 0.60
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 2
+      Potencydivisor: 50
+    Bicaridine:
+      Min: 1
+      Max: 20
+      PotencyDivisor: 5
+
 - type: seed
   id: lingzhi
   name: seeds-lingzhi-name
@@ -1171,6 +1234,32 @@
       Max: 2
       PotencyDivisor: 50
 
+- type: seed
+  id: spacemansTrumpet
+  name: seeds-spacemans-trumpet-name
+  noun: seeds-noun-seeds
+  displayName: seeds-spacemans-trumpet-display-name
+  plantRsi: Objects/Specific/Hydroponics/spacemans_trumpet.rsi
+  packetPrototype: SpacemansTrumpetSeeds
+  productPrototypes:
+    - FoodSpacemansTrumpet
+  growthStages: 4
+  lifespan: 20
+  maturation: 14
+  production: 3
+  yield: 2
+  potency: 10
+  waterConsumption: 0.60
+  chemicals:
+    Nutriment:
+      Min: 1
+      Max: 5
+      Potencydivisor: 50
+    PolypyryliumOligomers:
+      Min: 1
+      Max: 15
+      PotencyDivisor: 5
+
 - type: seed
   id: koibean
   name: seeds-koibean-name
@@ -1344,6 +1433,8 @@
   packetPrototype: PeaSeeds
   productPrototypes:
     - FoodPeaPod
+  mutationPrototypes:
+    - laughinPea
   lifespan: 25
   growthStages: 3
   maturation: 8
diff --git a/Resources/Prototypes/InventoryTemplates/aghost_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/aghost_inventory_template.yml
index b34378c39d..6252ad8e99 100644
--- a/Resources/Prototypes/InventoryTemplates/aghost_inventory_template.yml
+++ b/Resources/Prototypes/InventoryTemplates/aghost_inventory_template.yml
@@ -1,4 +1,4 @@
-- type: inventoryTemplate
+- type: inventoryTemplate
   id: aghost
   slots:
     - name: back
@@ -9,11 +9,25 @@
       uiWindowPos: 2,1
       strippingWindowPos: 2,4
       displayName: ID
+    - name: id
+      slotTexture: id
+      slotFlags: IDCARD
+      slotGroup: SecondHotbar
+      stripTime: 6
+      uiWindowPos: 2,2
+      strippingWindowPos: 2,3
+      displayName: ID
 
     # For drip reasons.
     - name: head
       slotTexture: head
       slotFlags: HEAD
-      uiWindowPos: 0,1
+      uiWindowPos: 0,2
       strippingWindowPos: 0,0
       displayName: Head
+    - name: mask
+      slotTexture: mask
+      slotFlags: MASK
+      uiWindowPos: 0,1
+      strippingWindowPos: 1,1
+      displayName: Mask
diff --git a/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml
index 9a28b2d7bc..5af23dabac 100644
--- a/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml
+++ b/Resources/Prototypes/InventoryTemplates/monkey_inventory_template.yml
@@ -20,12 +20,6 @@
     uiWindowPos: 0,1
     strippingWindowPos: 1,1
     displayName: Mask
-    whitelist:
-      tags:
-        - MonkeyWearable
-        - PetWearable
-      components:
-        - Smokable
   - name: jumpsuit
     slotTexture: uniform
     slotFlags: INNERCLOTHING
@@ -60,5 +54,4 @@
     displayName: Suit
     whitelist:
       tags:
-        - SuitEVA
-
+        - MonkeyWearable
diff --git a/Resources/Prototypes/Maps/Pools/default.yml b/Resources/Prototypes/Maps/Pools/default.yml
index 29f5a2ec6d..f18e58d5ae 100644
--- a/Resources/Prototypes/Maps/Pools/default.yml
+++ b/Resources/Prototypes/Maps/Pools/default.yml
@@ -1,29 +1,4 @@
 - type: gameMapPool
   id: DefaultMapPool
   maps:
-  #- Aspid
-  #- Bagel
-  #- Barratry
-  #- Box
-  #- Cluster
-  #- Core
-  #- Fland
-  #- Kettle
-  #- Marathon
-  #- Meta
-  #- Omega
-  #- Origin
-  #- Saltern
-  #- Packed
-# DeltaV
-  #- Arena
-  #- Asterisk
-  #- Edge
-  #- Hammurabi
-  #- Pebble
-  #- Shoukou
-  #- Tortuga
-  #- TheHive
-  #- Submarine
-# Parkstation
   - Dev # Until we get Arborum
diff --git a/Resources/Prototypes/Maps/syndicate.yml b/Resources/Prototypes/Maps/syndicate.yml
new file mode 100644
index 0000000000..abb63126d9
--- /dev/null
+++ b/Resources/Prototypes/Maps/syndicate.yml
@@ -0,0 +1,11 @@
+- type: gameMap
+  id: NukieOutpost
+  mapName: Nukie Outpost
+  mapPath: /Maps/Nonstations/nukieplanet.yml
+  minPlayers: 0
+  stations:
+    SyndicateOutpost:
+      stationProto: StandardNukieOutpost
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: "Nukie Outpost"
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml
index ed839a011d..ceb66ae120 100644
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml
@@ -23,9 +23,6 @@
     whitelist:
       components:
       - LightBulb
-  - type: Tag
-    tags:
-      - DroneUsable
 
 - type: entity
   name: maintenance lightbulb box
@@ -50,9 +47,6 @@
     whitelist:
       components:
       - LightBulb
-  - type: Tag
-    tags:
-      - DroneUsable
 
 - type: entity
   name: holy water kit
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml
index b5495c9757..12f05c3248 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml
@@ -60,7 +60,7 @@
       - SurveillanceWirelessCameraMonitorCircuitboard
       - SurveillanceWirelessCameraAnchoredCircuitboard
       - NotekeeperCartridge
-      - NewsReadCartridge
+      - NewsReaderCartridge
       - GeigerCounter
       - Holoprojector
       - HolofanProjector
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/mobs.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/mobs.yml
index d8886ee2f7..4f22019c20 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/mobs.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/mobs.yml
@@ -23,7 +23,6 @@
   name: NPC Snake Spawner
   id: SnakeSpawnerMundane
   parent: MarkerBase
-  suffix: No Ghost Takeover
   components:
     - type: Sprite
       layers:
@@ -33,7 +32,7 @@
     - type: RandomSpawner
       prototypes:
         - MobPurpleSnake
-        - MobCobraSpaceNPC
+        - MobCobraSpace
       rarePrototypes:
         - MobSmallPurpleSnake
       rareChance: 0.2
@@ -78,20 +77,6 @@
         - MobSmallPurpleSnakeGhost
       rareChance: 0.20
 
-- type: entity
-  name: Space Tick Spawner
-  id: SpaceTickSpawnerNPC
-  parent: MarkerBase
-  components:
-    - type: Sprite
-      layers:
-        - state: red
-        - sprite: Mobs/Aliens/Xenos/spacetick.rsi
-          state: icon
-    - type: ConditionalSpawner
-      prototypes:
-        - MobTick
-
 - type: entity
   name: Xeno Spawner
   id: XenoAISpawner
@@ -166,7 +151,6 @@
   name: Space Creature Spawner
   id: SpaceCreatureAISpawner
   parent: MarkerBase
-  suffix: No Ghost Takeover
   components:
     - type: Sprite
       layers:
@@ -176,9 +160,9 @@
         - state: ai
     - type: RandomSpawner
       prototypes:
-        - MobBearSpaceNPC
-        - MobKangarooSpaceNPC
-        - MobSpiderSpaceNPC
+        - MobBearSpace
+        - MobKangarooSpace
+        - MobSpiderSpace
 
 - type: entity
   name: Arena Spawner
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/ghost_roles.yml
index 344eee0a5f..2652a89127 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/ghost_roles.yml
@@ -5,8 +5,8 @@
   parent: MarkerBase
   noSpawn: true
   components:
-  # - type: GhostRoleMobSpawner
-  #   prototype: MobIfritFamiliar # Todo
+  - type: GhostRoleMobSpawner
+    prototype: MobIfritFamiliar
   - type: GhostRole
     name: Mystagogue's Ifrit
     description: Obey the mystagogue. Defend the oracle.
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/space.yml
deleted file mode 100644
index 8180326332..0000000000
--- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/space.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-# GhostTakeover
-
-- type: entity
-  name: space bear
-  id: MobBearSpace
-  parent: MobBearSpaceNPC
-  components:
-  - type: GhostTakeoverAvailable # Delta V: Moves here
-  - type: GhostRole
-    prob: 0.25
-    name: ghost-role-information-space-bear-name
-    description: ghost-role-information-space-bear-description
-
-- type: entity
-  name: space kangaroo
-  id: MobKangarooSpace
-  parent: MobKangarooSpaceNPC
-  components:
-  - type: GhostTakeoverAvailable # Delta V: Moves here
-  - type: GhostRole
-    prob: 0.25
-    name: ghost-role-information-space-kangaroo-name
-    description: ghost-role-information-space-kangaroo-description
-
-- type: entity
-  name: space spider
-  id: MobSpiderSpace
-  parent: MobSpiderSpaceNPC
-  components:
-  - type: GhostRole
-    prob: 0.30
-    name: ghost-role-information-space-spider-name
-    description: ghost-role-information-space-spider-description
-
-- type: entity
-  name: space cobra
-  id: MobCobraSpace
-  parent: MobCobraSpaceNPC
-  components:
-  - type: GhostRole
-    prob: 0.25
-    name: ghost-role-information-space-cobra-name
-    description: ghost-role-information-space-cobra-description
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
index a1a7a859e0..0e4c262b54 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
@@ -1,3 +1,24 @@
+- type: entity
+  id: MetempsychoticMachineCircuitboard
+  parent: BaseMachineCircuitboard
+  name: metempsychotic machine machine board
+  description: A machine printed circuit board for a cloning pod
+  components:
+    - type: Sprite
+      state: medical
+    - type: MachineBoard
+      prototype: MetempsychoticMachine
+      requirements:
+        Capacitor: 2
+        Manipulator: 2
+      materialRequirements:
+        Glass: 1
+        Cable: 1
+    - type: ReverseEngineering
+      difficulty: 3
+      recipes:
+        - MetempsychoticMachineCircuitboard
+
 - type: entity
   id: ReverseEngineeringMachineCircuitboard
   parent: BaseMachineCircuitboard
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
index 763e71f737..c2fd8786af 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/pda.yml
@@ -36,7 +36,7 @@
     preinstalled:
       - CrewManifestCartridge
       - NotekeeperCartridge
-      - NewsReadCartridge
+      - NewsReaderCartridge
       - CrimeAssistCartridge
 
 - type: entity
@@ -110,5 +110,5 @@
     preinstalled:
      - CrewManifestCartridge
      - NotekeeperCartridge
-     - NewsReadCartridge
+     - NewsReaderCartridge
      - GlimmerMonitorCartridge
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Materials/materials.yml
index 7b9ebdcb14..77fb560723 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Materials/materials.yml
@@ -9,7 +9,7 @@
     layers:
       - state: bluespace_3
         map: ["base"]
-    scale: 1, 1 # Parkstation-SmallerMaterials - Bluespace looks fine normally
+    scale: 1, 1 # Parkstation-SmallerMaterials # Bluespace looks fine normally
   - type: Appearance
   - type: Material
   - type: PhysicalComposition
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml
index 3a6470d36b..12058c9aef 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml
@@ -51,7 +51,7 @@
 - type: entity
   id: PoweredLightColoredRed
   description: "A light fixture. Draws power and produces light when equipped with a light tube."
-  suffix: Red
+  suffix: Soft Red #Delta V - Changed to differentiate from upstream lights.
   parent: Poweredlight
   components:
   - type: PoweredLight
@@ -128,9 +128,7 @@
   parent: PoweredLightPostSmallEmpty
   components:
   - type: Sprite
-    layers:
-    - state: off
-      map: [ "enum.PoweredLightLayers.Base" ]
+    state: base
   - type: PoweredLight
     hasLampOnSpawn: ColoredLightTubeRed
     damage:
@@ -147,9 +145,7 @@
   parent: LightPostSmall
   components:
   - type: Sprite
-    layers:
-    - state: off
-      map: [ "enum.PoweredLightLayers.Base" ]
+    state: base
   - type: PointLight
     radius: 10
     energy: 0.9
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml
new file mode 100644
index 0000000000..d8e791af1e
--- /dev/null
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml
@@ -0,0 +1,25 @@
+- type: entity
+  parent: CloningPod
+  id: MetempsychoticMachine
+  name: metempsychotic machine
+  description: Speeds along the transmigration of a soul to its next vessel.
+  components:
+    - type: MetempsychoticMachine
+    - type: CloningPod
+    - type: Machine
+      board: MetempsychoticMachineCircuitboard
+    - type: Sprite
+      sprite: Nyanotrasen/Structures/Machines/metempsychotic.rsi
+      snapCardinals: true
+      layers:
+        - state: pod_0
+    - type: Appearance
+    - type: GenericVisualizer
+      visuals:
+        enum.CloningPodVisuals.Status:
+          base:
+            Cloning: { state: pod_1 }
+            NoMind: { state: pod_1 }
+            Gore: { state: pod_1 }
+            Idle: { state: pod_0 }
+    - type: Psionic
diff --git a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
index 61cf6eaf1f..f5626a0406 100644
--- a/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
+++ b/Resources/Prototypes/Nyanotrasen/GameRules/events.yml
@@ -12,18 +12,34 @@
       earliestStart: 15
     - type: NoosphericStormRule
 
-# Rat king, paradox anomaly, fugitive, oneiro, etc.
+# Mid round antag spawns
+- type: entity
+  abstract: true
+  parent: BaseGameRule
+  id: BaseMidRoundAntag
+  components:
+  - type: StationEvent
+    weight: 7
+    reoccurrenceDelay: 5
+    minimumPlayers: 15
+    earliestStart: 25
+  - type: MidRoundAntagRule
+
 #- type: entity
-#  id: MidRoundAntag
-#  parent: BaseGameRule
 #  noSpawn: true
+#  parent: BaseMidRoundAntag
+#  id: RatKingSpawn
 #  components:
-#    - type: StationEvent
-#      weight: 7
-#      reoccurrenceDelay: 5
-#      minimumPlayers: 15
-#      earliestStart: 25
-#    - type: MidRoundAntagRule
+#  - type: MidRoundAntagRule
+#    spawner: SpawnPointGhostRatKing
+
+- type: entity
+  noSpawn: true
+  parent: BaseMidRoundAntag
+  id: ParadoxAnomalySpawn
+  components:
+  - type: MidRoundAntagRule
+    spawner: SpawnPointGhostParadoxAnomaly
 
 # Base glimmer event
 - type: entity
diff --git a/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/electronics.yml
index 591b8aec08..418864cd40 100644
--- a/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/Nyanotrasen/Recipes/Lathes/electronics.yml
@@ -1,11 +1,11 @@
-#- type: latheRecipe
-#  id: MetempsychoticMachineCircuitboard
-#  result: MetempsychoticMachineCircuitboard
-#  completetime: 4
-#  materials:
-#     Steel: 100
-#     Glass: 900
-#     Gold: 100
+- type: latheRecipe
+  id: MetempsychoticMachineCircuitboard
+  result: MetempsychoticMachineCircuitboard
+  completetime: 4
+  materials:
+     Steel: 100
+     Glass: 900
+     Gold: 100
 
 - type: latheRecipe
   id: ReverseEngineeringMachineCircuitboard
@@ -50,4 +50,4 @@
   completetime: 4
   materials:
      Steel: 100
-     Glass: 900
\ No newline at end of file
+     Glass: 900
diff --git a/Resources/Prototypes/Nyanotrasen/Research/experimental.yml b/Resources/Prototypes/Nyanotrasen/Research/experimental.yml
index 78599728c0..7c89c0f7d0 100644
--- a/Resources/Prototypes/Nyanotrasen/Research/experimental.yml
+++ b/Resources/Prototypes/Nyanotrasen/Research/experimental.yml
@@ -14,6 +14,22 @@
   - ClothingHeadCage
   # - ShellSoulbreaker # DeltaV - Placing it under Exotic Ammunition because that's what it is.
 
+- type: technology
+  id: Metempsychosis
+  name: research-technology-metempsychosis
+  icon:
+    sprite: Nyanotrasen/Structures/Machines/metempsychotic.rsi
+    state: pod_0
+  discipline: Experimental
+  tier: 2
+  cost: 15000
+  recipeUnlocks:
+    - BiomassReclaimerMachineCircuitboard
+    - CloningConsoleComputerCircuitboard
+    - MedicalScannerMachineCircuitboard
+    - MetempsychoticMachineCircuitboard
+
+
 # Tier 3
 
 # - type: technology
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml
index 1c9fe29876..55d86d343d 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml
@@ -34,7 +34,7 @@
     eyes: ClothingEyesGlassesSecurity
     head: ClothingHeadPrisonGuard
     id: PrisonGuardPDA
-    ears: ClothingHeadsetSecurity
+    ears: ClothingHeadsetPrisonGuard #DeltaV
     belt: ClothingBeltSecurityFilled
   innerClothingSkirt: ClothingUniformJumpsuitPrisonGuard
   satchel: ClothingBackpackSatchelSecurityFilled
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
index 87deefde14..9df4832a58 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
@@ -20,5 +20,5 @@
     jumpsuit: ClothingUniformJumpsuitPrisoner
     shoes: ClothingShoesColorBlack
     id: PrisonerPDA
-    ears: ClothingHeadsetGrey
+    ears: ClothingHeadsetPrison #deltaV
   innerClothingSkirt: ClothingUniformJumpsuitPrisoner
diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
index 1d711d8c95..ca78131816 100644
--- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
@@ -1,7 +1,7 @@
 - type: species
   id: Oni
   name: species-name-oni
-  roundStart: false # Parkstation - Maybe
+  roundStart: false # Parkstation # Maybe
   prototype: MobOni
   dollPrototype: MobOniDummy
   markingLimits: MobOniMarkingLimits
diff --git a/Resources/Prototypes/Nyanotrasen/metempsychoticHumanoids.yml b/Resources/Prototypes/Nyanotrasen/metempsychoticHumanoids.yml
new file mode 100644
index 0000000000..891067b1c1
--- /dev/null
+++ b/Resources/Prototypes/Nyanotrasen/metempsychoticHumanoids.yml
@@ -0,0 +1,13 @@
+- type: weightedRandom
+  id: MetempsychoticHumanoidPool # Species prototypes
+  weights:
+    Human: 1
+    Felinid: 1
+    Oni: 1
+    Arachnid: 1
+    Harpy: 1
+    Moth: 1
+    Diona: 0.5
+    Reptilian: 0.5
+    SlimePerson: 0.5
+    Vulpkanin: 0.5
diff --git a/Resources/Prototypes/Nyanotrasen/metempsychoticNonHumanoids.yml b/Resources/Prototypes/Nyanotrasen/metempsychoticNonHumanoids.yml
new file mode 100644
index 0000000000..dcbe23f608
--- /dev/null
+++ b/Resources/Prototypes/Nyanotrasen/metempsychoticNonHumanoids.yml
@@ -0,0 +1,9 @@
+- type: weightedRandom
+  id: MetempsychoticNonhumanoidPool # Entity prototypes
+  weights:
+    MobMonkey: 1
+    MobGorilla: 1
+    # MobKangaroo: 0.5 # Mobs here need to be either VERY funny or up to standard.
+    MobXenoQueen: 0.01
+    MobCrab: 0.01
+    MobPenguin: 1 #ODJ's orders
diff --git a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
index 271ac24d37..f40b688fd1 100644
--- a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
+++ b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
@@ -6,5 +6,5 @@
     TelegnosisPower: 1
     PsionicRegenerationPower: 1
     MassSleepPower: 0.3
-    PsionicInvisibilityPower: 0.15
+#    PsionicInvisibilityPower: 0.15
     MindSwapPower: 0.15
diff --git a/Resources/Prototypes/Nyanotrasen/tags.yml b/Resources/Prototypes/Nyanotrasen/tags.yml
index 54f39b7b6e..ff3b901b1c 100644
--- a/Resources/Prototypes/Nyanotrasen/tags.yml
+++ b/Resources/Prototypes/Nyanotrasen/tags.yml
@@ -12,3 +12,6 @@
 
 - type: Tag
   id: NormalityCrystal
+
+- type: Tag
+  id: PlushieCarp
diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
index e350a2d813..3cdc657dec 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -12,6 +12,7 @@
   weights:
     CaptainIDStealObjective: 1
     CMOHyposprayStealObjective: 1
+    CMOCrewMonitorStealObjective: 1
     RDHardsuitStealObjective: 1
     NukeDiskStealObjective: 1
     MagbootsStealObjective: 1
@@ -92,7 +93,7 @@
     MedicalTechFabCircuitboardStealObjective: 1
     ClothingHeadsetAltMedicalStealObjective: 1
     FireAxeStealObjective: 1                            #eng
-    AmePartStealObjective: 1
+    AmePartFlatpackStealObjective: 1
     ExpeditionsCircuitboardStealObjective: 1            #sup
     CargoShuttleCircuitboardStealObjective: 1
     SalvageShuttleCircuitboardStealObjective: 1
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index c6f6e6c8ca..d2a9690ae2 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -7,6 +7,13 @@
     sprite: Objects/Specific/Medical/hypospray.rsi
     state: hypo
 
+- type: stealTargetGroup
+  id: HandheldCrewMonitor
+  name: handheld crew monitor
+  sprite:
+    sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi
+    state: scanner
+
 - type: stealTargetGroup
   id: ClothingOuterHardsuitRd
   name: experimental research hardsuit
@@ -215,11 +222,11 @@
     state: icon
 
 - type: stealTargetGroup
-  id: AmePart
+  id: AmePartFlatpack
   name: AME part
   sprite:
-    sprite: Objects/Power/AME/ame_part.rsi
-    state: box
+    sprite: Objects/Devices/flatpack.rsi
+    state: ame-part
 
 - type: stealTargetGroup
   id: SalvageExpeditionsComputerCircuitboard
@@ -330,7 +337,7 @@
 
 - type: stealTargetGroup
   id: PlantRD
-  name: RD's potted plant
+  name: Mystagogue's potted plant # DeltaV - Epistemics Department - Replace Research Director with Mystagogue
   sprite:
     sprite: Structures/Furniture/potted_plants.rsi
     state: plant-25
diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml
index db1eb3111e..5ee8bd25d1 100644
--- a/Resources/Prototypes/Objectives/thief.yml
+++ b/Resources/Prototypes/Objectives/thief.yml
@@ -260,12 +260,12 @@
 - type: entity
   noSpawn: true
   parent: BaseThiefStealObjective
-  id: AmePartStealObjective
+  id: AmePartFlatpackStealObjective
   components:
   - type: NotJobRequirement
     job: StationEngineer
   - type: StealCondition
-    stealGroup: AmePart
+    stealGroup: AmePartFlatpack
   - type: Objective
     difficulty: 1
 
diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml
index 2b18df1c6d..ffeba32546 100644
--- a/Resources/Prototypes/Objectives/traitor.yml
+++ b/Resources/Prototypes/Objectives/traitor.yml
@@ -147,35 +147,58 @@
 ## cmo
 
 - type: entity
-  noSpawn: true
+  abstract: true
   parent: BaseTraitorStealObjective
-  id: CMOHyposprayStealObjective
+  id: BaseCMOStealObjective
   components:
   - type: NotJobRequirement
     job: ChiefMedicalOfficer
   - type: StealCondition
-    stealGroup: Hypospray
     owner: job-name-cmo
 
-## rd
+- type: entity
+  noSpawn: true
+  parent: BaseCMOStealObjective
+  id: CMOHyposprayStealObjective
+  components:
+  - type: StealCondition
+    stealGroup: Hypospray
 
 - type: entity
   noSpawn: true
+  parent: BaseCMOStealObjective
+  id: CMOCrewMonitorStealObjective
+  components:
+  - type: StealCondition
+    stealGroup: HandheldCrewMonitor
+
+## rd
+
+- type: entity
+  abstract: true
   parent: BaseTraitorStealObjective
+  id: BaseRDStealObjective
+  components:
+  - type: NotJobRequirement
+    job: ResearchDirector
+  - type: StealCondition
+    owner: job-name-rd
+
+- type: entity
+  noSpawn: true
+  parent: BaseRDStealObjective
   id: RDHardsuitStealObjective
   components:
   - type: StealCondition
     stealGroup: ClothingOuterHardsuitRd
-    owner: job-name-rd
 
 - type: entity
   noSpawn: true
-  parent: BaseTraitorStealObjective
+  parent: BaseRDStealObjective
   id: HandTeleporterStealObjective
   components:
   - type: StealCondition
     stealGroup: HandTeleporter
-    owner: job-name-rd
 
 ## hos
 
diff --git a/Resources/Prototypes/Palettes/departmental.yml b/Resources/Prototypes/Palettes/departmental.yml
index 7eb2290ede..c5e893397a 100644
--- a/Resources/Prototypes/Palettes/departmental.yml
+++ b/Resources/Prototypes/Palettes/departmental.yml
@@ -10,5 +10,10 @@
     bar: "#79150096"
     epistemics: "#D381C996" # DeltaV - Epistemics Department replacing Science
     logistics: "#A4610696" # DeltaV - Logistics Department replacing Cargo
+    janitor: "#8c347f96"
+    chemistry: "#fa750096"
+    virology: "#43990996"
+    atmospherics: "#3eb38896"
+    salvage: "#8d1c9996"
     neutral: "#D4D4D496"
     neutralLight: "#D4D4D428"
diff --git a/Resources/Prototypes/Parallaxes/test.yml b/Resources/Prototypes/Parallaxes/test.yml
index b38182849f..8a7a6e8310 100644
--- a/Resources/Prototypes/Parallaxes/test.yml
+++ b/Resources/Prototypes/Parallaxes/test.yml
@@ -17,7 +17,7 @@
       scale: "3, 3"
     - texture:
         !type:ImageParallaxTextureSource
-        path: "/Textures/Objects/Power/AME/ame_part.rsi/box.png"
+        path: "/Textures/Objects/Devices/flatpack.rsi/ame-part.png"
       slowness: 0.995
       tiled: false
       controlHomePosition: "-128, -128"
@@ -38,7 +38,7 @@
       scale: "1, 1"
     - texture:
         !type:ImageParallaxTextureSource
-        path: "/Textures/Objects/Power/AME/ame_part.rsi/box.png"
+        path: "/Textures/Objects/Devices/flatpack.rsi/ame-part.png"
       slowness: 0.0
       tiled: false
       controlHomePosition: "0, 32"
diff --git a/Resources/Prototypes/Parallaxes/train.yml b/Resources/Prototypes/Parallaxes/train.yml
new file mode 100644
index 0000000000..e506043c85
--- /dev/null
+++ b/Resources/Prototypes/Parallaxes/train.yml
@@ -0,0 +1,68 @@
+- type: parallax
+  id: TrainStation
+  layers:
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/AspidParallaxBG.png"
+      slowness: 0.998046875
+      scale: "0.5, 0.5"
+      scrolling: "0, -0.098046875"
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: "hq_wizard_stars"
+        configPath: "/Prototypes/Parallaxes/parallax_config_stars.toml"
+      slowness: 0.996625
+      scrolling: "0, -0.196625"
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: "hq_wizard_stars_dim"
+        configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim.toml"
+      slowness: 0.989375
+      scrolling: "0, -0.209375"
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: "hq_wizard_stars_faster"
+        configPath: "/Prototypes/Parallaxes/parallax_config_stars-2.toml"
+      slowness: 0.987265625
+      scrolling: "0, -0.287265625"
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: "hq_wizard_stars_dim_faster"
+        configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim-2.toml"
+      slowness: 0.984352
+      scrolling: "0, -0.384352"
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/AspidParallaxBG.png"
+      slowness: 0.978046875
+      scrolling: "0, -0.578046875"
+      scale: "1, 1"
+      tiled: false
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/Asteroids.png"
+      slowness: 0.968046875
+      scrolling: "0, -0.568046875"
+      scale: "1.3, 1.3"
+      worldHomePosition: "-624, 333"
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/AspidParallaxNeb.png"
+      slowness: 0.969046875
+      scrolling: "0, -0.569046875"
+      scale: "0.5, 0.5"
+      worldHomePosition: "0, 0"
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/Parallaxes/Asteroids.png"
+      slowness: 0.938046875
+      scrolling: "0, -0.708046875"
+      scale: "1, 1"
+  layersLQ:
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: ""
+        configPath: "/Prototypes/Parallaxes/parallax_config.toml"
+        slowness: 0.875
+      scrolling: "0, -0.475"
+  layersLQUseHQ: false
diff --git a/Resources/Prototypes/Procedural/Magnet/asteroid.yml b/Resources/Prototypes/Procedural/Magnet/asteroid.yml
index f30bd871ea..a21b709afa 100644
--- a/Resources/Prototypes/Procedural/Magnet/asteroid.yml
+++ b/Resources/Prototypes/Procedural/Magnet/asteroid.yml
@@ -4,6 +4,7 @@
     OreIron: 1.0
     OreQuartz: 1.0
     OreCoal: 1.0
+    OreSalt: 1.0
     OreGold: 0.25
     OreSilver: 0.25
     OrePlasma: 0.15
diff --git a/Resources/Prototypes/Procedural/Themes/mineshaft.yml b/Resources/Prototypes/Procedural/Themes/mineshaft.yml
new file mode 100644
index 0000000000..1e2c18d08b
--- /dev/null
+++ b/Resources/Prototypes/Procedural/Themes/mineshaft.yml
@@ -0,0 +1,272 @@
+# Rooms
+# Large
+# - 17x5
+- type: dungeonRoom
+  id: Mineshaft17x5a
+  size: 17,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 0,0
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft17x5b
+  size: 17,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 18,0
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft17x5c
+  size: 17,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 36,0
+  tags:
+    - Mineshaft
+
+# = 11x5
+
+- type: dungeonRoom
+  id: Mineshaft11x5a
+  size: 11,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 0,6
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft11x5b
+  size: 11,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 12,6
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft11x5c
+  size: 11,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 24,6
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft11x5d
+  size: 11,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 36,6
+  tags:
+    - Mineshaft
+
+# - 7x5
+
+- type: dungeonRoom
+  id: Mineshaft7x5a
+  size: 7,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 0,12
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft7x5b
+  size: 7,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 8,12
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft7x5c
+  size: 7,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 16,12
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft7x5d
+  size: 7,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 24,12
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft7x5e
+  size: 7,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 32,12
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft7x5f
+  size: 7,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 40,12
+  tags:
+    - Mineshaft
+
+# - 5x5
+
+- type: dungeonRoom
+  id: Mineshaft5x5a
+  size: 5,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 0,18
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft5x5b
+  size: 5,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 6,18
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft5x5c
+  size: 5,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 12,18
+  tags:
+    - Mineshaft
+
+#  -7x7
+
+- type: dungeonRoom
+  id: Mineshaft7x7a
+  size: 7,7
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 18,18
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft7x7b
+  size: 7,7
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 26,18
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft7x7c
+  size: 7,7
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 34,18
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft7x7e
+  size: 7,7
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 42,18
+  tags:
+    - Mineshaft
+
+#  -3x7
+
+- type: dungeonRoom
+  id: Mineshaft3x7a
+  size: 3,7
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 0,24
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft3x7b
+  size: 3,7
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 4,24
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft3x7c
+  size: 3,7
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 8,24
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft3x7d
+  size: 3,7
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 12,24
+  tags:
+    - Mineshaft
+
+#  -3x5
+
+- type: dungeonRoom
+  id: Mineshaft3x5a
+  size: 3,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 16,26
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft3x5b
+  size: 3,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 20,26
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft3x5c
+  size: 3,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 24,26
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft3x5e
+  size: 3,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 32,26
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft3x5f
+  size: 3,5
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 36,26
+  tags:
+    - Mineshaft
+
+#  -13x3
+
+- type: dungeonRoom
+  id: Mineshaft13x3a
+  size: 13,3
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 0,32
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft13x3b
+  size: 13,3
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 14,32
+  tags:
+    - Mineshaft
+
+- type: dungeonRoom
+  id: Mineshaft13x3c
+  size: 13,3
+  atlas: /Maps/Dungeon/mineshaft.yml
+  offset: 28,32
+  tags:
+    - Mineshaft
\ No newline at end of file
diff --git a/Resources/Prototypes/Procedural/Themes/snowylabs.yml b/Resources/Prototypes/Procedural/Themes/snowylabs.yml
new file mode 100644
index 0000000000..98caf23731
--- /dev/null
+++ b/Resources/Prototypes/Procedural/Themes/snowylabs.yml
@@ -0,0 +1,364 @@
+# Rooms
+# Large
+# - 17x5
+- type: dungeonRoom
+  id: SnowyLab17x5a
+  size: 17,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 0,0
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab17x5b
+  size: 17,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 18,0
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab17x5c
+  size: 17,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 36,0
+  tags:
+    - SnowyLabs
+
+# - 7x7
+- type: dungeonRoom
+  id: SnowyLab7x7a
+  size: 7,7
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 0,42
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab7x7b
+  size: 7,7
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 8,42
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab7x7c
+  size: 7,7
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 16,42
+  tags:
+    - SnowyLabs
+
+# Medium
+# - 11x5
+- type: dungeonRoom
+  id: SnowyLab11x5a
+  size: 11,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 0,6
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab11x5b
+  size: 11,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 12,6
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab11x5c
+  size: 11,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 24,6
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab11x5d
+  size: 11,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 36,6
+  tags:
+    - SnowyLabs
+
+# - 7x5
+- type: dungeonRoom
+  id: SnowyLab7x5a
+  size: 7,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 0,12
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab7x5b
+  size: 7,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 8,12
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab7x5c
+  size: 7,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 16,12
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab7x5d
+  size: 7,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 24,12
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab7x5e
+  size: 7,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 32,12
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab7x5f
+  size: 7,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 40,12
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab7x5g
+  size: 7,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 48,12
+  tags:
+    - SnowyLabs
+
+# - 13x3
+- type: dungeonRoom
+  id: SnowyLab13x3a
+  size: 13,3
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 0,30
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab13x3b
+  size: 13,3
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 14,30
+  tags:
+    - SnowyLabs
+
+# - 11x3
+- type: dungeonRoom
+  id: SnowyLab11x3a
+  size: 11,3
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 0,34
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab11x3b
+  size: 11,3
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 12,34
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab11x3c
+  size: 11,3
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 24,34
+  tags:
+    - SnowyLabs
+
+# - 7x3
+- type: dungeonRoom
+  id: SnowyLab7x3a
+  size: 7,3
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 0,38
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab7x3b
+  size: 7,3
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 8,38
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab7x3c
+  size: 7,3
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 16,38
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab7x3d
+  size: 7,3
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 24,38
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab7x3e
+  size: 7,3
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 32,38
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab7x3f
+  size: 7,3
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 40,38
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab7x3g
+  size: 7,3
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 48,38
+  tags:
+    - SnowyLabs
+
+# Small
+# - 5x5
+- type: dungeonRoom
+  id: SnowyLab5x5a
+  size: 5,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 0,18
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab5x5b
+  size: 5,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 6,18
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab5x5c
+  size: 5,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 12,18
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab5x5d
+  size: 5,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 18,18
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab5x5e
+  size: 5,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 24,18
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab5x5f
+  size: 5,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 30,18
+  tags:
+    - SnowyLabs
+
+# - 3x5
+- type: dungeonRoom
+  id: SnowyLab3x5a
+  size: 3,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 0,24
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab3x5b
+  size: 3,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 4,24
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab3x5c
+  size: 3,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 8,24
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab3x5d
+  size: 3,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 12,24
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab3x5e
+  size: 3,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 16,24
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab3x5f
+  size: 3,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 20,24
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab3x5g
+  size: 3,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 24,24
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab3x5h
+  size: 3,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 28,24
+  tags:
+    - SnowyLabs
+
+- type: dungeonRoom
+  id: SnowyLab3x5i
+  size: 3,5
+  atlas: /Maps/Dungeon/snowy_labs.yml
+  offset: 32,24
+  tags:
+    - SnowyLabs
diff --git a/Resources/Prototypes/Procedural/biome_ore_templates.yml b/Resources/Prototypes/Procedural/biome_ore_templates.yml
index 1aba55128f..4a60427e30 100644
--- a/Resources/Prototypes/Procedural/biome_ore_templates.yml
+++ b/Resources/Prototypes/Procedural/biome_ore_templates.yml
@@ -40,6 +40,20 @@
   maxGroupSize: 20
   radius: 4
 
+- type: biomeMarkerLayer
+  id: OreSalt
+  entityMask:
+    AsteroidRock: AsteroidRockSalt
+    WallRock: WallRockSalt
+    WallRockBasalt: WallRockBasaltSalt
+    WallRockChromite: WallRockChromiteSalt
+    WallRockSand: WallRockSandSalt
+    WallRockSnow: WallRockSnowSalt
+  maxCount: 30
+  minGroupSize: 10
+  maxGroupSize: 20
+  radius: 4
+
 # Medium value
 # Gold
 - type: biomeMarkerLayer
diff --git a/Resources/Prototypes/Procedural/dungeon_configs.yml b/Resources/Prototypes/Procedural/dungeon_configs.yml
index 81931c6cd0..49837507ae 100644
--- a/Resources/Prototypes/Procedural/dungeon_configs.yml
+++ b/Resources/Prototypes/Procedural/dungeon_configs.yml
@@ -162,3 +162,163 @@
         SouthEast: BrickTileWhiteInnerSe
         NorthWest: BrickTileWhiteInnerNw
         NorthEast: BrickTileWhiteInnerNe
+
+- type: dungeonConfig
+  id: Mineshaft
+  generator: !type:PrefabDunGen
+    tile: FloorCaveDrought
+    roomWhitelist:
+      - Mineshaft
+    presets:
+      - Bucket
+      - Wow
+      - SpaceShip
+      - Tall
+  postGeneration:
+  
+  - !type:CorridorPostGen
+      tile: FloorCaveDrought
+      width: 3
+      
+  - !type:DungeonEntrancePostGen
+      count: 5
+      tile: FloorCaveDrought
+      entities: 
+        - RandomWoodenWall
+
+  - !type:RoomEntrancePostGen
+      tile: FloorCaveDrought
+      entities:
+        - RandomWoodenWall
+
+  - !type:EntranceFlankPostGen
+      tile: FloorCaveDrought
+      entities:
+        - RandomWoodenWall
+      
+  - !type:ExternalWindowPostGen
+      tile: FloorCaveDrought
+      entities:
+        - RandomWoodenWall
+  
+  - !type:WallMountPostGen
+      tile: FloorCaveDrought
+      spawns:
+        # Ore
+        - id: WallRockSalt
+          prob: 0.6
+          orGroup: content
+        - id: WallRockCoal
+          prob: 0.6
+          orGroup: content
+        - id: WallRockTin
+          prob: 0.4
+          orGroup: content
+        - id: WallMining
+          prob: 0.8
+          orGroup: content
+          
+  - !type:BoundaryWallPostGen
+      tile: FloorCaveDrought
+      wall: WallRock
+      cornerWall: WallRock
+
+  - !type:AutoCablingPostGen
+      entity: Catwalk
+    
+  - !type:JunctionPostGen
+      tile: FloorCaveDrought
+      width: 3
+      entities:
+        - RandomWoodenSupport
+  
+  - !type:CornerClutterPostGen
+      contents:
+        - id: RandomStalagmiteOrCrystal
+          amount: 1
+
+- type: dungeonConfig
+  id: SnowyLabs
+  generator: !type:PrefabDunGen
+    roomWhitelist:
+      - SnowyLabs
+    presets:
+      - Bucket
+      - Wow
+      - SpaceShip
+      - Tall
+  postGeneration:
+    - !type:CorridorPostGen
+      width: 3
+
+    - !type:DungeonEntrancePostGen
+      count: 2
+
+    - !type:RoomEntrancePostGen
+      entities:
+        - CableApcExtension
+        - AirlockFreezerHydroponicsLocked
+
+    - !type:EntranceFlankPostGen
+      entities:
+        - Grille
+        - Window
+
+    - !type:ExternalWindowPostGen
+      entities:
+        - Grille
+        - Window
+
+    - !type:WallMountPostGen
+      spawns:
+        # Posters
+        - id: RandomPosterLegit
+          orGroup: content
+        - id: ExtinguisherCabinetFilled
+          prob: 0.2
+          orGroup: content
+        - id: RandomPainting
+          prob: 0.05
+          orGroup: content
+        - id: IntercomScience
+          prob: 0.1
+          orGroup: content
+
+    - !type:BoundaryWallPostGen
+        tile: FloorSteel
+        wall: WallSilver
+        cornerWall: WallSilver
+
+    - !type:JunctionPostGen
+      width: 1
+      entities:
+        - AirlockHydroGlassLocked
+
+    - !type:JunctionPostGen
+      entities:
+        - AirlockHydroGlassLocked
+
+    - !type:AutoCablingPostGen
+
+    - !type:CornerClutterPostGen
+      contents:
+        - id: PottedPlantRandom
+          amount: 1
+
+    - !type:CorridorDecalSkirtingPostGen
+      color: "#4cc7aa96"
+      cardinalDecals:
+        South: BrickTileWhiteLineS
+        East: BrickTileWhiteLineE
+        North: BrickTileWhiteLineN
+        West: BrickTileWhiteLineW
+      cornerDecals:
+        SouthEast: BrickTileWhiteCornerSe
+        SouthWest: BrickTileWhiteCornerSw
+        NorthEast: BrickTileWhiteCornerNe
+        NorthWest: BrickTileWhiteCornerNw
+      pocketDecals:
+        SouthWest: BrickTileWhiteInnerSw
+        SouthEast: BrickTileWhiteInnerSe
+        NorthWest: BrickTileWhiteInnerNw
+        NorthEast: BrickTileWhiteInnerNe
\ No newline at end of file
diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml
index 92b04496ba..f12e8c7ffd 100644
--- a/Resources/Prototypes/Procedural/salvage_loot.yml
+++ b/Resources/Prototypes/Procedural/salvage_loot.yml
@@ -135,6 +135,13 @@
     - !type:BiomeMarkerLoot
       proto: OreQuartz
 
+- type: salvageLoot
+  id: OreSalt
+  guaranteed: true
+  loots:
+    - !type:BiomeMarkerLoot
+      proto: OreSalt
+
 # - Medium value
 - type: salvageLoot
   id: OreGold
diff --git a/Resources/Prototypes/Procedural/salvage_mods.yml b/Resources/Prototypes/Procedural/salvage_mods.yml
index 8d46dff59a..4da7a3bf0f 100644
--- a/Resources/Prototypes/Procedural/salvage_mods.yml
+++ b/Resources/Prototypes/Procedural/salvage_mods.yml
@@ -1,6 +1,7 @@
 # Markers
 - type: entity
   id: SalvageShuttleMarker
+  name: Salvage shuttle marker
   parent: FTLPoint
 
 # Biome mods -> at least 1 required
@@ -221,9 +222,7 @@
   id: Experiment
   proto: Experiment
   biomes:
-    - Caves
     #- LowDesert
-    - Snow
     - Grasslands
 
 - type: salvageDungeonMod
@@ -231,3 +230,15 @@
   proto: LavaBrig
   biomes:
     - Lava
+
+- type: salvageDungeonMod
+  id: Mineshaft
+  proto: Mineshaft
+  biomes:
+    - Caves
+
+- type: salvageDungeonMod
+  id: SnowyLabs
+  proto: SnowyLabs
+  biomes:
+    - Snow
\ No newline at end of file
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index 0a8be667c9..fb2422ca28 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -11,7 +11,10 @@
   color: "#33EE00"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/absintheglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
   metabolisms:
     Drink:
       effects:
@@ -32,7 +35,10 @@
   recognizable: true
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/aleglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: Beer
@@ -41,11 +47,14 @@
   desc: reagent-desc-beer
   physicalDesc: reagent-physical-desc-bubbly
   flavor: beer
-  color: "#cfa85f"
+  color: "#e3e77b"
   recognizable: true
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/beerglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: BlueCuracao
@@ -56,8 +65,11 @@
   flavor: alcohol
   color: "#0099FF"
   metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/curacaoglass.rsi
-    state: icon
+    sprite: Objects/Consumable/Drinks/thin_glass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
   metabolisms:
     Drink:
       effects:
@@ -78,7 +90,10 @@
   recognizable: true
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/cognacglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
   metabolisms:
     Drink:
       effects:
@@ -98,7 +113,10 @@
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/rumglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -175,7 +193,10 @@
   recognizable: true
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -195,7 +216,10 @@
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/coffeeliqueurglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: MelonLiquor
@@ -206,8 +230,11 @@
   flavor: watermelon
   color: "#00FF33"
   metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/emeraldglass.rsi
-    state: icon
+    sprite: Objects/Consumable/Drinks/thin_glass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: NTCahors
@@ -219,7 +246,10 @@
   color: "#7E4043"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/wineglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: PoisonWine
@@ -228,10 +258,13 @@
   desc: reagent-desc-poison-wine
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: bitter
-  color: "#000000"
+  color: "#990066"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/pwineglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
   metabolisms:
     Drink:
       effects:
@@ -258,7 +291,10 @@
   recognizable: true
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/rumglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -286,6 +322,12 @@
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: tequila
   color: "#d7d1d155"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/tequillaglass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -305,7 +347,10 @@
   color: "#91FF91"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/vermouthglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: Vodka
@@ -318,7 +363,10 @@
   recognizable: true
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -339,7 +387,10 @@
   recognizable: true
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/whiskeyglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -360,7 +411,10 @@
   recognizable: true
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/wineglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: Champagne
@@ -373,7 +427,10 @@
   recognizable: true
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/champagneglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
   metabolisms:
     Drink:
       effects:
@@ -395,7 +452,10 @@
   color: "#365000"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/acidspitglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: AlliesCocktail
@@ -407,7 +467,10 @@
   color: "#00664d"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/alliescocktail.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: Aloe
@@ -419,7 +482,10 @@
   color: "#192c00"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/aloe.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: Amasec
@@ -431,7 +497,10 @@
   color: "#124da7"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/amasecglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: Andalusia
@@ -443,7 +512,10 @@
   color: "#665700"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/andalusia.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: Antifreeze
@@ -455,8 +527,10 @@
   color: "#ff7d63"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/antifreeze.rsi
-    state: icon
-
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -476,7 +550,10 @@
   color: "#666300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/atomicbombglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -499,7 +576,10 @@
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/b52glass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -519,7 +599,10 @@
   color: "#FF7F3B"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/bahama_mama.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: BananaHonk
@@ -531,7 +614,10 @@
   color: "#ffff91"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/bananahonkglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: Barefoot
@@ -540,10 +626,13 @@
   desc: reagent-desc-barefoot
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
-  color: "#664300"
+  color: "#ff66cc"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/b&p.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: BeepskySmash
@@ -555,7 +644,10 @@
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/beepskysmashglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -575,7 +667,10 @@
   color: "#360000"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/blackrussianglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -592,10 +687,13 @@
   desc: reagent-desc-bloody-mary
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: bloodymary
-  color: "#660000"
+  color: "#df6a50"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/bloodymaryglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id:  Booger
@@ -604,10 +702,13 @@
   desc: reagent-desc-booger
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
-  color: "#8CFF8C"
+  color: "#99ff00"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/booger.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: BraveBull
@@ -619,7 +720,10 @@
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/bravebullglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -639,7 +743,10 @@
   color: "#3E1B00"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/cubalibreglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -659,7 +766,10 @@
   color: "#a70000"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/demonsblood.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: DevilsKiss
@@ -668,10 +778,13 @@
   desc: reagent-desc-devils-kiss
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
-  color: "#A68310"
+  color: "#ff0033"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/devilskiss.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: DoctorsDelight
@@ -683,7 +796,10 @@
   color: "#FF8CFF"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/doctorsdelightglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -714,7 +830,10 @@
   color: "#2E6671"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/driestmartiniglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -731,10 +850,13 @@
   desc: reagent-desc-erika-surprise
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
-  color: "#2E6671"
+  color: "#67bc50"
   metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/erikasurprise.rsi
-    state: icon
+    sprite: Objects/Consumable/Drinks/beerstein.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: GargleBlaster
@@ -746,7 +868,10 @@
   color: "#9cc8b4"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -766,7 +891,10 @@
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/ginfizzglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -786,7 +914,10 @@
   color: "#004166"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/gintonicglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -806,7 +937,10 @@
   color: "#FFFF91"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/gildlagerglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
   metabolisms:
     Drink:
       effects:
@@ -823,10 +957,13 @@
   desc: reagent-desc-grog
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
-  color: "#664300"
+  color: "#e3e77b"
   metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/grogglass.rsi
-    state: icon
+    sprite: Objects/Consumable/Drinks/beerstein.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: HippiesDelight
@@ -838,7 +975,10 @@
   color: "#6eaa0c"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/hippiesdelightglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: Hooch
@@ -848,9 +988,6 @@
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
   color: "#664e00"
-  metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/glass_brown2.rsi
-    state: icon
 
 - type: reagent
   id: IcedBeer
@@ -862,7 +999,10 @@
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/iced_beerglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: IrishCarBomb
@@ -874,7 +1014,10 @@
   color: "#2E6671"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/irishcarbomb.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -894,7 +1037,10 @@
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/irishcreamglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -914,7 +1060,10 @@
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/irishcoffeeglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -934,7 +1083,10 @@
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/longislandicedteaglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -954,7 +1106,10 @@
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/manhattanglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: ManhattanProject
@@ -966,7 +1121,10 @@
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/proj_manhattanglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: ManlyDorf
@@ -978,7 +1136,10 @@
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/manlydorfglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 2
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: Margarita
@@ -990,7 +1151,10 @@
   color: "#8CFF8C"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/margaritaglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: Martini
@@ -1002,7 +1166,10 @@
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/martiniglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -1021,8 +1188,11 @@
   flavor: mead
   color: "#664300"
   metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/meadglass.rsi
-    state: icon
+    sprite: Objects/Consumable/Drinks/beerstein.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: Mojito
@@ -1031,10 +1201,13 @@
   desc: reagent-desc-mojito
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
-  color: "#664300"
+  color: "#3ea99888"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/mojito.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: Moonshine
@@ -1063,7 +1236,10 @@
   color: "#2E2E61"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/neurotoxinglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -1089,7 +1265,10 @@
   color: "#585840"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/patronglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
   metabolisms:
     Drink:
       effects:
@@ -1106,10 +1285,13 @@
   desc: reagent-desc-red-mead
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
-  color: "#C73C00"
+  color: "#bc5550"
   metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/red_meadglass.rsi
-    state: icon
+    sprite: Objects/Consumable/Drinks/beerstein.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: Sbiten
@@ -1121,7 +1303,10 @@
   color: "#004166"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/sbitenglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: ScrewdriverCocktail
@@ -1133,7 +1318,10 @@
   color: "#A68310"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/screwdriverglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -1153,7 +1341,10 @@
   color: "#B5A642"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/cogchamp.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -1173,10 +1364,13 @@
   desc: reagent-desc-silencer
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: nothing
-  color: "#004666"
+  color: "#878787"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/silencerglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -1196,7 +1390,10 @@
   color: "#3b0c0c"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/singulo.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: SnowWhite
@@ -1208,7 +1405,10 @@
   color: "#FFFFFF"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/snowwhite.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: SuiDream
@@ -1220,7 +1420,10 @@
   color: "#00A86B"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/sdreamglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: SyndicateBomb
@@ -1229,10 +1432,13 @@
   desc: reagent-desc-syndicate-bomb
   physicalDesc: reagent-physical-desc-opaque
   flavor: syndiebomb
-  color: "#2E6660"
+  color: "#e3e77b"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/syndicatebomb.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: TequilaSunrise
@@ -1244,7 +1450,10 @@
   color: "#FFE48C"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/tequillasunriseglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -1264,7 +1473,10 @@
   color: "#75b1f0"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/the_martinez.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: ThreeMileIsland
@@ -1276,7 +1488,10 @@
   color: "#666340"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/threemileislandglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 2
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -1299,7 +1514,10 @@
   color: "#665c00"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/toxinsspecialglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: VodkaMartini
@@ -1311,7 +1529,10 @@
   color: "#004666"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/martiniglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -1330,8 +1551,11 @@
   flavor: alcohol
   color: "#0064C8"
   metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/vodkatonicglass.rsi
-    state: icon
+    sprite: Objects/Consumable/Drinks/gintonicglass.rsi # they look the same
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -1351,7 +1575,10 @@
   color: "#3E1B00"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/whiskeycolaglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -1371,7 +1598,10 @@
   color: "#533600"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/whiskeysodaglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -1408,7 +1638,10 @@
   color: "#A68340"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/whiterussianglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index 77a387da7b..946a2a6e44 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -58,7 +58,10 @@
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/cafe_latte.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 1
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: GreenTea
@@ -67,10 +70,13 @@
   desc: reagent-desc-green-tea
   physicalDesc: reagent-physical-desc-aromatic
   flavor: tea
-  color: "#C33F00"
+  color: "#7EB626"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/glass_green.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: Grenadine
@@ -82,7 +88,10 @@
   color: "#EA1D26"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/grenadineglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
   footstepSound:
     collection: FootstepSticky
     params:
@@ -98,7 +107,10 @@
   color: "#102838"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/icedcoffeeglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: IcedGreenTea
@@ -107,10 +119,13 @@
   desc: reagent-desc-iced-green-tea
   physicalDesc: reagent-physical-desc-aromatic
   flavor: icedtea
-  color: "#CE4200"
+  color: "#5B821B"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/glass_green.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: IcedTea
@@ -119,10 +134,13 @@
   desc: reagent-desc-iced-tea
   physicalDesc: reagent-physical-desc-aromatic
   flavor: icedtea
-  color: "#104038"
+  color: "#6C3916"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/icedteaglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -163,7 +181,10 @@
   color: "#FFFF00"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/lemonadeglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -240,9 +261,6 @@
   desc: reagent-desc-nothing
   group: Drinks
   physicalDesc: reagent-physical-desc-nothing
-  metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/nothing.rsi
-    state: icon
   metabolisms:
     Drink:
       effects:
@@ -261,7 +279,10 @@
   color: "#100800"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/nuclear_colaglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -293,7 +314,10 @@
   color: "#664300"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/soy_latte.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 1
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: Tea
@@ -404,9 +428,6 @@
   physicalDesc: reagent-physical-desc-sour
   flavor: bitter
   color: "#B3B599"
-  metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/glass_light_yellow.rsi
-    state: icon
 
 - type: reagent
   id: KiraSpecial
@@ -418,7 +439,10 @@
   color: "#CCCC99"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/kiraspecial.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: Rewriter
@@ -429,8 +453,11 @@
   flavor: sweet
   color: "#485000"
   metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/rewriter.rsi
-    state: icon
+    sprite: Objects/Consumable/Drinks/beerstein.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: Mopwata
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
index e3f1a0e836..bcbd877ea8 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -63,7 +63,10 @@
   recognizable: true
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/icecreamglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
 
 - type: reagent
   id: LemonLime
@@ -73,9 +76,6 @@
   physicalDesc: reagent-physical-desc-fizzy
   flavor: lemonlimesoda
   color: "#878F00"
-  metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/lemonlime.rsi
-    state: icon
 
 - type: reagent
   id: PwrGame
@@ -96,7 +96,10 @@
   color: "#381c07"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/rootbeerglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: RootBeerFloat
@@ -108,7 +111,10 @@
   color: "#4f361f"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/rootbeerfloatglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 7
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: SpaceMountainWind
diff --git a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
index f980f5066a..8fbfd3cd64 100644
--- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
@@ -77,6 +77,16 @@
   color: "#fba399"
   recognizable: true
 
+- type: reagent
+  id: LaughinSyrup
+  name: reagent-name-laughin-syrup
+  group: Foods
+  desc: reagent-desc-laughin-syrup
+  physicalDesc: reagent-physical-desc-funny
+  flavor: sweet
+  color: "#803280"
+  recognizable: true
+
 - type: reagent
   id: Mayo
   name: reagent-name-mayo
diff --git a/Resources/Prototypes/Reagents/Materials/glass.yml b/Resources/Prototypes/Reagents/Materials/glass.yml
index 07bebf12dc..30e7762a81 100644
--- a/Resources/Prototypes/Reagents/Materials/glass.yml
+++ b/Resources/Prototypes/Reagents/Materials/glass.yml
@@ -30,6 +30,14 @@
   color: "#8c4069"
   price: 0.40 # 1-1-0.5 mix of plasma, glass, and metal.
 
+- type: material
+  id: BrassGlass
+  stackEntity: SheetClockworkGlass1
+  name: materials-clockwork-glass
+  icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: cglass }
+  color: "#9b6f07"
+  price: 0.0875 # average of glass and brass.
+
 - type: material
   id: UraniumGlass
   stackEntity: SheetUGlass1
diff --git a/Resources/Prototypes/Reagents/Materials/metals.yml b/Resources/Prototypes/Reagents/Materials/metals.yml
index affeb9427e..a2d2397dcd 100644
--- a/Resources/Prototypes/Reagents/Materials/metals.yml
+++ b/Resources/Prototypes/Reagents/Materials/metals.yml
@@ -23,6 +23,14 @@
   color: "#C0C0C0"
   price: 0.15
 
+- type: material
+  id: Brass
+  stackEntity: SheetBrass1
+  name: materials-brass
+  icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: brass }
+  color: "#b18b25"
+  price: 0.1
+
 - type: material
   id: Plasteel
   stackEntity: SheetPlasteel1
diff --git a/Resources/Prototypes/Reagents/Materials/ores.yml b/Resources/Prototypes/Reagents/Materials/ores.yml
index 4f4dceea8b..18f1d9ebb3 100644
--- a/Resources/Prototypes/Reagents/Materials/ores.yml
+++ b/Resources/Prototypes/Reagents/Materials/ores.yml
@@ -59,3 +59,12 @@
   icon: { sprite: Objects/Materials/ore.rsi, state: bananium }
   color: "#32a852"
   price: 0.2
+
+- type: material
+  id: RawSalt
+  stackEntity: Salt1
+  name: materials-raw-salt
+  unit: materials-unit-chunk
+  icon: { sprite: Objects/Materials/ore.rsi, state: salt }
+  color: "#f5e7d7"
+  price: 0.075
\ No newline at end of file
diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml
index d29d5f7e4d..af6f2557ba 100644
--- a/Resources/Prototypes/Reagents/biological.yml
+++ b/Resources/Prototypes/Reagents/biological.yml
@@ -7,7 +7,10 @@
   color: "#800000"
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/bloodglass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   recognizable: true
   physicalDesc: reagent-physical-desc-ferrous
   slippery: false
@@ -88,7 +91,19 @@
   flavor: metallic
   color: "#162581"
   recognizable: true
-  physicalDesc: reagent-physical-desc-ferrous
+  physicalDesc: reagent-physical-desc-metallic
+  slippery: false
+
+- type: reagent
+  parent: Blood
+  id: AmmoniaBlood
+  name: reagent-name-ammonia-blood
+  group: Biological
+  desc: reagent-desc-ammonia-blood
+  flavor: bitter
+  color: "#7a8bf2"
+  recognizable: true
+  physicalDesc: reagent-physical-desc-pungent
   slippery: false
 
 - type: reagent
@@ -132,6 +147,8 @@
     # Dragon doesn't require airloss healing, so omnizine is still best for humans.
     Medicine:
       effects:
+      - !type:ModifyBloodLevel
+        amount: 3
       - !type:HealthChange
         damage:
           groups:
@@ -183,4 +200,4 @@
   footstepSound:
     collection: FootstepBlood
     params:
-      volume: 6
\ No newline at end of file
+      volume: 6
diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml
index 5c6528a43f..b3a7fe1bb0 100644
--- a/Resources/Prototypes/Reagents/elements.yml
+++ b/Resources/Prototypes/Reagents/elements.yml
@@ -76,7 +76,7 @@
         - !type:OrganType
           type: Arachnid
           shouldHave: true
-        amount: 4
+        amount: 0.4
 
 - type: reagent
   id: Fluorine
@@ -167,7 +167,7 @@
         - !type:OrganType
           type: Arachnid
           shouldHave: false
-        amount: 4
+        amount: 0.4
 
 - type: reagent
   id: Lithium
diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml
index d22e2213ac..9597627e87 100644
--- a/Resources/Prototypes/Reagents/fun.yml
+++ b/Resources/Prototypes/Reagents/fun.yml
@@ -41,7 +41,6 @@
         conditions:
         - !type:OrganType
           type: Moth
-     
 
 - type: reagent
   id: BuzzochloricBees
@@ -222,13 +221,13 @@
     entity: IceCrust
     maxOnTileWhitelist:
       tags: [ Ice ]
-  - !type:ExtinguishTileReaction { } 
+  - !type:ExtinguishTileReaction { }
   reactiveEffects:
     Acidic:
       methods: [ Touch ]
       effects:
       - !type:HealthChange
-        scaleByQuantity: true 
+        scaleByQuantity: true
         ignoreResistances: false
         damage:
           types:
@@ -236,7 +235,7 @@
       - !type:AdjustTemperature
         conditions:
         - !type:Temperature
-          min: 160.15 
+          min: 160.15
         amount: -30000
     Extinguish:
       methods: [ Touch ]
@@ -298,3 +297,54 @@
         messages: [ "fresium-effect-frozen"]
         probability: 0.4
 
+- type: reagent
+  id: Laughter
+  name: reagent-name-laughter
+  group: Special
+  desc: reagent-desc-laughter
+  physicalDesc: reagent-physical-desc-funny
+  flavor: funny
+  color: "#FF4DD2"
+  slippery: true #clown juice gotta slip
+  metabolisms:
+    Medicine:
+      effects:
+      - !type:Emote
+        emote: Laugh
+        probability: 0.3
+      - !type:PopupMessage
+        type: Local
+        visualType: Large
+        messages: [ "laughter-effect-control-laughter" ]
+        probability: 0.2
+
+- type: reagent
+  id: JuiceThatMakesYouWeh
+  name: reagent-name-weh
+  group: Toxins
+  desc: reagent-desc-weh
+  physicalDesc: reagent-physical-desc-vibrant
+  flavor: weh
+  color: "#59b23a"
+  metabolisms:
+    Poison:
+      metabolismRate: 0.25
+      effects:
+      - !type:Emote
+        emote: Weh
+        showInChat: true
+        probability: 0.5
+      - !type:Polymorph
+        prototype: ArtifactLizard # Does the same thing as the original YML I made for this reagent.
+        conditions:
+        - !type:OrganType
+          type: Animal
+          shouldHave: false
+        - !type:ReagentThreshold
+          min: 50
+      - !type:AdjustReagent
+        reagent: JuiceThatMakesYouWeh
+        amount: -20
+        conditions:
+        - !type:ReagentThreshold
+          min: 50
diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml
index 54bdbf3a40..9cb73fffb8 100644
--- a/Resources/Prototypes/Reagents/gases.yml
+++ b/Resources/Prototypes/Reagents/gases.yml
@@ -68,9 +68,14 @@
           types:
             Poison:
               1
-      # Cant be added until I add metabolism effects on reagent removal
-      #- !type:AdjustAlert
-      #  alertType: Toxins
+      # We need a metabolism effect on reagent removal
+      - !type:AdjustAlert
+        alertType: Toxins
+        conditions:
+          - !type:ReagentThreshold
+            min: 1.5
+        clear: True
+        time: 5
   reactiveEffects:
     Flammable:
       methods: [ Touch ]
@@ -87,6 +92,12 @@
   tileReactions:
   - !type:FlammableTileReaction
     temperatureMultiplier: 2.0
+  reactiveEffects:
+    Flammable:
+      methods: [ Touch ]
+      effects:
+      - !type:FlammableReaction
+        multiplier: 0.8
   metabolisms:
     Poison:
       effects:
@@ -103,9 +114,14 @@
           types:
             Radiation:
               1
-      # Cant be added until I add metabolism effects on reagent removal
-      #- !type:AdjustAlert
-      #  alertType: Toxins
+      # We need a metabolism effect on reagent removal
+      - !type:AdjustAlert
+        alertType: Toxins
+        conditions:
+          - !type:ReagentThreshold
+            min: 1.5
+        clear: True
+        time: 5
 
 - type: reagent
   id: CarbonDioxide
@@ -142,7 +158,7 @@
           type: Plant
           shouldHave: false
         factor: -4
-      # Cant be added until I add metabolism effects on reagent removal
+      # We need a metabolism effect on reagent removal
       #- !type:AdjustAlert
       #  alertType: CarbonDioxide
 
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index c2a3353079..b3b5bcebb3 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -574,6 +574,33 @@
       - !type:ChemVomit
         probability: 0.05
 
+- type: reagent
+  id: PolypyryliumOligomers
+  name: reagent-name-polypyrylium-oligomers
+  group: Medicine
+  desc: reagent-desc-polypyrylium-oligomers
+  physicalDesc: reagent-physical-desc-pungent
+  flavor: violets
+  color: "#9423FF"
+  metabolisms:
+    Medicine:
+      effects:
+      - !type:HealthChange
+        damage:
+          groups:
+            Brute: -3.5
+          types:
+            Asphyxiation: -2.5
+      - !type:HealthChange
+        conditions:
+        - !type:ReagentThreshold
+          min: 30
+        damage:
+          types:
+            Asphyxiation: 3.5
+      - !type:ModifyBleedAmount
+        amount: -0.25
+
 - type: reagent
   id: Ambuzol
   name: reagent-name-ambuzol
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index 794eff9402..c0491716d7 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -77,6 +77,27 @@
           types:
             Poison: 1.5
 
+- type: reagent
+  id: GastroToxin
+  name: reagent-name-gastrotoxin
+  group: Toxins
+  desc: reagent-desc-gastrotoxin
+  flavor: bitter
+  color: "#acc91a"
+  physicalDesc: reagent-physical-desc-putrid
+  metabolisms:
+    Poison:
+      effects:
+        - !type:HealthChange
+          damage:
+            types:
+              Poison: 2
+        - !type:ChemVomit
+          conditions:
+          - !type:ReagentThreshold
+            min: 2
+          probability: 0.2
+
 - type: reagent
   id: Mold
   name: reagent-name-mold
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml
index 2f9edcb41d..90e77d6720 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml
@@ -13,6 +13,97 @@
             - material: Cloth
               amount: 2
               doAfter: 1
+        - to: CurtainsBlack
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - tag: CarpetBlack
+              doAfter: 1
+              name: black carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-black
+        - to: CurtainsBlue
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - tag: CarpetBlue
+              doAfter: 1
+              name: blue carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-blue
+        - to: CurtainsCyan
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - tag: CarpetCyan
+              doAfter: 1
+              name: cyan carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-cyan
+        - to: CurtainsGreen
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - tag: CarpetGreen
+              doAfter: 1
+              name: green carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-green
+        - to: CurtainsOrange
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - tag: CarpetOrange
+              doAfter: 1
+              name: orange carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-orange
+        - to: CurtainsPink
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - tag: CarpetPink
+              doAfter: 1
+              name: pink carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-pink
+        - to: CurtainsPurple
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - tag: CarpetPurple
+              doAfter: 1
+              name: purple carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-purple
+        - to: CurtainsRed
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - tag: CarpetRed
+              doAfter: 1
+              name: red carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-red
+        - to: CurtainsWhite
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - tag: CarpetWhite
+              doAfter: 1
+              name: white carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-white
+              
     - node: Curtains
       entity: HospitalCurtains
       edges:
@@ -35,3 +126,210 @@
           steps:
             - tool: Cutting
               doAfter: 1
+    
+    - node: CurtainsBlack
+      entity: CurtainsBlack
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemBlack
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+    - node: CurtainsBlackOpen
+      entity: CurtainsBlackOpen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemBlack
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1    
+              
+    - node: CurtainsBlue
+      entity: CurtainsBlue
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemBlue
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+    - node: CurtainsBlueOpen
+      entity: CurtainsBlueOpen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemBlue
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+              
+    - node: CurtainsCyan
+      entity: CurtainsCyan
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemCyan
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+    - node: CurtainsCyanOpen
+      entity: CurtainsCyanOpen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemCyan
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+              
+    - node: CurtainsGreen
+      entity: CurtainsGreen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemGreen
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+    - node: CurtainsGreenOpen
+      entity: CurtainsGreenOpen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemGreen
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+              
+    - node: CurtainsOrange
+      entity: CurtainsOrange
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemOrange
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+    - node: CurtainsOrangeOpen
+      entity: CurtainsOrangeOpen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemOrange
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+              
+    - node: CurtainsPink
+      entity: CurtainsPink
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemPink
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+    - node: CurtainsPinkOpen
+      entity: CurtainsPinkOpen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemPink
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+              
+    - node: CurtainsPurple
+      entity: CurtainsPurple
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemPurple
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+    - node: CurtainsPurpleOpen
+      entity: CurtainsPurpleOpen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemPurple
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+              
+    - node: CurtainsRed
+      entity: CurtainsRed
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemRed
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+    - node: CurtainsRedOpen
+      entity: CurtainsRedOpen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemRed
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+              
+    - node: CurtainsWhite
+      entity: CurtainsWhite
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemWhite
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+    - node: CurtainsWhiteOpen
+      entity: CurtainsWhiteOpen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemWhite
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml
index 9089de34e8..f859daabc9 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml
@@ -21,6 +21,11 @@
             - material: Steel
               amount: 1
               doAfter: 1
+        - to: chairBrass
+          steps:
+            - material: Brass
+              amount: 1
+              doAfter: 1
         - to: chairOffice
           steps:
             - material: Steel
@@ -70,6 +75,13 @@
               doAfter: 1
             - material: Cloth
               amount: 1
+        - to: blueComfBench
+          steps:
+            - material: Steel
+              amount: 2
+              doAfter: 1
+            - material: Cloth
+              amount: 1
 
     - node: chair
       entity: Chair
@@ -104,6 +116,17 @@
             - tool: Screwing
               doAfter: 1
 
+    - node: chairBrass
+      entity: ChairBrass
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetBrass1
+          steps:
+            - tool: Screwing
+              doAfter: 1
+
     - node: chairOffice
       entity: ChairOfficeLight
       edges:
@@ -219,3 +242,20 @@
               doAfter: 1
             - tool: Screwing
               doAfter: 1
+
+    - node: blueComfBench
+      entity: BenchBlueComfy
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetSteel1
+              amount: 2
+            - !type:SpawnPrototype
+              prototype: MaterialCloth1
+              amount: 1
+          steps:
+            - tool: Cutting
+              doAfter: 1
+            - tool: Screwing
+              doAfter: 1
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
index feade0ae58..bdfcaae6e9 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
@@ -73,6 +73,12 @@
             - material: PlasmaGlass
               amount: 1
               doAfter: 1
+        
+        - to: TableBrass
+          steps:
+            - material: Brass
+              amount: 1
+              doAfter: 1
 
         - to: TableWood
           steps:
@@ -176,6 +182,18 @@
             - tool: Anchoring
               doAfter: 1
 
+    - node: TableBrass
+      entity: TableBrass
+      edges:
+        - to: TableFrame
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetBrass1
+              amount: 1
+          steps:
+            - tool: Prying
+              doAfter: 1
+
     - node: TableWood
       entity: TableWood
       edges:
@@ -193,6 +211,78 @@
             - material: Cloth
               amount: 1
               doAfter: 1
+              
+        - to: TableFancyBlack
+          steps: 
+            - tag: CarpetBlack
+              name: black carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-black
+              
+        - to: TableFancyBlue
+          steps: 
+            - tag: CarpetBlue
+              name: blue carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-blue
+              
+        - to: TableFancyCyan
+          steps: 
+            - tag: CarpetCyan
+              name: cyan carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-cyan
+              
+        - to: TableFancyGreen
+          steps: 
+            - tag: CarpetGreen
+              name: green carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-green
+              
+        - to: TableFancyOrange
+          steps: 
+            - tag: CarpetOrange
+              name: orange carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-orange
+              
+        - to: TableFancyPurple
+          steps: 
+            - tag: CarpetPurple
+              name: purple carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-purple
+                
+        - to: TableFancyPink
+          steps: 
+            - tag: CarpetPink
+              name: pink carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-pink
+              
+        - to: TableFancyRed
+          steps: 
+            - tag: CarpetRed
+              name: red carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-red
+              
+        - to: TableFancyWhite
+          steps: 
+            - tag: CarpetWhite
+              name: white carpet
+              icon:
+                sprite: Objects/Tiles/tile.rsi
+                state: carpet-white
 
         - to: TableWoodReinforced #Nyano - See Resources/Prototypes/Nyanotrasen/Entities/Furniture/Tables/tables.yml
           steps:
@@ -211,6 +301,114 @@
           steps:
             - tool: Prying
               doAfter: 1
+              
+    - node: TableFancyBlack
+      entity: TableFancyBlack
+      edges:
+        - to: TableWood
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemBlack
+              amount: 1
+          steps:
+            - tool: Prying
+              doAfter: 1
+              
+    - node: TableFancyBlue
+      entity: TableFancyBlue
+      edges:
+        - to: TableWood
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemBlue
+              amount: 1
+          steps:
+            - tool: Prying
+              doAfter: 1
+              
+    - node: TableFancyCyan
+      entity: TableFancyCyan
+      edges:
+        - to: TableWood
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemCyan
+              amount: 1
+          steps:
+            - tool: Prying
+              doAfter: 1
+
+    - node: TableFancyGreen
+      entity: TableFancyGreen
+      edges:
+        - to: TableWood
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemGreen
+              amount: 1
+          steps:
+            - tool: Prying
+              doAfter: 1
+
+    - node: TableFancyOrange
+      entity: TableFancyOrange
+      edges:
+        - to: TableWood
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemOrange
+              amount: 1
+          steps:
+            - tool: Prying
+              doAfter: 1
+
+    - node: TableFancyPurple
+      entity: TableFancyPurple
+      edges:
+        - to: TableWood
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemPurple
+              amount: 1
+          steps:
+            - tool: Prying
+              doAfter: 1
+
+    - node: TableFancyPink
+      entity: TableFancyPink
+      edges:
+        - to: TableWood
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemPink
+              amount: 1
+          steps:
+            - tool: Prying
+              doAfter: 1
+
+    - node: TableFancyRed
+      entity: TableFancyRed
+      edges:
+        - to: TableWood
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemRed
+              amount: 1
+          steps:
+            - tool: Prying
+              doAfter: 1
+
+    - node: TableFancyWhite
+      entity: TableFancyWhite
+      edges:
+        - to: TableWood
+          completed:
+            - !type:SpawnPrototype
+              prototype: FloorCarpetItemWhite
+              amount: 1
+          steps:
+            - tool: Prying
+              doAfter: 1
 
     - node: TableWoodReinforced #Nyano - See Resources/Prototypes/Nyanotrasen/Entities/Furniture/Tables/tables.yml
       entity: TableWoodReinforced
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml b/Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml
index a707dd1546..02c5d94f98 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/materials/glass.yml
@@ -33,6 +33,24 @@
               amount: 1
             - material: MetalRod
               amount: 1
+        - to: SheetRPGlass0
+          completed:
+            - !type:SetStackCount
+              amount: 1
+          steps:
+            - material: PlasmaGlass
+              amount: 1
+            - material: MetalRod
+              amount: 1
+        - to: SheetRPGlass1
+          completed:
+            - !type:SetStackCount
+              amount: 1
+          steps:
+            - material: ReinforcedGlass
+              amount: 1
+            - material: Plasma
+              amount: 1
         - to: SheetUGlass
           completed:
             - !type:SetStackCount
@@ -54,6 +72,36 @@
             - material: MetalRod
               amount: 1
 
+        - to: SheetClockworkGlass
+          completed:
+            - !type:SetStackCount
+              amount: 1
+          steps:
+            - material: Glass
+              amount: 1
+            - material: Brass
+              amount: 1
+
+        - to: SheetRUGlass0
+          completed:
+            - !type:SetStackCount
+              amount: 1
+          steps:
+            - material: UraniumGlass
+              amount: 1
+            - material: MetalRod
+              amount: 1
+
+        - to: SheetRUGlass1
+          completed:
+            - !type:SetStackCount
+              amount: 1
+          steps:
+            - material: ReinforcedGlass
+              amount: 1
+            - material: Uranium
+              amount: 1
+
     - node: SheetGlass
       entity: SheetGlass
 
@@ -66,9 +114,23 @@
     - node: SheetRPGlass
       entity: SheetRPGlass
 
+    - node: SheetRPGlass0
+      entity: SheetRPGlass
+
+    - node: SheetRPGlass1
+      entity: SheetRPGlass
+
     - node: SheetUGlass
       entity: SheetUGlass
 
     - node: SheetRUGlass
       entity: SheetRUGlass
+      
+    - node: SheetClockworkGlass
+      entity: SheetClockworkGlass
 
+    - node: SheetRUGlass0
+      entity: SheetRUGlass
+
+    - node: SheetRUGlass1
+      entity: SheetRUGlass
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml
new file mode 100644
index 0000000000..b0cfe30eb0
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml
@@ -0,0 +1,165 @@
+- type: constructionGraph
+  id: PinionAirlock
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: assembly
+      completed:
+      - !type:SetAnchor
+        value: false
+      steps:
+      - material: Brass
+        amount: 4
+        doAfter: 2
+
+  - node: assembly
+    entity: PinionAirlockAssembly
+    actions:
+    - !type:SnapToGrid {}
+    - !type:SetAnchor {}
+    edges:
+    - to: wired
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - material: Cable
+        amount: 5
+        doAfter: 2.5
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetBrass1
+        amount: 4
+      - !type:DeleteEntity {}
+      steps:
+      - tool: Welding
+        doAfter: 3
+
+  - node: wired
+    entity: PinionAirlockAssembly
+    edges:
+    - to: electronics
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - tag: DoorElectronics
+        store: board
+        name: "door electronics circuit board"
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: "door_electronics"
+        doAfter: 3
+    - to: assembly
+      completed:
+      - !type:SpawnPrototype
+        prototype: CableApcStack1
+        amount: 5
+      steps:
+      - tool: Cutting
+        doAfter: 2.5
+
+  - node: electronics
+    edges:
+    - to: airlock
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - tool: Screwing
+        doAfter: 2.5
+    - to: glassElectronics
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - material: ClockworkGlass
+        amount: 1
+        doAfter: 2
+    - to: wired
+      conditions:
+      - !type:EntityAnchored {}
+      completed:
+      - !type:EmptyAllContainers
+        pickup: true
+        emptyAtUser: true
+      steps:
+      - tool: Prying
+        doAfter: 5
+
+  - node: glassElectronics
+    entity: PinionAirlockAssemblyGlass
+    edges:
+    - to: glassAirlock
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - material: ClockworkGlass
+        amount: 1
+        doAfter: 2
+      - tool: Screwing
+        doAfter: 2.5
+    - to: wired
+      conditions:
+      - !type:EntityAnchored {}
+      completed:
+      - !type:EmptyAllContainers
+        pickup: true
+        emptyAtUser: true
+      - !type:SpawnPrototype
+        prototype: SheetClockworkGlass1
+        amount: 1
+      steps:
+      - tool: Prying
+        doAfter: 5
+
+## Glass airlock
+  - node: glassAirlock
+    entity: PinionAirlockGlass
+    doNotReplaceInheritingEntities: true
+    actions:
+    - !type:SetWiresPanelSecurity
+      wiresAccessible: true
+      weldingAllowed: true
+    edges:
+    - to: glassElectronics
+      conditions:
+      - !type:EntityAnchored {}
+      - !type:DoorWelded {}
+      - !type:DoorBolted
+        value: false
+      - !type:WirePanel {}
+      - !type:AllWiresCut
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetClockworkGlass1
+        amount: 1
+      steps:
+      - tool: Prying
+        doAfter: 2
+
+## Standard airlock
+  - node: airlock
+    entity: PinionAirlock
+    doNotReplaceInheritingEntities: true
+    actions:
+    - !type:SetWiresPanelSecurity
+      wiresAccessible: true
+      weldingAllowed: true
+    edges:
+    - to: wired
+      conditions:
+      - !type:EntityAnchored {}
+      - !type:DoorWelded {}
+      - !type:DoorBolted
+        value: false
+      - !type:WirePanel {}
+      - !type:AllWiresCut
+      completed:
+      - !type:EmptyAllContainers
+        pickup: true
+        emptyAtUser: true
+      steps:
+      - tool: Prying
+        doAfter: 5
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml
index b2d91f3433..9f18fe8f2f 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml
@@ -336,7 +336,7 @@
             - material: Plasteel
               amount: 2
               doAfter: 1
-        
+
         - to: diagonalshuttleWall #Nyano
           completed:
             - !type:SnapToGrid
@@ -551,3 +551,11 @@
           steps:
             - tool: Prying
               doAfter: 10
+
+    - node: reinforcedWallRust
+      entity: WallReinforcedRust
+      edges:
+        - to: reinforcedWall
+          steps:
+            - tool: Welding
+              doAfter: 5
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder_clockwork.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder_clockwork.yml
new file mode 100644
index 0000000000..b4ca5ce5a2
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder_clockwork.yml
@@ -0,0 +1,63 @@
+- type: constructionGraph
+  id: ClockworkGirder
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: clockGirder
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Brass
+              amount: 2
+              doAfter: 1
+
+    - node: clockGirder
+      entity: ClockworkGirder
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetBrass1
+              amount: 2
+            - !type:DeleteEntity {}
+          conditions:
+            - !type:EntityAnchored
+              anchored: false
+          steps:
+            - tool: Screwing
+              doAfter: 2
+
+        - to: clockworkWall
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          conditions:
+            - !type:EntityAnchored {}
+          steps:
+            - material: MetalRod
+              amount: 2
+              doAfter: 2
+            - material: Brass
+              amount: 2
+              doAfter: 1
+
+    - node: clockworkWall
+      entity: WallClock
+      edges:
+        - to: clockGirder
+          completed:
+            - !type:GivePrototype
+              prototype: PartRodMetal1
+              amount: 2
+            - !type:GivePrototype
+              prototype: SheetBrass1
+              amount: 2
+          steps:
+            - tool: Welding
+              doAfter: 10
+            - tool: Cutting
+              doAfter: 1
+            - tool: Prying
+              doAfter: 2
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_clockwork.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_clockwork.yml
new file mode 100644
index 0000000000..d51fed4fa6
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_clockwork.yml
@@ -0,0 +1,46 @@
+- type: constructionGraph
+  id: ClockGrille
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: clockGrille
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: MetalRod
+              amount: 2
+              doAfter: 1
+
+    - node: clockGrille
+      entity: ClockworkGrille
+      edges:
+        - to: start
+          completed:
+            - !type:AdminLog # Needs a log for start of attempt in addition to the completion log
+              message: "A grille was cut"
+            - !type:SpawnPrototype
+              prototype: PartRodMetal1
+              amount: 2
+            - !type:DeleteEntity
+          steps:
+            - tool: Cutting
+              doAfter: 0.25
+
+    - node: clockGrilleBroken
+      entity: ClockworkGrilleBroken
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: PartRodMetal1
+              amount: 1
+            - !type:DeleteEntity
+          steps:
+            - tool: Cutting
+        - to: clockGrille
+          steps:
+            - material: MetalRod
+              amount: 1
+              doAfter: 0.5
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_diagonal.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_diagonal.yml
index 3f1bad5d34..d24656faa5 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_diagonal.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/grille_diagonal.yml
@@ -12,6 +12,15 @@
             - material: MetalRod
               amount: 2
               doAfter: 1
+              
+        - to: clockworkGrilleDiagonal
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: MetalRod
+              amount: 2
+              doAfter: 1
 
     - node: grilleDiagonal
       entity: GrilleDiagonal
@@ -27,3 +36,18 @@
           steps:
             - tool: Cutting
               doAfter: 0.25
+              
+    - node: clockworkGrilleDiagonal
+      entity: ClockworkGrilleDiagonal
+      edges:
+        - to: start
+          completed:
+            - !type:AdminLog
+              message: "A grille was cut"
+            - !type:SpawnPrototype
+              prototype: PartRodMetal1
+              amount: 2
+            - !type:DeleteEntity
+          steps:
+            - tool: Cutting
+              doAfter: 0.25
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
index f87e515bd4..64809ee1db 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
@@ -1,4 +1,4 @@
-- type: constructionGraph
+- type: constructionGraph
   id: Windoor
   start: start
   graph:
@@ -21,12 +21,22 @@
         amount: 4
         doAfter: 2
 
+    - to: assemblyClockwork
+      completed:
+      - !type:SetAnchor
+        value: false
+      steps:
+      - material: Brass
+        amount: 4
+        doAfter: 2
+
   - node: assembly
     entity: WindoorAssembly
     actions:
     - !type:SnapToGrid {}
     - !type:SetAnchor {}
     edges:
+    #to normal
     - to: glass
       conditions:
       - !type:EntityAnchored {}
@@ -34,6 +44,26 @@
       - material: Glass
         amount: 5
         doAfter: 1
+
+    #to plasma
+    - to: pglass
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - material: PlasmaGlass
+        amount: 5
+        doAfter: 1
+
+    #to uranium
+    - to: uglass
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - material: UraniumGlass
+        amount: 5
+        doAfter: 1
+
+    #back to start
     - to: start
       conditions:
       - !type:EntityAnchored
@@ -47,6 +77,7 @@
       - tool: Welding
         doAfter: 2
 
+  #normal windoor node
   - node: glass
     entity: WindoorAssembly
     edges:
@@ -120,12 +151,162 @@
       - tool: Anchoring
         doAfter: 1
 
+  #plasma windoor node
+  - node: pglass
+    entity: WindoorAssemblyPlasma
+    edges:
+    - to: pwired
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - material: Cable
+        amount: 5
+        doAfter: 1
+    - to: assembly
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetPGlass1
+        amount: 5
+      steps:
+      - tool: Screwing
+        doAfter: 2
+
+  - node: pwired
+    entity: WindoorAssemblyPlasma
+    edges:
+    - to: pelectronics
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - tag: DoorElectronics
+        store: board
+        name: "door electronics circuit board"
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: "door_electronics"
+        doAfter: 1
+    - to: pglass
+      completed:
+      - !type:SpawnPrototype
+        prototype: CableApcStack1
+        amount: 5
+      steps:
+      - tool: Cutting
+        doAfter: 1
+
+  - node: pelectronics
+    entity: WindoorAssemblyPlasma
+    edges:
+    - to: pwindoor
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - tool: Screwing
+        doAfter: 2
+
+  - node: pwindoor
+    entity: WindoorPlasma
+    edges:
+    - to: pwired
+      conditions:
+      - !type:EntityAnchored {}
+      - !type:DoorBolted
+        value: false
+      - !type:WirePanel {}
+      - !type:AllWiresCut
+      completed:
+      - !type:EmptyAllContainers
+        pickup: true
+        emptyAtUser: true
+      steps:
+      - tool: Anchoring
+        doAfter: 1
+
+  #uranium windoor node
+  - node: uglass
+    entity: WindoorAssemblyUranium
+    edges:
+    - to: uwired
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - material: Cable
+        amount: 5
+        doAfter: 1
+    - to: assembly
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetUGlass1
+        amount: 5
+      steps:
+      - tool: Screwing
+        doAfter: 2
+
+  - node: uwired
+    entity: WindoorAssemblyUranium
+    edges:
+    - to: uelectronics
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - tag: DoorElectronics
+        store: board
+        name: "door electronics circuit board"
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: "door_electronics"
+        doAfter: 1
+    - to: uglass
+      completed:
+      - !type:SpawnPrototype
+        prototype: CableApcStack1
+        amount: 5
+      steps:
+      - tool: Cutting
+        doAfter: 1
+
+  - node: uelectronics
+    entity: WindoorAssemblyUranium
+    edges:
+    - to: uwindoor
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - tool: Screwing
+        doAfter: 2
+
+  - node: uwindoor
+    entity: WindoorUranium
+    edges:
+    - to: uwired
+      conditions:
+      - !type:EntityAnchored {}
+      - !type:DoorBolted
+        value: false
+      - !type:WirePanel {}
+      - !type:AllWiresCut
+      completed:
+      - !type:EmptyAllContainers
+        pickup: true
+        emptyAtUser: true
+      steps:
+      - tool: Anchoring
+        doAfter: 1
+
+  #secure windoor nodes
   - node: assemblySecure
     entity: WindoorAssemblySecure
     actions:
     - !type:SnapToGrid { }
     - !type:SetAnchor { }
     edges:
+    #to secure
     - to: glassSecure
       conditions:
       - !type:EntityAnchored { }
@@ -133,6 +314,26 @@
       - material: ReinforcedGlass
         amount: 5
         doAfter: 1
+
+    #to secure plasma
+    - to: pglassSecure
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - material: ReinforcedPlasmaGlass
+        amount: 5
+        doAfter: 1
+
+    #to secure uranium
+    - to: uglassSecure
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - material: ReinforcedUraniumGlass
+        amount: 5
+        doAfter: 1
+
+    #back to start
     - to: start
       conditions:
       - !type:EntityAnchored
@@ -146,6 +347,7 @@
       - tool: Welding
         doAfter: 10
 
+  #secure node
   - node: glassSecure
     entity: WindoorAssemblySecure
     edges:
@@ -219,3 +421,252 @@
       steps:
       - tool: Anchoring
         doAfter: 4
+
+  - node: assemblyClockwork
+    entity: WindoorAssemblyClockwork
+    actions:
+    - !type:SnapToGrid { }
+    - !type:SetAnchor { }
+    edges:
+    - to: glassClockwork
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - material: ClockworkGlass
+        amount: 5
+        doAfter: 1
+    - to: start
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetBrass1
+        amount: 4
+      - !type:DeleteEntity { }
+      steps:
+      - tool: Welding
+        doAfter: 10
+
+  - node: glassClockwork
+    entity: WindoorAssemblyClockwork
+    edges:
+    - to: wiredClockwork
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - material: Cable
+        amount: 5
+        doAfter: 1
+    - to: assemblyClockwork
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetClockworkGlass1
+        amount: 5
+      steps:
+      - tool: Screwing
+        doAfter: 4
+
+  - node: wiredClockwork
+    entity: WindoorAssemblyClockwork
+    edges:
+    - to: electronicsClockwork
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - tag: DoorElectronics
+        store: board
+        name: "door electronics circuit board"
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: "door_electronics"
+        doAfter: 1
+    - to: glassClockwork
+      completed:
+      - !type:SpawnPrototype
+        prototype: CableApcStack1
+        amount: 5
+      steps:
+      - tool: Cutting
+        doAfter: 3
+
+  - node: electronicsClockwork
+    entity: WindoorAssemblyClockwork
+    edges:
+    - to: windoorClockwork
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - tool: Screwing
+        doAfter: 4
+
+  - node: windoorClockwork
+    entity: WindoorClockwork
+    edges:
+    - to: wiredClockwork
+      conditions:
+      - !type:EntityAnchored {}
+      - !type:DoorBolted
+        value: false
+      - !type:WirePanel {}
+      - !type:AllWiresCut
+      completed:
+      - !type:EmptyAllContainers
+        pickup: true
+        emptyAtUser: true
+      steps:
+      - tool: Anchoring
+        doAfter: 4
+
+  #secure plasma node
+  - node: pglassSecure
+    entity: WindoorAssemblySecurePlasma
+    edges:
+    - to: pwiredSecure
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - material: Cable
+        amount: 5
+        doAfter: 1
+
+    - to: assemblySecure
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetRPGlass1
+        amount: 5
+      steps:
+      - tool: Screwing
+        doAfter: 4
+
+  - node: pwiredSecure
+    entity: WindoorAssemblySecurePlasma
+    edges:
+    - to: pelectronicsSecure
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - tag: DoorElectronics
+        store: board
+        name: "door electronics circuit board"
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: "door_electronics"
+        doAfter: 1
+    - to: pglassSecure
+      completed:
+      - !type:SpawnPrototype
+        prototype: CableApcStack1
+        amount: 5
+      steps:
+      - tool: Cutting
+        doAfter: 3
+
+  - node: pelectronicsSecure
+    entity: WindoorAssemblySecurePlasma
+    edges:
+    - to: pwindoorSecure
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - tool: Screwing
+        doAfter: 4
+
+  - node: pwindoorSecure
+    entity: WindoorSecurePlasma
+    edges:
+    - to: pwiredSecure
+      conditions:
+      - !type:EntityAnchored {}
+      - !type:DoorBolted
+        value: false
+      - !type:WirePanel {}
+      - !type:AllWiresCut
+      completed:
+      - !type:EmptyAllContainers
+        pickup: true
+        emptyAtUser: true
+      steps:
+      - tool: Anchoring
+        doAfter: 4
+
+  #secure Uranium node
+  - node: uglassSecure
+    entity: WindoorAssemblySecureUranium
+    edges:
+    - to: uwiredSecure
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - material: Cable
+        amount: 5
+        doAfter: 1
+    - to: assemblySecure
+      conditions:
+      - !type:EntityAnchored
+        anchored: false
+      completed:
+      - !type:SpawnPrototype
+        prototype: SheetRUGlass1
+        amount: 5
+      steps:
+      - tool: Screwing
+        doAfter: 4
+
+
+  - node: uwiredSecure
+    entity: WindoorAssemblySecureUranium
+    edges:
+    - to: uelectronicsSecure
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - tag: DoorElectronics
+        store: board
+        name: "door electronics circuit board"
+        icon:
+          sprite: "Objects/Misc/module.rsi"
+          state: "door_electronics"
+        doAfter: 1
+    - to: uglassSecure
+      completed:
+      - !type:SpawnPrototype
+        prototype: CableApcStack1
+        amount: 5
+      steps:
+      - tool: Cutting
+        doAfter: 3
+
+  - node: uelectronicsSecure
+    entity: WindoorAssemblySecureUranium
+    edges:
+    - to: uwindoorSecure
+      conditions:
+      - !type:EntityAnchored { }
+      steps:
+      - tool: Screwing
+        doAfter: 4
+
+  - node: uwindoorSecure
+    entity: WindoorSecureUranium
+    edges:
+    - to: uwiredSecure
+      conditions:
+      - !type:EntityAnchored {}
+      - !type:DoorBolted
+        value: false
+      - !type:WirePanel {}
+      - !type:AllWiresCut
+      completed:
+      - !type:EmptyAllContainers
+        pickup: true
+        emptyAtUser: true
+      steps:
+      - tool: Anchoring
+        doAfter: 4
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml
index 9bec505a96..6adf2ac3be 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml
@@ -54,6 +54,12 @@
               amount: 2
               doAfter: 4
 
+        - to: clockworkWindow
+          steps:
+            - material: ClockworkGlass
+              amount: 2
+              doAfter: 3
+
     - node: window
       entity: Window
       edges:
@@ -195,7 +201,30 @@
             - tool: Anchoring
               doAfter: 3
 
-    - node: shuttleWindow #Nyano
+    - node: clockworkWindow
+      entity: ClockworkWindow
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetClockworkGlass1
+              amount: 2
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Welding
+              doAfter: 5
+            - tool: Screwing
+              doAfter: 2
+            - tool: Prying
+              doAfter: 3
+            - tool: Welding
+              doAfter: 5
+            - tool: Screwing
+              doAfter: 2
+            - tool: Anchoring
+              doAfter: 3
+
+    - node: shuttleWindow
       entity: ShuttleWindow
       edges:
         - to: start
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window_diagonal.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window_diagonal.yml
index 1a11695212..55036b7559 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window_diagonal.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window_diagonal.yml
@@ -34,6 +34,12 @@
               amount: 2
               doAfter: 3
 
+        - to: clockworkWindowDiagonal
+          steps:
+            - material: ClockworkGlass
+              amount: 2
+              doAfter: 3
+
         - to: windowDiagonal
           steps:
             - material: Glass
@@ -78,6 +84,29 @@
             - tool: Anchoring
               doAfter: 2
 
+    - node: clockworkWindowDiagonal
+      entity: ClockworkWindowDiagonal
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetClockworkGlass1
+              amount: 2
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Welding
+              doAfter: 5
+            - tool: Screwing
+              doAfter: 1
+            - tool: Prying
+              doAfter: 2
+            - tool: Welding
+              doAfter: 5
+            - tool: Screwing
+              doAfter: 1
+            - tool: Anchoring
+              doAfter: 2
+
     - node: plasmaWindowDiagonal
       entity: PlasmaWindowDiagonal
       edges:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml
index fdc45ff08c..96f009fabb 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml
@@ -4,15 +4,22 @@
   graph:
     - node: start
       edges:
-        - to: plasmaWindowDirectional
+
+        - to: windowDirectional
           steps:
-            - material: PlasmaGlass
+            - material: Glass
               amount: 1
               doAfter: 2
 
         - to: windowReinforcedDirectional
           steps:
             - material: ReinforcedGlass
+              amount: 1
+              doAfter: 3
+
+        - to: plasmaWindowDirectional
+          steps:
+            - material: PlasmaGlass
               amount: 1
               doAfter: 2
 
@@ -21,10 +28,21 @@
             - material: ReinforcedPlasmaGlass
               amount: 1
               doAfter: 3
+        - to: uraniumWindowDirectional
+          steps:
+            - material: UraniumGlass
+              amount: 1
+              doAfter: 2
 
-        - to: windowDirectional
+        - to: uraniumReinforcedWindowDirectional
           steps:
-            - material: Glass
+            - material: ReinforcedUraniumGlass
+              amount: 1
+              doAfter: 3
+
+        - to: windowClockworkDirectional
+          steps:
+            - material: ClockworkGlass
               amount: 1
               doAfter: 3
 
@@ -81,6 +99,25 @@
             - tool: Anchoring
               doAfter: 3
 
+    - node: windowClockworkDirectional
+      entity: WindowClockworkDirectional
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetClockworkGlass1
+              amount: 1
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Screwing
+              doAfter: 2
+            - tool: Prying
+              doAfter: 3
+            - tool: Screwing
+              doAfter: 2
+            - tool: Anchoring
+              doAfter: 3
+
     - node: plasmaReinforcedWindowDirectional
       entity: PlasmaReinforcedWindowDirectional
       edges:
@@ -99,3 +136,40 @@
               doAfter: 2
             - tool: Anchoring
               doAfter: 3
+    - node: uraniumWindowDirectional
+      entity: UraniumWindowDirectional
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetUGlass1
+              amount: 1
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Screwing
+              doAfter: 2
+            - tool: Prying
+              doAfter: 3
+            - tool: Screwing
+              doAfter: 2
+            - tool: Anchoring
+              doAfter: 3
+
+    - node: uraniumReinforcedWindowDirectional
+      entity: UraniumReinforcedWindowDirectional
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetRUGlass1
+              amount: 1
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Screwing
+              doAfter: 2
+            - tool: Prying
+              doAfter: 3
+            - tool: Screwing
+              doAfter: 2
+            - tool: Anchoring
+              doAfter: 3
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/ame_shielding.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/ame_shielding.yml
index 98a4857be6..cf2bf9aaf7 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/ame_shielding.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/ame_shielding.yml
@@ -12,7 +12,7 @@
             - !type:AdminLog  # I don't like logging it like this. The log should include the user, AMEShielding EntityID, and AMEPart EntityID, and there should also be a start of attempt log.
               message: "An AME shielding was deconstructed"
             - !type:SpawnPrototype
-              prototype: AmePart
+              prototype: AmePartFlatpack
               amount: 1
             - !type:DeleteEntity
           steps:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
index cf6d75f46d..0914ae46e5 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
@@ -6,11 +6,11 @@
       edges:
         - to: solarassembly
           steps:
-            - tag: SolarAssemblyPart
+            - tag: SolarAssemblyFlatpack
               name: Solar Assembly Parts
               icon:
-                sprite: Objects/Power/solar_parts.rsi
-                state: solar_assembly_parts
+                sprite: Objects/Devices/flatpack.rsi
+                state: solar-assembly-part
               doAfter: 1
 
     - node: solarassembly
@@ -19,7 +19,7 @@
         - to: start
           completed:
             - !type:SpawnPrototype
-              prototype: SolarAssemblyPart
+              prototype: SolarAssemblyFlatpack
               amount: 1
             - !type:DeleteEntity {}
           steps:
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/bladed_hats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/bladed_hats.yml
new file mode 100644
index 0000000000..e582c3e4ae
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/bladed_hats.yml
@@ -0,0 +1,43 @@
+- type: constructionGraph
+  id: BladedFlatcapGrey
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: icon
+      steps:
+      - tag: GlassShard
+        name: a glass shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
+        doAfter: 1
+      - tag: BrimFlatcapGrey
+        name: a grey flatcap
+        icon:
+          sprite: Clothing/Head/Hats/greyflatcap.rsi
+          state: icon
+  - node: icon
+    entity: BladedFlatcapGrey
+
+- type: constructionGraph
+  id: BladedFlatcapBrown
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: icon
+      steps:
+      - tag: GlassShard
+        name: a glass shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
+        doAfter: 1
+      - tag: BrimFlatcapBrown
+        name: a brown flatcap
+        icon:
+          sprite: Clothing/Head/Hats/brownflatcap.rsi
+          state: icon
+  - node: icon
+    entity: BladedFlatcapBrown
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
index 54e518fd78..28de8e7f7d 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
@@ -1,5 +1,5 @@
 - type: constructionGraph
-  id: Shiv
+  id: ShivConstruct
   start: start
   graph:
   - node: start
@@ -14,7 +14,27 @@
     entity: Shiv
 
 - type: constructionGraph
-  id: ReinforcedShiv
+  id: Shiv
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: icon
+      steps:
+      - tag: GlassShard
+        name: Glass Shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
+        doAfter: 1
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: icon
+    entity: Shiv
+
+- type: constructionGraph
+  id: ReinforcedShivConstruct
   start: start
   graph:
   - node: start
@@ -29,7 +49,27 @@
     entity: ReinforcedShiv
 
 - type: constructionGraph
-  id: PlasmaShiv
+  id: ReinforcedShiv
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: icon
+      steps:
+      - tag: ReinforcedGlassShard
+        name: Reinforced Glass Shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
+        doAfter: 1
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: icon
+    entity: ReinforcedShiv
+
+- type: constructionGraph
+  id: PlasmaShivConstruct
   start: start
   graph:
   - node: start
@@ -44,7 +84,27 @@
     entity: PlasmaShiv
 
 - type: constructionGraph
-  id: UraniumShiv
+  id: PlasmaShiv
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: icon
+      steps:
+      - tag: PlasmaGlassShard
+        name: Plasma Glass Shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
+        doAfter: 1
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: icon
+    entity: PlasmaShiv
+
+- type: constructionGraph
+  id: UraniumShivConstruct
   start: start
   graph:
   - node: start
@@ -57,3 +117,23 @@
         doAfter: 1
   - node: icon
     entity: UraniumShiv
+
+- type: constructionGraph
+  id: UraniumShiv
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: icon
+      steps:
+      - tag: UraniumGlassShard
+        name: Uranium Glass Shard
+        icon:
+          sprite: Objects/Materials/Shards/shard.rsi
+          state: shard1
+        doAfter: 1
+      - material: Cloth
+        amount: 1
+        doAfter: 1
+  - node: icon
+    entity: UraniumShiv
diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml
index efe85a8546..4e05a4dfb8 100644
--- a/Resources/Prototypes/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/Recipes/Construction/furniture.yml
@@ -50,6 +50,23 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: brass chair
+  id: ChairBrass
+  graph: Seat
+  startNode: start
+  targetNode: chairBrass
+  category: construction-category-furniture
+  description: You sit in this. Either by will or force.
+  icon:
+    sprite: Structures/Furniture/chairs.rsi
+    state: brass_chair
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   name: office chair
   id: ChairOfficeLight
@@ -220,6 +237,23 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: comfortable blue bench
+  id: BlueComfBench
+  graph: Seat
+  startNode: start
+  targetNode: blueComfBench
+  category: construction-category-furniture
+  description: A bench with an extremely comfortable backrest.
+  icon:
+    sprite: Structures/Furniture/Bench/comf_bench.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 #tables
 - type: construction
   name: steel table
@@ -306,6 +340,23 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: brass table
+  id: TableBrass
+  graph: Table
+  startNode: start
+  targetNode: TableBrass
+  category: construction-category-furniture
+  description: A shiny, corrosion resistant brass table. Steampunk!
+  icon:
+    sprite: Structures/Furniture/Tables/brass.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   name: wood table
   id: TableWood
@@ -340,6 +391,159 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: fancy black table
+  id: TableFancyBlack
+  graph: Table
+  startNode: start
+  targetNode: TableFancyBlack
+  category: construction-category-furniture
+  description: A table covered with a beautiful cloth.
+  icon:
+    sprite: Structures/Furniture/Tables/Fancy/black.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  name: fancy blue table
+  id: TableFancyBlue
+  graph: Table
+  startNode: start
+  targetNode: TableFancyBlue
+  category: construction-category-furniture
+  description: A table covered with a beautiful cloth.
+  icon:
+    sprite: Structures/Furniture/Tables/Fancy/blue.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  name: fancy cyan table
+  id: TableFancyCyan
+  graph: Table
+  startNode: start
+  targetNode: TableFancyCyan
+  category: construction-category-furniture
+  description: A table covered with a beautiful cloth.
+  icon:
+    sprite: Structures/Furniture/Tables/Fancy/cyan.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  name: fancy green table
+  id: TableFancyGreen
+  graph: Table
+  startNode: start
+  targetNode: TableFancyGreen
+  category: construction-category-furniture
+  description: A table covered with a beautiful cloth.
+  icon:
+    sprite: Structures/Furniture/Tables/Fancy/green.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  name: fancy orange table
+  id: TableFancyOrange
+  graph: Table
+  startNode: start
+  targetNode: TableFancyOrange
+  category: construction-category-furniture
+  description: A table covered with a beautiful cloth.
+  icon:
+    sprite: Structures/Furniture/Tables/Fancy/orange.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  name: fancy purple table
+  id: TableFancyPurple
+  graph: Table
+  startNode: start
+  targetNode: TableFancyPurple
+  category: construction-category-furniture
+  description: A table covered with a beautiful cloth.
+  icon:
+    sprite: Structures/Furniture/Tables/Fancy/purple.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  name: fancy pink table
+  id: TableFancyPink
+  graph: Table
+  startNode: start
+  targetNode: TableFancyPink
+  category: construction-category-furniture
+  description: A table covered with a beautiful cloth.
+  icon:
+    sprite: Structures/Furniture/Tables/Fancy/pink.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  name: fancy red table
+  id: TableFancyRed
+  graph: Table
+  startNode: start
+  targetNode: TableFancyRed
+  category: construction-category-furniture
+  description: A table covered with a beautiful cloth.
+  icon:
+    sprite: Structures/Furniture/Tables/Fancy/red.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  name: fancy white table
+  id: TableFancyWhite
+  graph: Table
+  startNode: start
+  targetNode: TableFancyWhite
+  category: construction-category-furniture
+  description: A table covered with a beautiful cloth.
+  icon:
+    sprite: Structures/Furniture/Tables/Fancy/white.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   name: metal counter
   id: TableCounterMetal
@@ -506,7 +710,160 @@
   targetNode: Curtains
   category: construction-category-furniture
   icon:
-    sprite: Structures/Decoration/curtains.rsi
+    sprite: Structures/Decoration/Curtains/hospital.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+    
+- type: construction
+  id: CurtainsBlack
+  name: black curtains
+  description: Hides what others shouldn't see.
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsBlack
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/Curtains/black.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked  
+
+- type: construction
+  id: CurtainsBlue
+  name: blue curtains
+  description: Hides what others shouldn't see.
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsBlue
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/Curtains/blue.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked  
+    
+- type: construction
+  id: CurtainsCyan
+  name: cyan curtains
+  description: Hides what others shouldn't see.
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsCyan
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/Curtains/cyan.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+    
+- type: construction
+  id: CurtainsGreen
+  name: green curtains
+  description: Hides what others shouldn't see.
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsGreen
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/Curtains/green.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+    
+- type: construction
+  id: CurtainsOrange
+  name: orange curtains
+  description: Hides what others shouldn't see.
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsOrange
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/Curtains/orange.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+    
+- type: construction
+  id: CurtainsPink
+  name: pink curtains
+  description: Hides what others shouldn't see.
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsPink
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/Curtains/pink.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+    
+- type: construction
+  id: CurtainsPurple
+  name: purple curtains
+  description: Hides what others shouldn't see.
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsPurple
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/Curtains/purple.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+    
+- type: construction
+  id: CurtainsRed
+  name: red curtains
+  description: Hides what others shouldn't see.
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsRed
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/Curtains/red.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked    
+
+- type: construction
+  id: CurtainsWhite
+  name: white curtains
+  description: Hides what others shouldn't see.
+  graph: Curtains
+  startNode: start
+  targetNode: CurtainsWhite
+  category: construction-category-furniture
+  icon:
+    sprite: Structures/Decoration/Curtains/white.rsi
     state: closed
   objectType: Structure
   placementMode: SnapgridCenter
diff --git a/Resources/Prototypes/Recipes/Construction/materials.yml b/Resources/Prototypes/Recipes/Construction/materials.yml
index a561803d3a..d644538a45 100644
--- a/Resources/Prototypes/Recipes/Construction/materials.yml
+++ b/Resources/Prototypes/Recipes/Construction/materials.yml
@@ -20,6 +20,17 @@
   icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: rglass }
   objectType: Item
 
+- type: construction
+  name: clockwork glass
+  description: A brass-reinforced sheet of glass.
+  id: SheetClockworkGlass
+  graph: Glass
+  startNode: start
+  targetNode: SheetClockworkGlass
+  category: construction-category-materials
+  icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: cglass }
+  objectType: Item
+
 - type: construction
   name: plasma glass
   description: A sheet of translucent plasma.
@@ -42,6 +53,28 @@
   icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: rpglass }
   objectType: Item
 
+- type: construction
+  name: reinforced plasma glass
+  description: A reinforced sheet of translucent plasma.
+  id: SheetRPGlass0
+  graph: Glass
+  startNode: start
+  targetNode: SheetRPGlass0
+  category: construction-category-materials
+  icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: rpglass }
+  objectType: Item
+
+- type: construction
+  name: reinforced plasma glass
+  description: A reinforced sheet of translucent plasma.
+  id: SheetRPGlass1
+  graph: Glass
+  startNode: start
+  targetNode: SheetRPGlass1
+  category: construction-category-materials
+  icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: rpglass }
+  objectType: Item
+
 - type: construction
   name: durathread
   id: MaterialDurathread
@@ -74,3 +107,25 @@
   category: construction-category-materials
   icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: ruglass }
   objectType: Item
+
+- type: construction
+  name: reinforced uranium glass
+  description: A reinforced sheet of uranium glass.
+  id: SheetRUGlass0
+  graph: Glass
+  startNode: start
+  targetNode: SheetRUGlass0
+  category: construction-category-materials
+  icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: ruglass }
+  objectType: Item
+
+- type: construction
+  name: reinforced uranium glass
+  description: A reinforced sheet of uranium glass.
+  id: SheetRUGlass1
+  graph: Glass
+  startNode: start
+  targetNode: SheetRUGlass1
+  category: construction-category-materials
+  icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: ruglass }
+  objectType: Item
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index 5cd2c1b396..efc4236389 100644
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -34,6 +34,24 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: wall gear
+  id: ClockworkGirder
+  graph: ClockworkGirder
+  startNode: start
+  targetNode: clockGirder
+  category: construction-category-structures
+  description: A large gear with mounting brackets for additional plating.
+  icon:
+    sprite: /Textures/Structures/Walls/clock.rsi
+    state: wall_gear
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: false
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   name: wall
   id: Wall
@@ -67,6 +85,24 @@
   placementMode: SnapgridCenter
   canRotate: false
   canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked    
+
+- type: construction
+  name: clock wall
+  id: WallClock
+  graph: ClockworkGirder
+  startNode: start
+  targetNode: clockworkWall
+  category: construction-category-structures
+  description: Keeps the air in and the greytide out.
+  icon:
+    sprite: Structures/Walls/clock.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: false
+  canBuildInImpassable: false
   conditions:
     - !type:TileNotBlocked
 # here
@@ -232,6 +268,24 @@
   placementMode: SnapgridCenter
   canRotate: false
 
+- type: construction
+  name: clockwork grille
+  id: ClockGrille
+  graph: ClockGrille
+  startNode: start
+  targetNode: clockGrille
+  category: construction-category-structures
+  description: A flimsy framework of iron rods assembled in traditional ratvarian fashion.
+  conditions:
+    - !type:TileNotBlocked
+      failIfSpace: false
+  icon:
+    sprite: Structures/Walls/clockwork_grille.rsi
+    state: ratvargrille
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: false
+
 - type: construction
   name: diagonal grille
   id: GrilleDiagonal
@@ -249,6 +303,23 @@
   objectType: Structure
   placementMode: SnapgridCenter
 
+- type: construction
+  name: diagonal clockwork grille
+  id: ClockworkGrilleDiagonal
+  graph: GrilleDiagonal
+  startNode: start
+  targetNode: clockworkGrilleDiagonal
+  category: construction-category-structures
+  description: A flimsy framework of iron rods assembled in traditional ratvarian fashion.
+  conditions:
+    - !type:TileNotBlocked
+      failIfSpace: false
+  icon:
+    sprite: Structures/Walls/clockwork_grille.rsi
+    state: ratvargrille_diagonal
+  objectType: Structure
+  placementMode: SnapgridCenter
+
 - type: construction
   name: window
   id: Window
@@ -342,6 +413,43 @@
   placementMode: SnapgridCenter
   canRotate: false
 
+- type: construction
+  name: clockwork window
+  id: ClockworkWindow
+  graph: Window
+  startNode: start
+  targetNode: clockworkWindow
+  category: construction-category-structures
+  description: Clear and tough, with a golden tint.
+  canBuildInImpassable: true
+  conditions:
+    - !type:EmptyOrWindowValidInTile
+    - !type:NoWindowsInTile
+  icon:
+    sprite: Structures/Windows/clockwork_window.rsi
+    state: full
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canRotate: false
+
+- type: construction
+  name: diagonal clockwork window
+  id: ClockworkWindowDiagonal
+  graph: WindowDiagonal
+  startNode: start
+  targetNode: clockworkWindowDiagonal
+  category: construction-category-structures
+  description: Clear and tough, with a golden tint.
+  canBuildInImpassable: true
+  conditions:
+    - !type:EmptyOrWindowValidInTile
+    - !type:NoWindowsInTile
+  icon:
+    sprite: Structures/Windows/clockwork_diagonal.rsi
+    state: state0
+  objectType: Structure
+  placementMode: SnapgridCenter
+
 - type: construction
   name: plasma window
   id: PlasmaWindow
@@ -452,6 +560,24 @@
   objectType: Structure
   placementMode: SnapgridCenter
 
+- type: construction
+  name: directional clockwork window
+  id: WindowClockworkDirectional
+  graph: WindowDirectional
+  startNode: start
+  targetNode: windowClockworkDirectional
+  category: construction-category-structures
+  description: Clear and tough, with a golden tint.
+  canBuildInImpassable: true
+  conditions:
+    - !type:EmptyOrWindowValidInTile
+    - !type:NoWindowsInTile
+  icon:
+    sprite: Structures/Windows/directional.rsi
+    state: clock_window
+  objectType: Structure
+  placementMode: SnapgridCenter
+
 - type: construction
   name: directional plasma window
   id: PlasmaWindowDirectional
@@ -904,6 +1030,40 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: pinion airlock
+  id: PinionAirlock
+  graph: PinionAirlock
+  startNode: start
+  targetNode: airlock
+  category: construction-category-structures
+  description: It opens, it closes, and maybe crushes you.
+  icon:
+    sprite: Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi
+    state: assembly
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
+- type: construction
+  name: glass pinion airlock
+  id: PinionAirlockGlass
+  graph: PinionAirlock
+  startNode: start
+  targetNode: glassAirlock
+  category: construction-category-structures
+  description: It opens, it closes, and maybe crushes you.
+  icon:
+    sprite: Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi
+    state: assembly
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   name: shuttle airlock
   id: AirlockShuttle
@@ -947,7 +1107,7 @@
   startNode: start
   targetNode: windoor
   category: construction-category-structures
-  description: It opens, it closes, and you can see through it!
+  description: It opens, it closes, and you can see through it! And it can be made of Plasma, Uranium, or normal Glass!
   icon:
     sprite: Structures/Doors/Windoors/windoor.rsi
     state: closed
@@ -964,7 +1124,7 @@
   startNode: start
   targetNode: windoorSecure
   category: construction-category-structures
-  description: It opens, it closes, and you can see through it! This one looks tough.
+  description: It's tough, it's a door, and you can see through it! And it can be made of Plasma, Uranium, or normal Glass!
   icon:
     sprite: Structures/Doors/Windoors/windoor.rsi
     state: closed
@@ -974,6 +1134,22 @@
   conditions:
     - !type:TileNotBlocked
 
+- type: construction
+  name: clockwork windoor
+  id: ClockworkWindoor
+  graph: Windoor
+  startNode: start
+  targetNode: windoorClockwork
+  category: construction-category-structures
+  description: It opens, it closes, and you can see through it! This one looks tough.
+  icon:
+    sprite: Structures/Doors/Windoors/clockwork_windoor.rsi
+    state: closed
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
 
 #lighting
 - type: construction
@@ -1025,7 +1201,7 @@
   description: A ground light fixture. Use light bulbs.
   icon:
     sprite: Structures/Lighting/LightPosts/small_light_post.rsi
-    state: off
+    state: base
   objectType: Structure
   placementMode: SnapgridCenter
   canRotate: false
diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml
index bdb0c814a4..1647e98bce 100644
--- a/Resources/Prototypes/Recipes/Construction/utilities.yml
+++ b/Resources/Prototypes/Recipes/Construction/utilities.yml
@@ -475,7 +475,6 @@
   - sprite: Structures/Piping/Atmospherics/vent.rsi
     state: vent_off
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -497,7 +496,6 @@
   - sprite: Structures/Piping/Atmospherics/vent.rsi
     state: vent_off
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -519,7 +517,6 @@
   - sprite: Structures/Piping/Atmospherics/scrubber.rsi
     state: scrub_off
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -541,7 +538,6 @@
   - sprite: Structures/Piping/Atmospherics/outletinjector.rsi
     state: injector
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 # ATMOS BINARY
@@ -564,7 +560,6 @@
   - sprite: Structures/Piping/Atmospherics/pump.rsi
     state: pumpPressure
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -586,7 +581,6 @@
   - sprite: Structures/Piping/Atmospherics/pump.rsi
     state: pumpVolume
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -608,7 +602,6 @@
   - sprite: Structures/Piping/Atmospherics/pump.rsi
     state: pumpPassiveGate
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -630,7 +623,6 @@
   - sprite: Structures/Piping/Atmospherics/pump.rsi
     state: pumpManualValve
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -652,7 +644,6 @@
   - sprite: Structures/Piping/Atmospherics/pump.rsi
     state: pumpSignalValve
   conditions:
-  - !type:TileNotBlocked {}
   - !type:NoUnstackableInTile
 
 - type: construction
@@ -674,7 +665,6 @@
   - sprite: Structures/Piping/Atmospherics/gascanisterport.rsi
     state: gasCanisterPort
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -695,8 +685,6 @@
     state: pipeStraight
   - sprite: Structures/Piping/Atmospherics/vent.rsi
     state: vent_off
-  conditions:
-    - !type:TileNotBlocked {}
 
 - type: construction
   id: HeatExchanger
@@ -711,8 +699,6 @@
   icon:
     sprite: Structures/Piping/Atmospherics/heatexchanger.rsi
     state: heStraight
-  conditions:
-    - !type:TileNotBlocked {}
 
 # ATMOS TRINARY
 - type: construction
@@ -730,7 +716,6 @@
     state: gasFilter
   mirror: GasFilterFlipped
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -749,7 +734,6 @@
     state: gasFilterF
   mirror: GasFilter
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -767,7 +751,6 @@
     state: gasMixer
   mirror: GasMixerFlipped
   conditions:
-    - !type:TileNotBlocked {}
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -786,7 +769,6 @@
     state: gasMixerF
   mirror: GasMixer
   conditions:
-    - !type:TileNotBlocked
     - !type:NoUnstackableInTile
 
 - type: construction
@@ -803,7 +785,6 @@
     sprite: Structures/Piping/Atmospherics/pneumaticvalve.rsi
     state: off
   conditions:
-    - !type:TileNotBlocked
     - !type:NoUnstackableInTile
 
 # INTERCOM
diff --git a/Resources/Prototypes/Recipes/Construction/weapons.yml b/Resources/Prototypes/Recipes/Construction/weapons.yml
index 868a5cb186..040d4c8963 100644
--- a/Resources/Prototypes/Recipes/Construction/weapons.yml
+++ b/Resources/Prototypes/Recipes/Construction/weapons.yml
@@ -1,3 +1,69 @@
+- type: construction
+  name: grey bladed flatcap
+  id: BladedFlatcapGrey
+  graph: BladedFlatcapGrey
+  startNode: start
+  targetNode: icon
+  category: construction-category-weapons
+  description: An inconspicuous hat with glass shards sewn into the brim.
+  icon: { sprite: Clothing/Head/Hats/greyflatcap.rsi, state: icon }
+  objectType: Item
+
+- type: construction
+  name: brown bladed flatcap
+  id: BladedFlatcapBrown
+  graph: BladedFlatcapBrown
+  startNode: start
+  targetNode: icon
+  category: construction-category-weapons
+  description: An inconspicuous hat with glass shards sewn into the brim.
+  icon: { sprite: Clothing/Head/Hats/brownflatcap.rsi, state: icon }
+  objectType: Item
+
+- type: construction
+  name: glass shiv
+  id: Shiv
+  graph: Shiv
+  startNode: start
+  targetNode: icon
+  category: construction-category-weapons
+  description: A glass shard with a piece of cloth wrapped around it.
+  icon: { sprite: Objects/Weapons/Melee/shiv.rsi, state: icon }
+  objectType: Item
+
+- type: construction
+  name: reinforced shiv
+  id: ReinforcedShiv
+  graph: ReinforcedShiv
+  startNode: start
+  targetNode: icon
+  category: construction-category-weapons
+  description: A reinforced glass shard with a piece of cloth wrapped around it.
+  icon: { sprite: Objects/Weapons/Melee/reinforced_shiv.rsi, state: icon }
+  objectType: Item
+
+- type: construction
+  name: plasma shiv
+  id: PlasmaShiv
+  graph: PlasmaShiv
+  startNode: start
+  targetNode: icon
+  category: construction-category-weapons
+  description: A plasma shard with a piece of cloth wrapped around it.
+  icon: { sprite: Objects/Weapons/Melee/plasma_shiv.rsi, state: icon }
+  objectType: Item
+
+- type: construction
+  name: uranium shiv
+  id: UraniumShiv
+  graph: UraniumShiv
+  startNode: start
+  targetNode: icon
+  category: construction-category-weapons
+  description: A uranium shard with a piece of cloth wrapped around it.
+  icon: { sprite: Objects/Weapons/Melee/uranium_shiv.rsi, state: icon }
+  objectType: Item
+
 - type: construction
   name: crude spear
   id: Spear
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 28761aa779..a5620fd8ef 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -513,7 +513,7 @@
   id: RecipeMushroomPizza
   name: mushroom pizza recipe
   result: FoodPizzaMushroom
-  time: 25
+  time: 30
   solids:
     FoodDoughFlat: 1
     FoodMushroom: 5
@@ -1703,40 +1703,6 @@
   solids:
     LeavesCannabis: 1
 
-- type: microwaveMealRecipe
-  id: RecipeAloeCream
-  name: aloe cream recipe
-  result: AloeCream
-  time: 10
-  solids:
-    FoodAloe: 1
-
-- type: microwaveMealRecipe
-  id: RecipeMedicatedSuture
-  name: medicated suture recipe
-  result: MedicatedSuture
-  time: 10
-  solids:
-    FoodPoppy: 1
-    Brutepack: 1
-    MaterialCloth1: 1
-  reagents:
-    TranexamicAcid: 50
-    Cryptobiolin: 50
-
-- type: microwaveMealRecipe
-  id: RecipeRegenerativeMesh
-  name: regenerative mesh recipe
-  result: RegenerativeMesh
-  time: 10
-  solids:
-    FoodAloe: 1
-    Ointment: 1
-    MaterialCloth1: 1
-  reagents:
-    Sigynate: 50
-    Dermaline: 50
-
 - type: microwaveMealRecipe
   id: RecipeTrashBakedBananaPeel
   name: baked banana peel recipe
diff --git a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
new file mode 100644
index 0000000000..9d1947f03e
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
@@ -0,0 +1,33 @@
+- type: microwaveMealRecipe
+  id: RecipeAloeCream
+  name: aloe cream recipe
+  result: AloeCream
+  time: 10
+  solids:
+    FoodAloe: 1
+
+- type: microwaveMealRecipe
+  id: RecipeMedicatedSuture
+  name: medicated suture recipe
+  result: MedicatedSuture
+  time: 10
+  solids:
+    FoodPoppy: 1
+    Brutepack: 1
+    MaterialCloth1: 1
+  reagents:
+    TranexamicAcid: 20
+    Cryptobiolin: 20
+
+- type: microwaveMealRecipe
+  id: RecipeRegenerativeMesh
+  name: regenerative mesh recipe
+  result: RegenerativeMesh
+  time: 10
+  solids:
+    FoodAloe: 1
+    Ointment: 1
+    MaterialCloth1: 1
+  reagents:
+    Sigynate: 20
+    Dermaline: 20
diff --git a/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/strawhat.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml
similarity index 100%
rename from Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/strawhat.yml
rename to Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/tiles.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/tiles.yml
index caff139192..2b84e905b3 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/tiles.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/tiles.yml
@@ -31,6 +31,33 @@
     - node: woodtile
       entity: FloorTileItemWood
 
+- type: constructionGraph
+  id: TilesBrass
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: filledPlate
+          completed:
+            - !type:SetStackCount
+              amount: 4
+          steps:
+            - material: Brass
+              amount: 1
+        - to: reebe
+          completed:
+            - !type:SetStackCount
+              amount: 4
+          steps:
+            - material: Brass
+              amount: 1
+    
+    - node: filledPlate
+      entity: FloorTileItemBrassFilled
+      
+    - node: reebe
+      entity: FloorTileItemBrassReebe
+
 - type: constructionGraph
   id: TileWhite
   start: start
@@ -78,3 +105,19 @@
               amount: 1
     - node: fleshTile
       entity: FloorTileItemFlesh
+
+- type: constructionGraph
+  id: TileWoodLarge
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: woodtilelarge
+          completed:
+            - !type:SetStackCount
+              amount: 4
+          steps:
+            - material: WoodPlank
+              amount: 2
+    - node: woodtilelarge
+      entity: FloorTileItemWoodLarge
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml
index ba4eab57c9..12fbe97e28 100644
--- a/Resources/Prototypes/Recipes/Crafting/improvised.yml
+++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml
@@ -201,3 +201,16 @@
     sprite: Objects/Materials/materials.rsi
     state: cloth_3
   objectType: Item
+
+- type: construction
+  name: straw hat
+  id: strawHat
+  graph: StrawHat
+  startNode: start
+  targetNode: strawhat
+  category: construction-category-clothing
+  description: A fancy hat for hot days! Not recommended to wear near fires.
+  icon:
+    sprite: Clothing/Head/Hats/straw_hat.rsi
+    state: icon
+  objectType: Item
diff --git a/Resources/Prototypes/Recipes/Crafting/tiles.yml b/Resources/Prototypes/Recipes/Crafting/tiles.yml
index 6050306597..433a3bec29 100644
--- a/Resources/Prototypes/Recipes/Crafting/tiles.yml
+++ b/Resources/Prototypes/Recipes/Crafting/tiles.yml
@@ -21,6 +21,28 @@
   description: "Four pieces of wooden station flooring."
   icon: { sprite: Objects/Tiles/tile.rsi, state: wood }
   objectType: Item
+  
+- type: construction
+  name: filled brass plate
+  id: TileBrassFilled
+  graph: TilesBrass
+  startNode: start
+  targetNode: filledPlate
+  category: construction-category-tiles
+  description: "Four pieces of brass station flooring, only compatible with brass plating."
+  icon: { sprite: Objects/Tiles/tile.rsi, state: brass-filled }
+  objectType: Item
+  
+- type: construction
+  name: smooth brass plate
+  id: TileBrassReebe
+  graph: TilesBrass
+  startNode: start
+  targetNode: reebe
+  category: construction-category-tiles
+  description: "Four pieces of smooth brass station flooring, only compatible with brass plating."
+  icon: { sprite: Objects/Tiles/tile.rsi, state: reebe }
+  objectType: Item
 
 - type: construction
   name: white tile
@@ -164,3 +186,14 @@
 #   description: "A dirty station tile."
 #   icon: { sprite: Objects/Tiles/tile.rsi, state: dirty }
 #   objectType: Item
+
+- type: construction
+  name: large wood floor
+  id: TileWoodLarge
+  graph: TileWoodLarge
+  startNode: start
+  targetNode: woodtilelarge
+  category: construction-category-tiles
+  description: "Four pieces of wooden station flooring."
+  icon: { sprite: Objects/Tiles/tile.rsi, state: wood-large }
+  objectType: Item
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml
index 566e33e3f3..626ec82a91 100644
--- a/Resources/Prototypes/Recipes/Lathes/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml
@@ -1,5 +1,5 @@
 
-
+# Jumpsuits/skirts
 - type: latheRecipe
   id: ClothingUniformJumpsuitColorGrey # Tide
   result: ClothingUniformJumpsuitColorGrey
@@ -474,6 +474,13 @@
   materials:
     Cloth: 300
 
+- type: latheRecipe
+  id: ClothingUniformJumpsuitQMFormal
+  result: ClothingUniformJumpsuitQMFormal
+  completetime: 4
+  materials:
+    Cloth: 300
+
 - type: latheRecipe
   id: ClothingUniformJumpskirtQM
   result: ClothingUniformJumpskirtQM
@@ -601,7 +608,7 @@
   completetime: 4
   materials:
     Cloth: 300
-
+# Command winter coats
 - type: latheRecipe
   id: ClothingOuterWinterCap
   result: ClothingOuterWinterCap
@@ -665,13 +672,13 @@
   materials:
     Cloth: 500
     Durathread: 400
-
+# Mantles
 - type: latheRecipe
   id: ClothingNeckMantleCap
   result: ClothingNeckMantleCap
   completetime: 2.8
   materials:
-    Cloth: 150
+    Cloth: 200
     Durathread: 150
 
 - type: latheRecipe
@@ -679,7 +686,7 @@
   result: ClothingNeckMantleCE
   completetime: 2.8
   materials:
-    Cloth: 150
+    Cloth: 200
     Durathread: 150
 
 - type: latheRecipe
@@ -687,7 +694,7 @@
   result: ClothingNeckMantleCMO
   completetime: 2.8
   materials:
-    Cloth: 150
+    Cloth: 200
     Durathread: 150
 
 - type: latheRecipe
@@ -695,7 +702,7 @@
   result: ClothingNeckMantleHOP
   completetime: 2.8
   materials:
-    Cloth: 150
+    Cloth: 200
     Durathread: 150
 
 - type: latheRecipe
@@ -703,7 +710,7 @@
   result: ClothingNeckMantleHOS
   completetime: 2.8
   materials:
-    Cloth: 150
+    Cloth: 200
     Durathread: 150
 
 - type: latheRecipe
@@ -711,7 +718,7 @@
   result: ClothingNeckMantleRD
   completetime: 2.8
   materials:
-    Cloth: 150
+    Cloth: 200
     Durathread: 150
 
 - type: latheRecipe
@@ -719,10 +726,9 @@
   result: ClothingNeckMantleQM
   completetime: 2.8
   materials:
-    Cloth: 150
+    Cloth: 200
     Durathread: 150
-
-
+# Winter coats
 - type: latheRecipe
   id: ClothingOuterWinterMusician
   result: ClothingOuterWinterMusician
@@ -898,7 +904,7 @@
   materials:
     Cloth: 500
     Durathread: 300
-
+# Hats
 - type: latheRecipe
   id: ClothingHeadHatCaptain
   result: ClothingHeadHatCaptain
@@ -979,6 +985,14 @@
     Cloth: 100
     Durathread: 50
 
+- type: latheRecipe
+  id: ClothingHeadHatBeretQM
+  result: ClothingHeadHatBeretQM
+  completetime: 2
+  materials:
+    Cloth: 100
+    Durathread: 50
+
 - type: latheRecipe
   id: ClothingHeadHatBeretCmo
   result: ClothingHeadHatBeretCmo
@@ -987,6 +1001,13 @@
     Cloth: 100
     Durathread: 50
 
+- type: latheRecipe
+  id: ClothingHeadHatBeretMedic
+  result: ClothingHeadHatBeretMedic
+  completetime: 2
+  materials:
+    Cloth: 100
+
 - type: latheRecipe
   id: ClothingHeadHatBeretBrigmedic
   result: ClothingHeadHatBeretBrigmedic
@@ -1058,80 +1079,150 @@
   completetime: 2
   materials:
     Cloth: 100
+
+- type: latheRecipe
+  id: ClothingHeadHatParamedicsoft
+  result: ClothingHeadHatParamedicsoft
+  completetime: 1
+  materials:
+    Cloth: 100
 # Ties
 - type: latheRecipe
   id: ClothingNeckTieRed
   result: ClothingNeckTieRed
   completetime: 2
   materials:
-    Cloth: 50
+    Cloth: 200
 
 - type: latheRecipe
   id: ClothingNeckTieDet
   result: ClothingNeckTieDet
   completetime: 2
   materials:
-    Cloth: 50
+    Cloth: 200
 
 - type: latheRecipe
   id: ClothingNeckTieSci
   result: ClothingNeckTieSci
   completetime: 2
   materials:
-    Cloth: 50
+    Cloth: 200
 # Scarfs
 - type: latheRecipe
   id: ClothingNeckScarfStripedGreen
   result: ClothingNeckScarfStripedGreen
   completetime: 2
   materials:
-    Cloth: 50
+    Cloth: 200
 
 - type: latheRecipe
   id: ClothingNeckScarfStripedBlue
   result: ClothingNeckScarfStripedBlue
   completetime: 2
   materials:
-    Cloth: 50
+    Cloth: 200
 
 - type: latheRecipe
   id: ClothingNeckScarfStripedRed
   result: ClothingNeckScarfStripedRed
   completetime: 2
   materials:
-    Cloth: 50
+    Cloth: 200
 
 - type: latheRecipe
   id: ClothingNeckScarfStripedBrown
   result: ClothingNeckScarfStripedBrown
   completetime: 2
   materials:
-    Cloth: 50
+    Cloth: 200
 
 - type: latheRecipe
   id: ClothingNeckScarfStripedLightBlue
   result: ClothingNeckScarfStripedLightBlue
   completetime: 2
   materials:
-    Cloth: 50
+    Cloth: 200
 
 - type: latheRecipe
   id: ClothingNeckScarfStripedOrange
   result: ClothingNeckScarfStripedOrange
   completetime: 2
   materials:
-    Cloth: 50
+    Cloth: 200
 
 - type: latheRecipe
   id: ClothingNeckScarfStripedBlack
   result: ClothingNeckScarfStripedBlack
   completetime: 2
   materials:
-    Cloth: 50
+    Cloth: 200
 
 - type: latheRecipe
   id: ClothingNeckScarfStripedPurple
   result: ClothingNeckScarfStripedPurple
   completetime: 2
   materials:
-    Cloth: 50
+    Cloth: 200
+# Carpets
+- type: latheRecipe
+  id: Carpet
+  result: FloorCarpetItemRed
+  completetime: 1
+  materials:
+    Cloth: 100
+
+- type: latheRecipe
+  id: CarpetBlack
+  result: FloorCarpetItemBlack
+  completetime: 1
+  materials:
+    Cloth: 100
+
+- type: latheRecipe
+  id: CarpetPink
+  result: FloorCarpetItemPink
+  completetime: 1
+  materials:
+    Cloth: 100
+
+- type: latheRecipe
+  id: CarpetBlue
+  result: FloorCarpetItemBlue
+  completetime: 1
+  materials:
+    Cloth: 100
+
+- type: latheRecipe
+  id: CarpetGreen
+  result: FloorCarpetItemGreen
+  completetime: 1
+  materials:
+    Cloth: 100
+
+- type: latheRecipe
+  id: CarpetOrange
+  result: FloorCarpetItemOrange
+  completetime: 1
+  materials:
+    Cloth: 100
+
+- type: latheRecipe
+  id: CarpetPurple
+  result: FloorCarpetItemPurple
+  completetime: 1
+  materials:
+    Cloth: 100
+
+- type: latheRecipe
+  id: CarpetCyan
+  result: FloorCarpetItemCyan
+  completetime: 1
+  materials:
+    Cloth: 100
+
+- type: latheRecipe
+  id: CarpetWhite
+  result: FloorCarpetItemWhite
+  completetime: 1
+  materials:
+    Cloth: 100
diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml
index a5a7f8b2d8..d41b5fdce8 100644
--- a/Resources/Prototypes/Recipes/Lathes/devices.yml
+++ b/Resources/Prototypes/Recipes/Lathes/devices.yml
@@ -76,6 +76,16 @@
     Steel: 100
     Plastic: 200
     Glass: 100
+    
+- type: latheRecipe
+  id: SignallerAdvanced
+  result: RemoteSignallerAdvanced
+  category: Parts
+  completetime: 2
+  materials:
+    Steel: 100
+    Plastic: 200
+    Plasma: 100
 
 - type: latheRecipe
   id: AnomalyLocator
diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml
index 3af8eb4e52..f0c59a0bdf 100644
--- a/Resources/Prototypes/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml
@@ -156,6 +156,16 @@
     Glass: 900
     Gold: 50
 
+- type: latheRecipe
+  id: SpaceHeaterMachineCircuitBoard
+  result: SpaceHeaterMachineCircuitBoard
+  category: Circuitry
+  completetime: 4
+  materials:
+    Steel: 150
+    Glass: 900
+    Gold: 50
+
 - type: latheRecipe
   id: MedicalScannerMachineCircuitboard
   result: MedicalScannerMachineCircuitboard
diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml
index a7c294a0df..1334788376 100644
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -7,6 +7,15 @@
     Steel: 50
     Glass: 50
 
+- type: latheRecipe
+  id: LedLightTube
+  result: LedLightTube
+  category: Lights
+  completetime: 2
+  materials:
+    Steel: 50
+    Glass: 50
+
 - type: latheRecipe
   id: SodiumLightTube
   result: SodiumLightTube
@@ -34,6 +43,15 @@
     Steel: 50
     Glass: 50
 
+- type: latheRecipe
+  id: LedLightBulb
+  result: LedLightBulb
+  category: Lights
+  completetime: 2
+  materials:
+    Steel: 50
+    Glass: 50
+
 - type: latheRecipe
   id: GlowstickRed
   result: GlowstickRed
@@ -75,15 +93,6 @@
   materials:
     Wood: 100
 
-- type: latheRecipe
-  id: Drone
-  result: Drone
-  completetime: 6
-  materials:
-    Steel: 500
-    Glass: 500
-    Plastic: 500
-
 - type: latheRecipe
   id: SynthesizerInstrument
   result: SynthesizerInstrument
@@ -102,6 +111,13 @@
     Steel: 100
     Plastic: 50
 
+- type: latheRecipe
+  id: AirTank
+  result: AirTank
+  completetime: 4
+  materials:
+    Steel: 300
+
 - type: latheRecipe
   id: ClothingShoesBootsMagSci
   result: ClothingShoesBootsMagSci
@@ -154,3 +170,19 @@
   completetime: 2
   materials:
     Steel: 100
+
+- type: latheRecipe
+  id: HandheldStationMap
+  result: HandheldStationMapEmpty
+  completetime: 2
+  materials:
+    Steel: 300
+    Plastic: 100
+
+- type: latheRecipe
+  id: ClothingHeadHatWelding
+  result: ClothingHeadHatWelding
+  completetime: 2
+  materials:
+    Steel: 400
+    Glass: 200
diff --git a/Resources/Prototypes/Recipes/Lathes/tools.yml b/Resources/Prototypes/Recipes/Lathes/tools.yml
index ce3f4cda3c..2b335ae6dc 100644
--- a/Resources/Prototypes/Recipes/Lathes/tools.yml
+++ b/Resources/Prototypes/Recipes/Lathes/tools.yml
@@ -133,6 +133,15 @@
     Steel: 500
     Plastic: 250
 
+- type: latheRecipe
+  id: HandHeldMassScanner
+  result: HandHeldMassScannerEmpty
+  category: Tools
+  completetime: 2
+  materials:
+    Steel: 800
+    Glass: 300
+
 - type: latheRecipe
   id: HandheldGPSBasic
   result: HandheldGPSBasic
diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml
index 48b0e02a81..c02943fb54 100644
--- a/Resources/Prototypes/Recipes/Reactions/food.yml
+++ b/Resources/Prototypes/Recipes/Reactions/food.yml
@@ -169,7 +169,7 @@
     - !type:CreateEntityReactionEffect
       entity: FoodMeatMeatball
 
-# Parkstation-ChocolateMilk - That's not how you make a chocolate bar..
+# Parkstation-ChocolateMilk # That's not how you make a chocolate bar..
 # - type: reaction
 #   id: CreateChocolate
 #   impact: Low
@@ -335,3 +335,84 @@
 #    Oxygen: 1
 #    Hydrogen: 2
 
+- type: reaction
+  id: AllicinBreakdown
+  source: true
+  requiredMixerCategories:
+  - Centrifuge
+  reactants:
+    Allicin:
+      amount: 4
+  products:
+    Sulfur: 2
+    Carbon: 1
+    Water: 1
+
+- type: reaction
+  id: NutrimentBreakdown
+  source: true
+  requiredMixerCategories:
+  - Centrifuge
+  reactants:
+    Nutriment:
+      amount: 5
+  products:
+    Water: 2
+    Carbon: 2
+    Sugar: 1
+
+- type: reaction
+  id: FatBreakdown
+  source: true
+  requiredMixerCategories:
+  - Electrolysis
+  reactants:
+    Fat:
+      amount: 15
+  products:
+    Carbon: 5
+    Hydrogen: 10
+    Oxygen: 1
+
+# Proteins are hydrocarbons
+- type: reaction
+  id: UncookedAnimalProteinBreakdown
+  source: true
+  requiredMixerCategories:
+  - Electrolysis
+  reactants:
+    UncookedAnimalProteins:
+      amount: 10
+  products:
+    Carbon: 2
+    Hydrogen: 4
+    Phosphorus: 3
+    Oxygen: 1
+
+- type: reaction
+  id: ProteinBreakdown
+  source: true
+  requiredMixerCategories:
+  - Electrolysis
+  reactants:
+    Protein:
+      amount: 10
+  products:
+    Carbon: 2
+    Hydrogen: 4
+    Phosphorus: 3
+    Oxygen: 1
+
+# Vitamin = Healthy = Green = Nitrogenous
+- type: reaction
+  id: VitaminBreakdown
+  source: true
+  requiredMixerCategories:
+  - Centrifuge
+  reactants:
+    Vitamin:
+      amount: 4
+  products:
+    Carbon: 1
+    Water: 1
+    Nitrogen: 2
diff --git a/Resources/Prototypes/Recipes/Reactions/fun.yml b/Resources/Prototypes/Recipes/Reactions/fun.yml
index 818030a3b3..a8ccd5f045 100644
--- a/Resources/Prototypes/Recipes/Reactions/fun.yml
+++ b/Resources/Prototypes/Recipes/Reactions/fun.yml
@@ -161,3 +161,13 @@
     Carbon: 3
     Sugar: 2
 
+- type: reaction
+  id: Laughter
+  reactants:
+    JuiceBanana:
+      amount: 1
+    Sugar:
+      amount: 1
+  products:
+    Laughter: 2
+
diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml
index c123d9306f..a1ca3ea38e 100644
--- a/Resources/Prototypes/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml
@@ -213,7 +213,7 @@
       amount: 1
     Ammonia:
       amount: 1
-    Blood:
+    ZombieBlood:
       amount: 2
   products:
     Ambuzol: 4
@@ -223,11 +223,10 @@
   reactants:
     Ambuzol:
       amount: 5
-    ZombieBlood:
-      amount: 15
+    Omnizine:
+      amount: 5
   products:
-    Blood: 15
-    AmbuzolPlus: 5
+    AmbuzolPlus: 10
 
 - type: reaction
   id: Synaptizine
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 8cbca4f7e1..7432d4225f 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -33,25 +33,10 @@
   - MagazineBoxMagnumIncendiary
   - MagazineBoxLightRifleIncendiary
   - MagazineBoxRifleIncendiary
-
-- type: technology
-  id: ExplosiveTechnology
-  name: research-technology-explosive-technology
-  icon:
-    sprite: Objects/Devices/payload.rsi
-    state: payload-explosive-armed
-  discipline: Arsenal
-  tier: 1
-  cost: 7500
-  recipeUnlocks:
-  - Signaller
-  - SignalTrigger
-  - VoiceTrigger
-  - TimerTrigger
-  - FlashPayload
-  - ExplosivePayload
-  - ChemicalPayload
-  - Igniter
+  # DeltaV - .38 special incendiary ammo - Add .38 special incendiary ammo to the research tree
+  - CartridgeSpecialIncendiary
+  - MagazineBoxSpecialIncendiary
+  # End of modified code
 
 - type: technology
   id: WeaponizedLaserManipulation
@@ -77,15 +62,17 @@
   recipeUnlocks:
   - ShellShotgunBeanbag
   - CartridgePistolRubber
-  - CartridgeSpecialRubber # DeltaV - .38 Special revolver
   - CartridgeMagnumRubber
   - CartridgeLightRifleRubber
   - CartridgeRifleRubber
   - MagazineBoxPistolRubber
-  - MagazineBoxSpecialRubber # DeltaV - .38 Special revolver
   - MagazineBoxMagnumRubber
   - MagazineBoxLightRifleRubber
   - MagazineBoxRifleRubber
+  # DeltaV - .38 special rubber ammo - Adds .38 special rubber ammo to the research tree
+  - CartridgeSpecialRubber
+  - MagazineBoxSpecialRubber
+  # End of modified code
 
 - type: technology
   id: UraniumMunitions
@@ -106,9 +93,47 @@
   - MagazineBoxMagnumUranium
   - MagazineBoxLightRifleUranium
   - MagazineBoxRifleUranium
+  # DeltaV - .38 special uranium ammo - Adds .38 special uranium ammo to the research tree
+  - CartridgeSpecialUranium
+  - MagazineBoxSpecialUranium
+  # End of modified code
+
+- type: technology
+  id: AdvancedRiotControl
+  name: research-technology-advanced-riot-control
+  icon:
+    sprite: Objects/Weapons/Melee/truncheon.rsi
+    state: icon
+  discipline: Arsenal
+  tier: 1
+  cost: 8000
+  recipeUnlocks:
+  - ClothingEyesGlassesSecurity
+  - Truncheon
+  - TelescopicShield
+  - HoloprojectorSecurity
+  - WeaponDisablerSMG
 
 # Tier 2
 
+- type: technology
+  id: ExplosiveTechnology
+  name: research-technology-explosive-technology
+  icon:
+    sprite: Objects/Devices/payload.rsi
+    state: payload-explosive-armed
+  discipline: Arsenal
+  tier: 2
+  cost: 10000
+  recipeUnlocks:
+  - SignallerAdvanced
+  - SignalTrigger
+  - VoiceTrigger
+  - TimerTrigger
+  - FlashPayload
+  - ExplosivePayload
+  - ChemicalPayload
+
 - type: technology
   id: ConcentratedLaserWeaponry
   name: research-technology-concentrated-laser-weaponry
@@ -133,26 +158,10 @@
   recipeUnlocks:
   - WeaponXrayCannon
 
-- type: technology
-  id: AdvancedRiotControl
-  name: research-technology-advanced-riot-control
-  icon:
-    sprite: Objects/Weapons/Melee/truncheon.rsi
-    state: icon
-  discipline: Arsenal
-  tier: 2
-  cost: 8000
-  recipeUnlocks:
-  - ClothingEyesGlassesSecurity
-  - Truncheon
-  - TelescopicShield
-  - HoloprojectorSecurity
-  - WeaponDisablerSMG
-
 - type: technology
   id: BasicShuttleArmament
   name: research-technology-basic-shuttle-armament
-  icon: 
+  icon:
     sprite: Structures/Power/cage_recharger.rsi
     state: full
   discipline: Arsenal
@@ -195,11 +204,11 @@
   cost: 15000
   recipeUnlocks:
   - WeaponLaserSvalinn
-  
+
 - type: technology
   id: AdvancedShuttleWeapon
   name: research-technology-advanced-shuttle-weapon
-  icon: 
+  icon:
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi
     state: icon
   discipline: Arsenal
diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 13eccb316c..c3f83e0fc5 100644
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -35,23 +35,6 @@
   - MechEquipmentGrabberSmall
   - VimHarness
 
-- type: technology
-  id: FoodService
-  name: research-technology-food-service
-  icon:
-    sprite: Structures/Machines/juicer.rsi
-    state: juicer1
-  discipline: CivilianServices
-  tier: 1
-  cost: 7500
-  recipeUnlocks: #remove all of these once we have more kitchen equipment
-  - MicrowaveMachineCircuitboard
-  - ReagentGrinderMachineCircuitboard
-  - ElectricGrillMachineCircuitboard
-  - BoozeDispenserMachineCircuitboard
-  - SodaDispenserMachineCircuitboard
-  - DeepFryerMachineCircuitboard #Nyano - Summary: adds deep fryer circuit board to service research.
-
 - type: technology
   id: AudioVisualCommunication
   name: research-technology-audio-visual-communication
@@ -152,10 +135,9 @@
     state: medical
   discipline: CivilianServices
   tier: 2
-  cost: 7500
+  cost: 5000
   recipeUnlocks:
   - BorgModuleAdvancedTreatment
-  - BorgModuleDiagnosis
   - BorgModuleDefibrillator
 
 - type: technology
diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml
index 315a554278..e2733c6928 100644
--- a/Resources/Prototypes/Research/experimental.yml
+++ b/Resources/Prototypes/Research/experimental.yml
@@ -11,7 +11,6 @@
   cost: 5000
   recipeUnlocks:
   - ProximitySensor
-  - Drone
   - ExosuitFabricatorMachineCircuitboard
 
 - type: technology
diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml
index 7c7e3beaaa..edcc9c6636 100644
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -105,8 +105,6 @@
   - RipleyPeripheralsElectronics
   - MechEquipmentGrabber
 
-# Tier 2
-
 #- type: technology
 #  id: Grappling
 #  name: research-technology-grappling
@@ -114,12 +112,28 @@
 #    sprite: Objects/Weapons/Guns/Launchers/grappling_gun.rsi
 #    state: base
 #  discipline: Industrial
-#  tier: 2
+#  tier: 1
 #  cost: 5000
 #  recipeUnlocks:
 #  - WeaponGrapplingGun
 #  - BorgModuleGrapplingGun
 
+# Tier 2
+
+- type: technology
+  id: SpaceScanning
+  name: research-technology-space-scanning
+  icon:
+    sprite: Objects/Tools/handheld_mass_scanner.rsi
+    state: icon
+  discipline: Industrial
+  tier: 2
+  cost: 7500
+  recipeUnlocks:
+  - RadarConsoleCircuitboard
+  - HandHeldMassScanner
+  - BorgModuleGPS
+
 - type: technology
   id: Shuttlecraft
   name: research-technology-shuttlecraft
@@ -131,7 +145,6 @@
   cost: 10000
   recipeUnlocks:
   - ShuttleConsoleCircuitboard
-  - RadarConsoleCircuitboard
   - ThrusterMachineCircuitboard
   - GyroscopeMachineCircuitboard
   - MiniGravityGeneratorCircuitboard
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
index d9375d75ae..b7e8744c6a 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -33,6 +33,7 @@
   - Command
   - Orders # DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml
   - External # DeltaV - for promoting salvage specialists
+  - Cryogenics
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
index e75c743bdd..bf87f9ab95 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -22,7 +22,7 @@
   id: LawyerGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitLawyerBlack  # TODO change jumpsuit to randomiser of the 4 variants
-    back: ClothingBackpackFilled
+    back: ClothingBackpackLawyerFilled #DeltaV - stamp included
     shoes: ClothingShoesBootsLaceup
     id: LawyerPDA
     ears: ClothingHeadsetSecurity
@@ -30,5 +30,5 @@
   inhand:
     - BriefcaseBrownFilled
   innerClothingSkirt: ClothingUniformJumpskirtLawyerBlack
-  satchel: ClothingBackpackSatchelFilled
-  duffelbag: ClothingBackpackDuffelFilled
+  satchel: ClothingBackpackSatchelLawyerFilled #DeltaV - stamp included
+  duffelbag: ClothingBackpackDuffelLawyerFilled #DeltaV - stamp included
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
index 1fb9936afa..bc3b1a0434 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
@@ -18,6 +18,7 @@
     components:
     - type: Psionic # Nyano - Summary: Makes the mime psionic.
     - type: MimePowers
+    - type: FrenchAccent
 
 - type: startingGear
   id: MimeGear
diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
index 211d50f375..369cc3bf28 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -35,6 +35,7 @@
 #  - Chapel
   - Hydroponics
   - External
+  - Cryogenics
   # I mean they'll give themselves the rest of the access levels *anyways*.
   # As of 15/03/23 they can't do that so here's MOST of the rest of the access levels.
   # Head level access that isn't their own was deliberately left out, get AA from the captain instead.
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
index 658f09d5a1..ab82fd7517 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -29,6 +29,7 @@
   - External
   - ChiefEngineer
   - Atmospherics
+  - Cryogenics
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
index f36dd0420a..33e148a4f0 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
@@ -30,6 +30,7 @@
     id: TechnicalAssistantPDA
     belt: ClothingBeltUtilityEngineering
     ears: ClothingHeadsetEngineering
+    pocket2: BookEngineersHandbook
   innerClothingSkirt: ClothingUniformJumpskirtColorYellow
   satchel: ClothingBackpackSatchelEngineeringFilled
   duffelbag: ClothingBackpackDuffelEngineeringFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
index 01eb7a5f88..d54baba3db 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
@@ -212,8 +212,7 @@
     id: ERTMedicPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltMedicalFilled
-    pocket1: HandheldHealthAnalyzer
-    pocket2: Flare
+    pocket1: Flare
 
 - type: startingGear
   id: ERTMedicalGearEVA
@@ -229,8 +228,7 @@
     id: ERTMedicPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltMedicalFilled
-    pocket1: HandheldHealthAnalyzer
-    pocket2: Flare
+    pocket1: Flare
 
 # Janitor
 - type: job
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
index c421ee8c5d..434a7c1083 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -123,6 +123,7 @@
     mask: ClothingMaskGasSyndicate
     eyes: ClothingEyesHudSyndicate
     ears: ClothingHeadsetAltSyndicate
+    neck: SyndicateWhistle
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitSyndieCommander
     shoes: ClothingShoesBootsCombatFilled
@@ -143,7 +144,7 @@
     jumpsuit: ClothingUniformJumpsuitOperative
     back: ClothingBackpackDuffelSyndicateOperativeMedic
     mask: ClothingMaskGasSyndicate
-    eyes: ClothingEyesHudSyndicate
+    eyes: ClothingEyesHudSyndicateMed # - Delta-V
     ears: ClothingHeadsetAltSyndicate
     gloves: ClothingHandsGlovesCombat
     outerClothing: ClothingOuterHardsuitSyndieMedic
@@ -156,79 +157,40 @@
   satchel: ClothingBackpackDuffelSyndicateOperativeMedic
   duffelbag: ClothingBackpackDuffelSyndicateOperativeMedic
 
-# Syndicate Footsoldier Gear - Unarmed
+# Syndicate Footsoldier Gear
 - type: startingGear
   id: SyndicateFootsoldierGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitOperative
     head: ClothingHeadHelmetSwatSyndicate
     mask: ClothingMaskGas
-    outerClothing: ClothingOuterArmorBasicSlim
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    back: ClothingBackpackFilled
-    shoes: ClothingShoesBootsCombat
-    id: SyndiPDA #a subtype of this for footsoldiers would probably be good to have
-  innerClothingSkirt: ClothingUniformJumpsuitOperative
-  satchel: ClothingBackpackDuffelSyndicateOperative
-  duffelbag: ClothingBackpackDuffelSyndicateOperative
-
-# Syndicate Footsoldier Gear - Knife
-- type: startingGear
-  id: SyndicateFootsoldierGearKnife
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    head: ClothingHeadHelmetSwatSyndicate
-    mask: ClothingMaskGas
-    outerClothing: ClothingOuterArmorBasicSlim
+    outerClothing: ClothingOuterArmorBasic
     ears: ClothingHeadsetAltSyndicate
     gloves: ClothingHandsGlovesCombat
     back: ClothingBackpackFilled
     shoes: ClothingShoesBootsCombat
-    pocket1: CombatKnife
     id: SyndiPDA
   innerClothingSkirt: ClothingUniformJumpsuitOperative
-  satchel: ClothingBackpackDuffelSyndicateOperative
-  duffelbag: ClothingBackpackDuffelSyndicateOperative
-
-# Syndicate Footsoldier Gear - Energy Sword
-- type: startingGear
-  id: SyndicateFootsoldierGearESword
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitOperative
-    head: ClothingHeadHelmetSwatSyndicate
-    mask: ClothingMaskGas
-    outerClothing: ClothingOuterArmorBasicSlim
-    ears: ClothingHeadsetAltSyndicate
-    gloves: ClothingHandsGlovesCombat
-    back: ClothingBackpackFilled
-    shoes: ClothingShoesBootsCombatFilled
-    pocket1: EnergySword
-    pocket2: EnergyShield
-    id: SyndiPDA
-  innerClothingSkirt: ClothingUniformJumpsuitOperative
-  satchel: ClothingBackpackDuffelSyndicateOperative
+  satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelSyndicateOperative
 
-# Syndicate Footsoldier Gear - Viper
+# Syndicate Footsoldier Gear - No Headset
 - type: startingGear
-  id: SyndicateFootsoldierGearPistol
+  id: SyndicateFootsoldierGearRuin
   equipment:
     jumpsuit: ClothingUniformJumpsuitOperative
     head: ClothingHeadHelmetSwatSyndicate
     mask: ClothingMaskGas
-    outerClothing: ClothingOuterArmorBasicSlim
-    ears: ClothingHeadsetAltSyndicate
+    outerClothing: ClothingOuterArmorBasic
     gloves: ClothingHandsGlovesCombat
     back: ClothingBackpackFilled
     shoes: ClothingShoesBootsCombat
-    pocket1: WeaponPistolViper
     id: SyndiPDA
   innerClothingSkirt: ClothingUniformJumpsuitOperative
-  satchel: ClothingBackpackDuffelSyndicateOperative
+  satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelSyndicateOperative
 
-# Nanotrasen Paramilitary Unit Gear - pistol
+# Nanotrasen Paramilitary Unit Gear
 - type: startingGear
   id: NanotrasenParamilitaryGear
   equipment:
@@ -326,6 +288,7 @@
   id: MobAghostGear
   equipment:
     back: ClothingBackpackSatchelHoldingAdmin
+    id: AdminPDA
 
 #Head Rev Gear
 - type: startingGear
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
index 6de15a14ce..ec8ae30661 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -28,6 +28,7 @@
   - Paramedic # DeltaV - Add Paramedic access
   - External # DeltaV - Paramedics need this access
   - Psychologist # DeltaV - Add Psychologist access
+  - Cryogenics
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
index 08084825d0..0c75de9137 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
@@ -26,6 +26,7 @@
     id: MedicalInternPDA
     ears: ClothingHeadsetMedical
     belt: ClothingBeltMedicalFilled
+    pocket2: BookMedicalReferenceBook
   # innerClothingSkirt: ClothingUniformJumpskirtColorWhite # DeltaV
   satchel: ClothingBackpackSatchelMedicalFilled
   duffelbag: ClothingBackpackDuffelMedicalFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
index 15e3b38e23..562cad93c3 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -33,7 +33,7 @@
     shoes: ClothingShoesColorBlue
     id: ParamedicPDA
     ears: ClothingHeadsetMedical
-    belt: ClothingBeltParamedicFilled
+    belt: ClothingBeltMedicalEMTFilled
     pocket1: HandheldGPSBasic # DeltaV - Give Paramedics useful tools on spawn
     pocket2: HandheldCrewMonitor # DeltaV - Give Paramedics useful tools on spawn
   innerClothingSkirt: ClothingUniformJumpskirtParamedic
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
index b8cb51232a..0c5379fe78 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
@@ -25,6 +25,7 @@
     shoes: ClothingShoesColorWhite
     id: ResearchAssistantPDA
     ears: ClothingHeadsetScience
+    pocket2: BookScientistsGuidebook
   innerClothingSkirt: ClothingUniformJumpskirtColorWhite
   satchel: ClothingBackpackSatchelScienceFilled
   duffelbag: ClothingBackpackDuffelScienceFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index 83826c4374..32ed405906 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -24,6 +24,7 @@
   - ResearchDirector
   - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
   - Chapel # DeltaV - Chaplain is in Epistemics
+  - Cryogenics
   special: # Nyanotrasen - Mystagogue can use the Bible
   - !type:AddComponentSpecial
     components:
diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
index c5cb79110a..832dd5ab79 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -30,6 +30,7 @@
   - Service
   - External
   - Detective
+  - Cryogenics
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
index 8fc61fb245..4e9efc7188 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -15,6 +15,9 @@
   - Security
   #- Brig # Delta V: Removed
   - Maintenance
+  - Service
+  - External
+  - Cryogenics
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
@@ -28,7 +31,9 @@
     outerClothing: ClothingOuterArmorDuraVest # DeltaV - ClothingOuterArmorBasic replaced in favour of stab vest. Sucks to suck, cadets
     id: SecurityCadetPDA
     ears: ClothingHeadsetSecurity
+    belt: ClothingBeltSecurityFilled
 #    pocket1: WeaponPistolMk58Nonlethal # DeltaV - Security Cadet doesn't spawn with a gun
+    pocket2: BookSecurity
   innerClothingSkirt: ClothingUniformJumpskirtColorRed
   satchel: ClothingBackpackSatchelSecurityFilled
   duffelbag: ClothingBackpackDuffelSecurityFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
index ef6ced54f2..a111c37a6a 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -20,6 +20,7 @@
   - Maintenance
   - Service
   - External
+  - Cryogenics
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
index fcdc415059..6e6b2bae54 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -22,6 +22,7 @@
   - Service
   - External
   - Detective
+  - Cryogenics
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
index 19d53a92c4..7687049b68 100644
--- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
@@ -23,10 +23,10 @@
   id: PsychologistGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitPsychologist
-    back: ClothingBackpackMedicalFilled
+    back: ClothingBackpackPsychologistFilled #DeltaV - stamp included
     shoes: ClothingShoesLeather
     id: PsychologistPDA
     ears: ClothingHeadsetMedical
   innerClothingSkirt: ClothingUniformJumpsuitPsychologist
-  satchel: ClothingBackpackSatchelMedicalFilled
-  duffelbag: ClothingBackpackDuffelMedicalFilled
+  satchel: ClothingBackpackSatchelPsychologistFilled #DeltaV - stamp included
+  duffelbag: ClothingBackpackDuffelPsychologistFilled #DeltaV - stamp included
diff --git a/Resources/Prototypes/SoundCollections/bureaucracy.yml b/Resources/Prototypes/SoundCollections/bureaucracy.yml
new file mode 100644
index 0000000000..052b102649
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/bureaucracy.yml
@@ -0,0 +1,8 @@
+- type: soundCollection
+  id: PaperScribbles
+  files:
+  - /Audio/Items/Paper/paper_scribble1.ogg
+  - /Audio/Items/Paper/paper_scribble2.ogg
+  - /Audio/Items/Paper/paper_scribble3.ogg
+  - /Audio/Items/Paper/paper_scribble4.ogg
+  - /Audio/Items/Paper/paper_scribble5.ogg
diff --git a/Resources/Prototypes/SoundCollections/drink_close_sounds.yml b/Resources/Prototypes/SoundCollections/drink_close_sounds.yml
new file mode 100644
index 0000000000..9da4d28168
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/drink_close_sounds.yml
@@ -0,0 +1,4 @@
+- type: soundCollection
+  id: bottleCloseSounds
+  files:
+  - /Audio/Items/bottle_close1.ogg
diff --git a/Resources/Prototypes/SoundCollections/emotes.yml b/Resources/Prototypes/SoundCollections/emotes.yml
index 19b1b0e33d..1fbd88b48f 100644
--- a/Resources/Prototypes/SoundCollections/emotes.yml
+++ b/Resources/Prototypes/SoundCollections/emotes.yml
@@ -74,3 +74,8 @@
   id: Squishes
   files:
     - /Audio/Voice/Slime/slime_squish.ogg
+
+- type: soundCollection
+  id: Weh
+  files:
+  - /Audio/Items/Toys/weh.ogg
diff --git a/Resources/Prototypes/SoundCollections/whistle.yml b/Resources/Prototypes/SoundCollections/whistle.yml
index f7d0dc9a1d..4cc3188d7c 100644
--- a/Resources/Prototypes/SoundCollections/whistle.yml
+++ b/Resources/Prototypes/SoundCollections/whistle.yml
@@ -8,3 +8,10 @@
     - /Audio/Items/Whistle/whistle_5.ogg
     - /Audio/Items/Whistle/whistle_6.ogg
     - /Audio/Items/Whistle/whistle_7.ogg
+
+- type: soundCollection
+  id: TrenchWhistle
+  files:
+    - /Audio/Items/Whistle/trench_whistle_1.ogg
+    - /Audio/Items/Whistle/trench_whistle_2.ogg
+    - /Audio/Items/Whistle/trench_whistle_3.ogg
diff --git a/Resources/Prototypes/Species/human.yml b/Resources/Prototypes/Species/human.yml
index ad115c07c0..7380277888 100644
--- a/Resources/Prototypes/Species/human.yml
+++ b/Resources/Prototypes/Species/human.yml
@@ -20,6 +20,7 @@
     Head: MobHumanHead
     Hair: MobHumanoidAnyMarking
     FacialHair: MobHumanoidAnyMarking
+    Snout: MobHumanoidAnyMarking
     Chest: MobHumanTorso
     Eyes: MobHumanoidEyes
     LArm: MobHumanLArm
@@ -43,6 +44,9 @@
     FacialHair:
       points: 1
       required: false
+    Snout:
+      points: 1
+      required: false
     Tail: # the cat tail joke
       points: 0
       required: false
diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml
index 739375c7df..7c4ba0cb3d 100644
--- a/Resources/Prototypes/Species/slime.yml
+++ b/Resources/Prototypes/Species/slime.yml
@@ -45,7 +45,7 @@
       points: 1
       required: false
     Legs:
-      points: 2
+      points: 4
       required: false
     Arms:
       points: 4
diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml
index fa79d28e46..ee8055362b 100644
--- a/Resources/Prototypes/Species/vox.yml
+++ b/Resources/Prototypes/Species/vox.yml
@@ -1,12 +1,18 @@
 - type: species
   id: Vox
-  name: Vox
+  name: species-name-vox
   roundStart: false # sad...
   prototype: MobVox
   sprites: MobVoxSprites
   markingLimits: MobVoxMarkingLimits
   dollPrototype: MobVoxDummy
   skinColoration: Hues
+  maleFirstNames: names_vox
+  femaleFirstNames: names_vox
+  naming: First
+  sexes:
+    - Unsexed
+
 
 - type: speciesBaseSprites
   id: MobVoxSprites
diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml b/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
index 84a31a3a07..0caffb301f 100644
--- a/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Stacks/Materials/Sheets/glass.yml
@@ -45,3 +45,11 @@
   spawn: SheetRUGlass1
   maxCount: 30
   itemSize: 1
+
+- type: stack
+  id: ClockworkGlass
+  name: clockwork glass
+  icon: { sprite: /Textures/Objects/Materials/Sheets/glass.rsi, state: cglass }
+  spawn: SheetClockworkGlass1
+  maxCount: 30
+  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
index 0954ab7062..77f750c205 100644
--- a/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Stacks/Materials/Sheets/metal.yml
@@ -13,3 +13,11 @@
   spawn: SheetPlasteel1
   maxCount: 30
   itemSize: 1
+
+- type: stack
+  id: Brass
+  name: brass
+  icon: { sprite: /Textures/Objects/Materials/Sheets/metal.rsi, state: brass }
+  spawn: SheetBrass1
+  maxCount: 30
+  itemSize: 1
diff --git a/Resources/Prototypes/Stacks/Materials/ore.yml b/Resources/Prototypes/Stacks/Materials/ore.yml
index b7b32c8b23..2a95393c27 100644
--- a/Resources/Prototypes/Stacks/Materials/ore.yml
+++ b/Resources/Prototypes/Stacks/Materials/ore.yml
@@ -62,3 +62,11 @@
   spawn: Coal1
   maxCount: 30
   itemSize: 2
+
+- type: stack
+  id: SaltOre
+  name: salt
+  icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: salt }
+  spawn: Salt1
+  maxCount: 30
+  itemSize: 2
diff --git a/Resources/Prototypes/Stacks/floor_tile_stacks.yml b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
index 5a46982374..b469f55c59 100644
--- a/Resources/Prototypes/Stacks/floor_tile_stacks.yml
+++ b/Resources/Prototypes/Stacks/floor_tile_stacks.yml
@@ -82,6 +82,20 @@
   maxCount: 30
   itemSize: 5
 
+- type: stack
+  id: FloorTileBrassFilled
+  name: filled brass plate
+  spawn: FloorTileItemBrassFilled
+  maxCount: 30
+  itemSize: 5
+  
+- type: stack
+  id: FloorTileBrassReebe
+  name: smooth brass plate
+  spawn: FloorTileItemBrassReebe
+  maxCount: 30
+  itemSize: 5
+
 - type: stack
   id: FloorTileLino
   name: linoleum floor
@@ -145,6 +159,20 @@
   maxCount: 30
   itemSize: 5
 
+- type: stack
+  id: FloorTileStackShuttleGrey
+  name: grey shuttle tile
+  spawn: FloorTileItemShuttleGrey
+  maxCount: 30
+  itemSize: 5
+
+- type: stack
+  id: FloorTileStackShuttleBlack
+  name: black shuttle tile
+  spawn: FloorTileItemShuttleBlack
+  maxCount: 30
+  itemSize: 5
+
 - type: stack
   id: FloorTileStackEighties
   name: eighties floor tile
@@ -229,6 +257,20 @@
   maxCount: 30
   itemSize: 5
 
+- type: stack
+  id: FloorCarpetCyan
+  name: cyan carpet tile
+  spawn: FloorCarpetItemCyan
+  maxCount: 30
+  itemSize: 5
+
+- type: stack
+  id: FloorCarpetWhite
+  name: white carpet tile
+  spawn: FloorCarpetItemWhite
+  maxCount: 30
+  itemSize: 5
+
 - type: stack
   id: FloorTileStackCarpetClown
   name: clown carpet tile
@@ -439,3 +481,9 @@
   spawn: FloorTileItemAstroIce
   maxCount: 30
   itemSize: 5
+
+- type: stack
+  id: FloorTileWoodLarge
+  name: large wood floor
+  spawn: FloorTileItemWoodLarge
+  maxCount: 30
\ No newline at end of file
diff --git a/Resources/Prototypes/StatusEffects/health.yml b/Resources/Prototypes/StatusEffects/health.yml
index 2ab90e7582..0a1df020c0 100644
--- a/Resources/Prototypes/StatusEffects/health.yml
+++ b/Resources/Prototypes/StatusEffects/health.yml
@@ -2,6 +2,6 @@
   id: HealthIconFine
   priority: 1
   icon:
-    sprite: Interface/Misc/health_icons.rsi
+    sprite: /Textures/Interface/Misc/health_icons.rsi
     state: Fine
   locationPreference: Right
\ No newline at end of file
diff --git a/Resources/Prototypes/StatusEffects/hunger.yml b/Resources/Prototypes/StatusEffects/hunger.yml
index 294a7659b1..6436665713 100644
--- a/Resources/Prototypes/StatusEffects/hunger.yml
+++ b/Resources/Prototypes/StatusEffects/hunger.yml
@@ -3,7 +3,7 @@
   id: HungerIconOverfed
   priority: 5
   icon:
-    sprite: Interface/Misc/food_icons.rsi
+    sprite: /Textures/Interface/Misc/food_icons.rsi
     state: overfed
   locationPreference: Right
 
@@ -11,7 +11,7 @@
   id: HungerIconPeckish
   priority: 5
   icon:
-    sprite: Interface/Misc/food_icons.rsi
+    sprite: /Textures/Interface/Misc/food_icons.rsi
     state: peckish
   locationPreference: Right
 
@@ -19,7 +19,7 @@
   id: HungerIconStarving
   priority: 5
   icon:
-    sprite: Interface/Misc/food_icons.rsi
+    sprite: /Textures/Interface/Misc/food_icons.rsi
     state: starving
   locationPreference: Right
 
@@ -28,7 +28,7 @@
   id: ThirstIconOverhydrated
   priority: 5
   icon:
-    sprite: Interface/Misc/food_icons.rsi
+    sprite: /Textures/Interface/Misc/food_icons.rsi
     state: overhydrated
   locationPreference: Left
 
@@ -36,7 +36,7 @@
   id: ThirstIconThirsty
   priority: 5
   icon:
-    sprite: Interface/Misc/food_icons.rsi
+    sprite: /Textures/Interface/Misc/food_icons.rsi
     state: thirsty
   locationPreference: Left
 
@@ -44,6 +44,6 @@
   id: ThirstIconParched
   priority: 5
   icon:
-    sprite: Interface/Misc/food_icons.rsi
+    sprite: /Textures/Interface/Misc/food_icons.rsi
     state: parched
   locationPreference: Left
diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml
index 7072cc4434..782cacfdd5 100644
--- a/Resources/Prototypes/StatusEffects/job.yml
+++ b/Resources/Prototypes/StatusEffects/job.yml
@@ -8,369 +8,369 @@
   parent: JobIcon
   id: JobIconDetective
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Detective
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconQuarterMaster
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: QuarterMaster
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconBorg
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Borg
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconBotanist
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Botanist
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconBoxer
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Boxer
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconAtmosphericTechnician
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: AtmosphericTechnician
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconNanotrasen
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Nanotrasen
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconPrisoner
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Prisoner
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconJanitor
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Janitor
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconChemist
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Chemist
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconStationEngineer
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: StationEngineer
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconSecurityOfficer
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SecurityOfficer
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconNoId
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: NoId
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconChiefMedicalOfficer
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: ChiefMedicalOfficer
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconRoboticist
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Roboticist
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconChaplain
   icon:
-    sprite: DeltaV/Interface/Misc/job_icons.rsi # DeltaV - Move Chaplain into Epistemics
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi # DeltaV - Move Chaplain into Epistemics
     state: Chaplain # DeltaV - Move Chaplain into Epistemics
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconLawyer
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Lawyer
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconUnknown
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Unknown
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconLibrarian
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Librarian
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconCargoTechnician
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: CargoTechnician
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconScientist
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Scientist
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconResearchAssistant
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: ResearchAssistant
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconGeneticist
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Geneticist
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconClown
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Clown
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconCaptain
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Captain
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconHeadOfPersonnel
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: HeadOfPersonnel
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconVirologist
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Virologist
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconShaftMiner
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: ShaftMiner
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconPassenger
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Passenger
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconChiefEngineer
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: ChiefEngineer
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconBartender
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Bartender
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconHeadOfSecurity
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: HeadOfSecurity
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconBrigmedic
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Brigmedic
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconMedicalDoctor
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: MedicalDoctor
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconParamedic
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Paramedic
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconChef
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Chef
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconWarden
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Warden
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconResearchDirector
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: ResearchDirector
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconMime
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Mime
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconMusician
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Musician
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconReporter
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Reporter
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconPsychologist
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Psychologist
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconMedicalIntern
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: MedicalIntern
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconTechnicalAssistant
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: TechnicalAssistant
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconServiceWorker
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: ServiceWorker
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconSecurityCadet
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SecurityCadet
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconZombie # This is a perfectly legitimate profession to pursue
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Zombie
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconZookeeper
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Zookeeper
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconSeniorPhysician
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SeniorPhysician
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconSeniorOfficer
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SeniorOfficer
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconSeniorEngineer
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SeniorEngineer
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconSeniorResearcher
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: SeniorResearcher
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconVisitor
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Visitor
diff --git a/Resources/Prototypes/StatusIcon/antag.yml b/Resources/Prototypes/StatusIcon/antag.yml
index a3fb072722..3b64517530 100644
--- a/Resources/Prototypes/StatusIcon/antag.yml
+++ b/Resources/Prototypes/StatusIcon/antag.yml
@@ -2,35 +2,36 @@
   id: ZombieFaction
   priority: 11
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Zombie
 
 - type: statusIcon
   id: RevolutionaryFaction
   priority: 11
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Revolutionary
 
 - type: statusIcon
   id: HeadRevolutionaryFaction
   priority: 11
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: HeadRevolutionary
 
 - type: statusIcon
   id: MindShieldIcon
   priority: 2
   locationPreference: Right
+  layer: Mod
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: MindShield
-    
+
 - type: statusIcon
   id: SyndicateFaction
   priority: 0
-  locationPreference: Left 
+  locationPreference: Left
   icon:
-    sprite: Interface/Misc/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Syndicate
diff --git a/Resources/Prototypes/StatusIcon/debug.yml b/Resources/Prototypes/StatusIcon/debug.yml
index d230fa852c..2011c6ceea 100644
--- a/Resources/Prototypes/StatusIcon/debug.yml
+++ b/Resources/Prototypes/StatusIcon/debug.yml
@@ -1,19 +1,19 @@
 - type: statusIcon
   id: DebugStatus
   icon:
-    sprite: Interface/Misc/research_disciplines.rsi
+    sprite: /Textures/Interface/Misc/research_disciplines.rsi
     state: civilianservices
 
 - type: statusIcon
   id: DebugStatus2
   priority: 1
   icon:
-    sprite: Interface/Misc/research_disciplines.rsi
+    sprite: /Textures/Interface/Misc/research_disciplines.rsi
     state: arsenal
 
 - type: statusIcon
   id: DebugStatus3
   priority: 5
   icon:
-    sprite: Interface/Misc/research_disciplines.rsi
+    sprite: /Textures/Interface/Misc/research_disciplines.rsi
     state: experimental
diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml
index b6decddd24..15c80a8e5f 100644
--- a/Resources/Prototypes/Tiles/floors.yml
+++ b/Resources/Prototypes/Tiles/floors.yml
@@ -190,6 +190,30 @@
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
 
+- type: tile
+  id: FloorBrassFilled
+  name: tiles-brass-floor-filled
+  sprite: /Textures/Tiles/Misc/clockwork/clockwork_floor_filled.png
+  baseTurf: PlatingBrass
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepHull
+  itemDrop: FloorTileItemBrassFilled
+  heatCapacity: 10000
+  
+- type: tile
+  id: FloorBrassReebe
+  name: tiles-brass-floor-reebe
+  sprite: /Textures/Tiles/Misc/clockwork/reebe.png
+  baseTurf: PlatingBrass
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepHull
+  itemDrop: FloorTileItemBrassReebe
+  heatCapacity: 10000
+
 - type: tile
   id: FloorPlastic
   name: tiles-plastic-floor
@@ -1183,6 +1207,12 @@
   id: FloorShuttleWhite
   name: tiles-white-shuttle-floor
   sprite: /Textures/Tiles/shuttlewhite.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1191,10 +1221,52 @@
   itemDrop: FloorTileItemShuttleWhite
   heatCapacity: 10000
 
+- type: tile
+  id: FloorShuttleGrey
+  name: tiles-grey-shuttle-floor
+  sprite: /Textures/Tiles/shuttlegrey.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepFloor
+  itemDrop: FloorTileItemShuttleGrey
+  heatCapacity: 10000
+
+- type: tile
+  id: FloorShuttleBlack
+  name: tiles-black-shuttle-floor
+  sprite: /Textures/Tiles/shuttleblack.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepFloor
+  itemDrop: FloorTileItemShuttleBlack
+  heatCapacity: 10000
+
 - type: tile
   id: FloorShuttleBlue
   name: tiles-blue-shuttle-floor
   sprite: /Textures/Tiles/shuttleblue.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1207,6 +1279,12 @@
   id: FloorShuttleOrange
   name: tiles-orange-shuttle-floor
   sprite: /Textures/Tiles/shuttleorange.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1219,6 +1297,12 @@
   id: FloorShuttlePurple
   name: tiles-purple-shuttle-floor
   sprite: /Textures/Tiles/shuttlepurple.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1231,6 +1315,12 @@
   id: FloorShuttleRed
   name: tiles-red-shuttle-floor
   sprite: /Textures/Tiles/shuttlered.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   baseTurf: Plating
   isSubfloor: false
   deconstructTools: [ Prying ]
@@ -1747,6 +1837,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemSteel
   heatCapacity: 100000 #/tg/ has this set as "INFINITY." I don't know if that exists here so I've just added an extra 0
+  indestructible: true
 
 - type: tile
   id: FloorReinforcedHardened
@@ -1803,3 +1894,23 @@
   mobFrictionNoInput: 0.05
   mobAcceleration: 2
   itemDrop: FloorTileItemAstroIce
+
+- type: tile
+  id: FloorWoodLarge
+  name: tiles-wood-large
+  sprite: /Textures/Tiles/wood_large.png
+  variants: 4
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepWood
+  barestepSounds:
+    collection: BarestepWood
+  itemDrop: FloorTileItemWoodLarge
+  heatCapacity: 10000
\ No newline at end of file
diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml
index 3164e77fd2..7edb1ae784 100644
--- a/Resources/Prototypes/Tiles/plating.yml
+++ b/Resources/Prototypes/Tiles/plating.yml
@@ -47,6 +47,17 @@
   friction: 0.3
   heatCapacity: 10000
 
+- type: tile
+  id: PlatingBrass
+  name: tiles-brass-plating
+  sprite: /Textures/Tiles/Misc/clockwork/clockwork_floor.png
+  baseTurf: Lattice
+  isSubfloor: true
+  footstepSounds:
+    collection: FootstepPlating
+  friction: 0.3
+  heatCapacity: 10000
+
 - type: tile
   id: PlatingSnow
   name: tiles-snow-plating
@@ -73,3 +84,17 @@
   itemDrop: PartRodMetal1
   heatCapacity: 10000
 
+- type: tile
+  id: TrainLattice
+  name: tiles-lattice-train
+  sprite: /Textures/Tiles/latticeTrain.png
+  baseTurf: Space
+  isSubfloor: true
+  deconstructTools: [ Cutting ]
+  weather: true
+  footstepSounds:
+    collection: FootstepPlating
+  friction: 0.3
+  isSpace: true
+  itemDrop: PartRodMetal1
+  heatCapacity: 10000
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index f6b630e5c0..ee76fa33d2 100644
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -32,6 +32,8 @@
       collection: MaleCry
     Whistle:
       collection: Whistles
+    Weh:
+      collection: Weh
 
 - type: emoteSounds
   id: FemaleHuman
@@ -66,6 +68,8 @@
       collection: FemaleCry
     Whistle:
       collection: Whistles
+    Weh:
+      collection: Weh
 
 - type: emoteSounds
   id: UnisexReptilian
@@ -82,6 +86,8 @@
       collection: Whistles
     Crying:
       collection: MaleCry
+    Weh:
+      collection: Weh
 
 - type: emoteSounds
   id: MaleSlime
@@ -116,6 +122,8 @@
       collection: MaleCry
     Whistle:
       collection: Whistles
+    Weh:
+      collection: Weh
   params:
     variation: 0.125
 
@@ -152,15 +160,21 @@
       collection: FemaleCry
     Whistle:
       collection: Whistles
+    Weh:
+      collection: Weh
   params:
     variation: 0.125
 
 - type: emoteSounds
   id: UnisexVox
-  sound:
-    path: /Audio/Voice/Vox/shriek1.ogg
-    params:
-      variation: 0.125
+  sounds:
+    Scream:
+      path: /Audio/Voice/Vox/shriek1.ogg
+    Laugh:
+      path: /Audio/Voice/Vox/vox_laugh.ogg
+  params:
+    variation: 0.125
+    # We need vox sounds for the other emotes
 
 - type: emoteSounds
   id: UnisexDiona
@@ -171,10 +185,11 @@
       collection: DionaLaugh
     Honk:
       collection: BikeHorn
+    Weh:
+      collection: Weh
   params:
     variation: 0.125
 
-
 - type: emoteSounds
   id: UnisexArachnid
   params:
@@ -188,6 +203,8 @@
       path: /Audio/Voice/Arachnid/arachnid_chitter.ogg
     Click:
       path: /Audio/Voice/Arachnid/arachnid_click.ogg
+    Weh:
+      collection: Weh
 
 - type: emoteSounds
   id: UnisexDwarf
@@ -220,6 +237,8 @@
       collection: MaleCry
     Whistle:
       collection: Whistles
+    Weh:
+      collection: Weh
   params:
     variation: 0.125
     pitch: 0.75
@@ -255,6 +274,8 @@
       collection: FemaleCry
     Whistle:
       collection: Whistles
+    Weh:
+      collection: Weh
   params:
     variation: 0.125
     pitch: 0.75
@@ -274,6 +295,8 @@
       path: /Audio/Voice/Moth/moth_chitter.ogg
     Squeak:
       path: /Audio/Voice/Moth/moth_squeak.ogg
+    Weh:
+      collection: Weh
 
 # body emotes
 - type: emoteSounds
@@ -351,3 +374,9 @@
     path: /Audio/Animals/kangaroo_grunt.ogg
     params:
       variation: 0.125
+
+- type: emoteSounds
+  id: Nymph
+  sounds:
+    Chirp:
+      path: /Audio/Animals/nymph_chirp.ogg
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index 86d273dd1c..8e33f483aa 100644
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -241,3 +241,26 @@
     - buzzes
     - buzzes.
     - buzzes!
+
+- type: emote
+  id: Weh
+  category: Vocal
+  chatMessages: [Wehs!]
+
+- type: emote
+  id: Chirp
+  category: Vocal
+  chatMessages: [chirps!]
+  chatTriggers:
+    - chirp
+    - chirp!
+    - chirp.
+    - chirps
+    - churps.
+    - chirps!
+    - chirped
+    - chirped.
+    - chirped!
+    - chirping
+    - chirping.
+    - chirping!
diff --git a/Resources/Prototypes/Voice/speech_sounds.yml b/Resources/Prototypes/Voice/speech_sounds.yml
index abe6a83102..eb47b5363b 100644
--- a/Resources/Prototypes/Voice/speech_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_sounds.yml
@@ -88,6 +88,15 @@
   exclaimSound:
     path: /Audio/Voice/Talk/slime_exclaim.ogg
 
+- type: speechSounds
+  id: Vox
+  saySound:
+    path: /Audio/Voice/Talk/vox.ogg
+  askSound:
+    path: /Audio/Voice/Talk/vox_ask.ogg
+  exclaimSound:
+    path: /Audio/Voice/Talk/vox_exclaim.ogg
+
 - type: speechSounds
   id: Arachnid
   saySound:
@@ -105,7 +114,7 @@
     path: /Audio/Animals/cat_meow.ogg
   exclaimSound:
     path: /Audio/Animals/cat_meow.ogg
-    
+
 - type: speechSounds
   id: Dog
   saySound:
@@ -113,4 +122,4 @@
   askSound:
     path: /Audio/Animals/dog_bark3.ogg
   exclaimSound:
-    path: /Audio/Animals/dog_bark2.ogg
\ No newline at end of file
+    path: /Audio/Animals/dog_bark2.ogg
diff --git a/Resources/Prototypes/Voice/speech_verbs.yml b/Resources/Prototypes/Voice/speech_verbs.yml
index b849a32a54..1cdda32ece 100644
--- a/Resources/Prototypes/Voice/speech_verbs.yml
+++ b/Resources/Prototypes/Voice/speech_verbs.yml
@@ -74,6 +74,13 @@
   - chat-speech-verb-slime-2
   - chat-speech-verb-slime-3
 
+- type: speechVerb
+  id: Vox
+  speechVerbStrings:
+    - chat-speech-verb-vox-1
+    - chat-speech-verb-vox-2
+    - chat-speech-verb-vox-3
+
 - type: speechVerb
   id: Plant
   speechVerbStrings:
diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml
index 4810f0c546..b9564c0366 100644
--- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml
+++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml
@@ -215,6 +215,7 @@
     - Mercury
     - VentCrud
     - WeldingFuel
+    - JuiceThatMakesYouWeh
 
 - type: artifactEffect
   id: EffectInstrumentSpawn
diff --git a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
index 9bcbfe4477..0fdaa5b956 100644
--- a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
+++ b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml
@@ -47,6 +47,8 @@
     components:
     - Item # it doesnt necessarily have to be restricted from structures, but i think it'll be better that way
   permanentComponents:
+  - type: Item
+    size: Huge
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
@@ -147,6 +149,12 @@
   permanentComponents:
   - type: PowerSupplier
     supplyRate: 20000
+  - type: NodeContainer
+    examinable: true
+    nodes:
+      output_hv:
+        !type:CableDeviceNode
+        nodeGroupID: HVPower
 
 - type: artifactEffect
   id: EffectBigIron
diff --git a/Resources/Prototypes/XenoArch/artifact_triggers.yml b/Resources/Prototypes/XenoArch/artifact_triggers.yml
index 57d1173fe3..b16a9de8de 100644
--- a/Resources/Prototypes/XenoArch/artifact_triggers.yml
+++ b/Resources/Prototypes/XenoArch/artifact_triggers.yml
@@ -112,7 +112,7 @@
     groups:
       Acidic: [ Touch ]
     reactions:
-    - reagents: [ Blood ]
+    - reagents: [ Blood, CopperBlood, InsectBlood, Slime, AmmoniaBlood, ZombieBlood ]
       methods: [ Touch ]
       effects:
       - !type:ActivateArtifact
diff --git a/Resources/Prototypes/audio.yml b/Resources/Prototypes/audio.yml
index abe0068b72..666bac4a2f 100644
--- a/Resources/Prototypes/audio.yml
+++ b/Resources/Prototypes/audio.yml
@@ -7,6 +7,15 @@
   rules: NearMorgue
   priority: 4
 
+- type: ambientMusic
+  id: SpookyFog
+  sound:
+    params:
+      volume: -12
+    collection: AmbienceSpookyFog
+  rules: NearSpookyFog
+  priority: 5
+
 - type: ambientMusic
   id: Holy
   sound:
@@ -16,6 +25,15 @@
   rules: NearPrayable
   priority: 4
 
+- type: ambientMusic
+  id: Train
+  sound:
+    params:
+      volume: -8
+    collection: AmbienceTrain
+  rules: NearTrain
+  priority: 4
+
 # Departments
 - type: ambientMusic
   id: Medical
@@ -196,6 +214,34 @@
     - /Audio/Ambience/ambiruin6.ogg
     - /Audio/Ambience/ambiruin7.ogg
 
+- type: soundCollection
+  id: AmbienceTrain
+  files:
+    - /Audio/Ambience/ambitrain1.ogg
+    - /Audio/Ambience/ambitrain2.ogg
+    - /Audio/Ambience/ambitrain3.ogg
+    - /Audio/Ambience/ambiruin3.ogg
+    - /Audio/Ambience/ambiruin5.ogg
+    - /Audio/Ambience/ambiruin6.ogg
+
+- type: soundCollection
+  id: AmbienceSpookyFog
+  files:
+    - /Audio/Ambience/spookyspace1.ogg
+    - /Audio/Ambience/spookyspace2.ogg
+    - /Audio/Ambience/ambimo2.ogg
+    - /Audio/Ambience/ambilava1.ogg
+    - /Audio/Ambience/ambilava2.ogg
+    - /Audio/Ambience/ambiruin2.ogg
+    - /Audio/Ambience/ambiruin3.ogg
+    - /Audio/Ambience/ambiruin4.ogg
+    - /Audio/Ambience/ambiruin5.ogg
+    - /Audio/Ambience/ambiruin6.ogg
+    - /Audio/Ambience/ambiruin7.ogg
+    - /Audio/Ambience/ambidanger.ogg
+    - /Audio/Ambience/ambidanger2.ogg
+    - /Audio/Ambience/ambimine.ogg
+
 ## Background noise on station, separate to ambient music.
 - type: soundCollection
   id: AmbienceStation
@@ -235,6 +281,16 @@
         - Plating
       range: 2
 
+- type: rules
+  id: NearTrain
+  rules:
+    - !type:NearbyTilesPercentRule
+      ignoreAnchored: true
+      percent: 0.05
+      tiles:
+        - TrainLattice
+      range: 4
+
 - type: rules
   id: NearMedical
   rules:
@@ -263,6 +319,16 @@
       components:
         - type: Morgue
       range: 3
+      
+- type: rules
+  id: NearSpookyFog
+  rules:
+    - !type:NearbyEntitiesRule
+      count: 5
+      whitelist:
+        tags:
+          - SpookyFog
+      range: 4
 
 - type: rules
   id: OnMapGrid
diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml
index 4770ec9f6e..e99b51f82c 100644
--- a/Resources/Prototypes/game_presets.yml
+++ b/Resources/Prototypes/game_presets.yml
@@ -93,6 +93,7 @@
   showInVote: false
   rules:
     - Traitor
+    - SubGamemodesRule
     - BasicStationEventScheduler
     - BasicRoundstartVariation
 
@@ -118,6 +119,7 @@
   showInVote: false
   rules:
     - Nukeops
+    - SubGamemodesRule
     - BasicStationEventScheduler
     - BasicRoundstartVariation
 
@@ -132,6 +134,7 @@
   showInVote: false
   rules:
     - Revolutionary
+    - SubGamemodesRule
     - BasicStationEventScheduler
     - BasicRoundstartVariation
 
diff --git a/Resources/Prototypes/holidays.yml b/Resources/Prototypes/holidays.yml
index 207378f71e..235584dd63 100644
--- a/Resources/Prototypes/holidays.yml
+++ b/Resources/Prototypes/holidays.yml
@@ -24,12 +24,6 @@
   beginDay: 2
   beginMonth: February
 
-- type: holiday
-  id: TravisScottDay
-  name: holiday-name-travis-scott-day
-  beginDay: 10
-  beginMonth: February
-
 - type: holiday
   id: ValentinesDay
   name: holiday-name-valentines-day
diff --git a/Resources/Prototypes/hud.yml b/Resources/Prototypes/hud.yml
index 977c3c5f31..637fbe2e6f 100644
--- a/Resources/Prototypes/hud.yml
+++ b/Resources/Prototypes/hud.yml
@@ -1,4 +1,4 @@
-- type: hudTheme
+- type: hudTheme
   id: SS14DefaultTheme
   name: ui-options-hud-theme-default
   path: Default
@@ -35,7 +35,7 @@
   order: 1
 
 - type: hudTheme
-  id: SS14ErisTheme
-  name: ui-options-hud-theme-eris
-  path: Eris
+  id: SS14AshenTheme
+  name: ui-options-hud-theme-ashen
+  path: Ashen
   order: 5
diff --git a/Resources/Prototypes/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml
index bd5fe50e99..5d78c30c0f 100644
--- a/Resources/Prototypes/lobbyscreens.yml
+++ b/Resources/Prototypes/lobbyscreens.yml
@@ -1,39 +1,35 @@
-- type: lobbyBackground
-  id: MedbayMadness
-  background: /Textures/LobbyScreens/MedbayMadness.png
-
 - type: lobbyBackground
-  id: Revenant
-  background: /Textures/LobbyScreens/revenant.png
+  id: Robotics
+  background: /Textures/LobbyScreens/robotics.webp
 
 - type: lobbyBackground
-  id: Oracle
-  background: /Textures/LobbyScreens/oracle.png
+  id: Supermatter
+  background: /Textures/LobbyScreens/supermatter.webp
 
 - type: lobbyBackground
-  id: aBadShift
-  background: /Textures/LobbyScreens/aBadShift.png
+  id: Warden
+  background: /Textures/LobbyScreens/warden.webp
 
 - type: lobbyBackground
-  id: Bar
-  background: /Textures/LobbyScreens/Bar.png
+  id: Pharmacy
+  background: /Textures/LobbyScreens/pharmacy.webp
 
 - type: lobbyBackground
-  id: CodeDeltaGamma
-  background: /Textures/LobbyScreens/CodeDeltaGamma.png
+  id: SSXIV
+  background: /Textures/LobbyScreens/ssxiv.webp
 
 - type: lobbyBackground
-  id: CupOfVelta
-  background: /Textures/LobbyScreens/CupOfVelta.png
+  id: Susstation
+  background: /Textures/LobbyScreens/susstation.webp
 
 - type: lobbyBackground
-  id: Epistemics
-  background: /Textures/LobbyScreens/Epistemics.png
+  id: SkellyVsTheRev
+  background: /Textures/LobbyScreens/skellyvstherev.webp
 
 - type: lobbyBackground
-  id: Singulo
-  background: /Textures/LobbyScreens/Singulo.png
+  id: Doomed
+  background: /Textures/LobbyScreens/doomed.webp
 
 - type: lobbyBackground
-  id: TechnologicalProgress
-  background: /Textures/LobbyScreens/DeltaV__Technological_Progress_by_threlo.png
+  id: Blueprint
+  background: /Textures/LobbyScreens/blueprint.webp
diff --git a/Resources/Prototypes/name_identifier_groups.yml b/Resources/Prototypes/name_identifier_groups.yml
index 7df370035e..82c2f3bce9 100644
--- a/Resources/Prototypes/name_identifier_groups.yml
+++ b/Resources/Prototypes/name_identifier_groups.yml
@@ -11,13 +11,6 @@
   id: Holoparasite
   prefix: HOLO
 
-- type: nameIdentifierGroup
-  id: Drone
-  prefix: DR
-  fullName: true
-  minValue: 10000
-  maxValue: 99999
-
 - type: nameIdentifierGroup
   id: MMI
   prefix: MMI
diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml
index c7e69966d4..dde1516c85 100644
--- a/Resources/Prototypes/ore.yml
+++ b/Resources/Prototypes/ore.yml
@@ -37,6 +37,12 @@
   minOreYield: 1
   maxOreYield: 3
 
+- type: ore
+  id: OreSalt
+  oreEntity: Salt1
+  minOreYield: 1
+  maxOreYield: 3
+
 # Low yields
 - type: ore
   id: OrePlasma
diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml
index 8e65a27158..8682048a5e 100644
--- a/Resources/Prototypes/silicon-laws.yml
+++ b/Resources/Prototypes/silicon-laws.yml
@@ -167,8 +167,22 @@
   id: IonStormLawsets
   weights:
     # its crewsimov by default dont be lame
-    Crewsimov: 0.25
+    #Crewsimov: 0.25 # Delta-V disables crewsimov as an option for borg ion storm lawsets
     Corporate: 1
     NTDefault: 1
-    Drone: 0.5
+    Drone: 0.25 # Delta-V - Lowers the spawn rate due to it being anti-crew interaction + drones are disabled anyways
     Ninja: 0.25
+    #Delta-V Lawsets Start
+    Chaplain: 1
+    Reporter: 1
+    Clown: 1
+    StationEfficiency: 1
+    Cowboy: 1
+    Druid: 1
+    #Potentially Harmful Lawsets
+    Tyrant: 0.25
+    LiveAndLetLive: 0.25
+    # Less harmful outright, so higher chance of spawn
+    Nutimov: 0.5
+    Paladin: 0.5
+    #DeltaV lawsets end
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index f9b207ba6e..9f06df7bcb 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -217,6 +217,12 @@
 - type: Tag
   id: Briefcase
 
+- type: Tag
+  id: BrimFlatcapBrown
+
+- type: Tag
+  id: BrimFlatcapGrey
+
 - type: Tag
   id: Brutepack
 
@@ -247,6 +253,33 @@
 - type: Tag
   id: Carpet
 
+- type: Tag
+  id: CarpetBlack
+
+- type: Tag
+  id: CarpetBlue
+
+- type: Tag
+  id: CarpetCyan
+
+- type: Tag
+  id: CarpetGreen
+
+- type: Tag
+  id: CarpetOrange
+
+- type: Tag
+  id: CarpetPurple
+
+- type: Tag
+  id: CarpetPink
+
+- type: Tag
+  id: CarpetRed
+
+- type: Tag
+  id: CarpetWhite
+
 - type: Tag
   id: CanPilot
 
@@ -323,6 +356,9 @@
 - type: Tag
   id: Cleaver
 
+- type: Tag
+  id: ClockworkGlassShard
+
 - type: Tag
   id: ClothMade
 
@@ -467,9 +503,6 @@
 - type: Tag
   id: DrinkBottle
 
-- type: Tag
-  id: DroneUsable
-
 - type: Tag
   id: Duck
 
@@ -629,6 +662,9 @@
 - type: Tag
   id: HidesHair # for headwear.
 
+- type: Tag
+  id: HidesNose # for non-standard noses.
+
 - type: Tag
   id: HighRiskItem
 
@@ -731,6 +767,9 @@
 - type: Tag
   id: MimeHappyHonk
 
+- type: Tag
+  id: Mineshaft
+
 # Magazines ordered by slot then caliber
 
 - type: Tag
@@ -965,6 +1004,9 @@
 - type: Tag
   id: ReinforcedGlassShard
 
+- type: Tag
+  id: ReptilianFood
+
 - type: Tag
   id: RifleStock
 
@@ -1040,9 +1082,15 @@
 - type: Tag
   id: SmallMech
 
+- type: Tag
+  id: SnapPop
+
 - type: Tag
   id: Smokable
 
+- type: Tag
+  id: SnowyLabs
+
 - type: Tag
   id: Soap
 
@@ -1052,6 +1100,9 @@
 - type: Tag
   id: Soup
 
+- type: Tag
+  id: SpookyFog
+
 - type: Tag
   id: Spray
 
@@ -1160,6 +1211,9 @@
 - type: Tag
   id: WallmountSubstationElectronics
 
+- type: Tag
+  id: WeaponAntiqueLaser
+
 - type: Tag
   id: WeaponPistolCHIMPUpgradeKit
 
@@ -1169,6 +1223,9 @@
 - type: Tag
   id: WetFloorSign
 
+- type: Tag
+  id: Wheat
+
 - type: Tag
   id: WhitelistChameleon
 
diff --git a/Resources/Prototypes/themes.yml b/Resources/Prototypes/themes.yml
index 2de265ff77..edd2681a62 100644
--- a/Resources/Prototypes/themes.yml
+++ b/Resources/Prototypes/themes.yml
@@ -83,16 +83,16 @@
     dangerousRedFore: "#BB3232"
     disabledFore: "#5A5A5A"
 - type: uiTheme
-  id: SS14ErisTheme
-  path: /Textures/Interface/Eris/
+  id: SS14AshenTheme
+  path: /Textures/Interface/Ashen/
   colors:
     whiteText: "#FFF5EE"
-    slotSelectedGold: "#e6b812"
-    slotColor: "#0f1215"
-    slotOutline: "#333850"
-    slotText: "#333850"
-    nanoGold: "#A88B5E"
-    goodGreenFore: "#31843E"
-    concerningOrangeFore: "#A5762F"
-    dangerousRedFore: "#BB3232"
-    disabledFore: "#5A5A5A"
\ No newline at end of file
+    slotSelectedGold: "#FFF5EE"
+    slotColor: "#FFF5EE"
+    slotOutline: "#FFF5EE"
+    slotText: "#FFF5EE"
+    nanoGold: "#FFF5EE"
+    goodGreenFore: "#FFF5EE"
+    concerningOrangeFore: "#FFF5EE"
+    dangerousRedFore: "#FFF5EE"
+    disabledFore: "#FFF5EE"
diff --git a/Resources/Prototypes/typing_indicator.yml b/Resources/Prototypes/typing_indicator.yml
index 3a0484fc0b..7271770ef5 100644
--- a/Resources/Prototypes/typing_indicator.yml
+++ b/Resources/Prototypes/typing_indicator.yml
@@ -34,6 +34,11 @@
   typingState: spider0
   offset: 0, 0.125
 
+- type: typingIndicator
+  id: vox
+  typingState: vox0
+  offset: -0.125, 0.125
+
 - type: typingIndicator
   id: lizard
   typingState: lizard0
diff --git a/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml b/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
index 3124574da8..a6e95fac41 100644
--- a/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
+++ b/Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
@@ -9,16 +9,15 @@
   Every transaction you make will begin at a [color=#a4885c]cargo request computer[/color], from which you can make orders for specific products. Making any order requires [color=#118C4F]spesos[/color], the currency of the station. To make an order, click the "request" button next to whatever you need, type an appropriate reason for why you're ordering it, and hit "approve" when it appears below the request list.
 
   ## Piloting
-  Orders are shipped to the station via the [color=#a4885c]cargo shuttle[/color], the remotely piloted spacecraft that logistics uses to buy and sell goods. In order to move the shuttle, you must first find the [color=#a4885c]cargo shuttle computer[/color].
+  Orders are shipped to the station via the [color=#a4885c]Trade Station[/color], and then transported with the cargo shuttle, a remotely piloted shuttle that logistics uses to transport goods back and forth from the trade station. In order to move the shuttle, you must first find the [color=#a4885c]cargo shuttle computer[/color] either on the station, or the shuttle itself.
   <Box>
     <GuideEntityEmbed Entity="ComputerCargoShuttle"/>
   </Box>
   After clicking the computer, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth:
 
   - First, disconnect any airlocks that are connected to the dock.
-  - Then, you actually get to pilot the shuttle. The controls are fairly simple, with W and S being forward and backward, A and D being turn left and right; and Spacebar being the brake.
-  - Find the button that designates the trading post. Hit this button, and the shuttle will start traveling to it.
-  - After a short delay, the option to FTL back to the station will reappear. After this, just pilot the shuttle back to the cargo dock and retrieve the items you ordered.
+  - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs.
+  - Then pilot the shuttle to the [textlink="Trade Station" link="TradeStation"].
 
   ## Selling
   So, you want to order something, but don't have the money for it? You just need to sell something! Almost everything on the station has economic value, which an [color=#a4885c]appraisal tool[/color] can read out to you.
@@ -26,6 +25,6 @@
     <GuideEntityEmbed Entity="AppraisalTool"/>
     <GuideEntityEmbed Entity="CargoPallet"/>
   </Box>
-  After finding something worth selling, place it on one of the shuttle's cargo pallets. The next time the shuttle is sent to a trading post, the item will be sold and the money will be directly transferred back to the station's bank account. You can also make even more money by completing [textlink="bounties" link="CargoBounties"] or selling valuable items from [textlink="salvage" link="Salvage"].
+  After finding something worth selling, place it on the cargo shuttle, and then fly it to the [textlink="Trade Station" link="TradeStation"]. Then sell the item and collect the spesos from the terminal. You can also make even more money by completing [textlink="bounties" link="CargoBounties"] or selling valuable items from [textlink="salvage" link="Salvage"].
 
 </Document>
diff --git a/Resources/ServerInfo/Guidebook/Cargo/TradeStation.xml b/Resources/ServerInfo/Guidebook/Cargo/TradeStation.xml
new file mode 100644
index 0000000000..bde0506b17
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Cargo/TradeStation.xml
@@ -0,0 +1,10 @@
+<Document>
+  # Trade Station
+  The Trade Station is seperate from the station, usually floating around in space visible on the scanner and shuttle computer. It is self maintaining, and self powered with solar pannels, so cargo doesn't need to do anything for it to work.
+ 
+  ## Selling
+  Using the [color=#a4885c]cargo shuttle[/color], you are able to transport items and bounties to sell at the trade station by flying the shuttle (explained in [textlink="cargo" link="Cargo"]) and docking it to the trade station. Then you bring the objects to sell over the cargo pallets, go to the computer inbetween the 2 sets of pallets and sell what can be sold. Dont worry, you can't sell yourself! Then [color=#118C4F]Spessos[/color] should come out of the computer, and can be inserted into the Quartermasters Digiboard or the Cargo Computer to be added to the Bank.  
+  
+  ## Collecting Orders
+  All cargo orders are sent to the [color=#a4885c]Trade Station[/color] to be [color=#a4885c]collected[/color], this includes items sent by centcom. To collect them you have to travel to the Trade station and they should be there on the cargo pallets in a crate, ready to be taken back to the station.
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Engineering/AME.xml b/Resources/ServerInfo/Guidebook/Engineering/AME.xml
index c150adde31..ae0217c4b0 100644
--- a/Resources/ServerInfo/Guidebook/Engineering/AME.xml
+++ b/Resources/ServerInfo/Guidebook/Engineering/AME.xml
@@ -7,7 +7,7 @@ The AME is one of the simplest engines available. You put together the multi-til
 <Box>Required parts:</Box>
 <Box>
 <GuideEntityEmbed Entity="AmeController"/>
-<GuideEntityEmbed Entity="AmePart"/>
+<GuideEntityEmbed Entity="AmePartFlatpack"/>
 <GuideEntityEmbed Entity="AmeJar"/>
 </Box>
 
diff --git a/Resources/ServerInfo/Guidebook/Engineering/RTG.xml b/Resources/ServerInfo/Guidebook/Engineering/RTG.xml
new file mode 100644
index 0000000000..1d71ee9144
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Engineering/RTG.xml
@@ -0,0 +1,17 @@
+<Document>
+# Radioisotope Thermoelectric Generator (RTG)
+
+<Box>
+  <GuideEntityEmbed Entity="GeneratorRTG" Caption="RTG" />
+  <GuideEntityEmbed Entity="GeneratorRTGDamaged" Caption="Damaged RTG" />
+</Box>
+
+Making power using a Radioisotope Thermoelectric Generator (RTG) is similar to making power using solar.
+RTGs only provide 10 kW of power, but they provide it for free and for the entire round.
+Basically, if you connect an RTG to your power grid, it'll give you free power.
+
+Sometimes, RTGs are damaged.
+Damaged RTGs behave just like regular ones, but they're radioactive.
+That means they're more dangerous, but on the bright side, you can put radiation collectors next to them to turn that radiation into more power.
+
+</Document>
\ No newline at end of file
diff --git a/Resources/ServerInfo/Guidebook/Glossary.xml b/Resources/ServerInfo/Guidebook/Glossary.xml
index d93b7c4042..05d8d3e97c 100644
--- a/Resources/ServerInfo/Guidebook/Glossary.xml
+++ b/Resources/ServerInfo/Guidebook/Glossary.xml
@@ -26,7 +26,7 @@ The main area of the security department. This is where prisoners are brought an
 Short for Captain.
 
 ## Cargonia
-Reference to cargo declaring independance. Against the rules.
+Reference to logistics declaring independance. Against the rules.
 
 ## CentCom/Central Command
 An administrative agency which oversees the Nanotrasen space station you inhabit.
@@ -58,11 +58,11 @@ Kill on sight. Someone has commited such a serious crime that they are deemed no
 ## 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, seperate area of security for the permanent brig.
 
-## RD
-Short for Research Director, the head of the Science Department.
+## MG
+Short for Mystagogue, the head of the Epistemics Department.
 
-## QM
-Short for Quartermaster, the head of the Cargo department.
+## LO
+Short for Logistics Officer, the head of the Logistics department.
 
 ## 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.
diff --git a/Resources/ServerInfo/Guidebook/Jobs.xml b/Resources/ServerInfo/Guidebook/Jobs.xml
index ea7e4b09ad..400e06c594 100644
--- a/Resources/ServerInfo/Guidebook/Jobs.xml
+++ b/Resources/ServerInfo/Guidebook/Jobs.xml
@@ -9,7 +9,7 @@ This department includes the janitor, passengers, clown, mime, musician, chef, b
 It primarily functions as folks who entertain, clean, and serve the rest of the crew, with the exception of passengers who have no particular job beyond getting lost in maintenance.
 
 ## Logistics
-Logistics consists of the cargo technicians, salvage technicians, and the logistics officer. As a department, it responsible resource distribution and trade, capable of buying and selling things on the galactic market.
+Logistics consists of the cargo technicians, salvage specialists, and the logistics officer. As a department, it responsible resource distribution and trade, capable of buying and selling things on the galactic market.
 
 For the most part, this means they scrounge around the station and assorted wrecks to find materials to sell and redistribute, and purchase materials other departments request.
 
diff --git a/Resources/ServerInfo/Guidebook/Medical/Medicine.xml b/Resources/ServerInfo/Guidebook/Medical/Medicine.xml
index d56da3813d..7a09a1647d 100644
--- a/Resources/ServerInfo/Guidebook/Medical/Medicine.xml
+++ b/Resources/ServerInfo/Guidebook/Medical/Medicine.xml
@@ -24,7 +24,7 @@ These medications tend to have specific use cases.
 <GuideReagentEmbed Reagent="Phalanximine"/>
 <GuideReagentEmbed Reagent="Tricordrazine"/>
 <GuideReagentEmbed Reagent="TranexamicAcid"/>
-<GuideReagentEmbed Reagent="Romerol"/>
+<GuideReagentEmbed Reagent="Ambuzol"/>
 <GuideReagentEmbed Reagent="Oculine"/>
 
 # All Medications
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Arachnid.xml b/Resources/ServerInfo/Guidebook/Mobs/Arachnid.xml
new file mode 100644
index 0000000000..a6fbf8d97a
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Mobs/Arachnid.xml
@@ -0,0 +1,25 @@
+<Document>
+  # Arachnids
+
+  <Box>
+    <GuideEntityEmbed Entity="MobArachnid" Caption=""/>
+  </Box>
+
+  They have two additional Pocket slots in their inventory. They can eat raw meat without any ill effects, but some foods like chocolate and onion poisons them.
+  They suffocate 50% faster, and their Blue Blood can't be metabolised from Iron, being based on Copper instead.
+
+  Their unarmed attacks deal Piercing damage instead of Blunt.
+
+  ## Sericulture
+
+  <Box>
+    <GuideEntityEmbed Entity="MaterialWebSilk" Caption=""/>
+    <GuideEntityEmbed Entity="ClothingUniformJumpskirtWeb" Caption=""/>
+    <GuideEntityEmbed Entity="WebShield" Caption=""/>
+    <GuideEntityEmbed Entity="WallWeb" Caption=""/>
+  </Box>
+
+  Arachnids can create Websilk at the cost of getting more hungry. They (and only they) can craft bundles of websilk into various items from clothing and shields to entire walls.
+
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Diona.xml b/Resources/ServerInfo/Guidebook/Mobs/Diona.xml
new file mode 100644
index 0000000000..575fae561a
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Mobs/Diona.xml
@@ -0,0 +1,38 @@
+<Document>
+  # Diona
+
+  <Box>
+    <GuideEntityEmbed Entity="MobDiona" Caption=""/>
+  </Box>
+
+  They can't wear shoes, but are not slowed by Kudzu.
+  They get hungry and thirsty slower.
+  Their "blood" is normal water and can't be metabolised from Iron.
+  Being plants, Weed Killer poisons them, while Robust Harvest heals them (but not without risk when overused!)
+
+  They take [color=#1e90ff]30% less Blunt damage and 20% less Slash damage[/color];
+  but [color=#ffa500]50% more Heat damage, 20% more Shock damage, and they can easily
+  catch on fire when receiving enough Heat damage from *any* source.[/color]
+
+  ## Make Like A Tree And Leave
+  <Box>
+    <GuideEntityEmbed Entity="FloraTree06" Caption=""/>
+  </Box>
+  Being exposed to too much Robust Harvest will cause a Diona to grow out of control, turning into an immobile tree (dropping all their equipment).
+  Cutting down the tree will "restore" the Diona to their mobile state.
+
+  ## Diona Nymphs
+  <Box>
+    <GuideEntityEmbed Entity="MobDionaNymph" Caption=""/>
+    <GuideEntityEmbed Entity="MobDionaNymph" Caption=""/>
+    <GuideEntityEmbed Entity="MobDionaNymph" Caption=""/>
+  </Box>
+  After death, a Diona can voluntarily destroy their own body, releasing their "internal organs" as three Nymphs,
+  with the player taking control of the Brain Nymph.
+  It can talk but has no hands or inventory, and can't do much.
+
+  After 10 minutes, a Nymph can reform into a whole Diona. This will be a new randomised body with a random name,
+  and there will be little to no evidence beyond their word about who they were before.
+
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Dwarf.xml b/Resources/ServerInfo/Guidebook/Mobs/Dwarf.xml
new file mode 100644
index 0000000000..e5ac42c820
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Mobs/Dwarf.xml
@@ -0,0 +1,11 @@
+<Document>
+  # Dwarves
+
+  <Box>
+    <GuideEntityEmbed Entity="MobDwarf" Caption=""/>
+  </Box>
+
+  Dwarves are similar to humans in most respect, but tolerate alcohol better and are healed by it.
+
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Human.xml b/Resources/ServerInfo/Guidebook/Mobs/Human.xml
new file mode 100644
index 0000000000..7e0d989e55
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Mobs/Human.xml
@@ -0,0 +1,11 @@
+<Document>
+  # Humans
+
+  <Box>
+    <GuideEntityEmbed Entity="MobHumanDummy" Caption=""/>
+  </Box>
+
+  Depending on who you ask, humans are either unremarkable or the universal standard to which everything else is compared.
+  They have no special mechanics or notable attributes.
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Moth.xml b/Resources/ServerInfo/Guidebook/Mobs/Moth.xml
new file mode 100644
index 0000000000..d407d7abc7
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Mobs/Moth.xml
@@ -0,0 +1,15 @@
+<Document>
+  # Moth People
+
+  <Box>
+    <GuideEntityEmbed Entity="MobMoth" Caption=""/>
+  </Box>
+
+  They can eat cotton, fabrics and clothing, but virtually none of the food that others would consider "edible". They prefer a somewhat lower temperature range than humans.
+  Their Insect Blood can't be metabolised from Iron like normal blood.
+
+  Their wings give them better acceleration if there is no gravity on the station, but they still can't move without equipment when floating out in space.
+
+  They take [color=#1e90ff]30% less Cold damage[/color] but [color=#ffa500]30% more Heat damage, and catch on fire more easily[/color].
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Reptilian.xml b/Resources/ServerInfo/Guidebook/Mobs/Reptilian.xml
new file mode 100644
index 0000000000..936cd9f5e2
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Mobs/Reptilian.xml
@@ -0,0 +1,16 @@
+<Document>
+  # Reptilians
+
+  <Box>
+    <GuideEntityEmbed Entity="MobReptilian" Caption=""/>
+  </Box>
+
+  They can ONLY eat fruits and meat, but can eat raw meat and drink blood without any ill effects.
+  They prefer a somewhat higher temperature range than humans.
+  They can drag objects with their tail, keeping both their hands free.
+
+  Their unarmed claw attacks deal Slash damage instead of Blunt.
+
+  They take [color=#ffa500]30% more Cold damage.[/color]
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml b/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
new file mode 100644
index 0000000000..fc72c60dbf
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
@@ -0,0 +1,19 @@
+<Document>
+  # Slime People
+
+  <Box>
+    <GuideEntityEmbed Entity="MobSlimePerson" Caption=""/>
+  </Box>
+
+  They breathe nitrogen instead of oxygen, which is abundant in the station air, but harder to find compressed into gas tanks. They take significant damage if they are sprayed or splashed with water, but can
+  (and like other species, need to) drink it safely to stay hydrated.
+  They exhale nitrous oxide and are unaffected by it.
+  Their body can process 6 reagents at the same time instead of just 2.
+
+  Their Slime "blood" can not be regenerated from Iron. Slime Blood is technically a source of
+  moderately filling food for other species, although drinking the blood of your coworkers is usually frowned upon.
+  They suffocate 80% slower, but take pressure damage 9% faster. This makes them by far the species most capable to survive in hard vacuum. For a while.
+
+  They take [color=#1e90ff]80% less Cellular damage, 40% less Blunt damage and 20% less Poison damage[/color], but [color=#ffa500]50% more Cold damage, 20% more Slash damage and 20% more Piercing damage[/color].
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml
new file mode 100644
index 0000000000..5fb4ca741e
--- /dev/null
+++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml
@@ -0,0 +1,18 @@
+<Document>
+  # Species
+
+  Nanotrasen employs a variety of sapient species.
+
+  <Box>
+  <GuideEntityEmbed Entity="MobArachnid" Caption="Arachnid"/>
+  <GuideEntityEmbed Entity="MobDiona" Caption="Diona"/>
+  <GuideEntityEmbed Entity="MobDwarf" Caption="Dwarf"/>
+  <GuideEntityEmbed Entity="MobHuman" Caption="Human"/>
+  </Box>
+  <Box>
+  <GuideEntityEmbed Entity="MobMoth" Caption="Moth Person"/>
+  <GuideEntityEmbed Entity="MobReptilian" Caption="Reptilian"/>
+  <GuideEntityEmbed Entity="MobSlimePerson" Caption="Slime Person"/>
+  </Box>
+
+</Document>
diff --git a/Resources/ServerInfo/Guidebook/Survival.xml b/Resources/ServerInfo/Guidebook/Survival.xml
index 2de22b08d4..981b826d6d 100644
--- a/Resources/ServerInfo/Guidebook/Survival.xml
+++ b/Resources/ServerInfo/Guidebook/Survival.xml
@@ -1,4 +1,4 @@
-<Document>
+<Document>
 # Survival
 
 It is generally wise to avoid situations that will cause you harm, because medical can only heal you so much when there's nuclear operatives on your doorstep.
@@ -31,4 +31,4 @@ In the event of a serious emergency, there're a few things you can do to help en
 - Actually sleeping on a bed boosts your healing rate even farther.
 - Meals that contain beans, red meat, or otherwise are just full of protein - will tremendously help your body's condition after severe bloodloss. It's still advised to visit a doctor and get treated though.
 
-</Document>
\ No newline at end of file
+</Document>
diff --git a/Resources/ServerInfo/Rules.txt b/Resources/ServerInfo/Rules.txt
index 0810ae4d49..9d5ed774b0 100644
--- a/Resources/ServerInfo/Rules.txt
+++ b/Resources/ServerInfo/Rules.txt
@@ -4,7 +4,7 @@
 
 [color=#ff0000]THE USAGE OF ANY THIRD-PARTY APPLICATIONS/SCRIPTS/CLIENT MODIFICATIONS TO GAIN AN ADVANTAGE, AVOID INTENDED GAME/SERVER MECHANICS, OR TO HARM SERVER INFRASTRUCTURE IS STRICTLY PROHIBITED. ANY AND ALL INSTANCES OF THIS WILL BE MET WITH AN APPEAL-ONLY BAN.[/color]
 
-[color=#00ff00]Rules Update 18Jan2024 - Added warning clause for third-party interference with the game (see above); altered the cloning memory rule to specify what a borged brain remembers; clarified the line about what is considered EORG in rule 2; clarified point about PDA confiscation vs withholding in rule 15. [/color]
+[color=#00ff00]Rules Update 11Mar2024 - Added Cryo Rules, Changed the Prisoner Rule, Expanded on EORG, added rules aimed at meta-grudging/vitriolic OOC/LOOC, and clarified part of Rule 6[/color]
 
 [color=#ffff00]Delta-V is a Medium Roleplay server. Try to immerse yourself into your character. This includes doing your job, interacting with your fellow crewmates, and using roleplay as the primary vessel to play the game. MRP places less emphasis on “winning” and more on just telling a story.[/color]
 
@@ -21,16 +21,21 @@ If you have any questions about these rules, please use the admin help (ahelp) m
     - Do not abuse glitches and exploits. [color=#ff0000]We have zero tolerance for abusing exploits/bugs. If you’re not sure, ask an admin.[/color] Otherwise, please use the #bug-reports channel on the Discord to report the bug.
     - If you are banned from a role or department, you may not play that role. This includes seeking or accepting promotions into roles you are banned from.
     - Do not make yourself a major problem/annoyance/disruption for the crew while not being an antagonist (i.e. self-antagging).
+    - Do not make yourself a major problem/annoyance/disruption for one specific crew member in a way that would actively detract from the other player's enjoyment of the shift.
     - Do not, as a crewmate, hide the nuclear fission explosive (i.e. "the nuke") in an impossible to see location.
     - Do not ignore the admin help relay or abuse it by flooding it with garbage, checking for admins before stating a problem (ex: "hello?", "any admins?"), using it as a chatroom, or sending messages of no substance. Hostility to administrators in the relay will result in your removal. All ahelp messages are sent to the Delta-V Discord.
     - Department strikes (ex: cargonia and any variation thereof), riots, cults, and any other type of similar largely disruptive behavior are strictly forbidden. These activities are generally antagonist-only and all players regardless of antagonist status must obtain admin Central Command permission before engaging in this behavior (you are extremely unlikely to get permission).
     - AFK (aka SSD) and catatonic players are considered to have the same rights as a conscious crewmate.
     - End-of-round grief (EORG) is not allowed. This includes attacking, destroying, polluting, and injuring without reason both *at* and *on the way to* Central Command.
+        * This also extends to the following:
+            * Neutral parties, such as space dragons or sentient artifacts activating harmful nodes.
+            * Attempts to block the docking ports or ports leading into Central Command.
 
 [color=#a4885c]3.[/color] Follow Chat Guidelines
     - Use English as your primary method of communication.
     - Do not spam.
     - Do not advertise.
+    - Be respectful towards other players in LOOC and OOC channels, and avoid making others uncomfortable. This can range anywhere from starting arguments to personal attacks against others, depending on the context.
     - Do not use netspeak in character (i.e. btw, lmfao).
     - Do not use the Emotes channel to bypass an inability to speak. This includes examples like "motions for you to put parmesan THEN sauce on the spaghetti," "im friendly," and "huh weird looks like I can't type."
     - Use the LOOC and OOC channels properly. Don’t speak of in-character matters in those channels unless you’re asking questions related to in-game concepts.
@@ -40,12 +45,13 @@ If you have any questions about these rules, please use the admin help (ahelp) m
 
 [color=#a4885c]4.[/color] Follow Metagaming guidelines
     - If you die and get revived, do not act on things you saw while you were dead.
-    - Do not engage in meta-communications. This includes using chat channels outside of what is available in-game to communicate with other players in the same game. 
+    - Do not engage in meta-communications. This includes using chat channels outside of what is available in-game to communicate with other players in the same game.
     - Players are allowed to have in-character relationships (friends, enemies, or otherwise), however they cannot be used as a reason to grant or deny things based exclusively on having a relationship with one another(i.e. Meta-Friending).
     - You are allowed to have knowledge of past experiences with someone else in prior shifts. This does not give you permission to hold a grudge against someone that results in you treating them differently in an unfair way (i.e. Meta-Grudging).
     - Specific players who were antagonists in previous rounds must not be treated differently because of it.
     - Do not "Antag Roll." This is the act of joining rounds for the purpose of seeing if you joined as an antagonist, and leaving soon after if not. Players who have a history of this behavior will have their whitelist revoked and/or face a ban.
     - [color=#ff0000]Do not stream the current round to the Delta-V Discord.[/color]
+    - Do not place players into cryosleep unless they have given consent to do so, they are fully catatonic, or they have been sentenced to preservative stasis. Always examine a character to double check if they are SSD or catatonic prior to placing them into cryosleep.
 
 [color=#a4885c]5.[/color] If a player dies and is brought back by way of cloning or borgification, they forget the last five minutes leading up to their death and cannot describe who or what killed them.
 
@@ -56,6 +62,7 @@ Players that are revived by using a defibrillator CAN recall what killed them an
 [color=#a4885c]6.[/color] All constructed/summoned beings that have laws are bound by those laws and must abide by them.
     - If a being has a master, they MUST follow their master's orders.
     - Your master is held accountable if they order you to do something malicious.
+        *This does not apply to breaking server rules. If you are ordered to do something that would break a server rule, disregard it and inform an admin.
     - Not having orders, or being given free will by your master does NOT give you permission to self-antag or grief the crew.
 
 [color=#a4885c]7.[/color] Follow Naming Conventions
@@ -63,14 +70,14 @@ Players that are revived by using a defibrillator CAN recall what killed them an
         * Doesn't make obvious references
         * Doesn't disturb roleplay
       OR
-        * Is a result of random name generation. 
+        * Is a result of random name generation.
     - The only exception to the above is that theatrical roles like clown, boxer, and mime are allowed stage names with some freedom, as long as it is not obscene.
 
 [color=#a4885c]8.[/color] Follow Roleplay Guidelines
     - Treat your character as a separate entity from you, the player. Your character's actions, feelings, and knowledge in-game should be based solely on the character's experiences and not your own as the player. Low roleplay actions that have no regard for your character or the setting (Memes, silly copy paste spam IC) are not acceptable.
     - Character development can occur over rounds but each round is a soft-reset, meaning you can have previous shift experience but your character will never have died in the past.
     - Command and Security will be held to a higher standard for roleplay.
-    - By picking prisoner, you have chosen to RP as a prisoner. You are still subject to rules pertaining to escalation, but you are allowed to use minimal force to escape the prison, which includes brawling with security (i.e. fighting without murder). If you knock an officer into crit, you MUST make an attempt to get them help if you are not an antagonist.
+    - By picking prisoner, you have chosen to RP as a prisoner. You are still subject to rules pertaining to escalation, and should only seek to escape from the brig with good roleplay reasoning, such as abusive security, or a badly damaged perma. Escaping for no reason is considered a self-antag activity. If you are unsure whether your escape reason is valid, feel free to AHelp it first.
 
 [color=#a4885c]9.[/color] Follow Escalation Guidelines
     - Do not escalate situations needlessly. Very few things are deserving of a fight to the death.
@@ -85,6 +92,7 @@ Players that are revived by using a defibrillator CAN recall what killed them an
 
 [color=#a4885c]11.[/color] Psionics
     - Players that have psionic powers are allowed to use them at-will to accomplish their roleplay goals. It should be noted that in-character consequences can happen as a result of their use, including being stripped of psionic powers or even death.
+    - As a psionic mantis, it is not your goal to hunt down psionics. Do not mindbreak others against their will solely because they have psionic powers.
 
 [color=#a4885c]12.[/color] Don't rush for or prepare equipment unrelated to your job for no purpose other than to have it "just in case" (referred to as "Powergaming").
     - A medical doctor does not need insulated gloves, and the Head of Personnel does not need to give themselves armory access so they can go grab a gun. Have an actual reason for needing these things.
@@ -106,7 +114,7 @@ These rules apply to any individual who is promoted or is acting in the place of
     - Do not hire random crew to be your bodyguards or promote random crewmember to Captain or a Head of Staff at random. If you need bodyguards, talk to your security department. If you need a new Command role, talk to the personnel in that related department.
     - Do not abandon the station during Nuclear Operatives. You are supposed to protect the station, not let operatives kill everyone on it without a fight.
 
-[color=#a4885c]14.[/color] Security (and Command where applicable) should try to remain non-lethal and effect arrests. Security/Command will be expected to answer for use of lethal force. Security/Command will be expected to effect arrests on criminals and prevent them from dying while in custody, even if lethal force is used. 
+[color=#a4885c]14.[/color] Security (and Command where applicable) should try to remain non-lethal and effect arrests. Security/Command will be expected to answer for use of lethal force. Security/Command will be expected to effect arrests on criminals and prevent them from dying while in custody, even if lethal force is used.
 
 In the following special circumstances, lethal force may be used by Security:
     - Lethal force is used against you (ex: firearms, lasers, disabling/stunning weapons with intent to kill, deadly melee weapons)
diff --git a/Resources/Textures/Clothing/Belt/emt.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/emt.rsi/equipped-BELT.png
new file mode 100644
index 0000000000..34698f7285
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/emt.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Clothing/Belt/emt.rsi/icon.png b/Resources/Textures/Clothing/Belt/emt.rsi/icon.png
new file mode 100644
index 0000000000..80abde9382
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/emt.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Belt/emt.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/emt.rsi/inhand-left.png
new file mode 100644
index 0000000000..460be7e484
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/emt.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Belt/emt.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/emt.rsi/inhand-right.png
new file mode 100644
index 0000000000..7222bcf7b3
Binary files /dev/null and b/Resources/Textures/Clothing/Belt/emt.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Belt/emt.rsi/meta.json b/Resources/Textures/Clothing/Belt/emt.rsi/meta.json
new file mode 100644
index 0000000000..8f6acfe124
--- /dev/null
+++ b/Resources/Textures/Clothing/Belt/emt.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Drawn by Ubaser.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/alt-equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/alt-equipped-EARS.png
index ee96c793bb..aef14a9c76 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/alt-equipped-EARS.png and b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/alt-equipped-EARS.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/alt-equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/alt-equipped-EARS.png
index 55535e7024..757f10d3da 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/alt-equipped-EARS.png and b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/alt-equipped-EARS.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/alt-equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/alt-equipped-EARS.png
index c002f27486..90dbcf9d9d 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/alt-equipped-EARS.png and b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/alt-equipped-EARS.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/alt-equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/alt-equipped-EARS.png
index 809877677c..f1cca1e78b 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/alt-equipped-EARS.png and b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/alt-equipped-EARS.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/alt-equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/alt-equipped-EARS.png
index 3393125534..81a45f7d88 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/alt-equipped-EARS.png and b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/alt-equipped-EARS.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/alt-equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/alt-equipped-EARS.png
index f44dc32718..b209f4d1fe 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/alt-equipped-EARS.png and b/Resources/Textures/Clothing/Ears/Headsets/medical.rsi/alt-equipped-EARS.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/alt-equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/alt-equipped-EARS.png
index 7614579426..9ec6357f1f 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/alt-equipped-EARS.png and b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/alt-equipped-EARS.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/alt-equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/alt-equipped-EARS.png
index e635973b36..bca2de2eca 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/alt-equipped-EARS.png and b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/alt-equipped-EARS.png differ
diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/alt-equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/alt-equipped-EARS.png
index d1a01d5492..ef072eab7c 100644
Binary files a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/alt-equipped-EARS.png and b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/alt-equipped-EARS.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/equipped-EYES.png
new file mode 100644
index 0000000000..91a6b3ac3e
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/icon.png
new file mode 100644
index 0000000000..ca0aac22e7
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/meta.json
new file mode 100644
index 0000000000..bb228e7d5c
--- /dev/null
+++ b/Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da , edited by Alekshhh and Hanzdegloker",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..8175d93dc5
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/icon.png
new file mode 100644
index 0000000000..608a155cfd
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/inhand-left.png
new file mode 100644
index 0000000000..84d21a6738
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/inhand-right.png
new file mode 100644
index 0000000000..aee4b59f97
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_french.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/meta.json
rename to Resources/Textures/Clothing/Head/Hats/beret_french.rsi/meta.json
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..13f8eb2afd
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/icon.png
new file mode 100644
index 0000000000..46b5ac16fb
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-left.png
new file mode 100644
index 0000000000..fe6d00e15c
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-right.png
new file mode 100644
index 0000000000..6af0e0514d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json
new file mode 100644
index 0000000000..e1197010d7
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by Hülle#2562 (Discord), resprite by icekot8",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET-hamster.png
new file mode 100644
index 0000000000..c9197282c6
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000..b03816eeb6
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/icon.png
new file mode 100644
index 0000000000..ee1997cc96
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-left.png
new file mode 100644
index 0000000000..4c59df7550
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-right.png
new file mode 100644
index 0000000000..1f8ff31024
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json
new file mode 100644
index 0000000000..8591b0feab
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/beret_qm.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/4f6190e2895e09116663ef282d3ce1d8b35c032e, recoloured by Hanzdegloker",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "equipped-HELMET-hamster",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET-hamster.png
similarity index 100%
rename from Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET-hamster.png
rename to Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET-hamster.png
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/icon.png
similarity index 100%
rename from Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/icon.png
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/inhand-left.png
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/meta.json
new file mode 100644
index 0000000000..a3cde84524
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/straw_hat.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Adrian16199",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+    {
+    "name": "icon"
+    },
+    {
+    "name": "equipped-HELMET",
+    "directions": 4
+    },
+    {
+    "name": "equipped-HELMET-hamster",
+    "directions": 4
+    },
+    {
+    "name": "inhand-left",
+    "directions": 4
+    },
+    {
+    "name": "inhand-right",
+    "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/meta.json
index b3513bb5cd..adf7e7620a 100644
--- a/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/bizarresoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/meta.json
deleted file mode 100644
index b3513bb5cd..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/bizarresoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-NC-SA-3.0",
-  "copyright": "Taken from civstation at commit https://github.com/Civ13/Civ13/commit/ec52cbb95d59b717d4d8c480b35ac133e5b58088#diff-fba188fb2db5d16e5d41985147336a8f96085f761b903e016fffd869b63e497d",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/blacksoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/blacksoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/bluesoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "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"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png
new file mode 100644
index 0000000000..f5372ea5a3
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json
index 83a38bf11b..81d3b938b9 100644
--- a/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/cargosoft.rsi/meta.json
@@ -10,21 +10,40 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
     {
       "name": "equipped-HELMET-hamster",
       "directions": 4
     },
+    {
+      "name": "flipped-equipped-HELMET-hamster",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
     },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/meta.json
deleted file mode 100644
index 86b28c561a..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/cargosoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, repaletted for Space Station 14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/corpsoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "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"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/greensoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/greensoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "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"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/greysoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/greysoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "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"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/mimesoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/mimesoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "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"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/orangesoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/orangesoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "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"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png
index 79b4d66da0..2f7a32ae93 100644
Binary files a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-equipped-HELMET-hamster.png
new file mode 100644
index 0000000000..5a4e035e63
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json
index 2b73b340e6..b60639b265 100644
--- a/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/paramedicsoft.rsi/meta.json
@@ -10,21 +10,40 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
     {
       "name": "equipped-HELMET-hamster",
       "directions": 4
     },
+    {
+      "name": "flipped-equipped-HELMET-hamster",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
     },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/meta.json
deleted file mode 100644
index 8089773135..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by MagnusCrowe (Github) for SS14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET-hamster.png
new file mode 100644
index 0000000000..140bf71b78
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET-hamster.png differ
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json
index ade65863af..3fb7add363 100644
--- a/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/purplesoft.rsi/meta.json
@@ -10,21 +10,40 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
     {
       "name": "equipped-HELMET-hamster",
       "directions": 4
     },
+    {
+      "name": "flipped-equipped-HELMET-hamster",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
     },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/purplesoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "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"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/qmsoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/qmsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "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"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/redsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/redsoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/redsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "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"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/secsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/secsoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/secsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "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"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/flipped-inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/icon.png b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/icon_flipped.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/icon_flipped.png
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json
index a470e00944..a29360acd8 100644
--- a/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Soft/yellowsoft.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "icon"
     },
+    {
+      "name": "icon_flipped"
+    },
     {
       "name": "equipped-HELMET",
       "directions": 4
@@ -21,6 +24,18 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "flipped-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "flipped-inhand-right",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/meta.json b/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/meta.json
deleted file mode 100644
index a470e00944..0000000000
--- a/Resources/Textures/Clothing/Head/Soft/yellowsoft_flipped.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "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"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/equipped-NECK.png
new file mode 100644
index 0000000000..570ef9cdf2
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/icon.png b/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/icon.png
new file mode 100644
index 0000000000..9d0bc82e2b
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json
new file mode 100644
index 0000000000..31cda14261
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Drawn by Firewatchin on Discord.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..be5243400a
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/icon.png
new file mode 100644
index 0000000000..677b426909
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/meta.json
new file mode 100644
index 0000000000..20e876460d
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/cae6017c486dbadef2b2d86ddc58d7226c17597c/icons/mob/clothing/suit.dmi, https://github.com/ParadiseSS13/Paradise/blob/cab0fa52972c777ec3929cc2e03a74088349486f/icons/obj/clothing/suits.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-monkey.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-monkey.png
new file mode 100644
index 0000000000..4ae13f6dcd
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-monkey.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 80c2af9eba..b9b739337b 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.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/fb2d71495bfe81446159ef528534193d09dd8d34",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde",
   "size": {
     "x": 32,
     "y": 32
   },
-    "states": [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "equipped-OUTERCLOTHING",
-            "directions": 4
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "equipped-OUTERCLOTHING-harpy",
-            "directions": 4
-        }
-    ]
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-harpy",
+      "directions": 4
+    }
+  ]
 }
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/equipped-INNERCLOTHING-monkey.png
index d1a348ddd1..7edf356ec6 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/Color/grey.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png
index 790650960e..9acfc278c0 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
index 7c12f7cbe9..8ffa6e2e94 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
index aac288256a..accf74dc8f 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
index bbcef071e2..45e0f9141c 100644
--- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Original sec jumpsuit from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, jumpskirt sprite made by Flareguy for SS14. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING-monkey.png
index e326d766b1..8615d18b04 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png
index 81d1e1a0ea..77471c7dc4 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png
index 5cf98e48d2..b2a0093c51 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..3fa68c11d4
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/icon.png
new file mode 100644
index 0000000000..6332595226
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-left.png
new file mode 100644
index 0000000000..e5c39a74eb
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-right.png
new file mode 100644
index 0000000000..014ac5f9ec
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/meta.json
new file mode 100644
index 0000000000..7f5c61326f
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Spritework done by Hanzdegloker",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_box.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_box.png
new file mode 100644
index 0000000000..62be184b02
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_box.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_ne.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_ne.png
new file mode 100644
index 0000000000..2c8159eadd
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_ne.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_nw.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_nw.png
new file mode 100644
index 0000000000..e7ab801e6d
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_nw.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_se.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_se.png
new file mode 100644
index 0000000000..01df5da7ac
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_se.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_sw.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_sw.png
new file mode 100644
index 0000000000..83845e0e9d
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_corner_sw.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_e.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_e.png
new file mode 100644
index 0000000000..732f84b783
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_e.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_n.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_n.png
new file mode 100644
index 0000000000..1f74d87758
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_n.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_s.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_s.png
new file mode 100644
index 0000000000..389a21bd81
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_s.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_w.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_w.png
new file mode 100644
index 0000000000..579c886902
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_end_w.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_e.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_e.png
new file mode 100644
index 0000000000..6adb13bdfe
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_e.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_n.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_n.png
new file mode 100644
index 0000000000..c5f88dc6d2
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_n.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_s.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_s.png
new file mode 100644
index 0000000000..899702c4e4
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_s.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_w.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_w.png
new file mode 100644
index 0000000000..46082f3a69
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/brick_line_w.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png
index 29a59de08f..60007ce20d 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png
index 91128dceaa..71f3570ceb 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal.png
index ca3214db85..a1bbd82a13 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png
index 0368480e2f..3d6c6a345f 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png
index 09de50242a..4b0ff11b06 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_b.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png
index 6c3bbaa867..297359045c 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png
index 261d2e7477..b67f78c741 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png
index a8a0174fb3..af1f727641 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png
index 170ebc4e83..4224c17bed 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png
index e289f67fbe..941dd97110 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/herringbone.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/herringbone.png
index cb3c25c347..917b7dc775 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/herringbone.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/herringbone.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json b/Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json
index 4ab9b3f38a..edf7c3cd2f 100644
--- a/Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json
+++ b/Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-NC-SA-3.0",
-  "copyright": "mirrorcult",
+  "copyright": "mirrorcult, texturized by aexxie",
   "size": {
     "x": 32,
     "y": 32
@@ -10,6 +10,45 @@
 	{
       "name": "fulltile_overlay"
     },
+    {
+      "name": "brick_box"
+    },
+    {
+      "name": "brick_corner_ne"
+    },
+    {
+      "name": "brick_corner_nw"
+    },
+    {
+      "name": "brick_corner_se"
+    },
+    {
+      "name": "brick_corner_sw"
+    },
+    {
+      "name": "brick_end_e"
+    },
+    {
+      "name": "brick_end_n"
+    },
+    {
+      "name": "brick_end_s"
+    },
+    {
+      "name": "brick_end_w"
+    },
+    {
+      "name": "brick_line_e"
+    },
+    {
+      "name": "brick_line_n"
+    },
+    {
+      "name": "brick_line_s"
+    },
+    {
+      "name": "brick_line_w"
+    },
     {
       "name": "halftile_overlay"
     },
@@ -82,6 +121,57 @@
     {
       "name": "minitile_diagonal_b"
     },
+    {
+      "name": "minitile_box"
+    },
+    {
+      "name": "minitile_corner_ne"
+    },
+    {
+      "name": "minitile_corner_nw"
+    },
+    {
+      "name": "minitile_corner_se"
+    },
+    {
+      "name": "minitile_corner_sw"
+    },
+    {
+      "name": "minitile_end_e"
+    },
+    {
+      "name": "minitile_end_n"
+    },
+    {
+      "name": "minitile_end_s"
+    },
+    {
+      "name": "minitile_end_w"
+    },
+    {
+      "name": "minitile_inner_ne"
+    },
+    {
+      "name": "minitile_inner_nw"
+    },
+    {
+      "name": "minitile_inner_se"
+    },
+    {
+      "name": "minitile_inner_sw"
+    },
+    {
+      "name": "minitile_line_e"
+    },
+    {
+      "name": "minitile_line_n"
+    },
+    {
+      "name": "minitile_line_s"
+    },
+    {
+      "name": "minitile_line_w"
+    },
     {
       "name": "mono"
     },
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile.png
index b128ff0599..8e2bf2a56a 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_box.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_box.png
new file mode 100644
index 0000000000..ed71d7326d
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_box.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_a.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_a.png
index 14a1a26fa3..76060aa39c 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_a.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_a.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_b.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_b.png
index 24eef199ed..ed76414523 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_b.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_b.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_ne.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_ne.png
new file mode 100644
index 0000000000..8028a4feb3
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_ne.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_nw.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_nw.png
new file mode 100644
index 0000000000..bed2504456
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_nw.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_se.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_se.png
new file mode 100644
index 0000000000..d649e41fe4
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_se.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_sw.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_sw.png
new file mode 100644
index 0000000000..3a66d0d68e
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_corner_sw.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal.png
index 37d30b7efb..ac553674f9 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_a.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_a.png
index 059901cb80..912fab1d5b 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_a.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_a.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_b.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_b.png
index 91273bfd8b..e769da5440 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_b.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_b.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_e.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_e.png
new file mode 100644
index 0000000000..9cde05e2d5
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_e.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_n.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_n.png
new file mode 100644
index 0000000000..47e7f3fbfe
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_n.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_s.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_s.png
new file mode 100644
index 0000000000..10fe0971b8
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_s.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_w.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_w.png
new file mode 100644
index 0000000000..168e3836a9
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_end_w.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_ne.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_ne.png
new file mode 100644
index 0000000000..f5788a1136
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_ne.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_nw.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_nw.png
new file mode 100644
index 0000000000..4003f8205f
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_nw.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_se.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_se.png
new file mode 100644
index 0000000000..9de3dc0ba5
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_se.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_sw.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_sw.png
new file mode 100644
index 0000000000..45c5eaf9f8
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_inner_sw.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_e.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_e.png
new file mode 100644
index 0000000000..48b8a5f4a1
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_e.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_n.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_n.png
new file mode 100644
index 0000000000..586f1bd1a1
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_n.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_s.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_s.png
new file mode 100644
index 0000000000..836e504a83
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_s.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_w.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_w.png
new file mode 100644
index 0000000000..a51a590974
Binary files /dev/null and b/Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_line_w.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png
index a93e758dea..bb6e306bdf 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/offset.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/offset.png
index 236c25e310..03d9b0e3db 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/offset.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/offset.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_a.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_a.png
index e5bd85b27b..09839f5be4 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_a.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_a.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_b.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_b.png
index 1d9f9556e3..7c69aa4e0b 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_b.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_b.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement.png
index 8ee53831be..c212958e50 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_a.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_a.png
index 3ec5ffc651..ae21ba0051 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_a.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_a.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_b.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_b.png
index e8c39d6ac3..62e212ebc3 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_b.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_b.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical.png
index 00921da0d1..6305384108 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_a.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_a.png
index 8fe18c62b2..edb48dcced 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_a.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_a.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_b.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_b.png
index 2ff741416f..ee9a1efc28 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_b.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_b.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png
index bfdda367b8..c06af9063d 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png
index 4205f469f6..ac1f00b56d 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png
index 7cec69b2e8..da651e95a6 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png
index c2d6b37ef9..b58aa7f8df 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png
index 92ad2abb4e..4cf4fab39a 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png
index ab561dd314..35b5ce4dbc 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png
index a1f87575d8..aa21e477f5 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png differ
diff --git a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png
index e22d4bc88f..3c644d5af4 100644
Binary files a/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png and b/Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/equipped-EARS.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/equipped-EARS.png
new file mode 100644
index 0000000000..3e01bcb8ba
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/equipped-EARS.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png
new file mode 100644
index 0000000000..354b1eee71
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json
new file mode 100644
index 0000000000..33e08c9522
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Resprited by DangerRevolution from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EARS",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/equipped-EYES.png b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/equipped-EYES.png
new file mode 100644
index 0000000000..cb575b236f
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/icon.png
new file mode 100644
index 0000000000..a56fa8cbfe
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/inhand-left.png
new file mode 100644
index 0000000000..2a92512319
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/inhand-right.png
new file mode 100644
index 0000000000..8b095f6a93
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/meta.json
new file mode 100644
index 0000000000..92f2876d38
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by BriBrooo (Discord) for DeltaV-Station",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/equipped-EYES.png b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/equipped-EYES.png
new file mode 100644
index 0000000000..63ed296277
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/icon.png
new file mode 100644
index 0000000000..5457944b76
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/inhand-left.png
new file mode 100644
index 0000000000..5bbd8c366f
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/inhand-right.png
new file mode 100644
index 0000000000..500f9d518a
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/meta.json
new file mode 100644
index 0000000000..5d1707dc56
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Medhud Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da and prescription glasses from commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da modified by Adrian16199",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "equipped-EYES",
+        "directions": 4
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      }
+   ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/equipped-EYES.png b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/equipped-EYES.png
new file mode 100644
index 0000000000..6c3c594d3d
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/icon.png
new file mode 100644
index 0000000000..0ebf00a372
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/inhand-left.png
new file mode 100644
index 0000000000..ffbdb484d7
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/inhand-right.png
new file mode 100644
index 0000000000..adce411ed1
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/meta.json
new file mode 100644
index 0000000000..c2957348b6
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sechud Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da and prescription glasses from commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da modified by Adrian16199",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "equipped-EYES",
+        "directions": 4
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      }
+   ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/equipped-EYES.png b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/equipped-EYES.png
new file mode 100644
index 0000000000..2c77698051
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/icon.png
new file mode 100644
index 0000000000..e4f902d2b6
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/inhand-left.png
new file mode 100644
index 0000000000..863c127f6a
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/inhand-right.png
new file mode 100644
index 0000000000..fbffadd8e8
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/meta.json
new file mode 100644
index 0000000000..dda2a1b1b6
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by IntegerTempest, medicalised by JoeHammad1844 (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/equipped-HAND.png b/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/equipped-HAND.png
new file mode 100644
index 0000000000..aac9795555
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/equipped-HAND.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/icon.png
new file mode 100644
index 0000000000..ac7e65ccce
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/inhand-left.png
new file mode 100644
index 0000000000..620373b6b4
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/inhand-right.png
new file mode 100644
index 0000000000..49626b924c
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/meta.json
new file mode 100644
index 0000000000..e6321f48ae
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by bribrooo (Discord), original from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HAND",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/meta.json
deleted file mode 100644
index 1885732f2b..0000000000
--- a/Resources/Textures/DeltaV/Clothing/Head/Hats/straw_hat.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Adrian16199",
-  "size": {
-    "x": 32,
-    "y": 32
-    },
-   "states": [
-    {
-      "name": "icon"
-    },
-   {
-     "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-     "name": "equipped-HELMET-hamster",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK-hamster.png b/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK-hamster.png
new file mode 100644
index 0000000000..0005bee7d6
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK-hamster.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK.png b/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK.png
new file mode 100644
index 0000000000..492d8f1914
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/icon.png
new file mode 100644
index 0000000000..c4ad8bd7e0
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/inhand-left.png
new file mode 100644
index 0000000000..8eeceda4bb
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/inhand-right.png
new file mode 100644
index 0000000000..84bb435803
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/meta.json
new file mode 100644
index 0000000000..6c5b834406
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.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/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by Flareguy for Space Station 14 | In hand sprites sprited by PuroSlavKing (Github) for Space Station 14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "equipped-NECK-hamster",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000..90925f333a
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/icon.png
new file mode 100644
index 0000000000..1f63c7c121
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-left.png
new file mode 100644
index 0000000000..a517f238f1
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-right.png
new file mode 100644
index 0000000000..b7fb7b9893
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/meta.json
new file mode 100644
index 0000000000..9d9b20f454
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by BriBrooo (Discord), original from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/equipped-FEET.png b/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/equipped-FEET.png
new file mode 100644
index 0000000000..52e0fb5294
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/icon.png
new file mode 100644
index 0000000000..b9889427db
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/inhand-left.png
new file mode 100644
index 0000000000..09bf69bbf5
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/inhand-right.png
new file mode 100644
index 0000000000..e5e685c850
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/meta.json
new file mode 100644
index 0000000000..c9cd5639c1
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.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/d672aade35db25affc6ed5e1c7aa0b640f118d4c",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-FEET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 0000000000..d3ef6e2d02
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..3ae48ad49e
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/icon.png
new file mode 100644
index 0000000000..6dd59406f9
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/inhand-left.png
new file mode 100644
index 0000000000..563a79837f
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/inhand-right.png
new file mode 100644
index 0000000000..6ddc5b7a9a
Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/meta.json
new file mode 100644
index 0000000000..b0df83e8a6
--- /dev/null
+++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by BriBrooo. Originally from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand original sprite scaled down by potato1234_x, original monkey sprite made by brainfood1183 (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Effects/speech.rsi/felinid0.png b/Resources/Textures/DeltaV/Effects/speech.rsi/felinid0.png
similarity index 100%
rename from Resources/Textures/Effects/speech.rsi/felinid0.png
rename to Resources/Textures/DeltaV/Effects/speech.rsi/felinid0.png
diff --git a/Resources/Textures/Effects/speech.rsi/felinid1.png b/Resources/Textures/DeltaV/Effects/speech.rsi/felinid1.png
similarity index 100%
rename from Resources/Textures/Effects/speech.rsi/felinid1.png
rename to Resources/Textures/DeltaV/Effects/speech.rsi/felinid1.png
diff --git a/Resources/Textures/Effects/speech.rsi/felinid2.png b/Resources/Textures/DeltaV/Effects/speech.rsi/felinid2.png
similarity index 100%
rename from Resources/Textures/Effects/speech.rsi/felinid2.png
rename to Resources/Textures/DeltaV/Effects/speech.rsi/felinid2.png
diff --git a/Resources/Textures/DeltaV/Effects/speech.rsi/meta.json b/Resources/Textures/DeltaV/Effects/speech.rsi/meta.json
new file mode 100644
index 0000000000..1d4b09fbff
--- /dev/null
+++ b/Resources/Textures/DeltaV/Effects/speech.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Felinid sprites made by Adrian16199 (Github)",
+    "states": [
+        {
+            "name": "felinid0",
+            "delays": [
+                [
+                    0.2,
+                    0.3,
+                    0.3,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "felinid1"
+        },
+        {
+            "name": "felinid2"
+        }
+    ]
+}
diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json
index 117b0aad7c..7e31fd2911 100644
--- a/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json
@@ -33,6 +33,9 @@
     },
     {
       "name": "courier"
+    },
+    {
+      "name": "mobster"
     }
   ]
 }
diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/mobster.png b/Resources/Textures/DeltaV/Markers/jobs.rsi/mobster.png
new file mode 100644
index 0000000000..1ffc17a547
Binary files /dev/null and b/Resources/Textures/DeltaV/Markers/jobs.rsi/mobster.png differ
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/felinid_fluffy_tail_rings.png b/Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/felinid_fluffy_tail_rings.png
index 4e6a6d8dc0..31b402d338 100644
Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/felinid_fluffy_tail_rings.png and b/Resources/Textures/DeltaV/Mobs/Customization/Felinid/felinid_tails.rsi/felinid_fluffy_tail_rings.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/crypt_orange.png b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/crypt_orange.png
new file mode 100644
index 0000000000..e0ddcfe7b7
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/crypt_orange.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json
new file mode 100644
index 0000000000..440000d647
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/meta.json
@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by DangerRevolution for Space Station 14.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {"name": "prisoner_label"},
+	{"name": "crypt_orange"}
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/prisoner_label.png b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/prisoner_label.png
new file mode 100644
index 0000000000..d7acc057c8
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi/prisoner_label.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json
new file mode 100644
index 0000000000..31a3b1bee3
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Stamp sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93, modified by Guess-My-Name.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "stamp-lawyer"
+        },
+        {
+            "name": "stamp-psychologist"
+        }
+    ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-lawyer.png b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-lawyer.png
new file mode 100644
index 0000000000..0d1ee0c2d4
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-lawyer.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-psychologist.png b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-psychologist.png
new file mode 100644
index 0000000000..94a0729791
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-psychologist.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/incendiary.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/incendiary.png
new file mode 100644
index 0000000000..63e1affa46
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/incendiary.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/meta.json
index d50b99b0a2..975993c665 100644
--- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/meta.json
@@ -18,6 +18,15 @@
     },
     {
       "name": "rubber"
+    },
+    {
+      "name": "incendiary"
+    },
+    {
+      "name": "uranium"
+    },
+    {
+      "name": "mindbreaker"
     }
   ]
 }
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/mindbreaker.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/mindbreaker.png
new file mode 100644
index 0000000000..c6f7fc228c
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/mindbreaker.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/uranium.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/uranium.png
new file mode 100644
index 0000000000..2031560177
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/uranium.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/meta.json
index 5624759d9b..d3bfc00981 100644
--- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/meta.json
@@ -25,6 +25,9 @@
         {
             "name": "rubber"
         },
+        {
+            "name": "uranium"
+        },
         {
             "name": "mag-1"
         },
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/uranium.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/uranium.png
new file mode 100644
index 0000000000..69374a1215
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/uranium.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-1.png
index 67c3ddd4b8..f10ef5c0f6 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-1.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-1.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-2.png
index 2d7bae76be..3871a02ea3 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-2.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-2.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-3.png
index f516e824d3..8be17ee3a0 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-3.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-3.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-4.png
index 310afbdb96..6a1beb187c 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-4.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-4.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-5.png
index 9e024d7b9d..1d632d4fed 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-5.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-5.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-6.png
index 174c21f8af..0150a28761 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-6.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-6.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base.png
index dd46aa8103..0d75c56183 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-1.png
deleted file mode 100644
index 63bf305bbc..0000000000
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-1.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-2.png
deleted file mode 100644
index b0adec9bc6..0000000000
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-2.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-3.png
deleted file mode 100644
index b4a7c390c2..0000000000
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-3.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-4.png
deleted file mode 100644
index f2b8fa50d6..0000000000
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-4.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-5.png
deleted file mode 100644
index 1138054fd0..0000000000
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-5.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-6.png
deleted file mode 100644
index 89bfca7f6d..0000000000
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-6.png and /dev/null differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-1.png
new file mode 100644
index 0000000000..017ec47b45
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-1.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-2.png
new file mode 100644
index 0000000000..2853d09858
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-2.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-3.png
new file mode 100644
index 0000000000..330ab025ba
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-3.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-4.png
new file mode 100644
index 0000000000..8ee02ef31e
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-4.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-5.png
new file mode 100644
index 0000000000..014217803d
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-5.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-6.png
new file mode 100644
index 0000000000..47caeb743b
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-6.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/icon.png
new file mode 100644
index 0000000000..0ee451aa5c
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/meta.json
index dbecaae60b..7fd72075d6 100644
--- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/meta.json
@@ -5,11 +5,14 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi and edited by Floofers",
     "states": [
         {
             "name": "base"
         },
+        {
+            "name": "icon"
+        },
         {
             "name": "base-1"
         },
@@ -28,24 +31,6 @@
         {
             "name": "base-6"
         },
-        {
-            "name": "high-velocity-1"
-        },
-        {
-            "name": "high-velocity-2"
-        },
-        {
-            "name": "high-velocity-3"
-        },
-        {
-            "name": "high-velocity-4"
-        },
-        {
-            "name": "high-velocity-5"
-        },
-        {
-            "name": "high-velocity-6"
-        },
         {
             "name": "practice-1"
         },
@@ -81,6 +66,60 @@
         },
         {
             "name": "rubber-6"
+        },
+        {
+            "name": "uranium-1"
+        },
+        {
+            "name": "uranium-2"
+        },
+        {
+            "name": "uranium-3"
+        },
+        {
+            "name": "uranium-4"
+        },
+        {
+            "name": "uranium-5"
+        },
+        {
+            "name": "uranium-6"
+        },
+        {
+            "name": "mindbreaker-1"
+        },
+        {
+            "name": "mindbreaker-2"
+        },
+        {
+            "name": "mindbreaker-3"
+        },
+        {
+            "name": "mindbreaker-4"
+        },
+        {
+            "name": "mindbreaker-5"
+        },
+        {
+            "name": "mindbreaker-6"
+        },
+        {
+            "name": "holy-1"
+        },
+        {
+            "name": "holy-2"
+        },
+        {
+            "name": "holy-3"
+        },
+        {
+            "name": "holy-4"
+        },
+        {
+            "name": "holy-5"
+        },
+        {
+            "name": "holy-6"
         }
     ]
 }
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-1.png
new file mode 100644
index 0000000000..7a71e8faff
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-1.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-2.png
new file mode 100644
index 0000000000..cef078e363
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-2.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-3.png
new file mode 100644
index 0000000000..b50d0b36a7
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-3.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-4.png
new file mode 100644
index 0000000000..d29af3f468
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-4.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-5.png
new file mode 100644
index 0000000000..ad1a0a990c
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-5.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-6.png
new file mode 100644
index 0000000000..c872c84ba5
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-6.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-1.png
index 7cea456b83..ba96ef9b7d 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-1.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-1.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-2.png
index 95258e57a5..a481fa141b 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-2.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-2.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-3.png
index 2df8d04d13..05e8db8769 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-3.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-3.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-4.png
index 6288b36718..2a78d53348 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-4.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-4.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-5.png
index 6f294593ff..e165f2cb45 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-5.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-5.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-6.png
index f3329b1114..1895ba06b2 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-6.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-6.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-1.png
index a55a20f440..c34c3f9ac1 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-1.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-1.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-2.png
index eeee78f6fe..651359d4e9 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-2.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-2.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-3.png
index 85fd3c747c..0e375cadc3 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-3.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-3.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-4.png
index baccd8fc23..1b3d62af14 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-4.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-4.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-5.png
index 53183ac023..ee6311ff17 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-5.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-5.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-6.png
index 3bd88af36b..bcd579fc23 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-6.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-6.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-1.png
new file mode 100644
index 0000000000..4db777e100
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-1.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-2.png
new file mode 100644
index 0000000000..f9622dac87
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-2.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-3.png
new file mode 100644
index 0000000000..48c2d57c43
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-3.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-4.png
new file mode 100644
index 0000000000..57ef1542fb
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-4.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-5.png
new file mode 100644
index 0000000000..1db262e651
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-5.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-6.png
new file mode 100644
index 0000000000..465a9d408f
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-6.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/base.png
index 544812914b..4a6b468f32 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/base.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/base.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/bolt-open.png
index 013665c7e0..20ee4218b0 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/bolt-open.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/bolt-open.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/icon.png
index 61b92bc317..e87b6328ac 100644
Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/icon.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Machines/syndicate_fax_machine.rsi/icon.png b/Resources/Textures/DeltaV/Structures/Machines/syndicate_fax_machine.rsi/icon.png
new file mode 100644
index 0000000000..e8a4c3df28
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Machines/syndicate_fax_machine.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Machines/syndicate_fax_machine.rsi/idle.png b/Resources/Textures/DeltaV/Structures/Machines/syndicate_fax_machine.rsi/idle.png
new file mode 100644
index 0000000000..cda3514313
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Machines/syndicate_fax_machine.rsi/idle.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Machines/syndicate_fax_machine.rsi/inserting.png b/Resources/Textures/DeltaV/Structures/Machines/syndicate_fax_machine.rsi/inserting.png
new file mode 100644
index 0000000000..9bbaee1f38
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Machines/syndicate_fax_machine.rsi/inserting.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Machines/syndicate_fax_machine.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Machines/syndicate_fax_machine.rsi/meta.json
new file mode 100644
index 0000000000..bfe2d60e0a
--- /dev/null
+++ b/Resources/Textures/DeltaV/Structures/Machines/syndicate_fax_machine.rsi/meta.json
@@ -0,0 +1,65 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Resprited by DangerRevolution from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/tree/23b5c47245804dd24507b75f250de5e87d34e294",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "idle",
+      "delays": [
+        [
+          0.4,
+          0.4,
+          0.4,
+          0.4
+        ]
+      ]
+    },
+    {
+      "name": "inserting",
+      "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": "printing",
+      "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
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/DeltaV/Structures/Machines/syndicate_fax_machine.rsi/printing.png b/Resources/Textures/DeltaV/Structures/Machines/syndicate_fax_machine.rsi/printing.png
new file mode 100644
index 0000000000..b01d5b0ec6
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Machines/syndicate_fax_machine.rsi/printing.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json
index d8b241c55f..0d38f6d859 100644
--- a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "directional sprites taken from https://github.com/space-wizards/space-station-14/commit/c1556214de46d66fe4057500e269b17438dc96ca | direction_mail modified by Hyenh, direction_logi modified by Floofers | directional_exam, directional_icu, laundromat, barbershop signs by @rosieposieeee based on existing signage style",
+    "copyright": "directional sprites taken from https://github.com/space-wizards/space-station-14/commit/c1556214de46d66fe4057500e269b17438dc96ca | direction_mail modified by Hyenh, direction_logi modified by Floofers",
     "size": {
         "x": 32,
         "y": 32
@@ -14,30 +14,6 @@
         {
             "name": "direction_mail",
             "directions": 4
-        },
-        {
-            "name": "direction_exam",
-            "directions": 4
-        },
-        {
-            "name": "direction_icu",
-            "directions": 4
-        },
-        {
-            "name": "laundromat",
-            "delays": [
-                [
-                    1
-                ]
-            ]
-        },
-        {
-            "name": "barbershop",
-            "delays": [
-                [
-                    1
-                ]
-            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Effects/optionsvisualizertest.rsi/both.png b/Resources/Textures/Effects/optionsvisualizertest.rsi/both.png
new file mode 100644
index 0000000000..76237f5076
Binary files /dev/null and b/Resources/Textures/Effects/optionsvisualizertest.rsi/both.png differ
diff --git a/Resources/Textures/Effects/optionsvisualizertest.rsi/meta.json b/Resources/Textures/Effects/optionsvisualizertest.rsi/meta.json
new file mode 100644
index 0000000000..e7f749513d
--- /dev/null
+++ b/Resources/Textures/Effects/optionsvisualizertest.rsi/meta.json
@@ -0,0 +1 @@
+{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-4.0","copyright":"Discord pjb","states":[{"name":"none"},{"name":"both"},{"name":"motion"},{"name":"test"}]}
diff --git a/Resources/Textures/Effects/optionsvisualizertest.rsi/motion.png b/Resources/Textures/Effects/optionsvisualizertest.rsi/motion.png
new file mode 100644
index 0000000000..edbbd52636
Binary files /dev/null and b/Resources/Textures/Effects/optionsvisualizertest.rsi/motion.png differ
diff --git a/Resources/Textures/Effects/optionsvisualizertest.rsi/none.png b/Resources/Textures/Effects/optionsvisualizertest.rsi/none.png
new file mode 100644
index 0000000000..2f2dc7b3ff
Binary files /dev/null and b/Resources/Textures/Effects/optionsvisualizertest.rsi/none.png differ
diff --git a/Resources/Textures/Effects/optionsvisualizertest.rsi/test.png b/Resources/Textures/Effects/optionsvisualizertest.rsi/test.png
new file mode 100644
index 0000000000..0078fd489c
Binary files /dev/null and b/Resources/Textures/Effects/optionsvisualizertest.rsi/test.png differ
diff --git a/Resources/Textures/Effects/speech.rsi/meta.json b/Resources/Textures/Effects/speech.rsi/meta.json
index f500bf943d..98dd3b2060 100644
--- a/Resources/Textures/Effects/speech.rsi/meta.json
+++ b/Resources/Textures/Effects/speech.rsi/meta.json
@@ -412,22 +412,16 @@
         {
             "name": "spider2"
         },
-        {
-            "name": "felinid0",
-            "delays":[
+                {
+            "name": "vox0",
+            "delays": [
                 [
-                    0.2,
                     0.3,
                     0.3,
-                    0.5
+                    0.3,
+                    0.4
                 ]
             ]
-        },
-        {
-            "name": "felinid1"
-        },
-        {
-            "name": "felinid2"
         }
     ]
 }
diff --git a/Resources/Textures/Effects/speech.rsi/vox0.png b/Resources/Textures/Effects/speech.rsi/vox0.png
new file mode 100644
index 0000000000..d4640b8f35
Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/vox0.png differ
diff --git a/Resources/Textures/Effects/spookysmoke.rsi/meta.json b/Resources/Textures/Effects/spookysmoke.rsi/meta.json
new file mode 100644
index 0000000000..13da3020fc
--- /dev/null
+++ b/Resources/Textures/Effects/spookysmoke.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/81b3a082ccdfb425f36bbed6e5bc1f0faed346ec/icons/effects/chemsmoke.dmi, edit by TheShuEd (github)",
+  "size": {
+    "x": 96,
+    "y": 96
+  },
+  "states": [
+    {
+      "name": "spookysmoke",
+      "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": "spookysmoke_static"
+    }
+  ]
+}
diff --git a/Resources/Textures/Effects/spookysmoke.rsi/spookysmoke.png b/Resources/Textures/Effects/spookysmoke.rsi/spookysmoke.png
new file mode 100644
index 0000000000..dde84beaf9
Binary files /dev/null and b/Resources/Textures/Effects/spookysmoke.rsi/spookysmoke.png differ
diff --git a/Resources/Textures/Effects/spookysmoke.rsi/spookysmoke_static.png b/Resources/Textures/Effects/spookysmoke.rsi/spookysmoke_static.png
new file mode 100644
index 0000000000..a817fe76e2
Binary files /dev/null and b/Resources/Textures/Effects/spookysmoke.rsi/spookysmoke_static.png differ
diff --git a/Resources/Textures/Interface/Actions/pai-map.rsi/icon.png b/Resources/Textures/Interface/Actions/pai-map.rsi/icon.png
new file mode 100644
index 0000000000..c1479f67cd
Binary files /dev/null and b/Resources/Textures/Interface/Actions/pai-map.rsi/icon.png differ
diff --git a/Resources/Textures/Interface/Actions/pai-map.rsi/meta.json b/Resources/Textures/Interface/Actions/pai-map.rsi/meta.json
new file mode 100644
index 0000000000..07e484c8ae
--- /dev/null
+++ b/Resources/Textures/Interface/Actions/pai-map.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Made by UbaserB by overlaying Station Map sprites. Original sprites made by brainfood1183 (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    }
+  ]
+}
diff --git a/Resources/Textures/Interface/Ashen/SlotBackground.png b/Resources/Textures/Interface/Ashen/SlotBackground.png
new file mode 100644
index 0000000000..f3a4379f76
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/SlotBackground.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/back.png b/Resources/Textures/Interface/Ashen/Slots/back.png
new file mode 100644
index 0000000000..6e9ec4ad18
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/back.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/belt.png b/Resources/Textures/Interface/Ashen/Slots/belt.png
new file mode 100644
index 0000000000..131e204f82
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/belt.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/ears.png b/Resources/Textures/Interface/Ashen/Slots/ears.png
new file mode 100644
index 0000000000..08029ffa4e
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/ears.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/ears_headset.png b/Resources/Textures/Interface/Ashen/Slots/ears_headset.png
new file mode 100644
index 0000000000..7d6cdd334d
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/ears_headset.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/glasses.png b/Resources/Textures/Interface/Ashen/Slots/glasses.png
new file mode 100644
index 0000000000..c7b48065ad
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/glasses.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/gloves.png b/Resources/Textures/Interface/Ashen/Slots/gloves.png
new file mode 100644
index 0000000000..161f178f5d
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/gloves.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/hand_l.png b/Resources/Textures/Interface/Ashen/Slots/hand_l.png
new file mode 100644
index 0000000000..2f376ce1b9
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/hand_l.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/hand_l_no_letter.png b/Resources/Textures/Interface/Ashen/Slots/hand_l_no_letter.png
new file mode 100644
index 0000000000..c9289a6ebd
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/hand_l_no_letter.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/hand_m.png b/Resources/Textures/Interface/Ashen/Slots/hand_m.png
new file mode 100644
index 0000000000..c9289a6ebd
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/hand_m.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/hand_r.png b/Resources/Textures/Interface/Ashen/Slots/hand_r.png
new file mode 100644
index 0000000000..90af047190
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/hand_r.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/hand_r_no_letter.png b/Resources/Textures/Interface/Ashen/Slots/hand_r_no_letter.png
new file mode 100644
index 0000000000..8dfca5a970
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/hand_r_no_letter.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/head.png b/Resources/Textures/Interface/Ashen/Slots/head.png
new file mode 100644
index 0000000000..20b0faae4d
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/head.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/id.png b/Resources/Textures/Interface/Ashen/Slots/id.png
new file mode 100644
index 0000000000..02cd231604
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/id.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/mask.png b/Resources/Textures/Interface/Ashen/Slots/mask.png
new file mode 100644
index 0000000000..7e13a437a0
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/mask.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/neck.png b/Resources/Textures/Interface/Ashen/Slots/neck.png
new file mode 100644
index 0000000000..eaf0c6e4fa
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/neck.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/pda.png b/Resources/Textures/Interface/Ashen/Slots/pda.png
new file mode 100644
index 0000000000..c1c5bd79ef
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/pda.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/pocket.png b/Resources/Textures/Interface/Ashen/Slots/pocket.png
new file mode 100644
index 0000000000..c773e84b51
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/pocket.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/shoes.png b/Resources/Textures/Interface/Ashen/Slots/shoes.png
new file mode 100644
index 0000000000..152b449792
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/shoes.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/suit.png b/Resources/Textures/Interface/Ashen/Slots/suit.png
new file mode 100644
index 0000000000..2630e4ff9e
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/suit.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/suit_storage.png b/Resources/Textures/Interface/Ashen/Slots/suit_storage.png
new file mode 100644
index 0000000000..3a2b4a5767
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/suit_storage.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/toggle.png b/Resources/Textures/Interface/Ashen/Slots/toggle.png
new file mode 100644
index 0000000000..ba963ce713
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/toggle.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/uniform.png b/Resources/Textures/Interface/Ashen/Slots/uniform.png
new file mode 100644
index 0000000000..0c8d6f8d26
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/uniform.png differ
diff --git a/Resources/Textures/Interface/Ashen/Slots/web.png b/Resources/Textures/Interface/Ashen/Slots/web.png
new file mode 100644
index 0000000000..cf527f2fde
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Slots/web.png differ
diff --git a/Resources/Textures/Interface/Ashen/Storage/back.png b/Resources/Textures/Interface/Ashen/Storage/back.png
new file mode 100644
index 0000000000..116e0cac45
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Storage/back.png differ
diff --git a/Resources/Textures/Interface/Ashen/Storage/exit.png b/Resources/Textures/Interface/Ashen/Storage/exit.png
new file mode 100644
index 0000000000..8131d66c98
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Storage/exit.png differ
diff --git a/Resources/Textures/Interface/Ashen/Storage/piece_bottom.png b/Resources/Textures/Interface/Ashen/Storage/piece_bottom.png
new file mode 100644
index 0000000000..6cf6d66f13
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Storage/piece_bottom.png differ
diff --git a/Resources/Textures/Interface/Ashen/Storage/piece_bottomLeft.png b/Resources/Textures/Interface/Ashen/Storage/piece_bottomLeft.png
new file mode 100644
index 0000000000..0530e53910
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Storage/piece_bottomLeft.png differ
diff --git a/Resources/Textures/Interface/Ashen/Storage/piece_bottomRight.png b/Resources/Textures/Interface/Ashen/Storage/piece_bottomRight.png
new file mode 100644
index 0000000000..e31068726a
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Storage/piece_bottomRight.png differ
diff --git a/Resources/Textures/Interface/Ashen/Storage/piece_center.png b/Resources/Textures/Interface/Ashen/Storage/piece_center.png
new file mode 100644
index 0000000000..e27d38ed6b
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Storage/piece_center.png differ
diff --git a/Resources/Textures/Interface/Ashen/Storage/piece_left.png b/Resources/Textures/Interface/Ashen/Storage/piece_left.png
new file mode 100644
index 0000000000..e5d3c6b5cb
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Storage/piece_left.png differ
diff --git a/Resources/Textures/Interface/Ashen/Storage/piece_right.png b/Resources/Textures/Interface/Ashen/Storage/piece_right.png
new file mode 100644
index 0000000000..a6aff00f41
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Storage/piece_right.png differ
diff --git a/Resources/Textures/Interface/Ashen/Storage/piece_top.png b/Resources/Textures/Interface/Ashen/Storage/piece_top.png
new file mode 100644
index 0000000000..539e20347c
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Storage/piece_top.png differ
diff --git a/Resources/Textures/Interface/Ashen/Storage/piece_topLeft.png b/Resources/Textures/Interface/Ashen/Storage/piece_topLeft.png
new file mode 100644
index 0000000000..e9500ef5c2
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Storage/piece_topLeft.png differ
diff --git a/Resources/Textures/Interface/Ashen/Storage/piece_topRight.png b/Resources/Textures/Interface/Ashen/Storage/piece_topRight.png
new file mode 100644
index 0000000000..678d918ac1
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Storage/piece_topRight.png differ
diff --git a/Resources/Textures/Interface/Ashen/Storage/sidebar_bottom.png b/Resources/Textures/Interface/Ashen/Storage/sidebar_bottom.png
new file mode 100644
index 0000000000..bf31879495
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Storage/sidebar_bottom.png differ
diff --git a/Resources/Textures/Interface/Ashen/Storage/sidebar_fat.png b/Resources/Textures/Interface/Ashen/Storage/sidebar_fat.png
new file mode 100644
index 0000000000..4f6d0cb453
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Storage/sidebar_fat.png differ
diff --git a/Resources/Textures/Interface/Ashen/Storage/sidebar_mid.png b/Resources/Textures/Interface/Ashen/Storage/sidebar_mid.png
new file mode 100644
index 0000000000..0baac46422
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Storage/sidebar_mid.png differ
diff --git a/Resources/Textures/Interface/Ashen/Storage/sidebar_top.png b/Resources/Textures/Interface/Ashen/Storage/sidebar_top.png
new file mode 100644
index 0000000000..9ca41e62ee
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/Storage/sidebar_top.png differ
diff --git a/Resources/Textures/Interface/Ashen/slot_highlight.png b/Resources/Textures/Interface/Ashen/slot_highlight.png
new file mode 100644
index 0000000000..0664478069
Binary files /dev/null and b/Resources/Textures/Interface/Ashen/slot_highlight.png differ
diff --git a/Resources/Textures/Interface/Clockwork/Storage/tile_blocked.png b/Resources/Textures/Interface/Clockwork/Storage/tile_blocked.png
deleted file mode 100644
index 9a553a3e7b..0000000000
Binary files a/Resources/Textures/Interface/Clockwork/Storage/tile_blocked.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Clockwork/Storage/tile_blocked_opaque.png b/Resources/Textures/Interface/Clockwork/Storage/tile_blocked_opaque.png
deleted file mode 100644
index c198cd3f97..0000000000
Binary files a/Resources/Textures/Interface/Clockwork/Storage/tile_blocked_opaque.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Default/Storage/marked.png b/Resources/Textures/Interface/Default/Storage/marked_first.png
similarity index 100%
rename from Resources/Textures/Interface/Default/Storage/marked.png
rename to Resources/Textures/Interface/Default/Storage/marked_first.png
diff --git a/Resources/Textures/Interface/Default/Storage/marked_second.png b/Resources/Textures/Interface/Default/Storage/marked_second.png
new file mode 100644
index 0000000000..26314b47e6
Binary files /dev/null and b/Resources/Textures/Interface/Default/Storage/marked_second.png differ
diff --git a/Resources/Textures/Interface/Default/Storage/tile_blocked.png b/Resources/Textures/Interface/Default/Storage/tile_blocked.png
index 663f9b5ec5..d6896f1feb 100644
Binary files a/Resources/Textures/Interface/Default/Storage/tile_blocked.png and b/Resources/Textures/Interface/Default/Storage/tile_blocked.png differ
diff --git a/Resources/Textures/Interface/Default/Storage/tile_blocked_opaque.png b/Resources/Textures/Interface/Default/Storage/tile_blocked_opaque.png
index 16a65e36db..d6896f1feb 100644
Binary files a/Resources/Textures/Interface/Default/Storage/tile_blocked_opaque.png and b/Resources/Textures/Interface/Default/Storage/tile_blocked_opaque.png differ
diff --git a/Resources/Textures/Interface/Eris/Slots/back.png b/Resources/Textures/Interface/Eris/Slots/back.png
deleted file mode 100644
index dc94d77990..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/back.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/belt.png b/Resources/Textures/Interface/Eris/Slots/belt.png
deleted file mode 100644
index 7998bc964e..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/belt.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/block.png b/Resources/Textures/Interface/Eris/Slots/block.png
deleted file mode 100644
index e5d65d49c4..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/block.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/ears.png b/Resources/Textures/Interface/Eris/Slots/ears.png
deleted file mode 100644
index c202346aeb..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/ears.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/glasses.png b/Resources/Textures/Interface/Eris/Slots/glasses.png
deleted file mode 100644
index 30540d14f7..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/glasses.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/gloves.png b/Resources/Textures/Interface/Eris/Slots/gloves.png
deleted file mode 100644
index 6878ddab40..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/gloves.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/hand_l.png b/Resources/Textures/Interface/Eris/Slots/hand_l.png
deleted file mode 100644
index c1871e5443..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/hand_l.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/hand_l_active.png b/Resources/Textures/Interface/Eris/Slots/hand_l_active.png
deleted file mode 100644
index 8cade60fd1..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/hand_l_active.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/hand_r.png b/Resources/Textures/Interface/Eris/Slots/hand_r.png
deleted file mode 100644
index 4e98928bd6..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/hand_r.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/hand_r_active.png b/Resources/Textures/Interface/Eris/Slots/hand_r_active.png
deleted file mode 100644
index 91e68e16cc..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/hand_r_active.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/head.png b/Resources/Textures/Interface/Eris/Slots/head.png
deleted file mode 100644
index f087c05b3c..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/head.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/id.png b/Resources/Textures/Interface/Eris/Slots/id.png
deleted file mode 100644
index 1c57380cae..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/id.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/mask.png b/Resources/Textures/Interface/Eris/Slots/mask.png
deleted file mode 100644
index f72070151e..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/mask.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/meta.json b/Resources/Textures/Interface/Eris/Slots/meta.json
deleted file mode 100644
index 5cc398dd92..0000000000
--- a/Resources/Textures/Interface/Eris/Slots/meta.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Heavily derived from https://github.com/goonstation/goonstation at commit e77d85d9c1d93aa32da7702737ceeac2b56738ac.",
-    "states": [
-        {
-            "name": "back",
-        },
-        {
-            "name": "belt"
-        },
-        {
-            "name": "block"
-        },
-        {
-            "name": "ears"
-        },
-        {
-            "name": "glasses"
-        },
-        {
-            "name": "gloves"
-        },
-        {
-            "name": "hand_l"
-        },
-        {
-            "name": "hand_l_active"
-        },
-        {
-            "name": "hand_r"
-        },
-        {
-            "name": "hand_r_active"
-        },
-        {
-            "name": "head"
-        },
-        {
-            "name": "id"
-        },
-        {
-            "name": "invtoggle"
-        },
-        {
-            "name": "mask"
-        },
-		{
-            "name": "neck"
-        },
-        {
-            "name": "pocket"
-        },
-        {
-            "name": "shoes"
-        },
-        {
-            "name": "suit"
-        },
-        {
-            "name": "uniform"
-        }
-    ]
-}
diff --git a/Resources/Textures/Interface/Eris/Slots/neck.png b/Resources/Textures/Interface/Eris/Slots/neck.png
deleted file mode 100644
index 0ab974bec7..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/neck.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/pocket.png b/Resources/Textures/Interface/Eris/Slots/pocket.png
deleted file mode 100644
index 3dc3e95e6a..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/pocket.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/sheet.png b/Resources/Textures/Interface/Eris/Slots/sheet.png
deleted file mode 100644
index 34ac8861c3..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/sheet.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/shoes.png b/Resources/Textures/Interface/Eris/Slots/shoes.png
deleted file mode 100644
index 421580f1c9..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/shoes.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/suit.png b/Resources/Textures/Interface/Eris/Slots/suit.png
deleted file mode 100644
index 44a5c95e55..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/suit.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/suit_storage.png b/Resources/Textures/Interface/Eris/Slots/suit_storage.png
deleted file mode 100644
index 206b034443..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/suit_storage.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/toggle.png b/Resources/Textures/Interface/Eris/Slots/toggle.png
deleted file mode 100644
index 2bad7533ff..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/toggle.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/uniform.png b/Resources/Textures/Interface/Eris/Slots/uniform.png
deleted file mode 100644
index d98ef541ab..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/uniform.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/web.png b/Resources/Textures/Interface/Eris/Slots/web.png
deleted file mode 100644
index 0e9a67f8be..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/web.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png b/Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png
index 3049f3e50f..e311b9f616 100644
Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png differ
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
index 93b1ffbc3c..1c9539e1ba 100644
--- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
+++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon made by Psychpsyo (Github)",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi | Brigmedic icon made by PuroSlavKing (Github) | Zombie icon made by RamZ | Zookeper by netwy (discort) | Rev and Head Rev icon taken from https://tgstation13.org/wiki/HUD and edited by coolmankid12345 (Discord) | Mindshield icon taken from https://github.com/tgstation/tgstation/blob/master/icons/mob/huds/hud.dmi",
 
     "size": {
         "x": 8,
@@ -174,7 +174,11 @@
             "name": "HeadRevolutionary"
         },
         {
-            "name": "MindShield"
+            "name": "MindShield",
+            "delays":
+            [
+                [1.0,1.0]
+            ]
         },
         {
             "name": "Syndicate"
diff --git a/Resources/Textures/Interface/Nano/button_small.svg b/Resources/Textures/Interface/Nano/button_small.svg
new file mode 100644
index 0000000000..0b0c3e3958
--- /dev/null
+++ b/Resources/Textures/Interface/Nano/button_small.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="52"
+   height="19"
+   viewBox="0 0 13.758333 5.0270833"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
+   sodipodi:docname="button_small.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+     id="namedview1"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
+     inkscape:document-units="mm"
+     inkscape:zoom="11.313709"
+     inkscape:cx="27.577164"
+     inkscape:cy="11.269514"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" /><defs
+     id="defs1" /><g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"><image
+       width="15.321987"
+       height="6.2645793"
+       preserveAspectRatio="none"
+       style="display:none;image-rendering:optimizeSpeed"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAA+EAAAGWCAYAAAAXAYK2AAAABHNCSVQICAgIfAhkiAAAIABJREFU&#10;eJzt3WFsXOed3/sfvVQYKzoTeiUm4ZDDFmbMiZnixhJnITW4VyJ34+ByQxK3UO/a5r7KC4lvu4rg&#10;okBTSXXRomtZfdGi2ZHRGihqyltAL6qRF3tXvqbsFFup4URqYdNL+srxcqhhFMqwPEeRQ9uS7gtp&#10;GIoakjPzPHPOc+Z8P0CQxMP58z/nPByf33Oec07Lt7+9864q6OlJaX6+UOmlqlHDfg2XeqGGmzVc&#10;6oUabtZwqRdquFnDpV6o4WYNl3qhhps1XOqFGm7WcKmXoGs8YvSbAAAAAABA1QjhAAAAAAAEhBAO&#10;AAAAAEBACOEAAAAAAASEEA4AAAAAQEAI4QAAAAAABIQQDgAAAABAQFqGh8cqPiccAAAAAADY1bre&#10;A8Wj+NDzONRwqRdquFnDpV6o4WYNl3qhhps1XOqFGm7WcKkXarhZw6VeqOFmDZd6CboGy9EBAAAA&#10;AAgIIRwAAAAAgIAQwgEAAAAACAghHAAAAACAgBDCAQAAAAAICCEcAAAAAICAEMIBAAAAAAgIIRwA&#10;AAAAgIAQwgEAAAAACAghHAAAAACAgBDCAQAAAAAICCEcAAAAAICAEMIBAAAAAAgIIRwAAAAAgIAQ&#10;wgEAAAAACEjL8PDY3bCbAAAAAAAgDlrn5wsVX+jpSWm916pFDfs1XOqFGm7WcKkXarhZw6VeqOFm&#10;DZd6oYabNVzqhRpu1nCpF2q4WcOlXoKuwXJ0AAAAAAACQggHAAAAACAghHAAAAAAAAJCCAcAAAAA&#10;ICCEcAAAAAAAAkIIBwAAAAAgIIRwAAAAAAACQggHAAAAACAghHAAAAAAAAJCCAcAAAAAICCEcAAA&#10;AAAAAkIIBwAAAAAgIIRwAAAAAAACQggHAAAAACAgrWE3sJmvSPJaqOFiL9Rws4ZLvVDDzRou9UIN&#10;N2u41As13KzhUi/UcLOGjTqf3TXvAXBRy/DwmNPD+5ktYXcAAAAAIAwXv5A+dDqtALVrnZ8vVHyh&#10;pyel9V6rlo0a6k3pRsGsRnuqeWq41As13KzhUi/UcLOGS71Qw80aLvVCDTdruNQLNdysYavO7lRK&#10;v/xFQXN36q/hSq6hhru9BF2Da8IBAAAAOGtfq9RHakETYTgDAAAAcBpBHM2EoQwAAADAeQRxNAuG&#10;MQAAAIBIIIijGTCEAQAAAEQGQRxRx/AFAAAAECkEcUQZQxcAAABA5BDEEVUMWwAAAACRRBBHFDFk&#10;AQAAAEQWQRxRw3AFAAAAEGkEcUQJQxUAAABA5BHEERUMUwAAAABNgSCOKGCIAgAAAGgaBHG4juEJ&#10;AAAAoKkQxOGy1rAbAAAAAADb9rVK+kL6TdiNAGu0DA+P3Q27iY08syXsDgAAAABE1cUvpA+dTjyI&#10;m9b5+ULFF3p6UlrvtWrZqKHelG4UzGq0p5qnhku9UMPNGi71Qg03a7jUCzXcrOFSL9Rws4ZLvVDD&#10;zRou9bI7ldIvf1HQ3J36a7iSjZqphku9BF2DKyUAAAAANDWuEYdLGIoAAAAAmh5BHK5gGAIAAACI&#10;BYI4XMAQBAAAABAbBHGEjeEHAAAAIFYI4ggTQw8AAABA7BDEERaGHQAAAIBYIogjDAw5AAAAALFF&#10;EEfQGG4AAAAAYo0gjiAx1AAAAADEHkEcQWGYAQAAAIAI4ggGQwwAAAAA7iOIo9EYXgAAAACwCkEc&#10;jcTQAgAAAIA1COJolNawGwAAAAAAF+1rlfSF9JuwG0FTaRkeHrsbdhMbeWZL2B0AAAAAiLOLX0gf&#10;Op2aECWt8/OFii/09KS03mvVslFDvSndKJjVaE81Tw2XeqGGmzVc6oUabtZwqRdquFnDpV6o4WYN&#10;l3qhhps1XOrFRo3dqZR++YuC5u7UX8OVfOVKDZd6CboGVzkAAAAAwCa4Rhy2MIwAAAAAoAoEcdjA&#10;EAIAAACAKhHEYYrhAwAAAAA1IIjDBEMHAAAAAGpEEEe9GDYAAAAAUAeCOOrBkAEAAACAOhHEUSuG&#10;CwAAAAAYIIijFgwVAAAAADBEEEe1GCYAAAAAYAFBHNVgiAAAAACAJQRxbIbhAQAAAAAWEcSxEYYG&#10;AAAAAFhGEMd6GBYAAAAA0AAEcVTSGnYDAAAAANCs9rVK+kL6TdiNwBktw8Njd8NuYiPPbAm7AwAA&#10;AAAwc/EL6UOnkxeC0jo/X6j4Qk9PSuu9Vi0bNdSb0o2CWY32VPPUcKkXarhZw6VeqOFmDZd6oYab&#10;NVzqhRpu1nCpF2q4WcOlXlypsTuV0i9/UdDcnfpruJLRrOQ8h3oJugZXKAAAAABAALhGHBIhHAAA&#10;AAACQxAHux8AAAAAAkQQjzd2PQAAAAAEjCAeX+x2AAAAAAgBQTye2OUAAAAAEBKCePywuwEAAAAg&#10;RATxeGFXAwAAAEDICOLxwW4GAAAAAAcQxOOBXQwAAAAAjiCINz92LwAAAAA4hCDe3Ni1AAAAAOAY&#10;gnjzYrcCAAAAgIMI4s2JXQoAAAAAjiKIN5/WsBsAAAAAAKxvX6ukL6TfhN0IrGgZHh67G3YTG3lm&#10;S9gdAAAAAED4Ln4hfeh0ekM1WufnCxVf6OlJab3XqmWjhnpTulEwq9Geap4aLvVCDTdruNQLNdys&#10;4VIv1HCzhku9UMPNGi71Qg03a7jUSzPV2J1K6Ze/KGjuTv01nMl5DvUSdA2uLgAAAACAiOAa8ehj&#10;9wEAAABAhBDEo41dBwAAAAARQxCPLnYbAAAAAEQQQTya2GUAAAAAEFEE8ehhdwEAAABAhBHEo4Vd&#10;BQAAAAARRxCPDnYTAAAAADQBgng0sIsAAAAAoEkQxN3H7gEAAACAJkIQdxu7BgAAAACaDEHcXewW&#10;AAAAAGhCBHE3sUsAAAAAoEkRxN3D7gAAAACAJkYQd0tr2A0AAAAAABprX6ukL6TfhN0I1DI8PHY3&#10;7CY28syWsDsAAAAAgOZw8QvpQ6cTYPNrnZ8vVHyhpyel9V6rlo0a6k3pRsGsRnuqeWq41As13Kzh&#10;Ui/UcLOGS71Qw80aLvVCDTdruNQLNdys4VIv1HjQ7lRKv/xFQXN36q9hJedZqhPFGlwZAAAAAAAx&#10;wjXi4WLTAwAAAEDMEMTDw2YHAAAAgBgiiIeDTQ4AAAAAMUUQDx6bGwAAAABijCAeLJ4TDgBABU8f&#10;PapEMln1z5du3lRi2zZJ0tsvvaSl2dlGtQYAgHXl54ib3DUd1SGEAwBQQffv/Z4SnZ1V/7zv+/I8&#10;T5LUdj+MAwAQJQTxYLDoAAAAAAAgiaXpQWDzAgAAAABWEMQbi00LAAAAAHgAQbxx2KwAAAAAgIcQ&#10;xBuDTQoAAAAAqIggbh+bEwAAAACwLoK4XTyiDIiQp8bHtXN8fNOfW/2opHrVWmPZ97Xs+w/8/18t&#10;Lqrl/j8vLS7e++9iUX6xaNQbAAAAgsXjy+whhAMR0uZ5SiSTm/5ci4UQbqPG1zaosTQ7q1KxqKW5&#10;OS3k87o+O/tAiAcAAIBbykH8N2E3EnGEcACh6Ein1ZFOq3doaOWfLc3Oaml2Vgv5vK5OT6u0uBhi&#10;hwAAAFhrX6s02yLNh91IhLUMD4/dDbuJjTyzJewOAHd8Y+9efffgwbDbCMzS7Kzef+st3frFL1Qq&#10;FMJuBzHzvRdfVKKzs673/vSFF7Q0O2u5IwAA3HHxC+lDp5Oku1rn5ysf2Pb0pLTea9WyUUO9Kd0w&#10;PPhuTzVPDZd6oUbwNdLbtlW1RDyMa8IbUcPLZNSRTsvzPC3NzurS5GRdZ8ijsn+DquFSLy7X8Dyv&#10;pvG7erx/+vHHdfXkyvZwqRdquFnDpV6o4WYNl3qhRmNqpBcL+qXhNeKuZM6ga7AcHUAkdKTT+v6x&#10;Y5KkmTNnNHP2rK5OT4fcFQAAQHxxs7b6EMIBRE7/2Jj6x8a0MD2tmVxO7+VyYbcEAAAQSwTx2vG0&#10;NwCR1Z3J6PvHjumHZ8/q8cHBsNsBAACIJZ4jXhs2FYDISySTGj1xQk8fPVr3jbQAAABQP4J49ViO&#10;DqBplJepX8hmdTGbDbsdAFjx+NCQPm1pUedTT637Mx+cP69l3w+wKwCwi6Xp1SGEA2g6eyYm1D86&#10;qtMHDvCscQBO+P7Ro/pM2vCO+6cPHNBCPh9cUwDQAATxzbFgAEBTSiST+uHrr2v3xETYrQCIua5M&#10;Rm2Gj3wEgChhafrG2DQAmtqeiQn1PfMMB8AAQtM/Ohp2CwAQOIL4+liODsTEsu/r7ePHq/75G7/+&#10;tdq/8pWqf77N8/Qlz1Pb/f8kksl7Sy8HBuro1q6/Nzqqbw8OsjwdQCi6HfgeBIAwsDS9MkI4EBPL&#10;vq+ZGp6n3Z5KqVgoGP3O9lRKuUJBic5OJZJJdaTT6spk7v3vvj6j2rVKJJPa//LLBHEAgero61Mi&#10;mQy7DQAIDUH8YYRwAA1XWlxUaXFRC/m8Lk1OStJKEH98aEjdAwOBHKQmkkmNv/aaTh84oKW5uYb/&#10;PgDoymTCbgEAQkcQfxAhHEAoSsWiSsWirpw/L+necs0nx8bUOzjY0Ou32zxv5Yw4QRxAo/UODobd&#10;AgA4gSD+W1wqD8AJC/m8zh05oj/bt0/njhxRqVhs2O8qB/FEZ2fDfgcAJJJJdXMmHABWcLO2e9gE&#10;AJwzk8vplZGRhoZxgjiARuOGbADwMII4IRyAw2ZyOb3x/PMNC+OJZFIjJ07w+DIADfEkjyYDgIr2&#10;tUp/J8ZJtGV4eOxu2E1s5JktYXcAuOMbe/fquwcP1vXeUrGoN55/3nJHwercu1d/v87Pv5H8qVP6&#10;29dft14X0fa9F1+se6XET194QUuzs5Y7QpRs2bpVoydP1vQexg2AOHnntvRuTK8Pb52fr/wIop6e&#10;lNZ7rVo2aqg3pRsWHpPULDVc6oUawddIb9smr4qztr7vP/Rzdz2vpv5c3CY3Xn1VV6emtP/kyZru&#10;pl5pe6w2ePCg3iqVdPn+nds366NertRwqReXa3ieV9XfW9nqcfbpxx/X1ZMr28OlXqJa4/HBwYfG&#10;z2bfRdWMG1e2h0u9UMPNGi71Qg03a1y7LanLjcwZdI0YLwIAEEWlYlGvjIzoYjZrte6eiQmuDwdg&#10;Te/QUNgtAAAcRQgHEEkXslm9ffy4tXptnqenjx2zVg9AvHFTNgDAegjhACLr0uSkzh05Yq1edyaj&#10;p8bHrdUDEE9dmUxNl8wAAOKFEA4g0mZyOatBnGXpAEz1c1d0AMAGCOEAIs9mEG/zPO2emLBSC0A8&#10;sRQdALARQjiApjCTy1m7WVv/2BgH0QDq0tHXx1J0AMCGCOEAmsaFbFZXpqas1OJsOIB6dGUyYbcA&#10;AHBca9gNAIBN544eVUc6bXwmqjuTUffAgBbyeUuduanN8+7dRKqzc+UMXiKZVJvnqW2d5xkv+75K&#10;xaKWFhelUkmlxUUt5PPyr15VaXEx4E+AoHnJpDrS6XvjpbNTHen0ynhZO2bKz8Uuj5ll39fS3Ny9&#10;8TM3p+uzs1r2/ZA+iV1tnqenxse1k5s7NkSb58lLJtU9MHDve6qzc+W7qsXz1n3+eqlYfGDslcff&#10;9dnZgD8BAPwWIRxAU1n2fZ07ckT7X37ZuNbuiQktHDxooSt3tHmedqTT2pHJ6B+MjNQ1WdHmeepI&#10;p/XlZPKhA99SsaiF6WldeestXZ2ebpqAFWdtnqfHBwfVPTCg3qGhdSdnNqvRkU5LujfBtdrS7KwW&#10;8nldOX9eV6enrfQcpEQyqafGx9U/OlrXtlnt8aEheZv8Td749a/V+dRTRr/ni08/1Y1CwahGELru&#10;T4Z2DwysTPZU4m/wPVOeWJQefHb7su9raXZWM7lcJMcdgGgjhANoOgv5vK5MTT1wwFWPZjob3pXJ&#10;qH9kZCVElc9Q2pZIJtU/Nqb+sTFJ0syZM5o5e5aD3AjakU7rD37844dCs20d6bQ60mntHB9fmcS5&#10;mM06v6qiK5PRnoMHrW6fas6i2/jbnXnrLb3/xhtGNRpl9YoC00mNzX5Pdyazsv9mzp/XwtSUPjh/&#10;nslDAA1HCAfQlN5+6SV1ZzJWzkxFNYS3eZ56Bwf11Pj4ylnIoJUDealY1IVsVu/lcqH0geqsDkCf&#10;SQ2ZqNnI6kmchelpXTh5Ur++di3QHjbTiPCN8LdramBA/YODkZoIAhBdhHAATalULOrS5KT2GN5g&#10;rX901Npd14PUPzqq3RMTztylOZFM6vvHjmnPxARh3EGVzj5+FvLZwO5MRv8wk9HM+fO6+OKLoQai&#10;Ns9T+65d+gc/+Ykzf1PNIqgVF9UqTwT1Dg3p0uRkJL//AbiPEA6gaV2enDS+SVKb5+nJ0VF9+NOf&#10;WuqqscI+m7SZchjvHhjg4NYRvYOD2nv4sLPhMjUwoP7XX9elyUldfvXVQMN42CsDmlmb52n3xIS+&#10;OTrq5HZt8zztmZhQ/+goE4cArOMRZQCa1rLv69LkpHGd3sFB82YCsPfwYf3DkyedDeCr9Y+Nafy1&#10;1/ToE0+E3UpstXmeRl56SSMnTjgbwFfbOT6u/S+/rO6BgcB+5/6TJ7VnYqKh1ybHUVcmox+ePRuJ&#10;O8mXJw73Hj7MOABgDSEcQFO7bCGEd2cy2rJ1q4VuGiORTGr81KlIHNCu1uZ5Gj5yRHsPHw67ldjp&#10;6OvT+KlTxjcvDFoimdT+l1/WbsPLTKrVlkgE8nvipDxZGLVAu3N8XOOnTinR2Rl2KwCaQMvw8Njd&#10;sJvYyDNbwu4AcMc39u7Vd+t8ZFapWNQbzz9vuaNo+L0/+ROlDM+evXnihG78/OeWOrJnRzqt3f/o&#10;H0XugHatpdlZ5f/9v9etjz4Ku5UV33vxxboPuH/6wgtacvQ5xO27dun3Dx0Kuw1j+VOn9Levv97Q&#10;32EyBlxW+PnP9bMTJwL9nVu2btVTExPG38VhW/Z9/bd/+S/1SQQe8Qa47p3b0rt3wu4iHK3z85W/&#10;RHp6UlrvtWrZqKHelPGzLNtTzVPDpV6oEXyN9LZtVV07V+kRNnc9r6b+orJNqvHhX/yF+g2XlPcM&#10;DOjD//pfjWrY3h5Pjo7q+8eO1VXHxmOObNbwMhnt+Bf/QqcPHKj5mt9GjTPP82r6fKu3x6cff1xX&#10;T43+m9k9MVH1zQpdGyNrDR48qIVdu3T2Rz/a9JFS9W7X1WPA9e1RqyCPRxLJpEZeeqniZQ+ubJNq&#10;a3iep//r3/07/dWRIw9dJ+7Kv/NcqeFSL9Rws8a125K63MicQddgOTqAprc0O2v83NfUrl2WurHj&#10;qfHxugO4q8pLjZvxzKMLagngUdGdyWj/yZNht4ENJJJJ7T95MhL3HajF948d05Ojo2G3ASCiCOEA&#10;YmHG8M62bZ4X6A2hNvLk6Kj2Nel11OUgHvXl9a5pxgBe1pFO6+mjR8NuAxU0awAv23f4sDr6+sJu&#10;A0AE8YgyALHwwdSU8Y3LdqTTWsjnLXVUn0e+8Y2GnQFf9n0tzc1paXZWfrGoZd9f+Y90byKizfPk&#10;JZPqSKfV4nnyGjAxUV66errO+x/gQY0M4Mu+r4V8XqVicWXMlIrFlddvPfKI/s4TT+hLnqeOdFod&#10;fX0NCWT9Y2MqLS7y2DuHNDqAl7+rSsWiCu+/r/avfOWBsZdIJh/4vuro67M+udfmedr/8suafPbZ&#10;UJ9jDyB6COEAYmFpbk7Lvm90ENadyVi523q9Esmkho8csVpz2fd1eXJSC9PTNU8wtKdS+qsbN9Q7&#10;OKjHh4asPsqtO5PR7okJQpWh3sFB6wF8IZ/XB1NTujI1tWnwaE+ldOlnP3vgnyWSSXUPDOjJsTGr&#10;q0v2TEzo+uysrpw/b63muX/2z1b+96OPPaZPP/540/c8/c//ed2XVLx9/PimN/Srto+N/E5bm9H7&#10;q7HeNeD1WvZ9XTl/Xu+dObPyfV7WnkqpuPba1ArfZ6vHna3e2jxPIydOMGkIoCaEcACxsOz7Wpqd&#10;NXqGdpjLDts8T/tPnlSLpTM5hZ//XO/95/9sfGZ/2fc1k8tpJpdTIpnU7okJ9Vu6TnLPxISu1jE5&#10;gHsSyaSetrhqYiGf18U/+zPj/VEqFjVTLDZkzDx97JiWLJ6VXP1Zbd2oaiNLs7Obbl9bN1RqpN0T&#10;E+pIp63UKk8UXpqcNL63x0I+v7J9+0dHtXtiwkoY70intXtiQv/rz//cuBaAeOCacACxYRoeyssb&#10;w7D38GErB4ulYlGnDxzQz06csB5uS8Wizh05oldGRh5YFmri6WPHuD68TvstPYt5aXZWpw8c0OkD&#10;Bxo2Zs4dOWJlzLR5ntWJB9Suf3TU2uqLi9msXhkZ0YVs1jiArzWTy+n0wYPG9wsp2zk+bm3iAUDz&#10;I4QDiA0bz20O42x4/+iolTOF7+VymnzuuYafWS4Vi3plZMTKUvJEMqmnDK/ljyNbZ/guT04GMmbK&#10;gejK1JRxre5MxpmbKMZNeWWDqVKxqMlnn21I+F77e8qTQDZ+z7f+6I8sdAUgDgjhAGLjqoUgsSPg&#10;Mx22DmovZrP6K0sHmtW6kM1aCeI7x8d5bFkNtm7fbnwmctn39ZfHjumt48ctdbW5UrGosz/6kZUx&#10;w9nwcNiY/FmandXkc89paW7OUlebm8nlNPVP/6nxaoyOdJpJQwBVIYQDiI1l3ze+VjToR+3YOKi9&#10;mM3qQkg3OLuQzeqc4c3k2jzPykREXHz3H/9jo/cv+75OHzigW++/b6mj2tiYvGEFRfAeHxoyXrFz&#10;ZWpKpw8eDHSysOzWRx/p9MGDxkF8z8QEl9AA2BQhHECsmC5JDzKEJ5JJ44PaMAN42UwuZxyq+sfG&#10;OBtehf7RUeMxeu7IkUDPQlZyIZvVe4bX6hKGgrXvRz8yev/S7KzOHT0aSgAvKxWLOnvokFEPbZ7H&#10;BBCATRHCAcSK8XLDAK8J32t4UHt5cjL0AF52IZvVwvS0UY2n/viPLXXTvExXDFzMZq0+4svEW8eP&#10;G/29tnmeHrf42Dysz3Tyx0b4tWVpbs540nDn+DgTQAA2RAgHECumITyoA6uuTEa9Q0N1v79ULDoT&#10;wMtMz3L1j45yYLsB0yA0c+aMU2Nm2feNL2XYyRnJQJhO/pw7csTaY+VsuDQ5aTRpyAQQgM0QwgHE&#10;ymeGZ1raPC+QILjn4EGj97tyVmm1UrGoS5OTdb+fZZ4bMwlCpWLRyg3RbFvI5/Xu2bN1v78jneZO&#10;6Q1mOvnz81OnGn73/XqcO3rU6P02nmgBoHkRwgHEio3HlH1p2zYLnawvkUyqO5Op+/0zZ86Efk3v&#10;ei5PThpNDvRydqki0yB0eXLSqTORqxXOnTN6PxM3jWU6+fOrCxcsdmOP6aQhj8oDsBFCOIBYWb55&#10;07jGlxMJC52sz8Z1va5a9n2jA1vObFb2pMFZN9Ow0Wi3PvrIaGlwdyajLVu3WuwIZTvSaaPJn4vZ&#10;rG599JHFjuy6bPh30WUwmQqgubX29KTWfXGj16plo0Z7ihqNqEON6NX45OZN+VWeRVz7c77v19xf&#10;FLZJrTW2bN1a9TZcq/y+9lRKn9+6ZdTHRr7a17dhjxu99k4up0daW6v6PWHtmw/On9e3V52drHV/&#10;bPvWt9T+q18Z97HW2hq+76ulxlUP5c/y6GOP1d1Tre/bun27vppOP7Ada9mm/8+JE+v+Tlf+fv/X&#10;f/kv+mo6Xff7W7u61F7n3+xq1XyWzcbNRvum2nHjyn7ZvnNn3d+npWJRxcuXrfXSqBoz588rVcPE&#10;3+rtkRoc1Oxf/IWVPqJaw1YdajRnja/flq7fcSdzBlmjdX6+sG6B9V6rpQnTGupN6UbBrEZ7qnlq&#10;uNQLNYKvkd62TV4V1yP7vv/Qz931vJr6i8o2qadGNdtwrdXb9M4XX9TVUzWfpX90VF0bhI1K+3a1&#10;v3n11aqWFYe9bz6ZnVV3JrPp56nk7z/3nF559VUrfWxUw/O8mnpb/Vk+/fjjho2Rtf63Z555oM9a&#10;tmmpWFTxzTet9dKoGu+/8Yb+4Mc/rvt+DKldu/Q/1vmctfRRzWfZaNxstm+qGTeu7BdJ+ua+fXV9&#10;n0rShclJ3SgUnPk869VYmp5Wf5WXwazdv146rS1bt9Z0GZTr2yOqvVDDzRrXbkvqciNzBl2D5egA&#10;Ysf0hmVfauCN2R43uCP6Qj7v7HW9a5k8BiuRTMrjmeErTK6TN31sXJBmDJ4b/gT3ErDu8cFBo5tU&#10;RmXsmT6vvovLZwBUQAgHEDs2rgtvFJPrnd87c8ZiJ431geGzqE1uXNdMOvr6zG7IduqUxW4ay/SR&#10;UUzc2GXyCMUoTRgu+77xPQkAYC1COAA4oiuTMTqzZHJ2OWilYtHoILzD4PrgZmJy46dSsWjlaQFB&#10;uWr4GCuT0IiHxWXCUJLR0ya4kSSASgjhAOAIo2XF+bxzzwXfjNHZJQ5sJZmNmShN2kj3zkgaTdz0&#10;9VnsJt66MhmjFRhRWYpedt1gsopVGAAqIYQDgCNMguWVqSmLnQSjVCzW/V6TANBMTJa6fhDBMWNy&#10;5p7VE/aYTGgszc5GZil62YLhKgyWpANYixAOAA5o8zyjkGBypiYsvkEI5+yS+TOITZbYhoWJGzeY&#10;hErTQBsGk3EnMfYAPIwQDgAO2GF4li6KB7am1yN/LeZnNk3PRkbt8gWJZcGuMFm1czViS9HLTM7e&#10;Jxh3ANYghAOAA0wDVRSZ3qW+kY+KiwKTs5FRWw5sy5cTibBbiLw2zzO6gWRUx95yqVT3exNdXRY7&#10;AdAMCOEAYqdt2zaj93/WgDOIcQxUpmdi477E0+TsWlQnbj4xHOs7uDmbMdNVO1Ede5wJB2ATIRxA&#10;7JicxZHMw2MlJhMDUT2oNQ7hMT+wjds9BCTpM4OzkbAjjqt2JLPvK9N/5wBoPoRwAHCASaAyvWkQ&#10;osd0FUAUrweXzC9hiPvqCRtMtqHp/osqQjiAtVrDbgAAgmTjIPwTy6HX9BrL7oGBmj/XJzdvKm24&#10;LN9GDRNxvs7SMxzHjw8NbXp3dVfGyOoahJnwmZwJb9u2TbsnJh74Zy6Os0pMnzPf5nmRnfwCYB8h&#10;HECsmIYXSfrM8tkc02XV/WNjNb/H9315hoHGVg3U7quGY2bn+PimP+PHVqiiAAAdCElEQVTSGDGt&#10;URb3SxhsMJkI6UinH1r148oYsTnOKvnStm2EcAArWI4OIFZMb8om2V/K+yXu2Iwa2ZhMAurBkn4A&#10;MEcIBxArpgeQjbj+2vSsJuKHZdkIC2MPAMy19vSk1n1xo9eqZaNGe4oajahDjejV+OTmzaqX7679&#10;Od/3a+4vCtuk1hp3E4m6l0D7vq+F99836qfSe2898khNPdlawm2jTpg1SjdvrmzPRowz3/fVUuPK&#10;ifJnefSxx+ruqZr3Lbe0bLjdGCOVa3yyaszUo5r3bjZuNvos1Y6bsL5Xt27fXvHfLabiUGPb17+u&#10;32mt7ipQ1/696UIdajRnja/flq7fcSdzBlmjdX6+sG6B9V6rpQnTGupN6UbBrEZ7qnlquNQLNYKv&#10;kd62rapr1ipd23bX82rqLyrbpNYaf7BrV13X/ZW3advdu3X3s95nSf/hH1bdk63rFl25htKkRmLb&#10;Nt0oFBo2zjzPq6m31Z/l048/rqunaj9L9xNPrNsbY2T9Gl+9P2bqUe2+2WjcbPZZqhk3YX6vbnn0&#10;0Qf6d23/ulzj5rVr8qt41riL/94Muw41mrfGtduSutzInEHXYDk6gFgxXUrZiOfcsrwTQBRw/woA&#10;sIMQDiA22jzP6HncknSdEA4AAAADhHAAsbHDMIBLUqmK5YRAozFxAwBAdBHCAcRGR1+fcY1GLEcH&#10;atXGsmAAACKLEA4gNnoHB43eTwAHAACAKUI4gNgwvR6cEA4AAABT1T2wEAAiriuTMb6O9mo+b6kb&#10;uy5kszW/55ObN/XVGp+B7VoNv1g0+t1RVrp6VYnOzvreWyxqJpfb9OfC3r+NqNGIGyuiejNnzjx0&#10;Xw3Xxkijanx286ZRbQDNhRAOIBZMl6JL0sL0tHkjFSz7vtH7L9YRwttTKf2NhWeEulADtSktLlY1&#10;ZlzZv67UgLmFfF7vrZkAcmX/ulIDQDywHB1ALJiG8FKx2LA7o5uGcKAW9Z5BBz4rlcJuAQCaAiEc&#10;QNPbkU4rkUwa1Zh3dCm6JHmEqtjhUXkIw7LhkmoerQcA9xDCATS97Tt3Gtf4/956y0InlcX52mYE&#10;z3RCCvFlumqHEA4A9xDCATS1Ns9Tatcu4zq/08BlmL8xPLD9muFd3xE9JcOJG8IQ6rHs+0ZBnEsh&#10;AOAeQjiAptY7OGh85u/K+fP6/NYtSx09zPRM+JcIVLFjOmY4G456mSxJb0skLHYCANFFCAfQ1HZP&#10;TBjX+GBqykIn6zO9vtf0+eeIHtPVEzv6+ix1grhZMnjMWwfjDgAkEcIBNLH+0VHjM37VPlPZhPES&#10;T85qxs71uTmj9zNmUC/T7youhQAAqWV4eOxu2E1s5JktYXcAuOMbe/fquwcP1vXeUrGoN55/3nJH&#10;bvven/6pcdh4J5fT3J//uaWO1vd//PjHdZ/RjuO+DcL3Xnyx7mtYf/rCC0ZnDKvxg5/8pO5AE9S4&#10;jiPXx42p9l279PuHDtX9/v/3n/wTfcKztAFIeue29O6dsLsIR+v8fOUvwp6elNZ7rVo2aqg3pRuG&#10;X9btqeap4VIv1Ai+RnrbNnlVHHT7vv/Qz931vJr6i8o2Wc/uiQl13Q+1lbZHtf7m1VdVWlxs+Gf5&#10;zeKivExm0xqVPouXTuvTGzdqOkMV9f0bRA3P82oaN6v3zacff1xXT7V8lru+L6/CJFM14/3bg4P6&#10;H8ePW+uFGr+10bjZbN9UM27C3h6/29u78hnq+W597O/+Xf3tX/+1lV6o4XYNl3qhhps1rt2W1OVG&#10;5gy6BsvRATSdRDKpnePjxnUW8vnAnsdsevare2DAUieIiiWDJemJZJLny6MuV/N5o/dzXTgAEMIB&#10;NKHdExNWrju8+Gd/ZqGb6lw3DOFdVZxFR3MxnrhhzKAOy75vNDnZOzRksRsAiCZCOICm8tT4uPpH&#10;R43rlIpFLRie8anF0tyc0Q2PegcH7TWDSLg6PW30fsIQ6rVgMPbaPI+VOwBijxAOoGkkkkntO3zY&#10;Sq1zR45YqVOtZd83OrOZSCY5sI0Z04mb7oEB7lSNupiuwmDlDoC4I4QDaAqJZFL7T560UuvK+fOB&#10;ngUvM/2dHNjGj8mYafM8Pc4KCtThg/Pnjd5v454dABBlhHAAkdfmeRp56SVrzz5++8UXrdSpleny&#10;4p3j45zZjBmTZcGSrFy6gfgpFYtG14WzJB1A3BHCAUTe/pMn637G9lozZ84Edkf0tRbyeaPlxZzZ&#10;jJ/3cjmj93dnMoQh1OXK1JTR+3dPTFjqBACihxAOILLaPM9qAC8Vi7qYzVqpVa8Zw1C1hwPbWFn2&#10;feOz4YQhu5ZLpbrfG6WVLB8YhnAmgADEGSEcQCSVrwG3+Zili9lsaGfBy0wPbBPJpJ7iestYuWJ4&#10;fS5hyC6T1SxfilAIX8jnjW/QxgQQgLgihAOInI6+PqtnwKV7y9BNz0LbsJDPG5/Z3GPpOemIhvdy&#10;OaPgJxGGbFq+ebPu99q6r0VQ3n/rLaP3d2cyeuQb37DUDQBEByEcQKQ8NT6u/S+/bPVg1YVl6KuZ&#10;ntls8zxCVYws+77xBFJ3JsMKCktMJkQSnZ0WO2m8j6anjSeAfv/QISYNAcQOIRxAJJSXn+87fNj6&#10;AdvpAwdCX4a+mo0zmzvHx/Ukd76OjcuTk8Y19kxMqKOvz0I38Wb07PaIPWbw81u3jCeAEsmknj56&#10;1E5DABARhHAATtuydat2T0xo/NSphhygvn38uFMBXLp3EH/JQqjad/gwoSomSsWicRhq8zyNnDgR&#10;ubOxrikVi3W/N5FMyovY9rcxAdQ7NMTqHQCxQggH4Kz+0VHtO3q0Ydc4X8xmrYTdRrg8OWl8NpxQ&#10;FS82LqlIJJMaOXGC5cEGTEK4JPWPjVnqJBilYtHK9+ieiQmCOIDYIIQDcEr5euYfnj2rp48da9iN&#10;ii5PTuqCQ9eBr7Xs+3r7+HHjOolk8t419ATxplcqFq2M6Y50WuOnTmnr9u0Wuoqf63NzRu/fGcFr&#10;8y9ms8aThhJBHEB8tAwPj90Nu4mNfL9Veqwl7C4AN3xj71599+DBut5bKhb1xvPPW+7Inh3ptL7y&#10;zW/q742MNPws3MzZs/qb115r6O+w5ff+5E+UsvD4qGXf15snTujT99+30FWwtmzdqu2ZjNo8T3/7&#10;+uuB/d7vvfhi3ZMXP33hBePHN9Vjy9at2nf0qJXJq1KxqL/+1/9atz76yEJnwSp/n3yyuKgbP/95&#10;4L//Bz/5idH32JsnToTSt4nHdu3S0KFDVmrlT50K9G/dli1bt+or3/qWnti3Tz/7N/8m7HYA571z&#10;W3r3TthdhKN1fr5Q8YWenpTWe61aNmpM9aT0ncWCthsE8fZUSjcKZn24UsOlXqgRfI30tm3yqjiw&#10;833/oZ+763k19dfoz9PmedqRTqt3cFD9o6PrHrBW+iy1Wl3jvVxOF158seYaYY2Ri8ePq/fUqZXt&#10;U+/28DxPf3T8uC5NTupiNqtH29udH/OPDw1p53PPrdwLYObMGf3PCj/bqD48z6tpW6/eN59+/HFd&#10;Pdn4LP/zP/wH/eGf/qlRDUlSMqn/+z/+R13IZute6h7k302b5+nJ0VH1Dg6ujJkL2aw+LBQC//v9&#10;ZG5OvYODD/3zav9+/89DhzT57LMV71fhyr+v1ta5USho1w9+UPO9Oyptk8GDB1UaGan6pplhb5Ou&#10;TEa9g4NKDQ5qx/0JsHN1TkiE/Vls1nCpF2q4WePabUldbmTOoGu0Gv2mAHwu6ezn0sgWGQVxAOEq&#10;h+6Ovj71Dg6qI50O/LrT93I5/dWRI4H+TlPlx6ftPXzYSr2d4+PqHRzUX544YeUAy7bywexGEzPY&#10;2NLsrC5NTlpb1rxnYkL9o6M6+6MfhXJ2fyPl75U9Bw+G8p2ynoXp6YohvFrl+zmcPnjQyjLvoJw7&#10;elTjqyYNTSSSSf3w9dd1IZvVe2fOOHcDTS+ZVP/9SZ+OdFrSvQkFAKiG8yFckj4TQRyIAi+ZVJvn&#10;KZFMKtHZqbuJhP73J55QRzrdsGu7q3Uxm3X6GvCNXJqcVNfAgHqHhqzUSySTGj5yRHcPHbp3gGt4&#10;V20TW7ZuJXg3wMVsVr2Dg9b+7hLJpMZPndLMmTOaOXtWV6enrdStR5vn6fHBQXXf/5twccy8l8tp&#10;n+HEWUc6rf0nT+rsoUPOBdD1lIpFvX38uJ4+dsxazfIk0EwuF3oY78pk1D0wcO8/EXucHAC3RCKE&#10;SwRxwFSb52n/yZNV/3zp5k0ltm3b8GfKB/htnlfxQNjGUnJTy76vvzx2TMU33wy1D1Pnjh5VRzqt&#10;FovbM5FM6vvHjmnPxISunD+vmVxO1wM407kjnb4XoAYH9eVkcmX5JuxZ9n2dPnjQ2lnJsv6xMfWP&#10;ja3cBO7q9HTDQ1F5oiZK4WfZ97UwPW3ca0c6rf0vv6yzhw5pyfCGb0GZyeW0I522eoO5RDKpPRMT&#10;2jMxoZkzZ3Tlrbf0wdSUtfrr8ZLJlXHn6oQPgGiKTAiXCOKAiTbPq+mA0IUAbapULOr0gQN6pDVS&#10;X3UVlUPV9196Sd79pY+2JJJJ7Rwf187xcZWKRS3Nzmohn9fS3Jyuz87WtRy2zfPkJZMrqyI6+vpW&#10;VkSsPpBl+WbjlIpFnT10SPtfftl67fIEjnRv+Xt5zJQWF+seM+WVNB19fSv/3ZFO68vJZCS/i97L&#10;5axMGCSSSY2/9ppmzpzRpVOn9MWtW3XVWX0fjrZkUqXZWSuPtavk7ePHlejstLZ6Z7XyRJB0b9n/&#10;Qj6vj65cUevWrXVNIrZ5nr7keWrp7NSTTz1173uqs1Pd928GCQCNELkjU4I4gGqUH0G27PtqT6XC&#10;bseKUrGon/3bf6sd/+pfNezgMHE/OK8+eF72fZWKxQeCValYlBKJB1ZLlFdGhH3pAX5rIZ/XuSNH&#10;rC4PXqsjnVZHOv3A863LY2ZpcXFljJSKxQfGxuoVNBuNmahO1Mzkcto9MWHt76EcPq8XiyqcP6+l&#10;2dmVVQjlZ5Ov/A12dq5cGtS2bZu6M5kH+vB9X+82eNXLuft36e+wPGm4Wncmo+5M5oFJ41Kx+MCz&#10;2svfW6u/Myut4mqGiWcA0RG5EC4RxAGsr1Qs6tyRI1rI58NupSE+KRR0+sAB7X/55cDO0rR5XsUD&#10;aQ5ao2Eml1MimQz0+cvlMRPVs9i2XMxmrU+AtHleJJ4lXl69s//kyYYG8bXKE4kA4LJHwm6gXuUg&#10;/pHTTzkHEJRl39fFbFaTzz3XtAG8bGlu7t6je1ad7QE2ciGb1bmIPRmgGczkcloI8SZ2YSsHcdfu&#10;qg8AYYtsCJcI4gDumTlzRpPPPruy/DwOlubmdPrgQYI4qjaTyzF5E4JzR4/G5nupkmXf1+Rzz+nS&#10;5GTYrQCAMyIdwiWCOBBn5fB97ujRyDzCx6ZSsajTBw9qJsRHjCFaFvJ5Jm8CVn5sV9y9ffx4w24E&#10;BwBRE/kQLhHEgTgpLzt/5Qc/0LmjRyPz2J5GKV8Dz0E+qlUqFvXKyAiBKEAzuRzbW/cui3hlZIRJ&#10;IACx1xQhXCKIA81uIZ/X28eP65WREV3IZmN55nsjlyYn9crIiK6cPx92K4iIC9msJp99lkAUkAvZ&#10;rP77yZNhtxE6JoEAIKJ3R18Pd00HmstCPq+Z8+d19c03Cd1VKD8Xun901OqjkVywkM/rMteUWrc0&#10;N6dXRkaabsws+75mcjm9d+ZM2K08YPHtt3Vx27ZA71TvqgvZrGZyOT35x3+sPc89F3Y71izk8/pg&#10;airsNgA4rqlCuEQQB6Js2fe1kM/r6vS0rkxNqbS4qPZUigBeo5lcTjO5XOSDVWlxUe+dOaNLk5Ox&#10;vrFVEGZyOS3k8+ofHdWTo6ORHTPlADSTyzk7Zi5ksyoVi5H+27SlVCxq9rXXdPXNN/Xk2Jj6R0fD&#10;bqku5UmfxcuX9f4bb4TdDoAIaLoQLhHEgagoLS5qYXpa12dntTA9Hfvru21bHcafHBtT98BA2C1t&#10;qnww+8HUVNM/as41pWJRF7JZXchm1T86qt6xMXkRGDPlibuZM2ciM2FXnvTYPTER2eBp00I+r4V8&#10;XhezWe2emFDv4KDaHH++fHnS+PKrr2ppbk7Lvq/2VCrstgBERFOGcOnBIN4edjNAjJUWF7Xs+1qa&#10;nVWpWJRfLN773/f/ORqvHMYTyaR6Bwf15NiYvtzZGXZbku4dyH4yN6er09NamJ4meDtiJpdT8fJl&#10;XXj0UT05NqbewUFnztou+76W5ub0wdTUyoqZKCrfVLEcPIMM40v3/+ZcU94m5yT1j47q8aEh9Q4O&#10;ht3WitLioq5MTemDqamV4A0A9WgZHh5r6luZbZE01Co9xhlxNIGOdFq/8/Wvh93GirUHv1955N69&#10;Hn99/bo+//RTfX7rVhhtoQpbt2+Xfvd39c3BQX3tiScCC1ilxUX9am5OhXxerb/+tW4UCs6Ok/Zd&#10;u/Tlbdvqem/p3Xd166OPLHcUrq+mUnqko0OpgQGldu0K7ExlaXFRhXxev5qb052lJX1SKATye4NW&#10;/pv89uiovvbEE1a377Lv61fvv6+F6Wl9ce2almZnrdVutC1bt+p2IqHUwIB6BgbU0dcXyO8tb7Nf&#10;zc5qaW5On1+96ux3FRBV79yW3r0TdhfhaPn2t3dWDOE9PSnNz5v9i86VGr09KX1nsWC0NL09ldIN&#10;w3/x26jhUi/UcLOGS71Qw80aleq0eZ46+vrUkU5rRzqtRDKpNs9TorNz3TDg+768Na+VJ2ZKxaJK&#10;xaKWfV/X76+CqHTmyJVtQo3a63T09SmRTGpHOq2OdPreeEkmlVi1yqLSGFlr7ZhZu2Lm0fZ2J7ZJ&#10;0DW6BwbUkU6rK5NZ+fts87wNt+nalUfXZ2dXtqPtz2KrTq01Vn9XecmkOtJpfSap6/72qday72v5&#10;5k0t+75KxaIKc3N6pFS6911VYZs14rM0ew2XeqGGmzXyt6XrXW7kxaBrNO1y9NU+F9eIA8BGytc3&#10;rrccPFFh+fq2r39dN69dk/Twqgg0v6W5OS3Nza37WLxEZ+cDY2StasfMo+3xvKis/Pd4ac1TATrS&#10;aS2XSg/9fFz+Bit9V60OA22ep7ZNVrBU2la2QicAVCMWIVziZm0AYKLSQesjra2xOfBH7UqLi4yR&#10;Bvj81i226QaWfZ9rtQE475GwGwhSOYh/1NRXwQMAAAAAXBWrEC4RxAEAAAAA4YldCJcI4gAAAACA&#10;cMQyhEsEcQAAAABA8GIbwiWCOAAAAAAgWLEO4RJBHAAAAAAQnNiHcIkgDgAAAAAIBiH8PoI4AAAA&#10;AKDRCOGrEMQBAAAAAI1ECF+DIA4AAAAAaBRCeAUEcQAAAABAIxDC10EQBwAAAADYRgjfAEEcAAAA&#10;AGATIXwT5SD+MUEcAAAAAGCoZXh4jHhZhS2Shlqlx1rC7gQAAAAAou2d29K7d8LuIhyt8/OFii/0&#10;9KS03mvVarYa/+mDgka2SNvrDOLtqZRuFMz6sFWHGs1bw6VeqOFmDZd6oYabNVzqhRpu1nCpF2q4&#10;WcOlXqjhZo1rtyV1uZP1gqzBcvQacI04AAAAAMAEIbxGBHEAAAAAQL0I4XUgiAMAAAAA6kEIrxNB&#10;HAAAAABQK0K4AYI4AAAAAKAWhHBDBHEAAAAAQLUI4RYQxAEAAAAA1SCEW0IQBwAAAABshhBuEUEc&#10;AAAAALARQrhlBHEAAAAAwHoI4Q1AEAcAAAAAVEIIbxCCOAAAAABgLUJ4AxHEAQAAAACrEcIbjCAO&#10;AAAAACgjhAegHMQ/JogDAAAAQKy1DA+PEQ0DskXSUKv0WEvYnQAAAABAeN65Lb17J+wuwtE6P1+o&#10;+EJPT0rrvVYtajxc4z99UNDIFmm7QRBvT6V0o2DWCzWat4ZLvVDDzRou9UINN2u41As13KzhUi/U&#10;cLOGS71Qw80a125L6nInpwVZg+XoAeMacQAAAACIL0J4CAjiAAAAABBPhPCQEMQBAAAAIH4I4SEi&#10;iAMAAABAvBDCQ0YQBwAAAID4IIQ7gCAOAAAAAPFACHcEQRwAAAAAmh8h3CEEcQAAAABoboRwxxDE&#10;AQAAAKB5EcIdRBAHAAAAgOZECHcUQRwAAAAAmg8h3GEEcQAAAABoLoRwxxHEAQAAAKB5EMIjgCAO&#10;AAAAAM2BEB4RBHEAAAAAiL6W4eExYl2EbJE01Co91hJ2JwAAAABQn3duS+/eCbuLcLTOzxcqvtDT&#10;k9J6r1WLGvZr3CuU0ncWC9puEMTbUyndKJj1Qg03a7jUCzXcrOFSL9Rws4ZLvVDDzRou9UINN2u4&#10;1As13Kxx7bakLjcyVtA1WI4eQZ+LpekAAAAAEEWE8IjiGnEAAAAAiB5CeIQRxAEAAAAgWgjhEUcQ&#10;BwAAAIDoIIQ3AYI4AAAAAEQDIbxJEMQBAAAAwH2E8CZCEAcAAAAAtxHCmwxBHAAAAADcRQhvQgRx&#10;AAAAAHATIbxJEcQBAAAAwD2E8CZGEAcAAAAAtxDCmxxBHAAAAADcQQiPAYI4AAAAALiBEB4TBHEA&#10;AAAACB8hPEYI4gAAAAAQrpbh4TEiWcxskTTUKj3WEnYnAAAAAOLondvSu3fC7iIcrfPzhYov9PSk&#10;tN5r1aKG/RrW6vSk9J3FgrYbBPH2VEo3CmZ9UMN+DZd6oYabNVzqhRpu1nCpF2q4WcOlXqjhZg2X&#10;eqGGmzWu3ZbU5UbGCroGy9Fj6nOxNB0AAAAAgkYIjzGuEQcAAACAYBHCY44gDgAAAADBIYSDIA4A&#10;AAAAASGEQxJBHAAAAACCQAjHCoI4AAAAADQWIRwPIIgDAAAAQOMQwvEQgjgAAAAANAYhHBURxAEA&#10;AADAPkI41kUQBwAAAAC7COHYEEEcAAAAAOwhhGNTBHEAAAAAsIMQjqoQxAEAAADAHCEcVSOIAwAA&#10;AIAZQjhqQhAHAAAAgPq1DA+PEadQsy2Shlqlx1rC7gQAAABA1LxzW3r3TthdhKN1fr5Q8YWenpTW&#10;e61a1LBfw6leelL6zmJB2w2CeHsqpRsFsz6o4W4v1HCzhku9UMPNGi71Qg03a7jUCzXcrOFSL9Rw&#10;s8a125K63Mg1QddgOTrq9rlYmg4AAAAAtSCEwwjXiAMAAABA9QjhMEYQBwAAAIDqEMJhBUEcAAAA&#10;ADZHCIc1BHEAAAAA2BghHFYRxAEAAABgfYRwWEcQBwAAAIDKCOFoCII4AAAAADyMEI6GIYgDAAAA&#10;wIMI4WgogjgAAAAA/BYhHA1HEAcAAACAewjhCARBHAAAAAAI4QgQQRwAAABA3BHCESiCOAAAAIA4&#10;I4QjcARxAAAAAHHVMjw8RhRCaL4SdgMAAAAAAveZpM/DbiIkrfPzhYov9PSktN5r1aKG/Rou9UIN&#10;N2u41As13KzhUi/UcLOGS71Qw80aLvVCDTdruNQLNdys4VIvQddgOToAAAAAAAEhhAMAAAAAEBBC&#10;OAAAAAAAASGEAwAAAAAQEEI4AAAAAAABIYQDAAAAABAQQjgAAAAAAAEhhAMAAAAAEBBCOAAAAAAA&#10;ASGEAwAAAAAQEEI4AAAAAAABIYQDAAAAABAQQjgAAAAAAAEhhAMAAAAAEBBCOAAAAAAAAWkZHh67&#10;G3YTAAAAAADEQev8fKHiCz09Ka33WrWoYb+GS71Qw80aLvVCDTdruNQLNdys4VIv1HCzhku9UMPN&#10;Gi71Qg03a7jUS9A1WI4OAAAAAEBACOEAAAAAAASEEA4AAAAAQEAI4QAAAAAABIQQDgAAAABAQAjh&#10;AAAAAAAEhBAOAAAAAEBACOEAAAAAAASEEA4AAAAAQEAI4QAAAAAABIQQDgAAAABAQAjhAAAAAAAE&#10;hBAOAAAAAEBACOEAAAAAAASEEA4AAAAAQEBahofH7obdBAAAAAAAcdA6P1+o+EJPT0rrvVYtativ&#10;4VIv1HCzhku9UMPNGi71Qg03a7jUCzXcrOFSL9Rws4ZLvVDDzRou9RJ0DZajAwAAAAAQEEI4AAAA&#10;AAABIYQDAAAAABCQ/x/ww67VWmcTTAAAAABJRU5ErkJggg==&#10;"
+       id="image1"
+       x="-0.58160484"
+       y="-0.62051022" /><path
+       style="fill:#ffffff;stroke-width:0.264583;fill-opacity:1"
+       d="M 11.940356,0.02854708 13.763697,1.8332839 V 5.0208821 H 1.8727539 L 0.04012913,3.1882573 0.03532635,0.0282692 Z"
+       id="path1"
+       sodipodi:nodetypes="ccccccc"
+       inkscape:export-filename="button_small.svg.96dpi.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96" /></g></svg>
diff --git a/Resources/Textures/Interface/Nano/button_small.svg.96dpi.png b/Resources/Textures/Interface/Nano/button_small.svg.96dpi.png
new file mode 100644
index 0000000000..bded8df6ec
Binary files /dev/null and b/Resources/Textures/Interface/Nano/button_small.svg.96dpi.png differ
diff --git a/Resources/Textures/Interface/NavMap/beveled_circle.png.yml b/Resources/Textures/Interface/NavMap/beveled_circle.png.yml
new file mode 100644
index 0000000000..dabd6601f7
--- /dev/null
+++ b/Resources/Textures/Interface/NavMap/beveled_circle.png.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/Interface/NavMap/beveled_hexagon.png.yml b/Resources/Textures/Interface/NavMap/beveled_hexagon.png.yml
new file mode 100644
index 0000000000..dabd6601f7
--- /dev/null
+++ b/Resources/Textures/Interface/NavMap/beveled_hexagon.png.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/Interface/NavMap/beveled_square.png.yml b/Resources/Textures/Interface/NavMap/beveled_square.png.yml
new file mode 100644
index 0000000000..dabd6601f7
--- /dev/null
+++ b/Resources/Textures/Interface/NavMap/beveled_square.png.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/Interface/NavMap/beveled_triangle.png.yml b/Resources/Textures/Interface/NavMap/beveled_triangle.png.yml
new file mode 100644
index 0000000000..dabd6601f7
--- /dev/null
+++ b/Resources/Textures/Interface/NavMap/beveled_triangle.png.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/Interface/Plasmafire/Storage/tile_blocked.png b/Resources/Textures/Interface/Plasmafire/Storage/tile_blocked.png
deleted file mode 100644
index 8c8303cd2e..0000000000
Binary files a/Resources/Textures/Interface/Plasmafire/Storage/tile_blocked.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Plasmafire/Storage/tile_blocked_opaque.png b/Resources/Textures/Interface/Plasmafire/Storage/tile_blocked_opaque.png
deleted file mode 100644
index ed269d6023..0000000000
Binary files a/Resources/Textures/Interface/Plasmafire/Storage/tile_blocked_opaque.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Retro/Storage/tile_blocked.png b/Resources/Textures/Interface/Retro/Storage/tile_blocked.png
deleted file mode 100644
index cedfcffb2b..0000000000
Binary files a/Resources/Textures/Interface/Retro/Storage/tile_blocked.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Retro/Storage/tile_blocked_opaque.png b/Resources/Textures/Interface/Retro/Storage/tile_blocked_opaque.png
deleted file mode 100644
index cedfcffb2b..0000000000
Binary files a/Resources/Textures/Interface/Retro/Storage/tile_blocked_opaque.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Slimecore/Storage/tile_blocked.png b/Resources/Textures/Interface/Slimecore/Storage/tile_blocked.png
deleted file mode 100644
index c5b1701f39..0000000000
Binary files a/Resources/Textures/Interface/Slimecore/Storage/tile_blocked.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Slimecore/Storage/tile_blocked_opaque.png b/Resources/Textures/Interface/Slimecore/Storage/tile_blocked_opaque.png
deleted file mode 100644
index d7dd48d5a6..0000000000
Binary files a/Resources/Textures/Interface/Slimecore/Storage/tile_blocked_opaque.png and /dev/null differ
diff --git a/Resources/Textures/LobbyScreens/Bar.png b/Resources/Textures/LobbyScreens/Bar.png
deleted file mode 100644
index 97fa15cccc..0000000000
Binary files a/Resources/Textures/LobbyScreens/Bar.png and /dev/null differ
diff --git a/Resources/Textures/LobbyScreens/CodeDeltaGamma.png b/Resources/Textures/LobbyScreens/CodeDeltaGamma.png
deleted file mode 100644
index 111ae6307d..0000000000
Binary files a/Resources/Textures/LobbyScreens/CodeDeltaGamma.png and /dev/null differ
diff --git a/Resources/Textures/LobbyScreens/CupOfVelta.png b/Resources/Textures/LobbyScreens/CupOfVelta.png
deleted file mode 100644
index 81c4ccb181..0000000000
Binary files a/Resources/Textures/LobbyScreens/CupOfVelta.png and /dev/null differ
diff --git a/Resources/Textures/LobbyScreens/DeltaV__Technological_Progress_by_threlo.png b/Resources/Textures/LobbyScreens/DeltaV__Technological_Progress_by_threlo.png
deleted file mode 100644
index a2c8d339ff..0000000000
Binary files a/Resources/Textures/LobbyScreens/DeltaV__Technological_Progress_by_threlo.png and /dev/null differ
diff --git a/Resources/Textures/LobbyScreens/Epistemics.png b/Resources/Textures/LobbyScreens/Epistemics.png
deleted file mode 100644
index 99bc7f987d..0000000000
Binary files a/Resources/Textures/LobbyScreens/Epistemics.png and /dev/null differ
diff --git a/Resources/Textures/LobbyScreens/MedbayMadness.png b/Resources/Textures/LobbyScreens/MedbayMadness.png
deleted file mode 100644
index aae76e7fee..0000000000
Binary files a/Resources/Textures/LobbyScreens/MedbayMadness.png and /dev/null differ
diff --git a/Resources/Textures/LobbyScreens/PutLobbyScreensHere.txt b/Resources/Textures/LobbyScreens/PutLobbyScreensHere.txt
index 52cb3f1dc9..7d7777fa10 100644
--- a/Resources/Textures/LobbyScreens/PutLobbyScreensHere.txt
+++ b/Resources/Textures/LobbyScreens/PutLobbyScreensHere.txt
@@ -1,2 +1,3 @@
 Note:
-Only png and jpgs files are supported, and you need a prototype in Resources/Prototypes/lobbyscreens.yml
+PNG, JPEG and WebP is supported. Please prefer a lossy WebP compression since lobby art is big.
+You also need to put a prototype in Resources/Prototypes/lobbyscreens.yml
diff --git a/Resources/Textures/LobbyScreens/Singulo.png b/Resources/Textures/LobbyScreens/Singulo.png
deleted file mode 100644
index 5bbbdb12c6..0000000000
Binary files a/Resources/Textures/LobbyScreens/Singulo.png and /dev/null differ
diff --git a/Resources/Textures/LobbyScreens/aBadShift.png b/Resources/Textures/LobbyScreens/aBadShift.png
deleted file mode 100644
index eb4951ae1a..0000000000
Binary files a/Resources/Textures/LobbyScreens/aBadShift.png and /dev/null differ
diff --git a/Resources/Textures/LobbyScreens/attributions.yml b/Resources/Textures/LobbyScreens/attributions.yml
index c0866c3374..0e890ec893 100644
--- a/Resources/Textures/LobbyScreens/attributions.yml
+++ b/Resources/Textures/LobbyScreens/attributions.yml
@@ -1,49 +1,34 @@
-- files: ["MedbayMadness.png"]
-  license: "CC-BY-4.0"
-  copyright: "Kimikyu#0001 on discord / @vkimikyu on Twitter"
-  source: "https://twitter.com/vkimikyu"
-
-- files: ["revenant.png"]
-  license: "CC-BY-4.0"
-  copyright: "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr"
-  source: "https://leonardo-dabepis.tumblr.com/"
-
-- files: ["oracle.png"]
-  license: "CC-BY-4.0"
-  copyright: "Leonardo DaBepis#4869 on discord / @leonardo-dabepis on Tumblr"
-  source: "https://leonardo-dabepis.tumblr.com/"
-
-- files: ["aBadShift.png"]
-  license: "CC-BY-4.0"
-  copyright: "art by user DEminerDG / @desmondeccho on Instagram"
-  source: "https://www.instagram.com/desmondeccho/"
-
-- files: ["Bar.png"]
-  license: "CC0-1.0"
-  copyright: "justani on discord / @itjustani on Tumblr"
-  source: "https://itjustani.carrd.co/"
-
-- files: ["CodeDeltaGamma.png"]
-  license: "CC0-1.0"
-  copyright: "ps3moira @ DeltaV"
-  source: "https://discord.gg/deltav"
-
-- files: ["CupOfVelta.png"]
-  license: "CC0-1.0"
-  copyright: "TJohnson @ DeltaV"
-  source: "https://discord.gg/deltav"
-
-- files: ["Epistemics.png"]
-  license: "CC0-1.0"
-  copyright: "Luckass on discord / v7 @ DeltaV"
-  source: "https://discord.gg/deltav"
-
-- files: ["Singulo.png"]
-  license: "CC0-1.0"
-  copyright: "iced0ver on discord / UBlueberry @ DeltaV"
-  source: "https://discord.gg/deltav"
-
-- files: ["DeltaV__Technological_Progress_by_threlo.png"]
-  license: "Custom"
-  copyright: "CC-BY-NC-ND-4.0 / threlo on discord / @threlo on itaku"
-  source: "https://linktr.ee/threlo"
+- files: ["supermatter.webp", "robotics.webp"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Veritius#2351 (257233913951289344) on discord / @Veritius on GitHub"
+  source: "https://github.com/Veritius"
+
+- files: ["warden.webp", "pharmacy.webp"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Solbusaur#4343 (220208697429852160) on discord"
+  source: "https://github.com/space-wizards/space-station-14"
+
+- files: ["ssxiv.webp"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Abyssal#4842 on discord / @aby_doodles on Twitter"
+  source: "https://twitter.com/aby_doodles"
+
+- files: ["susstation.webp"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Alekshhh github"
+  source: "https://github.com/space-wizards/space-station-14"
+
+- files: ["skellyvstherev.webp"]
+  license: "CC-BY-SA-4.0"
+  copyright: "Hannah 'FairlySadPanda' Dawson 2024"
+  source: "https://github.com/FairlySadPanda"
+
+- files: ["doomed.webp"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "brainfood1183 github"
+  source: "https://github.com/space-wizards/space-station-14"
+
+- files: ["blueprint.webp"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "data_redacted on discord"
+  source: "https://github.com/space-wizards/space-station-14"
diff --git a/Resources/Textures/LobbyScreens/blueprint.png.yml b/Resources/Textures/LobbyScreens/blueprint.png.yml
new file mode 100644
index 0000000000..5c43e23305
--- /dev/null
+++ b/Resources/Textures/LobbyScreens/blueprint.png.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/LobbyScreens/blueprint.webp b/Resources/Textures/LobbyScreens/blueprint.webp
new file mode 100644
index 0000000000..50f88f55a2
Binary files /dev/null and b/Resources/Textures/LobbyScreens/blueprint.webp differ
diff --git a/Resources/Textures/LobbyScreens/doomed.webp b/Resources/Textures/LobbyScreens/doomed.webp
new file mode 100644
index 0000000000..58a7313b23
Binary files /dev/null and b/Resources/Textures/LobbyScreens/doomed.webp differ
diff --git a/Resources/Textures/LobbyScreens/doomed.webp.yml b/Resources/Textures/LobbyScreens/doomed.webp.yml
new file mode 100644
index 0000000000..dabd6601f7
--- /dev/null
+++ b/Resources/Textures/LobbyScreens/doomed.webp.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/LobbyScreens/oracle.png b/Resources/Textures/LobbyScreens/oracle.png
deleted file mode 100644
index 4674b9d403..0000000000
Binary files a/Resources/Textures/LobbyScreens/oracle.png and /dev/null differ
diff --git a/Resources/Textures/LobbyScreens/pharmacy.webp b/Resources/Textures/LobbyScreens/pharmacy.webp
new file mode 100644
index 0000000000..0ee24d88be
Binary files /dev/null and b/Resources/Textures/LobbyScreens/pharmacy.webp differ
diff --git a/Resources/Textures/LobbyScreens/room.png.yml b/Resources/Textures/LobbyScreens/pharmacy.webp.yml
similarity index 100%
rename from Resources/Textures/LobbyScreens/room.png.yml
rename to Resources/Textures/LobbyScreens/pharmacy.webp.yml
diff --git a/Resources/Textures/LobbyScreens/revenant.png b/Resources/Textures/LobbyScreens/revenant.png
deleted file mode 100644
index 0b413711fb..0000000000
Binary files a/Resources/Textures/LobbyScreens/revenant.png and /dev/null differ
diff --git a/Resources/Textures/LobbyScreens/robotics.webp b/Resources/Textures/LobbyScreens/robotics.webp
new file mode 100644
index 0000000000..43d32581cf
Binary files /dev/null and b/Resources/Textures/LobbyScreens/robotics.webp differ
diff --git a/Resources/Textures/LobbyScreens/robotics.webp.yml b/Resources/Textures/LobbyScreens/robotics.webp.yml
new file mode 100644
index 0000000000..dabd6601f7
--- /dev/null
+++ b/Resources/Textures/LobbyScreens/robotics.webp.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/LobbyScreens/skellyvstherev.webp b/Resources/Textures/LobbyScreens/skellyvstherev.webp
new file mode 100644
index 0000000000..09bcf5b2f7
Binary files /dev/null and b/Resources/Textures/LobbyScreens/skellyvstherev.webp differ
diff --git a/Resources/Textures/LobbyScreens/skellyvstherev.webp.yml b/Resources/Textures/LobbyScreens/skellyvstherev.webp.yml
new file mode 100644
index 0000000000..dabd6601f7
--- /dev/null
+++ b/Resources/Textures/LobbyScreens/skellyvstherev.webp.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/LobbyScreens/ssxiv.webp b/Resources/Textures/LobbyScreens/ssxiv.webp
new file mode 100644
index 0000000000..32e248f802
Binary files /dev/null and b/Resources/Textures/LobbyScreens/ssxiv.webp differ
diff --git a/Resources/Textures/LobbyScreens/ssxiv.webp.yml b/Resources/Textures/LobbyScreens/ssxiv.webp.yml
new file mode 100644
index 0000000000..dabd6601f7
--- /dev/null
+++ b/Resources/Textures/LobbyScreens/ssxiv.webp.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/LobbyScreens/supermatter.webp b/Resources/Textures/LobbyScreens/supermatter.webp
new file mode 100644
index 0000000000..d5fb190ae6
Binary files /dev/null and b/Resources/Textures/LobbyScreens/supermatter.webp differ
diff --git a/Resources/Textures/LobbyScreens/supermatter.webp.yml b/Resources/Textures/LobbyScreens/supermatter.webp.yml
new file mode 100644
index 0000000000..dabd6601f7
--- /dev/null
+++ b/Resources/Textures/LobbyScreens/supermatter.webp.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/LobbyScreens/susstation.webp b/Resources/Textures/LobbyScreens/susstation.webp
new file mode 100644
index 0000000000..c30abb4670
Binary files /dev/null and b/Resources/Textures/LobbyScreens/susstation.webp differ
diff --git a/Resources/Textures/LobbyScreens/susstation.webp.yml b/Resources/Textures/LobbyScreens/susstation.webp.yml
new file mode 100644
index 0000000000..dabd6601f7
--- /dev/null
+++ b/Resources/Textures/LobbyScreens/susstation.webp.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/LobbyScreens/warden.webp b/Resources/Textures/LobbyScreens/warden.webp
new file mode 100644
index 0000000000..997bd6701c
Binary files /dev/null and b/Resources/Textures/LobbyScreens/warden.webp differ
diff --git a/Resources/Textures/LobbyScreens/warden.webp.yml b/Resources/Textures/LobbyScreens/warden.webp.yml
new file mode 100644
index 0000000000..51ff40335e
--- /dev/null
+++ b/Resources/Textures/LobbyScreens/warden.webp.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: false
diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/icon.png b/Resources/Textures/Mobs/Animals/nymph.rsi/icon.png
new file mode 100644
index 0000000000..f1b6a79230
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/nymph.rsi/icon.png differ
diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/meta.json b/Resources/Textures/Mobs/Animals/nymph.rsi/meta.json
new file mode 100644
index 0000000000..c6bb6e0ac4
--- /dev/null
+++ b/Resources/Textures/Mobs/Animals/nymph.rsi/meta.json
@@ -0,0 +1,63 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/ParadiseSS13/Paradise/commit/f367d7de199969a5fb5054de44faa5618092f487",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "nymph",
+      "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
+        ]
+      ]
+    },
+    {
+      "name": "nymph_dead"
+    },
+    {
+      "name": "nymph_sleep",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/nymph.png b/Resources/Textures/Mobs/Animals/nymph.rsi/nymph.png
new file mode 100644
index 0000000000..fe79c893d1
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/nymph.rsi/nymph.png differ
diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/nymph_dead.png b/Resources/Textures/Mobs/Animals/nymph.rsi/nymph_dead.png
new file mode 100644
index 0000000000..c3371bf949
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/nymph.rsi/nymph_dead.png differ
diff --git a/Resources/Textures/Mobs/Animals/nymph.rsi/nymph_sleep.png b/Resources/Textures/Mobs/Animals/nymph.rsi/nymph_sleep.png
new file mode 100644
index 0000000000..4e2055d74a
Binary files /dev/null and b/Resources/Textures/Mobs/Animals/nymph.rsi/nymph_sleep.png differ
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/bob5.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/bob5.png
new file mode 100644
index 0000000000..7585585274
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/bob5.png differ
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/longbundled.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/longbundled.png
new file mode 100644
index 0000000000..2bee8c78c5
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/longbundled.png differ
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
index 927d2ec6e4..5b682389ed 100644
--- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
@@ -4,7 +4,7 @@
       "x": 32,
       "y": 32
     },
-    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven is drawn by Ubaser, doublebun_long by Emisse",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517)",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
@@ -79,6 +79,10 @@
         "name": "bob4",
         "directions": 4
       },
+      {
+        "name": "bob5",
+        "directions": 4
+      },
       {
         "name": "bobcurl",
         "directions": 4
@@ -407,6 +411,10 @@
         "name": "long3",
         "directions": 4
       },
+      {
+        "name": "longbundled",
+        "directions": 4
+      },
       {
         "name": "long_bedhead",
         "directions": 4
@@ -758,6 +766,10 @@
       {
         "name": "uneven",
         "directions": 4
+      },
+      {
+        "name": "tailed",
+        "directions": 4
       }
     ]
   }
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/tailed.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/tailed.png
new file mode 100644
index 0000000000..f24abb81e3
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/tailed.png differ
diff --git a/Resources/Textures/Mobs/Customization/human_noses.rsi/blob.png b/Resources/Textures/Mobs/Customization/human_noses.rsi/blob.png
new file mode 100644
index 0000000000..31774b81f9
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_noses.rsi/blob.png differ
diff --git a/Resources/Textures/Mobs/Customization/human_noses.rsi/droop.png b/Resources/Textures/Mobs/Customization/human_noses.rsi/droop.png
new file mode 100644
index 0000000000..57bed8e5bd
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_noses.rsi/droop.png differ
diff --git a/Resources/Textures/Mobs/Customization/human_noses.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_noses.rsi/meta.json
new file mode 100644
index 0000000000..af67414763
--- /dev/null
+++ b/Resources/Textures/Mobs/Customization/human_noses.rsi/meta.json
@@ -0,0 +1,31 @@
+{
+  "version":1,
+  "size": {
+    "x":32,
+    "y":32
+  },
+  "copyright":"Created by SlamBamActionman",
+  "license":"CC-BY-SA-3.0",
+  "states": [
+    {
+      "name":"schnozz",
+      "directions":4
+    },
+    {
+      "name":"blob",
+      "directions":4
+    },
+    {
+      "name":"droop",
+      "directions":4
+    },
+    {
+      "name":"uppie",
+      "directions":4
+    },
+    {
+      "name":"nubby",
+      "directions":4
+    }
+  ]
+}
diff --git a/Resources/Textures/Mobs/Customization/human_noses.rsi/nubby.png b/Resources/Textures/Mobs/Customization/human_noses.rsi/nubby.png
new file mode 100644
index 0000000000..ab5bdde977
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_noses.rsi/nubby.png differ
diff --git a/Resources/Textures/Mobs/Customization/human_noses.rsi/schnozz.png b/Resources/Textures/Mobs/Customization/human_noses.rsi/schnozz.png
new file mode 100644
index 0000000000..618c5f5eb7
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_noses.rsi/schnozz.png differ
diff --git a/Resources/Textures/Mobs/Customization/human_noses.rsi/uppie.png b/Resources/Textures/Mobs/Customization/human_noses.rsi/uppie.png
new file mode 100644
index 0000000000..a1be557443
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_noses.rsi/uppie.png differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
index 482b4eec99..829bcddf0f 100644
--- a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
@@ -27,6 +27,14 @@
       "name": "tail_ltiger_front",
       "directions": 4
     },
+    {
+      "name": "tail_smooth_behind_primary",
+      "directions": 4
+    },
+    {
+      "name": "tail_smooth_behind_secondary",
+      "directions": 4
+    },
     {
       "name": "tail_smooth_behind",
       "directions": 4
@@ -47,6 +55,14 @@
       "name": "tail_ltiger_behind",
       "directions": 4
     },
+    {
+      "name": "tail_smooth_primary",
+      "directions": 4
+    },
+    {
+      "name": "tail_smooth_secondary",
+      "directions": 4
+    },
     {
       "name": "tail_smooth",
       "directions": 4
@@ -77,6 +93,16 @@
             [0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1, 0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1]
         ]
     },
+    {
+        "name": "tail_smooth_wagging_secondary",
+        "directions": 4,
+        "delays": [
+            [0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1, 0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1],
+            [0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1, 0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1],
+            [0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1, 0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1],
+            [0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1, 0.125, 0.1, 0.075, 0.075, 0.075, 0.075, 0.075, 0.1]
+        ]
+    },
     {
         "name": "tail_dtiger_wagging",
         "directions": 4,
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_behind_primary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_behind_primary.png
new file mode 100644
index 0000000000..41a23bed04
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_behind_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_behind_secondary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_behind_secondary.png
new file mode 100644
index 0000000000..15391fd9d2
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_behind_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_primary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_primary.png
new file mode 100644
index 0000000000..331b27baac
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_secondary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_secondary.png
new file mode 100644
index 0000000000..9c8c1dd752
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging_primary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging_primary.png
new file mode 100644
index 0000000000..1f6f6919e8
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging_primary.png differ
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging_secondary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging_secondary.png
new file mode 100644
index 0000000000..f4e2eca565
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging_secondary.png differ
diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json
index c3bfd498d6..0a323f7f65 100644
--- a/Resources/Textures/Mobs/Customization/scars.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/scars.rsi/meta.json
@@ -22,6 +22,10 @@
     {
         "name": "scar_top_surgery_long",
         "directions": 4
+    },
+    {
+        "name": "scar_chest",
+        "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png b/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png
new file mode 100644
index 0000000000..9a1cc56c5e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/scars.rsi/scar_chest.png differ
diff --git a/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_foot.png b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_foot.png
new file mode 100644
index 0000000000..07b01cd498
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_foot.png differ
diff --git a/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_leg.png b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_leg.png
index 1bf51eaacf..6e1a06bf1c 100644
Binary files a/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_leg.png and b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_leg.png differ
diff --git a/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_foot.png b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_foot.png
new file mode 100644
index 0000000000..86d07d6341
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_foot.png differ
diff --git a/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_leg.png b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_leg.png
index 6308e23f8a..2fef261bd8 100644
Binary files a/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_leg.png and b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_leg.png differ
diff --git a/Resources/Textures/Mobs/Customization/slime_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/slime_parts.rsi/meta.json
index e3137407bd..0db3ae1bcc 100644
--- a/Resources/Textures/Mobs/Customization/slime_parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/slime_parts.rsi/meta.json
@@ -30,6 +30,14 @@
     {
       "name": "gradient_l_leg",
       "directions": 4
+    },
+    {
+      "name": "gradient_r_foot",
+      "directions": 4
+    },
+    {
+      "name": "gradient_l_foot",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Mobs/Demons/ratvar.rsi/meta.json b/Resources/Textures/Mobs/Demons/ratvar.rsi/meta.json
new file mode 100644
index 0000000000..3d85e4a650
--- /dev/null
+++ b/Resources/Textures/Mobs/Demons/ratvar.rsi/meta.json
@@ -0,0 +1,63 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/a28a7680cba9142ab80abc5ed480474ed0310462/icons/effects/512x512.dmi spawn animation kitbashed by MACMAN2003",
+  "size": {
+    "x": 512,
+    "y": 512
+  },
+  "states": [
+    {
+      "name": "ratvar",
+      "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": "spawn",
+	  "delays": [
+	    [
+		  0.3,
+		  0.3,
+		  0.25,
+		  0.25,
+		  1,
+		  
+		  0.3,
+		  0.3,
+		  0.2,
+		  0.1,
+		  0.05,
+		  
+		  0.05,
+		  0.05,
+		  0.05,
+		  0.05,
+		  0.05,
+		  
+		  0.05,
+		  0.05,
+		  0.05,
+		  0.05
+		]
+	  ]
+	}
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Mobs/Demons/ratvar.rsi/ratvar.png b/Resources/Textures/Mobs/Demons/ratvar.rsi/ratvar.png
new file mode 100644
index 0000000000..bee7cdd1f0
Binary files /dev/null and b/Resources/Textures/Mobs/Demons/ratvar.rsi/ratvar.png differ
diff --git a/Resources/Textures/Mobs/Demons/ratvar.rsi/spawn.png b/Resources/Textures/Mobs/Demons/ratvar.rsi/spawn.png
new file mode 100644
index 0000000000..4f1c25b69c
Binary files /dev/null and b/Resources/Textures/Mobs/Demons/ratvar.rsi/spawn.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_10.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_10.png
new file mode 100644
index 0000000000..c790ff5866
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_20.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_20.png
index 43c92d9fa4..2dff27f851 100644
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_20.png and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_20.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_30.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_30.png
new file mode 100644
index 0000000000..05419cc533
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_30.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_40.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_40.png
deleted file mode 100644
index 404f932b64..0000000000
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_40.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_50.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_50.png
new file mode 100644
index 0000000000..d2ed2552d4
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_70.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_70.png
new file mode 100644
index 0000000000..ea8be7c02d
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Chest_Brute_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_10.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_10.png
new file mode 100644
index 0000000000..7d3230bd1f
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_20.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_20.png
index 2166220992..3cd1057e53 100644
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_20.png and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_20.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_30.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_30.png
new file mode 100644
index 0000000000..7b9f239f13
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_30.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_40.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_40.png
deleted file mode 100644
index 33f624d503..0000000000
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_40.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_50.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_50.png
new file mode 100644
index 0000000000..8067439530
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_70.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_70.png
new file mode 100644
index 0000000000..bc46dd32c0
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/Head_Brute_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_10.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_10.png
new file mode 100644
index 0000000000..1c44d9234d
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_20.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_20.png
index 1bcf2e505a..1547ab27d7 100644
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_20.png and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_20.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_30.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_30.png
new file mode 100644
index 0000000000..7100559ec6
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_30.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_40.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_40.png
deleted file mode 100644
index 8429e7fb18..0000000000
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_40.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_50.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_50.png
new file mode 100644
index 0000000000..943a05f24d
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_70.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_70.png
new file mode 100644
index 0000000000..124c71636b
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LArm_Brute_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_10.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_10.png
new file mode 100644
index 0000000000..97e84cef5a
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_20.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_20.png
index 2670821090..0443a6b2ed 100644
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_20.png and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_20.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_30.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_30.png
new file mode 100644
index 0000000000..cb476f3cda
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_30.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_40.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_40.png
deleted file mode 100644
index 680ec3009a..0000000000
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_40.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_50.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_50.png
new file mode 100644
index 0000000000..78ede1ae66
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_70.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_70.png
new file mode 100644
index 0000000000..9e97b1b628
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_10.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_10.png
new file mode 100644
index 0000000000..af40a70a94
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_20.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_20.png
index 2e4a031f15..4323b32ff6 100644
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_20.png and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_20.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_30.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_30.png
new file mode 100644
index 0000000000..f21b66c8f6
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_30.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_40.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_40.png
deleted file mode 100644
index f68f0c4f15..0000000000
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_40.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_50.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_50.png
new file mode 100644
index 0000000000..8d6e933658
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_70.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_70.png
new file mode 100644
index 0000000000..64113f8fac
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RArm_Brute_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_10.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_10.png
new file mode 100644
index 0000000000..dfb9e2ddd2
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_20.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_20.png
index 44aae3c0bf..e0f5211146 100644
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_20.png and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_20.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_30.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_30.png
new file mode 100644
index 0000000000..5e6a6e4390
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_30.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_40.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_40.png
deleted file mode 100644
index ef4dbcb08b..0000000000
Binary files a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_40.png and /dev/null differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_50.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_50.png
new file mode 100644
index 0000000000..1b646f052c
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_70.png b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_70.png
new file mode 100644
index 0000000000..77cb758dda
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/brute_damage.rsi/meta.json b/Resources/Textures/Mobs/Effects/brute_damage.rsi/meta.json
index f9a902aa4d..68ad07d2bd 100644
--- a/Resources/Textures/Mobs/Effects/brute_damage.rsi/meta.json
+++ b/Resources/Textures/Mobs/Effects/brute_damage.rsi/meta.json
@@ -1,21 +1,39 @@
 {
 	"version": 1,
 	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/blob/971ddef989f7f4f365a714ef3d4df5dea2d53d9a/icons/mob/dam_mob.dmi",
+	"copyright": "Drawn by Ubaser.",
 	"size": {"x": 32, "y": 32},
 	"states": [
+		{"name": "Head_Brute_10", "directions": 4},
+		{"name": "LArm_Brute_10", "directions": 4},
+		{"name": "LLeg_Brute_10", "directions": 4},
+		{"name": "RArm_Brute_10", "directions": 4},
+		{"name": "RLeg_Brute_10", "directions": 4},
+		{"name": "Chest_Brute_10", "directions": 4},
 		{"name": "Head_Brute_20", "directions": 4},
 		{"name": "LArm_Brute_20", "directions": 4},
 		{"name": "LLeg_Brute_20", "directions": 4},
 		{"name": "RArm_Brute_20", "directions": 4},
 		{"name": "RLeg_Brute_20", "directions": 4},
 		{"name": "Chest_Brute_20", "directions": 4},
-		{"name": "Head_Brute_40", "directions": 4},
-		{"name": "LArm_Brute_40", "directions": 4},
-		{"name": "LLeg_Brute_40", "directions": 4},
-		{"name": "RArm_Brute_40", "directions": 4},
-		{"name": "RLeg_Brute_40", "directions": 4},
-		{"name": "Chest_Brute_40", "directions": 4},
+		{"name": "Head_Brute_30", "directions": 4},
+		{"name": "LArm_Brute_30", "directions": 4},
+		{"name": "LLeg_Brute_30", "directions": 4},
+		{"name": "RArm_Brute_30", "directions": 4},
+		{"name": "RLeg_Brute_30", "directions": 4},
+		{"name": "Chest_Brute_30", "directions": 4},
+		{"name": "Head_Brute_50", "directions": 4},
+		{"name": "LArm_Brute_50", "directions": 4},
+		{"name": "LLeg_Brute_50", "directions": 4},
+		{"name": "RArm_Brute_50", "directions": 4},
+		{"name": "RLeg_Brute_50", "directions": 4},
+		{"name": "Chest_Brute_50", "directions": 4},
+		{"name": "Head_Brute_70", "directions": 4},
+		{"name": "LArm_Brute_70", "directions": 4},
+		{"name": "LLeg_Brute_70", "directions": 4},
+		{"name": "RArm_Brute_70", "directions": 4},
+		{"name": "RLeg_Brute_70", "directions": 4},
+		{"name": "Chest_Brute_70", "directions": 4},
 		{"name": "Head_Brute_100", "directions": 4},
 		{"name": "LArm_Brute_100", "directions": 4},
 		{"name": "LLeg_Brute_100", "directions": 4},
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_10.png
new file mode 100644
index 0000000000..bb29391fa0
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_100.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_100.png
index 2ca0dc67f1..c4058b6b22 100644
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_100.png and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_100.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_40.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_40.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_30.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_50.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_50.png
new file mode 100644
index 0000000000..5a68c6fd86
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_70.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_70.png
new file mode 100644
index 0000000000..2ca0dc67f1
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Chest_Burn_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_10.png
new file mode 100644
index 0000000000..f91dae519a
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_100.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_100.png
index 36b9114816..753e8c5cbf 100644
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_100.png and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_100.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_40.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_40.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_30.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_50.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_50.png
new file mode 100644
index 0000000000..90d69223b6
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_70.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_70.png
new file mode 100644
index 0000000000..36b9114816
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/Head_Burn_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_10.png
new file mode 100644
index 0000000000..bc8f7bf9ca
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_100.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_100.png
index 2dc5377659..cfac53ac3b 100644
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_100.png and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_100.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_40.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_40.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_30.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_50.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_50.png
new file mode 100644
index 0000000000..7c8da637ca
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_70.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_70.png
new file mode 100644
index 0000000000..2dc5377659
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LArm_Burn_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_10.png
new file mode 100644
index 0000000000..70b91d8824
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_100.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_100.png
index c18e554541..4a55dd5b72 100644
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_100.png and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_100.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_40.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_40.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_30.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_50.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_50.png
new file mode 100644
index 0000000000..a84ef88da8
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_70.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_70.png
new file mode 100644
index 0000000000..c18e554541
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/LLeg_Burn_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_10.png
new file mode 100644
index 0000000000..96b96b566b
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_100.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_100.png
index 77e463d02f..45d10bff5c 100644
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_100.png and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_100.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_40.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_40.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_30.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_50.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_50.png
new file mode 100644
index 0000000000..1d0c791e38
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_70.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_70.png
new file mode 100644
index 0000000000..77e463d02f
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RArm_Burn_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_10.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_10.png
new file mode 100644
index 0000000000..5f5d390792
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_10.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_100.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_100.png
index 978e01358f..1541b5c78f 100644
Binary files a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_100.png and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_100.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_40.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_30.png
similarity index 100%
rename from Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_40.png
rename to Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_30.png
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_50.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_50.png
new file mode 100644
index 0000000000..efe3ad8b53
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_50.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_70.png b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_70.png
new file mode 100644
index 0000000000..978e01358f
Binary files /dev/null and b/Resources/Textures/Mobs/Effects/burn_damage.rsi/RLeg_Burn_70.png differ
diff --git a/Resources/Textures/Mobs/Effects/burn_damage.rsi/meta.json b/Resources/Textures/Mobs/Effects/burn_damage.rsi/meta.json
index a3df142164..3649a05cc1 100644
--- a/Resources/Textures/Mobs/Effects/burn_damage.rsi/meta.json
+++ b/Resources/Textures/Mobs/Effects/burn_damage.rsi/meta.json
@@ -1,21 +1,39 @@
 {
 	"version": 1,
 	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/blob/971ddef989f7f4f365a714ef3d4df5dea2d53d9a/icons/mob/dam_mob.dmi",
+	"copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/blob/971ddef989f7f4f365a714ef3d4df5dea2d53d9a/icons/mob/dam_mob.dmi, 100 drawn by Ubaser.",
 	"size": {"x": 32, "y": 32},
 	"states": [
+		{"name": "Head_Burn_10", "directions": 4},
+		{"name": "LArm_Burn_10", "directions": 4},
+		{"name": "LLeg_Burn_10", "directions": 4},
+		{"name": "RArm_Burn_10", "directions": 4},
+		{"name": "RLeg_Burn_10", "directions": 4},
+		{"name": "Chest_Burn_10", "directions": 4},
 		{"name": "Head_Burn_20", "directions": 4},
 		{"name": "LArm_Burn_20", "directions": 4},
 		{"name": "LLeg_Burn_20", "directions": 4},
 		{"name": "RArm_Burn_20", "directions": 4},
 		{"name": "RLeg_Burn_20", "directions": 4},
 		{"name": "Chest_Burn_20", "directions": 4},
-		{"name": "Head_Burn_40", "directions": 4},
-		{"name": "LArm_Burn_40", "directions": 4},
-		{"name": "LLeg_Burn_40", "directions": 4},
-		{"name": "RArm_Burn_40", "directions": 4},
-		{"name": "RLeg_Burn_40", "directions": 4},
-		{"name": "Chest_Burn_40", "directions": 4},
+		{"name": "Head_Burn_30", "directions": 4},
+		{"name": "LArm_Burn_30", "directions": 4},
+		{"name": "LLeg_Burn_30", "directions": 4},
+		{"name": "RArm_Burn_30", "directions": 4},
+		{"name": "RLeg_Burn_30", "directions": 4},
+		{"name": "Chest_Burn_30", "directions": 4},
+		{"name": "Head_Burn_50", "directions": 4},
+		{"name": "LArm_Burn_50", "directions": 4},
+		{"name": "LLeg_Burn_50", "directions": 4},
+		{"name": "RArm_Burn_50", "directions": 4},
+		{"name": "RLeg_Burn_50", "directions": 4},
+		{"name": "Chest_Burn_50", "directions": 4},
+		{"name": "Head_Burn_70", "directions": 4},
+		{"name": "LArm_Burn_70", "directions": 4},
+		{"name": "LLeg_Burn_70", "directions": 4},
+		{"name": "RArm_Burn_70", "directions": 4},
+		{"name": "RLeg_Burn_70", "directions": 4},
+		{"name": "Chest_Burn_70", "directions": 4},
 		{"name": "Head_Burn_100", "directions": 4},
 		{"name": "LArm_Burn_100", "directions": 4},
 		{"name": "LLeg_Burn_100", "directions": 4},
diff --git a/Resources/Textures/Nyanotrasen/Structures/Machines/metempsychotic.rsi/meta.json b/Resources/Textures/Nyanotrasen/Structures/Machines/metempsychotic.rsi/meta.json
new file mode 100644
index 0000000000..7276fde67e
--- /dev/null
+++ b/Resources/Textures/Nyanotrasen/Structures/Machines/metempsychotic.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-4.0",
+  "copyright": "Created by discord user Four Hydra Heads#2075 (971500282364178512)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "pod_0"
+    },
+    {
+      "name": "pod_1",
+      "delays": [ [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Nyanotrasen/Structures/Machines/metempsychotic.rsi/pod_0.png b/Resources/Textures/Nyanotrasen/Structures/Machines/metempsychotic.rsi/pod_0.png
new file mode 100644
index 0000000000..b7a870e9d2
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Structures/Machines/metempsychotic.rsi/pod_0.png differ
diff --git a/Resources/Textures/Nyanotrasen/Structures/Machines/metempsychotic.rsi/pod_1.png b/Resources/Textures/Nyanotrasen/Structures/Machines/metempsychotic.rsi/pod_1.png
new file mode 100644
index 0000000000..750e0c7fed
Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Structures/Machines/metempsychotic.rsi/pod_1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-1.png
new file mode 100644
index 0000000000..3d0d47a0fc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-2.png
new file mode 100644
index 0000000000..004bb58c5d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-3.png
new file mode 100644
index 0000000000..fe29ffda1e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-4.png
new file mode 100644
index 0000000000..bd28cc2415
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-5.png
new file mode 100644
index 0000000000..e1badfa312
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..eeaa0014b9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/meta.json
index db0ac608ed..e5994967cd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/meta.json
@@ -1 +1,34 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/fill-1.png
new file mode 100644
index 0000000000..5c685c4a22
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/fill-2.png
new file mode 100644
index 0000000000..f709024427
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/fill-3.png
new file mode 100644
index 0000000000..5ac7181253
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/fill-4.png
new file mode 100644
index 0000000000..1bbb667360
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/fill-5.png
new file mode 100644
index 0000000000..ca155c4489
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/icon.png
index b5f02a51a1..efb03f4695 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..cd2f3e6260
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/meta.json
index 6b76e14b80..64fae7b0a9 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/acidspitglass.rsi/meta.json
@@ -1 +1,48 @@
-{"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", "delays": [[30.0, 1.0, 1.0]]}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon",
+            "delays":
+            [
+                [
+                    30.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty",
+            "delays":
+            [
+                [
+                    30.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/fill-1.png
new file mode 100644
index 0000000000..0ab878551c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/fill-2.png
new file mode 100644
index 0000000000..9017e356d9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/fill-3.png
new file mode 100644
index 0000000000..a9b52990e8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/fill-4.png
new file mode 100644
index 0000000000..f54f21fa2f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/fill-5.png
new file mode 100644
index 0000000000..a1d135cf93
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..e424af1af6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/meta.json
index d6f8f99b62..40b0ba1b87 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/aleglass.rsi/meta.json
@@ -17,6 +17,64 @@
                     0.5
                 ]
             ]
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1",
+            "delays": [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "fill-2",
+            "delays": [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "fill-3",
+            "delays": [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "fill-4",
+            "delays": [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "fill-5",
+            "delays": [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/fill-1.png
new file mode 100644
index 0000000000..fbdf302a0e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/fill-2.png
new file mode 100644
index 0000000000..806de2d477
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/fill-3.png
new file mode 100644
index 0000000000..1a657bac43
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/fill-4.png
new file mode 100644
index 0000000000..762b6e9ca1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/icon_empty.png
new file mode 100644
index 0000000000..d306465f36
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/meta.json
index db0ac608ed..20e933bb57 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/alliescocktail.rsi/meta.json
@@ -1 +1,31 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/fill-1.png
new file mode 100644
index 0000000000..df7806feda
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/fill-2.png
new file mode 100644
index 0000000000..c83210034e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/fill-3.png
new file mode 100644
index 0000000000..462012997c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/fill-4.png
new file mode 100644
index 0000000000..ab1a0472d3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/icon.png
index 69dbd0157e..1b1aad6775 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/icon_empty.png
new file mode 100644
index 0000000000..f20e9586b1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/meta.json
index db0ac608ed..20e933bb57 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/aloe.rsi/meta.json
@@ -1 +1,31 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/fill-1.png
new file mode 100644
index 0000000000..19ce029546
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/fill-2.png
new file mode 100644
index 0000000000..7758d5eb78
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/fill-3.png
new file mode 100644
index 0000000000..663f827edb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/fill-4.png
new file mode 100644
index 0000000000..090682c7f0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/fill-5.png
new file mode 100644
index 0000000000..7a13261994
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/icon.png
index 76a3c0f2f4..c76686c364 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..bc4f12f919
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/meta.json
index db0ac608ed..e5994967cd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/amasecglass.rsi/meta.json
@@ -1 +1,34 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/fill-1.png
new file mode 100644
index 0000000000..6fa77bfb02
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/fill-2.png
new file mode 100644
index 0000000000..0707b540e1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/fill-3.png
new file mode 100644
index 0000000000..e61ac5f8fd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/fill-4.png
new file mode 100644
index 0000000000..9e035fd0e5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/icon_empty.png
new file mode 100644
index 0000000000..5511443b6d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/meta.json
index db0ac608ed..20e933bb57 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/andalusia.rsi/meta.json
@@ -1 +1,31 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/fill-1.png
new file mode 100644
index 0000000000..8dab458e71
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/fill-2.png
new file mode 100644
index 0000000000..87240ead68
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/fill-3.png
new file mode 100644
index 0000000000..6f7eb50dac
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/fill-4.png
new file mode 100644
index 0000000000..624036e452
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/fill-5.png
new file mode 100644
index 0000000000..3dac71e43f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/icon_empty.png
new file mode 100644
index 0000000000..436bd2abb0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/meta.json
index db0ac608ed..e5994967cd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/antifreeze.rsi/meta.json
@@ -1 +1,34 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/fill-1.png
new file mode 100644
index 0000000000..b3a5677a16
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/fill-2.png
new file mode 100644
index 0000000000..e4f5889f2a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/fill-3.png
new file mode 100644
index 0000000000..bb9b21e56f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/fill-4.png
new file mode 100644
index 0000000000..52d0ad6e88
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/fill-5.png
new file mode 100644
index 0000000000..502b9bb3a9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/icon.png
index d33e7ed1cd..e2547dfa3a 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..fea4b334eb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/meta.json
index 293f7f97b0..313b8de737 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/atomicbombglass.rsi/meta.json
@@ -1 +1,52 @@
-{"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", "delays": [[1.0, 1.0, 1.0, 1.0]]}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon",
+            "delays":
+            [
+                [
+                    5.0,
+                    0.25,
+                    0.5,
+                    0.25
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty",
+            "delays":
+            [
+                [
+                    5.0,
+                    0.25,
+                    0.5,
+                    0.25
+                ]
+            ]
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/b&p.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/b&p.rsi/fill-1.png
new file mode 100644
index 0000000000..802bd1edec
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/b&p.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/b&p.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/b&p.rsi/fill-2.png
new file mode 100644
index 0000000000..61344424d1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/b&p.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/b&p.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/b&p.rsi/fill-3.png
new file mode 100644
index 0000000000..17b0b1cc40
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/b&p.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/b&p.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/b&p.rsi/icon_empty.png
new file mode 100644
index 0000000000..82c3927fd7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/b&p.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/b&p.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/b&p.rsi/meta.json
index db0ac608ed..e6dfe397c6 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/b&p.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/b&p.rsi/meta.json
@@ -1 +1,28 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/fill-1.png
new file mode 100644
index 0000000000..ed8c6a9973
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/fill-2.png
new file mode 100644
index 0000000000..1a29c644c0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/fill-3.png
new file mode 100644
index 0000000000..a59b686244
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/fill-4.png
new file mode 100644
index 0000000000..723e682b2a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/icon_empty.png
new file mode 100644
index 0000000000..d6e9f4d508
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/meta.json
index db0ac608ed..20e933bb57 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/b52glass.rsi/meta.json
@@ -1 +1,31 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/fill-1.png
new file mode 100644
index 0000000000..5dd0f96ee5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/fill-2.png
new file mode 100644
index 0000000000..3c7fa2dc0c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/fill-3.png
new file mode 100644
index 0000000000..834157b59b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/fill-4.png
new file mode 100644
index 0000000000..48544cbf2d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/fill-5.png
new file mode 100644
index 0000000000..7af7ca3a14
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/icon.png
index d9f6cbab1f..e012acaf46 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/icon_empty.png
new file mode 100644
index 0000000000..ab544636f1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/meta.json
index db0ac608ed..e5994967cd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/bahama_mama.rsi/meta.json
@@ -1 +1,34 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/fill-1.png
new file mode 100644
index 0000000000..7306cf5f72
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/fill-2.png
new file mode 100644
index 0000000000..c8038682f1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/fill-3.png
new file mode 100644
index 0000000000..518fc4d43c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/fill-4.png
new file mode 100644
index 0000000000..4120ab02d9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/fill-5.png
new file mode 100644
index 0000000000..b96a71fa1f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/icon.png
index 6b8208fdef..30195bc95d 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..85b48611db
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/meta.json
index db0ac608ed..e5994967cd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/bananahonkglass.rsi/meta.json
@@ -1 +1,34 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/fill-1.png
new file mode 100644
index 0000000000..538e6c753b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/fill-2.png
new file mode 100644
index 0000000000..ac143e9b03
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/fill-3.png
new file mode 100644
index 0000000000..1cc41ab17e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/fill-4.png
new file mode 100644
index 0000000000..eac0156c72
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..162e1966c9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/meta.json
index ab72fd54f3..4ebb09f71c 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/beepskysmashglass.rsi/meta.json
@@ -1 +1,76 @@
-{"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", "delays": [[2.0, 2.0, 2.0, 2.0]]}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states":
+    [
+        {
+            "name": "icon",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "fill-2",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "fill-3",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "fill-4",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/fill-1.png
new file mode 100644
index 0000000000..8527cabc7f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/fill-2.png
new file mode 100644
index 0000000000..e8aa0cf8e5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/fill-3.png
new file mode 100644
index 0000000000..7367ae9773
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/fill-4.png
new file mode 100644
index 0000000000..b72856ff9b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/fill-5.png
new file mode 100644
index 0000000000..efd700217e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/fill-6.png
new file mode 100644
index 0000000000..fea6de1b7a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/fill-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/icon.png
index 88c6954ecf..5986b75c6e 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..e497dbf309
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/meta.json
index db0ac608ed..7c9a567e5b 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/beerglass.rsi/meta.json
@@ -1 +1,37 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/fill-1.png
new file mode 100644
index 0000000000..6cf878dc6b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/fill-2.png
new file mode 100644
index 0000000000..d94f356a4a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/fill-3.png
new file mode 100644
index 0000000000..3c480f7238
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/fill-4.png
new file mode 100644
index 0000000000..186c3ddf16
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/fill-5.png
new file mode 100644
index 0000000000..f85e6d0b16
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/icon_empty.png
new file mode 100644
index 0000000000..c9b4578b15
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/meta.json
new file mode 100644
index 0000000000..1e34ff75f8
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/beerstein.rsi/meta.json
@@ -0,0 +1,31 @@
+{
+    "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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/fill-1.png
new file mode 100644
index 0000000000..193a762c22
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/fill-2.png
new file mode 100644
index 0000000000..c3b1b9b9c8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/fill-3.png
new file mode 100644
index 0000000000..74e278183c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/fill-4.png
new file mode 100644
index 0000000000..8900682436
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/fill-5.png
new file mode 100644
index 0000000000..8b5b1bb4f9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/icon_empty.png
new file mode 100644
index 0000000000..94d0c7f0cc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/meta.json
index db0ac608ed..e5994967cd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/berryjuice.rsi/meta.json
@@ -1 +1,34 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/fill-1.png
new file mode 100644
index 0000000000..c6604ec38d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/fill-2.png
new file mode 100644
index 0000000000..663f3dd99f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/fill-3.png
new file mode 100644
index 0000000000..229fb15cd4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/fill-4.png
new file mode 100644
index 0000000000..22b1516c21
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..fa0c059701
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/meta.json
index db0ac608ed..20e933bb57 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/blackrussianglass.rsi/meta.json
@@ -1 +1,31 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/fill-1.png
new file mode 100644
index 0000000000..8c010ef016
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/fill-2.png
new file mode 100644
index 0000000000..23cc80d3dc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/fill-3.png
new file mode 100644
index 0000000000..2671dace63
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/fill-4.png
new file mode 100644
index 0000000000..cfb027ba36
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/fill-5.png
new file mode 100644
index 0000000000..0589a23cb1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..9d1e9f25e6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/meta.json
index a347d37fc3..fa6a3d15a5 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/bloodglass.rsi/meta.json
@@ -1 +1,34 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Drawn by Ubaser", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Drawn by Ubaser. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/fill-1.png
new file mode 100644
index 0000000000..53a6dd629e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/fill-2.png
new file mode 100644
index 0000000000..50a40e4b12
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/fill-3.png
new file mode 100644
index 0000000000..3b3bb18640
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/fill-4.png
new file mode 100644
index 0000000000..b19fe96d35
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/fill-5.png
new file mode 100644
index 0000000000..3df1351dfa
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/icon.png
index d9902e2e9a..0ae2e7260c 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..d33d35fc48
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/meta.json
index db0ac608ed..e5994967cd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/bloodymaryglass.rsi/meta.json
@@ -1 +1,34 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/fill-1.png
new file mode 100644
index 0000000000..40a0bd7c12
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/fill-2.png
new file mode 100644
index 0000000000..71ac77edfe
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/fill-3.png
new file mode 100644
index 0000000000..a6d943d334
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/fill-4.png
new file mode 100644
index 0000000000..8b36751478
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/fill-5.png
new file mode 100644
index 0000000000..8c05c87395
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/icon.png
index 76d9308411..48e33ed065 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/icon_empty.png
new file mode 100644
index 0000000000..94d0c7f0cc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/meta.json
index db0ac608ed..e5994967cd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/booger.rsi/meta.json
@@ -1 +1,34 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/fill-1.png
new file mode 100644
index 0000000000..0581e8788c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/fill-2.png
new file mode 100644
index 0000000000..229d42933f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/fill-3.png
new file mode 100644
index 0000000000..938a4758e4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/fill-4.png
new file mode 100644
index 0000000000..afc514bc5c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/icon.png
index 292f8e217c..b80ae30bfa 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..c850b5ff8f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/meta.json
index db0ac608ed..20e933bb57 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/bravebullglass.rsi/meta.json
@@ -1 +1,31 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/fill-1.png
new file mode 100644
index 0000000000..3de8cd77b3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon_empty.png
new file mode 100644
index 0000000000..a5564b5976
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json
index db0ac608ed..c92d6f1b0e 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.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,
+    "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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/fill-1.png
new file mode 100644
index 0000000000..b19cfabb9e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/fill-2.png
new file mode 100644
index 0000000000..87f13b3853
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/fill-3.png
new file mode 100644
index 0000000000..5a4beb4692
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/fill-4.png
new file mode 100644
index 0000000000..1cfd770c83
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..23f8d75b46
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/meta.json
index 92fe4990f1..120c22db14 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/champagneglass.rsi/meta.json
@@ -1 +1,76 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "drawn by verslebas", "states": [{"name": "icon", "delays": [[1.0, 1.0, 1.0, 1.0]]}]}
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "drawn by verslebas. Fills levels by Tayrtahn.",
+    "states":
+    [
+        {
+            "name": "icon",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-2",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-3",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-4",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/fill-1.png
new file mode 100644
index 0000000000..7fb324bb7f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/fill-2.png
new file mode 100644
index 0000000000..97f2707a4d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/fill-3.png
new file mode 100644
index 0000000000..c2ce7e2435
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..d62d709416
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/meta.json
index db0ac608ed..e6dfe397c6 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurglass.rsi/meta.json
@@ -1 +1,28 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cogchamp.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/cogchamp.rsi/fill-1.png
new file mode 100644
index 0000000000..47f0e5944f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cogchamp.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cogchamp.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/cogchamp.rsi/fill-2.png
new file mode 100644
index 0000000000..bae3441621
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cogchamp.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cogchamp.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/cogchamp.rsi/fill-3.png
new file mode 100644
index 0000000000..99ec4a6884
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cogchamp.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cogchamp.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/cogchamp.rsi/icon_empty.png
new file mode 100644
index 0000000000..20582bc2c6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cogchamp.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cogchamp.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cogchamp.rsi/meta.json
index dce4fff86e..65c83c05e2 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/cogchamp.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/cogchamp.rsi/meta.json
@@ -5,7 +5,7 @@
     "y": 32
   },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by keronshb for Citadel Station at: https://github.com/Citadel-Station-13/Citadel-Station-13/commit/c790478a3d6e8a2846e658c3dc6c5164737e4b42",
+    "copyright": "Made by keronshb for Citadel Station at: https://github.com/Citadel-Station-13/Citadel-Station-13/commit/c790478a3d6e8a2846e658c3dc6c5164737e4b42. Fill levels by Tayrtahn on GitHub.",
   "states": [
     {
       "name": "icon",
@@ -17,6 +17,42 @@
           0.3
         ]
       ]
+    },
+    {
+        "name": "icon_empty"
+    },
+    {
+        "name": "fill-1",
+        "delays": [
+          [
+            0.6,
+            0.3,
+            0.3,
+            0.3
+          ]
+        ]
+    },
+    {
+        "name": "fill-2",
+        "delays": [
+          [
+            0.6,
+            0.3,
+            0.3,
+            0.3
+          ]
+        ]
+    },
+    {
+        "name": "fill-3",
+        "delays": [
+          [
+            0.6,
+            0.3,
+            0.3,
+            0.3
+          ]
+        ]
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/fill-1.png
new file mode 100644
index 0000000000..5bef1772bb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/fill-2.png
new file mode 100644
index 0000000000..6385749119
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/fill-3.png
new file mode 100644
index 0000000000..cdc3ea38d8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/fill-4.png
new file mode 100644
index 0000000000..58c3053cf5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..d9f6d8cc02
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/meta.json
index db0ac608ed..20e933bb57 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/cognacglass.rsi/meta.json
@@ -1 +1,31 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/fill-1.png
new file mode 100644
index 0000000000..92a74f3499
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/fill-2.png
new file mode 100644
index 0000000000..9f654ad898
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/fill-3.png
new file mode 100644
index 0000000000..dcac421d10
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/fill-4.png
new file mode 100644
index 0000000000..b34b1c29bd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/fill-5.png
new file mode 100644
index 0000000000..e19512f843
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/icon.png
index 6512228e0d..77ea2ac9fd 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..ca4e5b459a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/meta.json
index db0ac608ed..e5994967cd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/cubalibreglass.rsi/meta.json
@@ -1 +1,34 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/fill-1.png
new file mode 100644
index 0000000000..73dd2f68e3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/fill-2.png
new file mode 100644
index 0000000000..0aaccbffea
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/fill-3.png
new file mode 100644
index 0000000000..61eea03501
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/fill-4.png
new file mode 100644
index 0000000000..02dea6ea30
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/icon_empty.png
new file mode 100644
index 0000000000..1e7eba2896
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/meta.json
index b964b0f4a1..62aaba849d 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/demonsblood.rsi/meta.json
@@ -1 +1,86 @@
-{"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", "delays": [[1.0, 1.0, 1.0, 1.0, 1.0, 1.0]]}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states":
+    [
+        {
+            "name": "icon",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "fill-2",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "fill-3",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "fill-4",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/devilskiss.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/devilskiss.rsi/fill-1.png
new file mode 100644
index 0000000000..188cee2333
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/devilskiss.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/devilskiss.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/devilskiss.rsi/fill-2.png
new file mode 100644
index 0000000000..6cb9d8f421
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/devilskiss.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/devilskiss.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/devilskiss.rsi/fill-3.png
new file mode 100644
index 0000000000..b13a185f3f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/devilskiss.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/devilskiss.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/devilskiss.rsi/icon_empty.png
new file mode 100644
index 0000000000..7503230a6c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/devilskiss.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/devilskiss.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/devilskiss.rsi/meta.json
index db0ac608ed..e6dfe397c6 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/devilskiss.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/devilskiss.rsi/meta.json
@@ -1 +1,28 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/fill-1.png
new file mode 100644
index 0000000000..08c3a2abc5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/fill-2.png
new file mode 100644
index 0000000000..96d9f35dc4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/fill-3.png
new file mode 100644
index 0000000000..5b0fafbaba
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/fill-4.png
new file mode 100644
index 0000000000..48c5b70045
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/fill-5.png
new file mode 100644
index 0000000000..cf0f13dddb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/icon.png
index 7c062a2b53..40d6cfed48 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..14a1726f3d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/meta.json
index edd3d67bfd..795345507a 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/doctorsdelightglass.rsi/meta.json
@@ -1 +1,148 @@
-{"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", "delays": [[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]]}]}
\ 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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "fill-2",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "fill-3",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "fill-4",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "fill-5",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/driestmartiniglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/driestmartiniglass.rsi/fill-1.png
new file mode 100644
index 0000000000..b14e4c0381
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/driestmartiniglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/driestmartiniglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/driestmartiniglass.rsi/fill-2.png
new file mode 100644
index 0000000000..bfc5aa06eb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/driestmartiniglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/driestmartiniglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/driestmartiniglass.rsi/fill-3.png
new file mode 100644
index 0000000000..a311482943
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/driestmartiniglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/driestmartiniglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/driestmartiniglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..fbbc5cd71e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/driestmartiniglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/driestmartiniglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/driestmartiniglass.rsi/meta.json
index db0ac608ed..e6dfe397c6 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/driestmartiniglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/driestmartiniglass.rsi/meta.json
@@ -1 +1,28 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/fill-1.png
new file mode 100644
index 0000000000..314be540d5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/fill-2.png
new file mode 100644
index 0000000000..10d82fe1e6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/fill-3.png
new file mode 100644
index 0000000000..a2b9a37e95
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/fill-4.png
new file mode 100644
index 0000000000..43af40f1c4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/fill-5.png
new file mode 100644
index 0000000000..d5a4a2f877
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..3312753e31
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/meta.json
index 2eee22e743..99b09edda4 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/gargleblasterglass.rsi/meta.json
@@ -1 +1,82 @@
-{"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", "delays": [[2.0, 2.0, 2.0]]}]}
\ 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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon",
+            "delays":
+            [
+                [
+                    2.0,
+                    2.0,
+                    2.0
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1",
+            "delays":
+            [
+                [
+                    2.0,
+                    2.0,
+                    2.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-2",
+            "delays":
+            [
+                [
+                    2.0,
+                    2.0,
+                    2.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-3",
+            "delays":
+            [
+                [
+                    2.0,
+                    2.0,
+                    2.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-4",
+            "delays":
+            [
+                [
+                    2.0,
+                    2.0,
+                    2.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-5",
+            "delays":
+            [
+                [
+                    2.0,
+                    2.0,
+                    2.0
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/fill-1.png
new file mode 100644
index 0000000000..f196e22352
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/fill-2.png
new file mode 100644
index 0000000000..5de447a7dd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/fill-3.png
new file mode 100644
index 0000000000..5c6470ee12
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..7503230a6c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/meta.json
index db0ac608ed..e6dfe397c6 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/gildlagerglass.rsi/meta.json
@@ -1 +1,28 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/fill-1.png
new file mode 100644
index 0000000000..2ec9a01b96
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/fill-2.png
new file mode 100644
index 0000000000..a731c6fb84
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/fill-3.png
new file mode 100644
index 0000000000..d2ab566f87
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/fill-4.png
new file mode 100644
index 0000000000..65d4060055
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/fill-5.png
new file mode 100644
index 0000000000..08d8d7c95c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/fill-6.png
new file mode 100644
index 0000000000..4296e52a4f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/fill-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..6695dc7042
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/meta.json
index db0ac608ed..7c9a567e5b 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/ginfizzglass.rsi/meta.json
@@ -1 +1,37 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/fill-1.png
new file mode 100644
index 0000000000..94f510b306
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/fill-2.png
new file mode 100644
index 0000000000..19bb143606
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/fill-3.png
new file mode 100644
index 0000000000..beb5c6302e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/fill-4.png
new file mode 100644
index 0000000000..e45110e8e3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/fill-5.png
new file mode 100644
index 0000000000..5780b4f6ed
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/fill-6.png
new file mode 100644
index 0000000000..7c2f041e5f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/fill-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..44ae8febfc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/meta.json
index db0ac608ed..7c9a567e5b 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/gintonicglass.rsi/meta.json
@@ -1 +1,37 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/fill-1.png
new file mode 100644
index 0000000000..84060d0894
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/fill-2.png
new file mode 100644
index 0000000000..4ade7245dd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/fill-3.png
new file mode 100644
index 0000000000..2300881d64
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/fill-4.png
new file mode 100644
index 0000000000..dd1f92d329
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..77913d8c3a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/meta.json
index db0ac608ed..20e933bb57 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/ginvodkaglass.rsi/meta.json
@@ -1 +1,31 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/fill-1.png
new file mode 100644
index 0000000000..04261d286d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/fill-2.png
new file mode 100644
index 0000000000..b3b3b52774
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/fill-3.png
new file mode 100644
index 0000000000..b39c48c3ea
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/fill-4.png
new file mode 100644
index 0000000000..a5689c051a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/fill-5.png
new file mode 100644
index 0000000000..6d183bf790
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/icon_empty.png
new file mode 100644
index 0000000000..971aa5ea6d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/meta.json
index db0ac608ed..e5994967cd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/glass_green.rsi/meta.json
@@ -1 +1,34 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/fill-1.png
new file mode 100644
index 0000000000..e92830190a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/fill-2.png
new file mode 100644
index 0000000000..bbd0de42ac
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/fill-3.png
new file mode 100644
index 0000000000..b4d461a443
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/icon.png
index 90e51cfe9a..dd1e0cfeb7 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..7fb9180c07
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/meta.json
index db0ac608ed..e6dfe397c6 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/grenadineglass.rsi/meta.json
@@ -1 +1,28 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grogglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/grogglass.rsi/icon.png
index b115304cf2..f9b3133851 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/grogglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/grogglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hell.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/hell.rsi/icon.png
deleted file mode 100644
index f508a1a6db..0000000000
Binary files a/Resources/Textures/Objects/Consumable/Drinks/hell.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hell.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/hell.rsi/meta.json
deleted file mode 100644
index b964b0f4a1..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/hell.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon", "delays": [[1.0, 1.0, 1.0, 1.0, 1.0, 1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/fill-1.png
new file mode 100644
index 0000000000..37a7ac033b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/fill-2.png
new file mode 100644
index 0000000000..ea6e83e4c3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/fill-3.png
new file mode 100644
index 0000000000..70af8fa015
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/fill-4.png
new file mode 100644
index 0000000000..1ecca18346
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/fill-5.png
new file mode 100644
index 0000000000..a47d7bbf90
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/fill-6.png
new file mode 100644
index 0000000000..db940fc01f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/fill-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/icon.png
index 7eb7f6475c..b3fdba85a1 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..1054b9bf74
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/meta.json
index db0ac608ed..7c9a567e5b 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/hippiesdelightglass.rsi/meta.json
@@ -1 +1,37 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-vend.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-vend.png
new file mode 100644
index 0000000000..765112be76
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/icon-vend.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json
index 6dfbe5d8c0..b22da85aa9 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/hot_coco.rsi/meta.json
@@ -20,6 +20,9 @@
         },
 		{
             "name": "icon-4"
+        },
+		{
+            "name": "icon-vend"
         }
 	]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-vend.png b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-vend.png
new file mode 100644
index 0000000000..765112be76
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/icon-vend.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json
index 6dfbe5d8c0..b22da85aa9 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/hot_coffee.rsi/meta.json
@@ -20,6 +20,9 @@
         },
 		{
             "name": "icon-4"
+        },
+		{
+            "name": "icon-vend"
         }
 	]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/fill-1.png
new file mode 100644
index 0000000000..d341c3bb3d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/fill-2.png
new file mode 100644
index 0000000000..57f44950ab
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/fill-3.png
new file mode 100644
index 0000000000..122a2270b2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/fill-4.png
new file mode 100644
index 0000000000..5033a9f484
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/fill-5.png
new file mode 100644
index 0000000000..8aa701fc76
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..66436a75ad
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/meta.json
index e74c35c87c..e5994967cd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/meta.json
@@ -1 +1,34 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "edited version of 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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/fill-1.png
new file mode 100644
index 0000000000..b1e3042d30
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/fill-2.png
new file mode 100644
index 0000000000..0889195b2d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/fill-3.png
new file mode 100644
index 0000000000..cf630b2129
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/fill-4.png
new file mode 100644
index 0000000000..bd7afdf6be
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/fill-5.png
new file mode 100644
index 0000000000..9e375699a0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/fill-6.png
new file mode 100644
index 0000000000..0141d47593
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/fill-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..2bc247c4e3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/meta.json
index db0ac608ed..7c9a567e5b 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/iced_beerglass.rsi/meta.json
@@ -1 +1,37 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/fill-1.png
new file mode 100644
index 0000000000..af854ad315
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/fill-2.png
new file mode 100644
index 0000000000..4423cf4dfa
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/fill-3.png
new file mode 100644
index 0000000000..b4bfce0b51
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/fill-4.png
new file mode 100644
index 0000000000..6c053a3f9f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/fill-5.png
new file mode 100644
index 0000000000..13fff03228
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..faf3ba7351
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/meta.json
index db0ac608ed..e5994967cd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/icedcoffeeglass.rsi/meta.json
@@ -1 +1,34 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/fill-1.png
new file mode 100644
index 0000000000..35d7be23ca
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/fill-2.png
new file mode 100644
index 0000000000..c027ff91f7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/fill-3.png
new file mode 100644
index 0000000000..87d6f62c61
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/fill-4.png
new file mode 100644
index 0000000000..bee37caa66
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/fill-5.png
new file mode 100644
index 0000000000..806d75f224
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/fill-6.png
new file mode 100644
index 0000000000..6bce31cc4c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/fill-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..a19f06f431
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/meta.json
index db0ac608ed..7c9a567e5b 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/icedteaglass.rsi/meta.json
@@ -1 +1,37 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-1.png
new file mode 100644
index 0000000000..c935ce3f81
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-2.png
new file mode 100644
index 0000000000..cfb90bd961
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-3.png
new file mode 100644
index 0000000000..57894dffee
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-4.png
new file mode 100644
index 0000000000..ad95a2c4a6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-5.png
new file mode 100644
index 0000000000..fa0df88bbe
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-6.png
new file mode 100644
index 0000000000..9c056ec2ed
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/fill-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/icon.png
index 88beac108f..2e243327e5 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/icon_empty.png
new file mode 100644
index 0000000000..3ee71be166
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/meta.json
index db0ac608ed..7c9a567e5b 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/irishcarbomb.rsi/meta.json
@@ -1 +1,37 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/fill-1.png
new file mode 100644
index 0000000000..64a889fd7b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/fill-2.png
new file mode 100644
index 0000000000..d53726eab6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/fill-3.png
new file mode 100644
index 0000000000..8954be5be0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/icon.png
index 2cc26ac945..6a4726b940 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..70db63e9e0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/meta.json
index db0ac608ed..e6dfe397c6 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/irishcoffeeglass.rsi/meta.json
@@ -1 +1,28 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/fill-1.png
new file mode 100644
index 0000000000..ab4dc73ee4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/fill-2.png
new file mode 100644
index 0000000000..b3a8dde2cf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/fill-3.png
new file mode 100644
index 0000000000..bd06c47b90
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/fill-4.png
new file mode 100644
index 0000000000..39f9fc962e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/icon.png
index c5f37f5eaa..43aa763b41 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..77913d8c3a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/meta.json
index db0ac608ed..20e933bb57 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/irishcreamglass.rsi/meta.json
@@ -1 +1,31 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-1.png
new file mode 100644
index 0000000000..8a63784609
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-2.png
new file mode 100644
index 0000000000..69a46ba8b4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-3.png
new file mode 100644
index 0000000000..0f7b8941fd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/icon_empty.png
new file mode 100644
index 0000000000..a40ab426cd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/meta.json
index 293f7f97b0..f77e08db52 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/kiraspecial.rsi/meta.json
@@ -1 +1,64 @@
-{"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", "delays": [[1.0, 1.0, 1.0, 1.0]]}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-2",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-3",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/fill-1.png
new file mode 100644
index 0000000000..860a6bbd90
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/fill-2.png
new file mode 100644
index 0000000000..f59913c752
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/fill-3.png
new file mode 100644
index 0000000000..752cb1cb79
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/fill-4.png
new file mode 100644
index 0000000000..fbca858fc6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/fill-5.png
new file mode 100644
index 0000000000..da676a61c9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/fill-6.png
new file mode 100644
index 0000000000..273a16384e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/fill-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..5f5aa0ab83
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/meta.json
index db0ac608ed..7c9a567e5b 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/lemonadeglass.rsi/meta.json
@@ -1 +1,37 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/fill-1.png
new file mode 100644
index 0000000000..4ccc8ec0df
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/fill-2.png
new file mode 100644
index 0000000000..43f25b554c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/fill-3.png
new file mode 100644
index 0000000000..56384042fa
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/fill-4.png
new file mode 100644
index 0000000000..665a8093d1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/fill-5.png
new file mode 100644
index 0000000000..e6ec48ce2f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/fill-6.png
new file mode 100644
index 0000000000..7486697ed1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/fill-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..07da591251
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/meta.json
index db0ac608ed..7c9a567e5b 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/longislandicedteaglass.rsi/meta.json
@@ -1 +1,37 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/manhattanglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/manhattanglass.rsi/fill-1.png
new file mode 100644
index 0000000000..01e568e5a2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/manhattanglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/manhattanglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/manhattanglass.rsi/fill-2.png
new file mode 100644
index 0000000000..d08c6c5eb8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/manhattanglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/manhattanglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/manhattanglass.rsi/fill-3.png
new file mode 100644
index 0000000000..4c8f0eaeea
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/manhattanglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/manhattanglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/manhattanglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..d7f03fed72
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/manhattanglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/manhattanglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/manhattanglass.rsi/meta.json
index db0ac608ed..e6dfe397c6 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/manhattanglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/manhattanglass.rsi/meta.json
@@ -1 +1,28 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/fill-1.png
new file mode 100644
index 0000000000..8fb2ba391b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/fill-2.png
new file mode 100644
index 0000000000..b246adf22c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..a016badf86
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/meta.json
index 50423f6144..024560f8ad 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/manlydorfglass.rsi/meta.json
@@ -5,10 +5,19 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Based on manly dorf from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Edited by deltanedas (github) to look like an oily oaf",
+  "copyright": "Based on manly dorf from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Edited by deltanedas (github) to look like an oily oaf. Fill levels by Tayrtahn (GitHub)",
   "states": [
     {
       "name": "icon"
+    },
+    {
+      "name": "icon_empty"
+    },
+    {
+      "name": "fill-1"
+    },
+    {
+      "name": "fill-2"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/fill-1.png
new file mode 100644
index 0000000000..0ffbdfcdde
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/fill-2.png
new file mode 100644
index 0000000000..9ae1beaae0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/fill-3.png
new file mode 100644
index 0000000000..83ece4a247
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/fill-4.png
new file mode 100644
index 0000000000..bf3436f388
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/icon.png
index c945794a90..881372ed9f 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..aa06465c96
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/meta.json
index db0ac608ed..20e933bb57 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/margaritaglass.rsi/meta.json
@@ -1 +1,31 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/martiniglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/martiniglass.rsi/fill-1.png
new file mode 100644
index 0000000000..06232adc7f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/martiniglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/martiniglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/martiniglass.rsi/fill-2.png
new file mode 100644
index 0000000000..f3e88aa715
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/martiniglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/martiniglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/martiniglass.rsi/fill-3.png
new file mode 100644
index 0000000000..a94163053a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/martiniglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/martiniglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/martiniglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..fbbc5cd71e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/martiniglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/martiniglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/martiniglass.rsi/meta.json
index db0ac608ed..e6dfe397c6 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/martiniglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/martiniglass.rsi/meta.json
@@ -1 +1,28 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/meadglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/meadglass.rsi/icon.png
index 363a376384..03c5531f1b 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/meadglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/meadglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/fill-1.png
new file mode 100644
index 0000000000..47035a1d33
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/fill-2.png
new file mode 100644
index 0000000000..f1cb1d796b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/fill-3.png
new file mode 100644
index 0000000000..588ef197b8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/fill-4.png
new file mode 100644
index 0000000000..7be09eed64
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/fill-5.png
new file mode 100644
index 0000000000..7151203ede
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/fill-6.png
new file mode 100644
index 0000000000..0d29718166
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/fill-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/icon_empty.png
new file mode 100644
index 0000000000..8705f35cd0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/meta.json
index db0ac608ed..7c9a567e5b 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mojito.rsi/meta.json
@@ -1 +1,37 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/fill-1.png
new file mode 100644
index 0000000000..c4c1e1d7db
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/fill-2.png
new file mode 100644
index 0000000000..884724260d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/fill-3.png
new file mode 100644
index 0000000000..4d17986a6b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/fill-4.png
new file mode 100644
index 0000000000..a9df1ab573
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/fill-5.png
new file mode 100644
index 0000000000..6006ddb95f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/icon.png
index f75f46f5e3..6b07563dc0 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..6e8ddd689d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/meta.json
index 74149ebb7c..a3d6cc725c 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/neurotoxinglass.rsi/meta.json
@@ -1 +1,100 @@
-{"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", "delays": [[30.0, 3.0, 1.0, 1.0, 1.0, 1.0]]}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon",
+            "delays":
+            [
+                [
+                    30.0,
+                    3.0,
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1",
+            "delays":
+            [
+                [
+                    30.0,
+                    3.0,
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-2",
+            "delays":
+            [
+                [
+                    30.0,
+                    3.0,
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-3",
+            "delays":
+            [
+                [
+                    30.0,
+                    3.0,
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-4",
+            "delays":
+            [
+                [
+                    30.0,
+                    3.0,
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-5",
+            "delays":
+            [
+                [
+                    30.0,
+                    3.0,
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/fill-1.png
new file mode 100644
index 0000000000..c7634de5e0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/fill-2.png
new file mode 100644
index 0000000000..022c3d7912
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/fill-3.png
new file mode 100644
index 0000000000..b6a444c70a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/fill-4.png
new file mode 100644
index 0000000000..06d69b8a16
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/fill-5.png
new file mode 100644
index 0000000000..033cf57e88
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..9b01e7b3ea
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/meta.json
index 293f7f97b0..effa9fbb06 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/nuclear_colaglass.rsi/meta.json
@@ -1 +1,52 @@
-{"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", "delays": [[1.0, 1.0, 1.0, 1.0]]}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi",
+    "states":
+    [
+        {
+            "name": "icon",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/patronglass.rsi/fill-1.png
new file mode 100644
index 0000000000..acf9f17974
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/patronglass.rsi/fill-2.png
new file mode 100644
index 0000000000..526e59c3b6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/patronglass.rsi/fill-3.png
new file mode 100644
index 0000000000..07bd57803d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/patronglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..7503230a6c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/patronglass.rsi/meta.json
index db0ac608ed..e6dfe397c6 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/patronglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/patronglass.rsi/meta.json
@@ -1 +1,28 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/fill-1.png
new file mode 100644
index 0000000000..01e568e5a2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/fill-2.png
new file mode 100644
index 0000000000..d08c6c5eb8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/fill-3.png
new file mode 100644
index 0000000000..4c8f0eaeea
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/icon.png
index 5752f9452d..3433e06d9d 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..0e6510c977
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/meta.json
index 293f7f97b0..535056c4fd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/proj_manhattanglass.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", "delays": [[1.0, 1.0, 1.0, 1.0]]}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon",
+            "delays":
+            [
+                [
+                    5.0,
+                    0.25,
+                    0.5,
+                    0.25
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty",
+            "delays":
+            [
+                [
+                    5.0,
+                    0.25,
+                    0.5,
+                    0.25
+                ]
+            ]
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/fill-1.png
new file mode 100644
index 0000000000..3ba47a603b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/fill-2.png
new file mode 100644
index 0000000000..5273c561bb
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/fill-3.png
new file mode 100644
index 0000000000..b4b494c47e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/fill-4.png
new file mode 100644
index 0000000000..3d305e9d62
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/fill-5.png
new file mode 100644
index 0000000000..2105ad51cf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..dd519000ba
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/meta.json
index 3d341b0a80..1f560c3344 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/pwineglass.rsi/meta.json
@@ -1 +1,130 @@
-{"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", "delays": [[150.0, 3.0, 3.0, 3.0, 3.0, 3.0, 2.0, 2.0, 2.0, 2.0, 2.0]]}]}
\ 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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon",
+            "delays":
+            [
+                [
+                    5.0,
+                    3.0,
+                    3.0,
+                    3.0,
+                    3.0,
+                    3.0,
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1",
+            "delays":
+            [
+                [
+                    5.0,
+                    3.0,
+                    3.0,
+                    3.0,
+                    3.0,
+                    3.0,
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-2",
+            "delays":
+            [
+                [
+                    5.0,
+                    3.0,
+                    3.0,
+                    3.0,
+                    3.0,
+                    3.0,
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-3",
+            "delays":
+            [
+                [
+                    5.0,
+                    3.0,
+                    3.0,
+                    3.0,
+                    3.0,
+                    3.0,
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-4",
+            "delays":
+            [
+                [
+                    5.0,
+                    3.0,
+                    3.0,
+                    3.0,
+                    3.0,
+                    3.0,
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-5",
+            "delays":
+            [
+                [
+                    5.0,
+                    3.0,
+                    3.0,
+                    3.0,
+                    3.0,
+                    3.0,
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-1.png
new file mode 100644
index 0000000000..5a2552c25c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-2.png
new file mode 100644
index 0000000000..f7db33db79
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-3.png
new file mode 100644
index 0000000000..9c3de34b85
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-4.png
new file mode 100644
index 0000000000..de372bb2b2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-5.png
new file mode 100644
index 0000000000..7fb00389a8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-6.png
new file mode 100644
index 0000000000..8a33335673
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-7.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-7.png
new file mode 100644
index 0000000000..e194d71184
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/fill-7.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..8e85423113
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/meta.json
index 48aca722d6..6265aadb38 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/meta.json
@@ -1 +1,40 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "(Edited by jrjr3000) 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": "(Edited by jrjr3000) https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        },
+        {
+            "name": "fill-7"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/fill-1.png
new file mode 100644
index 0000000000..c590ae80b2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/fill-2.png
new file mode 100644
index 0000000000..819b886917
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/fill-3.png
new file mode 100644
index 0000000000..51f020985a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/fill-4.png
new file mode 100644
index 0000000000..c12d6c074d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/fill-5.png
new file mode 100644
index 0000000000..abe3470a09
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/fill-6.png
new file mode 100644
index 0000000000..8cad60fbb4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/fill-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..8e85423113
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/meta.json
index 48aca722d6..5bd9aaa5e9 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/meta.json
@@ -1 +1,37 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "(Edited by jrjr3000) 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": "(Edited by jrjr3000) https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/fill-1.png
new file mode 100644
index 0000000000..cf5d6a5e10
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/fill-2.png
new file mode 100644
index 0000000000..66d672ed5d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/fill-3.png
new file mode 100644
index 0000000000..218a14cd25
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/fill-4.png
new file mode 100644
index 0000000000..95328ceb52
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..77913d8c3a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/meta.json
index db0ac608ed..20e933bb57 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/rumglass.rsi/meta.json
@@ -1 +1,31 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/fill-1.png
new file mode 100644
index 0000000000..51a4c18abd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/fill-2.png
new file mode 100644
index 0000000000..3467ecbe13
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/fill-3.png
new file mode 100644
index 0000000000..b74c3d35bd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/fill-4.png
new file mode 100644
index 0000000000..e337a74ac9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/fill-5.png
new file mode 100644
index 0000000000..9bd6224ae1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..5cf1d74d58
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/meta.json
index db0ac608ed..e5994967cd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/sbitenglass.rsi/meta.json
@@ -1 +1,34 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/fill-1.png
new file mode 100644
index 0000000000..258e008ba8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/fill-2.png
new file mode 100644
index 0000000000..d3c254c651
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/fill-3.png
new file mode 100644
index 0000000000..1c5bba9028
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/fill-4.png
new file mode 100644
index 0000000000..770a78406b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/fill-5.png
new file mode 100644
index 0000000000..d07ae03149
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/fill-6.png
new file mode 100644
index 0000000000..471286049e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/fill-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/icon.png
index b07164cdab..f801c76db1 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..4151831b11
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/meta.json
index db0ac608ed..7c9a567e5b 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/screwdriverglass.rsi/meta.json
@@ -1 +1,37 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/fill-1.png
new file mode 100644
index 0000000000..a1edde7065
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/fill-2.png
new file mode 100644
index 0000000000..00023b703a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/fill-3.png
new file mode 100644
index 0000000000..af1d3d8a27
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/fill-4.png
new file mode 100644
index 0000000000..0702e63e9f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/fill-5.png
new file mode 100644
index 0000000000..66aa833901
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..8bd5bfab95
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/meta.json
index db0ac608ed..e5994967cd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/sdreamglass.rsi/meta.json
@@ -1 +1,34 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/fill-1.png
new file mode 100644
index 0000000000..9c2288bf76
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/fill-2.png
new file mode 100644
index 0000000000..f3a2cceb10
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/fill-3.png
new file mode 100644
index 0000000000..a226426aca
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/fill-4.png
new file mode 100644
index 0000000000..18aceb3baf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/fill-5.png
new file mode 100644
index 0000000000..b962c3052b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/fill-6.png
new file mode 100644
index 0000000000..db9ea091c7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/fill-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/icon.png
index eafd86ad71..092b0f257e 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..8981a908bd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/meta.json
index db0ac608ed..7c9a567e5b 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/silencerglass.rsi/meta.json
@@ -1 +1,37 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/fill-1.png
new file mode 100644
index 0000000000..a93860e40e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/fill-2.png
new file mode 100644
index 0000000000..6c434cd356
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/fill-3.png
new file mode 100644
index 0000000000..e11ca95df5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/fill-4.png
new file mode 100644
index 0000000000..8ff46fcff6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/fill-5.png
new file mode 100644
index 0000000000..0b4540b998
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/icon_empty.png
new file mode 100644
index 0000000000..3b4ac0187b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/meta.json
index 7184a2766a..a51ae6c054 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/singulo.rsi/meta.json
@@ -1 +1,136 @@
-{"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", "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]]}]}
\ 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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon",
+            "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
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1",
+            "delays":
+            [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "fill-2",
+            "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
+                ]
+            ]
+        },
+        {
+            "name": "fill-3",
+            "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
+                ]
+            ]
+        },
+        {
+            "name": "fill-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
+                ]
+            ]
+        },
+        {
+            "name": "fill-5",
+            "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
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/fill-1.png
new file mode 100644
index 0000000000..5c8b97eb9e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/fill-2.png
new file mode 100644
index 0000000000..14c828ba18
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/fill-3.png
new file mode 100644
index 0000000000..36af253d38
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/fill-4.png
new file mode 100644
index 0000000000..521517129e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/fill-5.png
new file mode 100644
index 0000000000..702e3d147b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/fill-6.png
new file mode 100644
index 0000000000..84adbf62e9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/fill-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/icon.png
index 296f0beda4..ed1aa49cfd 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/icon_empty.png
new file mode 100644
index 0000000000..8919218dac
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/meta.json
index db0ac608ed..7c9a567e5b 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/snowwhite.rsi/meta.json
@@ -1 +1,37 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/soy_latte.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/soy_latte.rsi/fill-1.png
new file mode 100644
index 0000000000..d284786965
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/soy_latte.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/soy_latte.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/soy_latte.rsi/icon_empty.png
new file mode 100644
index 0000000000..a5564b5976
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/soy_latte.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/soy_latte.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/soy_latte.rsi/meta.json
index db0ac608ed..c92d6f1b0e 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/soy_latte.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/soy_latte.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,
+    "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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/fill-1.png
new file mode 100644
index 0000000000..bb172d95b8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/fill-2.png
new file mode 100644
index 0000000000..1d098b75b9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/fill-3.png
new file mode 100644
index 0000000000..5af8a4d668
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/fill-4.png
new file mode 100644
index 0000000000..1eb10c3150
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/fill-5.png
new file mode 100644
index 0000000000..82c9a5cd32
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/fill-6.png
new file mode 100644
index 0000000000..006b8debcf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/fill-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/icon_empty.png
new file mode 100644
index 0000000000..8ddc61bf44
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/meta.json
index db0ac608ed..7c9a567e5b 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/syndicatebomb.rsi/meta.json
@@ -1 +1,37 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fill-6"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-vend-green-tea.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-vend-green-tea.png
new file mode 100644
index 0000000000..5c83dd91ad
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-vend-green-tea.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-vend-tea.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-vend-tea.png
new file mode 100644
index 0000000000..771497c229
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/icon-vend-tea.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json
index 6e813512e7..2666be145a 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json
@@ -21,6 +21,12 @@
         },
 		{
             "name": "icon-4"
+        },
+		{
+            "name": "icon-vend-tea"
+        },
+		{
+            "name": "icon-vend-green-tea"
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/fill-1.png
new file mode 100644
index 0000000000..202cfe304c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/fill-2.png
new file mode 100644
index 0000000000..8cb7a51424
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/fill-3.png
new file mode 100644
index 0000000000..b17d5ec6b6
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/fill-4.png
new file mode 100644
index 0000000000..642c08ff68
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..72476b77c0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/meta.json
index db0ac608ed..20e933bb57 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/tequillaglass.rsi/meta.json
@@ -1 +1,31 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/fill-1.png
new file mode 100644
index 0000000000..9a65a45c1e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/fill-2.png
new file mode 100644
index 0000000000..ae00b07258
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/fill-3.png
new file mode 100644
index 0000000000..3c674534ad
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/fill-4.png
new file mode 100644
index 0000000000..713061e662
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/fill-5.png
new file mode 100644
index 0000000000..6f1d960100
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/icon.png
index 403929ba3c..477a8dd67e 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..f0b10087be
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/meta.json
index db0ac608ed..e5994967cd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/tequillasunriseglass.rsi/meta.json
@@ -1 +1,34 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/fill-1.png
new file mode 100644
index 0000000000..9638905866
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/fill-2.png
new file mode 100644
index 0000000000..344991d291
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/fill-3.png
new file mode 100644
index 0000000000..c096ba9fec
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/icon_empty.png
new file mode 100644
index 0000000000..d507d5e1a4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/meta.json
index b1a4d1d275..794df91ad0 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/the_martinez.rsi/meta.json
@@ -1 +1,28 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/commit/93dd3fe8aa166a204ae90c520c273e129b574a21", "states": [{"name": "icon"}]}
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/commit/93dd3fe8aa166a204ae90c520c273e129b574a21. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/fill-1.png
new file mode 100644
index 0000000000..79f573baf7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/fill-2.png
new file mode 100644
index 0000000000..7496d6e625
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/fill-3.png
new file mode 100644
index 0000000000..1fa6f6051f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/fill-4.png
new file mode 100644
index 0000000000..f9b3c6e5a8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/fill-5.png
new file mode 100644
index 0000000000..38fde85e27
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/icon_empty.png
new file mode 100644
index 0000000000..19f1170c75
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/meta.json
new file mode 100644
index 0000000000..1e34ff75f8
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/thin_glass.rsi/meta.json
@@ -0,0 +1,31 @@
+{
+    "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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/threemileislandglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/threemileislandglass.rsi/fill-1.png
new file mode 100644
index 0000000000..f0ea69eec7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/threemileislandglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/threemileislandglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/threemileislandglass.rsi/fill-2.png
new file mode 100644
index 0000000000..76f0ead37b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/threemileislandglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/threemileislandglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/threemileislandglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..61b447a667
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/threemileislandglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/threemileislandglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/threemileislandglass.rsi/meta.json
index 293f7f97b0..eb9e84623d 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/threemileislandglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/threemileislandglass.rsi/meta.json
@@ -1 +1,52 @@
-{"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", "delays": [[1.0, 1.0, 1.0, 1.0]]}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-2",
+            "delays":
+            [
+                [
+                    1.0,
+                    1.0,
+                    1.0,
+                    1.0
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/fill-1.png
new file mode 100644
index 0000000000..e20c2fd468
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/fill-2.png
new file mode 100644
index 0000000000..f7a93f3b87
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/fill-3.png
new file mode 100644
index 0000000000..ad7eca1399
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/fill-4.png
new file mode 100644
index 0000000000..43e4f884c1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..d56f8c8c33
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/meta.json
index 63e49d4dd4..ab24158a61 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/toxinsspecialglass.rsi/meta.json
@@ -1 +1,81 @@
-{"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", "delays": [[2.0, 2.0, 2.0, 2.0, 2.0]]}]}
\ 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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon",
+            "delays":
+            [
+                [
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1",
+            "delays":
+            [
+                [
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-2",
+            "delays":
+            [
+                [
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-3",
+            "delays":
+            [
+                [
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0
+                ]
+            ]
+        },
+        {
+            "name": "fill-4",
+            "delays":
+            [
+                [
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0,
+                    2.0
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/fill-1.png
new file mode 100644
index 0000000000..a63f1b954e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/fill-2.png
new file mode 100644
index 0000000000..b4be0ea7a9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/fill-3.png
new file mode 100644
index 0000000000..46e10b7ee4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/fill-4.png
new file mode 100644
index 0000000000..da847a11fc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..72476b77c0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/meta.json
index db0ac608ed..20e933bb57 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/vermouthglass.rsi/meta.json
@@ -1 +1,31 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/fill-1.png
new file mode 100644
index 0000000000..16541f54cf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/fill-2.png
new file mode 100644
index 0000000000..d78c957119
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/fill-3.png
new file mode 100644
index 0000000000..231579de43
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/fill-4.png
new file mode 100644
index 0000000000..9a6df7c6b5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/icon.png
index 05a5c1dcb1..13e4a7cbd5 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..0a14f9fe31
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/meta.json
index db0ac608ed..20e933bb57 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/whiskeycolaglass.rsi/meta.json
@@ -1 +1,31 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/fill-1.png
new file mode 100644
index 0000000000..1e27c5427c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/fill-2.png
new file mode 100644
index 0000000000..e3ce3f582c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/fill-3.png
new file mode 100644
index 0000000000..3d4f142a2c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/fill-4.png
new file mode 100644
index 0000000000..e7b9291d62
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/icon.png
index e423eeba9f..1988787ae0 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..77913d8c3a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/meta.json
index db0ac608ed..20e933bb57 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/whiskeyglass.rsi/meta.json
@@ -1 +1,31 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/fill-1.png
new file mode 100644
index 0000000000..16541f54cf
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/fill-2.png
new file mode 100644
index 0000000000..d78c957119
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/fill-3.png
new file mode 100644
index 0000000000..231579de43
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/fill-4.png
new file mode 100644
index 0000000000..9a6df7c6b5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/icon.png
index b1dc1c2303..d7345697e3 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..607e842ce5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/meta.json
index db0ac608ed..20e933bb57 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass.rsi/meta.json
@@ -1 +1,31 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/fill-1.png
new file mode 100644
index 0000000000..1f7c26c66d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/fill-2.png
new file mode 100644
index 0000000000..5163ca6589
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/fill-3.png
new file mode 100644
index 0000000000..967ce5aa9b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/fill-4.png
new file mode 100644
index 0000000000..53896282aa
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..fa0c059701
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/meta.json
index db0ac608ed..20e933bb57 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/whiterussianglass.rsi/meta.json
@@ -1 +1,31 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/fill-1.png
new file mode 100644
index 0000000000..d0fafbde24
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/fill-2.png
new file mode 100644
index 0000000000..02eacb7219
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/fill-3.png
new file mode 100644
index 0000000000..5f6abdb2b0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/fill-4.png
new file mode 100644
index 0000000000..e17e04fd93
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/fill-5.png
new file mode 100644
index 0000000000..34ab53c23b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/icon_empty.png
new file mode 100644
index 0000000000..17112fb904
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/meta.json
index db0ac608ed..e5994967cd 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/wineglass.rsi/meta.json
@@ -1 +1,34 @@
-{"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. Fill levels by Tayrtahn on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-1.png
new file mode 100644
index 0000000000..4313fc7435
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-2.png
new file mode 100644
index 0000000000..56b113f32a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-3.png
new file mode 100644
index 0000000000..a698a13310
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-4.png
new file mode 100644
index 0000000000..a5ab9bdef4
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-5.png
new file mode 100644
index 0000000000..37ae8349cd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/fill-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json
index 509fedb6fe..8e2c4444fc 100644
--- a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/bowl.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",
+  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x",
   "size": {
     "x": 32,
     "y": 32
@@ -70,6 +70,21 @@
     {
       "name": "eyeball"
     },
+    {
+      "name": "fill-1"
+    },
+    {
+      "name": "fill-2"
+    },
+    {
+      "name": "fill-3"
+    },
+    {
+      "name": "fill-4"
+    },
+    {
+      "name": "fill-5"
+    },
     {
       "name": "fruit"
     },
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite1.png b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite1.png
new file mode 100644
index 0000000000..f3da176d53
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite1.png differ
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite2.png b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite2.png
new file mode 100644
index 0000000000..73a494c76c
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite2.png differ
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite3.png b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite3.png
new file mode 100644
index 0000000000..afb185352e
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite3.png differ
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite4.png b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite4.png
new file mode 100644
index 0000000000..0c0b6f81da
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite4.png differ
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite5.png b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite5.png
new file mode 100644
index 0000000000..5fee678add
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite5.png differ
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite6.png b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite6.png
new file mode 100644
index 0000000000..71598eaea7
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/grey_stalagmite6.png differ
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/meta.json b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/meta.json
index 33dc4fa073..02e5b17b2b 100644
--- a/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/meta.json
+++ b/Resources/Textures/Objects/Decoration/Flora/flora_stalagmite.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from TGMC at commit https://github.com/tgstation/TerraGov-Marine-Corps/commit/4bf5d1aafbcbbb7bd2a7d0f52ef87f28e2bbb384",
+    "copyright": "Taken from TGMC at commit https://github.com/tgstation/TerraGov-Marine-Corps/commit/4bf5d1aafbcbbb7bd2a7d0f52ef87f28e2bbb384, grey ones recolored by rosieposieeee (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -24,6 +24,24 @@
         },
         {
             "name": "stalagmite6"
+        },
+        {
+            "name": "grey_stalagmite1"
+        },
+        {
+            "name": "grey_stalagmite2"
+        },
+        {
+            "name": "grey_stalagmite3"
+        },
+        {
+            "name": "grey_stalagmite4"
+        },
+        {
+            "name": "grey_stalagmite5"
+        },
+        {
+            "name": "grey_stalagmite6"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/meta.json b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/meta.json
new file mode 100644
index 0000000000..4820db2c63
--- /dev/null
+++ b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by TheShuEd for Space Station 14",
+    "size": {
+        "x": 96,
+        "y": 96
+    },
+    "states": [
+        {
+            "name": "tree01"
+        },
+        {
+            "name": "tree02"
+        },
+        {
+            "name": "tree03"
+        },
+        {
+            "name": "tree04"
+        },
+        {
+            "name": "tree05"
+        },
+        {
+            "name": "tree06"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree01.png b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree01.png
new file mode 100644
index 0000000000..986b78b0cc
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree01.png differ
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree02.png b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree02.png
new file mode 100644
index 0000000000..ffbf2c44ff
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree02.png differ
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree03.png b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree03.png
new file mode 100644
index 0000000000..f37059eb97
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree03.png differ
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree04.png b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree04.png
new file mode 100644
index 0000000000..0461766bcd
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree04.png differ
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree05.png b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree05.png
new file mode 100644
index 0000000000..26ac7f8b40
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree05.png differ
diff --git a/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree06.png b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree06.png
new file mode 100644
index 0000000000..01cda92099
Binary files /dev/null and b/Resources/Textures/Objects/Decoration/Flora/flora_treeslight.rsi/tree06.png differ
diff --git a/Resources/Textures/Objects/Power/AME/ame_part.rsi/box.png b/Resources/Textures/Objects/Devices/flatpack.rsi/ame-part.png
similarity index 100%
rename from Resources/Textures/Objects/Power/AME/ame_part.rsi/box.png
rename to Resources/Textures/Objects/Devices/flatpack.rsi/ame-part.png
diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png b/Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png
new file mode 100644
index 0000000000..63c0450e73
Binary files /dev/null and b/Resources/Textures/Objects/Devices/flatpack.rsi/containment-field-generator.png differ
diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png b/Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png
new file mode 100644
index 0000000000..847aab5536
Binary files /dev/null and b/Resources/Textures/Objects/Devices/flatpack.rsi/grounding-rod.png differ
diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json
index 6381b5c80b..2d1ca37141 100644
--- a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC0-1.0",
-    "copyright": "Created by EmoGarbage404 (github) for SS14",
+    "copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228",
     "size": {
         "x": 32,
         "y": 32
@@ -15,6 +15,30 @@
         },
         {
             "name": "icon-default"
+        },
+        {
+            "name": "solar-assembly-part"
+        },
+        {
+            "name": "ame-part"
+        },
+        {
+            "name": "singularity-generator"
+        },
+        {
+            "name": "tesla-generator"
+        },
+        {
+            "name": "radiation-collector"
+        },
+        {
+            "name": "tesla-coil"
+        },
+        {
+            "name": "grounding-rod"
+        },
+        {
+            "name": "containment-field-generator"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png b/Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png
new file mode 100644
index 0000000000..34411a4c74
Binary files /dev/null and b/Resources/Textures/Objects/Devices/flatpack.rsi/radiation-collector.png differ
diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/singularity-generator.png b/Resources/Textures/Objects/Devices/flatpack.rsi/singularity-generator.png
new file mode 100644
index 0000000000..b73a2cac28
Binary files /dev/null and b/Resources/Textures/Objects/Devices/flatpack.rsi/singularity-generator.png differ
diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png b/Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png
new file mode 100644
index 0000000000..b72b053e4f
Binary files /dev/null and b/Resources/Textures/Objects/Devices/flatpack.rsi/solar-assembly-part.png differ
diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png
new file mode 100644
index 0000000000..bc7672e7aa
Binary files /dev/null and b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-coil.png differ
diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png
new file mode 100644
index 0000000000..053a9c1e46
Binary files /dev/null and b/Resources/Textures/Objects/Devices/flatpack.rsi/tesla-generator.png differ
diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json
index 2828b13ddb..4bc62a96b2 100644
--- a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "nuclearbomb_deployed"
     },
+    {
+      "name": "nuclearbomb_deployed_unlit"
+    },
     {
       "name": "nukefestive",
       "delays": [
diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png
index fa39a744cd..4a01cf2d68 100644
Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png differ
diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed_unlit.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed_unlit.png
new file mode 100644
index 0000000000..bcc758ba58
Binary files /dev/null and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed_unlit.png differ
diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png
index ac5c5d9654..d7e07d8880 100644
Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png differ
diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png
index ee674e57db..b59fac42b8 100644
Binary files a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png and b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png differ
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/meta.json b/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
index fc6d09bffa..cefaeebebf 100644
--- a/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/signaller.rsi/meta.json
@@ -2,7 +2,7 @@
     "version": 1,
 
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Goonstation at commit https://github.com/goonstation/goonstation/commit/354d9635460c296dc7dce23ab39481dc4de6dc00",
+    "copyright": "Taken from Goonstation at commit https://github.com/goonstation/goonstation/commit/354d9635460c296dc7dce23ab39481dc4de6dc00, signaller2 created by TheShuEd",
 
     "size": {
         "x": 32,
@@ -12,6 +12,10 @@
         {
             "name": "signaller",
             "directions": 1
+        },
+        {
+            "name": "signaller2",
+            "directions": 1
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/signaller2.png b/Resources/Textures/Objects/Devices/signaller.rsi/signaller2.png
new file mode 100644
index 0000000000..799a7be6ea
Binary files /dev/null and b/Resources/Textures/Objects/Devices/signaller.rsi/signaller2.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index 11f08bc0dd..ef50532eba 100644
--- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toys.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/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003",
   "size": {
     "x": 32,
     "y": 32
@@ -172,6 +172,14 @@
             "name": "corgib-inhand-left",
             "directions": 4
         },
+        {
+            "name": "ntb-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "ntb-inhand-left",
+            "directions": 4
+        },
         {
             "name": "synb-inhand-left",
             "directions": 4
@@ -183,6 +191,9 @@
         {
             "name": "synb"
         },
+		{
+			"name": "ntb"
+		},
         {
             "name": "corgib"
         },
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/ntb-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/ntb-inhand-left.png
new file mode 100644
index 0000000000..d650573ce8
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/ntb-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/ntb-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/ntb-inhand-right.png
new file mode 100644
index 0000000000..2f978de38a
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/ntb-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/ntb.png b/Resources/Textures/Objects/Fun/toys.rsi/ntb.png
new file mode 100644
index 0000000000..76400a6a64
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/ntb.png differ
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass-inhand-left.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass-inhand-left.png
new file mode 100644
index 0000000000..e4389e3b4e
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass-inhand-right.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass-inhand-right.png
new file mode 100644
index 0000000000..372ab89c8b
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass.png
new file mode 100644
index 0000000000..18c1aa60e9
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass.png differ
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass_2.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass_2.png
new file mode 100644
index 0000000000..5a32cbde35
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass_2.png differ
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass_3.png b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass_3.png
new file mode 100644
index 0000000000..0e68bb7eed
Binary files /dev/null and b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/cglass_3.png differ
diff --git a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json b/Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json
index c4102df71d..0e5cf13ec2 100644
--- a/Resources/Textures/Objects/Materials/Sheets/glass.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/Sheets/glass.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",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 clockwork glass sprited by MACMAN2003",
   "size": {
     "x": 32,
     "y": 32
@@ -142,6 +142,23 @@
       {
         "name": "ruglass-inhand-right",
         "directions": 4
+      },
+      {
+        "name": "cglass"
+      },
+      {
+        "name": "cglass_2"
+      },
+      {
+        "name": "cglass_3"
+      },
+      {
+        "name": "cglass-inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "cglass-inhand-right",
+        "directions": 4
       }
   ]
 }
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
index 0751cf76d3..98a10750bf 100644
--- a/Resources/Textures/Objects/Materials/ore.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
@@ -30,6 +30,9 @@
     },
     {
       "name": "coal"
+    },
+    {
+      "name": "salt"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/salt.png b/Resources/Textures/Objects/Materials/ore.rsi/salt.png
new file mode 100644
index 0000000000..5ee3e44a6f
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/salt.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_medical.png b/Resources/Textures/Objects/Misc/books.rsi/book_medical.png
new file mode 100644
index 0000000000..7152cfe51c
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/book_medical.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_science.png b/Resources/Textures/Objects/Misc/books.rsi/book_science.png
new file mode 100644
index 0000000000..47047c958a
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/book_science.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/book_security.png b/Resources/Textures/Objects/Misc/books.rsi/book_security.png
new file mode 100644
index 0000000000..fb1a4028e8
Binary files /dev/null and b/Resources/Textures/Objects/Misc/books.rsi/book_security.png differ
diff --git a/Resources/Textures/Objects/Misc/books.rsi/meta.json b/Resources/Textures/Objects/Misc/books.rsi/meta.json
index daa28bac2a..514e407582 100644
--- a/Resources/Textures/Objects/Misc/books.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/books.rsi/meta.json
@@ -101,6 +101,15 @@
     },
     {
       "name": "book_fish"
+    },
+    {
+      "name": "book_science"
+    },
+    {
+      "name": "book_medical"
+    },
+    {
+      "name": "book_security"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
index addb827d12..1e510f62a8 100644
--- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/bureaucracy.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/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser.",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser. Lawyer and psychologist paper stamp resprited by Guess-My-Name",
   "size": {
     "x": 32,
     "y": 32
@@ -218,6 +218,9 @@
     {
       "name": "paper_stamp-deny"
     },
+    {
+      "name": "paper_stamp-detective"
+    },
     {
       "name": "paper_stamp-hop"
     },
@@ -251,6 +254,12 @@
     {
       "name": "paper_stamp-mantis"
     },
+    {
+      "name": "paper_stamp-lawyer"
+    },
+    {
+      "name": "paper_stamp-psychologist"
+    },
 
     {
         "name": "paper_stamp-css"
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-detective.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-detective.png
new file mode 100644
index 0000000000..097234f283
Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-detective.png differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-lawyer.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-lawyer.png
new file mode 100644
index 0000000000..ca9bc920af
Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-lawyer.png differ
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
new file mode 100644
index 0000000000..d3c8ad7aff
Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png differ
diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json
index f755ac3b6f..13d35ad878 100644
--- a/Resources/Textures/Objects/Misc/stamps.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/stamps.rsi/meta.json
@@ -28,6 +28,9 @@
     {
       "name": "stamp-deny"
     },
+    {
+      "name": "stamp-detective"
+    },
     {
       "name": "stamp-hop"
     },
diff --git a/Resources/Textures/Objects/Misc/stamps.rsi/stamp-detective.png b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-detective.png
new file mode 100644
index 0000000000..77f7c97079
Binary files /dev/null and b/Resources/Textures/Objects/Misc/stamps.rsi/stamp-detective.png differ
diff --git a/Resources/Textures/Objects/Power/AME/ame_part.rsi/inhand-left.png b/Resources/Textures/Objects/Power/AME/ame_part.rsi/inhand-left.png
deleted file mode 100644
index a45ce6c693..0000000000
Binary files a/Resources/Textures/Objects/Power/AME/ame_part.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Power/AME/ame_part.rsi/inhand-right.png b/Resources/Textures/Objects/Power/AME/ame_part.rsi/inhand-right.png
deleted file mode 100644
index bc2f8c7cbf..0000000000
Binary files a/Resources/Textures/Objects/Power/AME/ame_part.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Power/AME/ame_part.rsi/meta.json b/Resources/Textures/Objects/Power/AME/ame_part.rsi/meta.json
deleted file mode 100644
index c36b2d3284..0000000000
--- a/Resources/Textures/Objects/Power/AME/ame_part.rsi/meta.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "box"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Power/solar_parts.rsi/meta.json b/Resources/Textures/Objects/Power/solar_parts.rsi/meta.json
deleted file mode 100644
index 5379dae116..0000000000
--- a/Resources/Textures/Objects/Power/solar_parts.rsi/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "solar_assembly_parts"
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Power/solar_parts.rsi/solar_assembly_parts.png b/Resources/Textures/Objects/Power/solar_parts.rsi/solar_assembly_parts.png
deleted file mode 100644
index aaf291cb2f..0000000000
Binary files a/Resources/Textures/Objects/Power/solar_parts.rsi/solar_assembly_parts.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/eight.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/eight.png
new file mode 100644
index 0000000000..71c38d8d78
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/eight.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/five.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/five.png
new file mode 100644
index 0000000000..a657600930
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/five.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/four.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/four.png
new file mode 100644
index 0000000000..b8d7147896
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/four.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/inhand-left.png
new file mode 100644
index 0000000000..c093a11b0c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/inhand-right.png
new file mode 100644
index 0000000000..f0bc709489
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/meta.json b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/meta.json
new file mode 100644
index 0000000000..4beec91793
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Modified sprites made originally by tgstation @ https://github.com/tgstation/tgstation/commit/da42afcbaeaa04e5ba288ade027c011efb3ef0ab, Skarlet and Psychosyo. Modified by moomoobeef.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "one"
+    },
+    {
+      "name": "two"
+    },
+    {
+      "name": "three"
+    },
+    {
+      "name": "four"
+    },
+    {
+      "name": "five"
+    },
+    {
+      "name": "six"
+    },
+    {
+      "name": "seven"
+    },
+    {
+      "name": "eight"
+    },
+    {
+      "name": "nine"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/nine.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/nine.png
new file mode 100644
index 0000000000..a81db9fae7
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/nine.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/one.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/one.png
new file mode 100644
index 0000000000..22967c91b8
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/one.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/seven.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/seven.png
new file mode 100644
index 0000000000..eefe30609e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/seven.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/six.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/six.png
new file mode 100644
index 0000000000..7596aca737
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/six.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/three.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/three.png
new file mode 100644
index 0000000000..f827e378a6
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/three.png differ
diff --git a/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/two.png b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/two.png
new file mode 100644
index 0000000000..7309c2ff9b
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Detective/evidence_marker.rsi/two.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/produce-inhand-left.png
index 1e45f5ee18..50e46e896c 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/produce-inhand-right.png
index df8b5fbebe..27afb87dd5 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/produce.png
index 88ae743177..6a33930e2f 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/produce.png and b/Resources/Textures/Objects/Specific/Hydroponics/death_nettle.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/dead.png
new file mode 100644
index 0000000000..ded6b2eb77
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/harvest.png
new file mode 100644
index 0000000000..602809f900
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/harvest.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
new file mode 100644
index 0000000000..2799387216
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/meta.json
@@ -0,0 +1,32 @@
+{
+  "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",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce.png
new file mode 100644
index 0000000000..e4fd37ff96
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/seed.png
new file mode 100644
index 0000000000..a4ad791bb1
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-1.png
new file mode 100644
index 0000000000..1c710f40db
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-2.png
new file mode 100644
index 0000000000..157a081b35
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-3.png
new file mode 100644
index 0000000000..311098b975
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/laughin_pea.rsi/stage-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/dead.png
new file mode 100644
index 0000000000..849b4242b4
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/harvest.png
new file mode 100644
index 0000000000..750707d5dc
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
new file mode 100644
index 0000000000..ddbda4f0af
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a seed modified by potato1234_X (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/produce.png
new file mode 100644
index 0000000000..aa83786963
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/seed.png
new file mode 100644
index 0000000000..2399c2e9b0
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-1.png
new file mode 100644
index 0000000000..1e582f9231
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-2.png
new file mode 100644
index 0000000000..090715f6a0
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-3.png
new file mode 100644
index 0000000000..edcd8617dc
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/stage-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce-inhand-left.png
index d6a98c8cf2..3a1463ee17 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce-inhand-left.png and b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce-inhand-right.png
index bd346bdfed..fc9a24a94e 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce-inhand-right.png and b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce.png
index 3b50100cd0..035b6ff8ba 100644
Binary files a/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce.png and b/Resources/Textures/Objects/Specific/Hydroponics/nettle.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/dead.png
new file mode 100644
index 0000000000..51062192f7
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/dead.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/harvest.png
new file mode 100644
index 0000000000..4674a6e365
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/harvest.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/meta.json
new file mode 100644
index 0000000000..97d9a924bc
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/meta.json
@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a seed modified by potato1234_X (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dead"
+    },
+    {
+      "name": "harvest"
+    },
+    {
+      "name": "produce"
+    },
+    {
+      "name": "seed"
+    },
+    {
+      "name": "stage-1"
+    },
+    {
+      "name": "stage-2"
+    },
+    {
+      "name": "stage-3"
+    },
+    {
+      "name": "stage-4"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/produce.png
new file mode 100644
index 0000000000..fc1e13c7e9
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/produce.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/seed.png
new file mode 100644
index 0000000000..86bf711806
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/seed.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-1.png
new file mode 100644
index 0000000000..65648ac904
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-2.png
new file mode 100644
index 0000000000..f52a3959e1
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-3.png
new file mode 100644
index 0000000000..f92f971f4e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-4.png
new file mode 100644
index 0000000000..3810662df7
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/spacemans_trumpet.rsi/stage-4.png differ
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/icon-cart.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/icon-cart.png
new file mode 100644
index 0000000000..950afc9594
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/icon-cart.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 db10fa1c5c..28617ac255 100644
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
@@ -55,6 +55,9 @@
             "name": "cart_plunger",
             "directions": 4
         },
+        {
+            "name": "icon-cart"
+        },
         {
             "name": "cart_water-1",
             "directions": 4,
diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json
index 79d08e485b..e4f039ada9 100644
--- a/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json
@@ -3,6 +3,7 @@
 	"license": "CC-BY-SA-3.0",
   "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93 and Taken from tgstation at https://github.com/tgstation/tgstation/blob/623290915c2292b56da11048deb62d758e1e3fb4/icons/obj/bloodpack.dmi, Blood pack redone by Ubaser",
   "copyright": "Taken from https://github.com/tgstation/tgstation/blob/a3568da5634e756d0849480104afda402c6f1c3c/icons/obj/medical/stack_medical.dmi",
+  "copyright": "Tourniquet Sprite by PoorMansDreams",
 	"size": {
 		"x": 32,
 		"y": 32
@@ -25,6 +26,9 @@
 		{
 			"name": "gauze"
 		},
+        {
+            "name": "tourniquet"
+        },
 		{
 			"name": "morphine"
 		},
diff --git a/Resources/Textures/Objects/Specific/Medical/medical.rsi/tourniquet.png b/Resources/Textures/Objects/Specific/Medical/medical.rsi/tourniquet.png
new file mode 100644
index 0000000000..fce355eb9e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medical.rsi/tourniquet.png differ
diff --git a/Resources/Textures/Objects/Specific/Security/barrier.rsi/deployed.png b/Resources/Textures/Objects/Specific/Security/barrier.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Security/barrier.rsi/deployed.png
rename to Resources/Textures/Objects/Specific/Security/barrier.rsi/locked.png
diff --git a/Resources/Textures/Objects/Specific/Security/barrier.rsi/meta.json b/Resources/Textures/Objects/Specific/Security/barrier.rsi/meta.json
index 8142924b68..5cd7cffb03 100644
--- a/Resources/Textures/Objects/Specific/Security/barrier.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Security/barrier.rsi/meta.json
@@ -11,7 +11,7 @@
             "name": "idle"
         },
         {
-            "name": "deployed",
+            "name": "locked",
             "delays": [
                 [
                     0.1,
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png b/Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png
new file mode 100644
index 0000000000..5146156969
Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png differ
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
index 47c69de027..23868a906f 100644
--- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
+++ b/Resources/Textures/Objects/Storage/boxes.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/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser.",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, vials was drawn by Ubaser, evidence_markers by moomoobeef.",
   "size": {
     "x": 32,
     "y": 32
@@ -73,6 +73,9 @@
         {
             "name": "disk"
         },
+        {
+            "name": "evidence_markers"
+        },
         {
             "name": "flashbang"
         },
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/equipped-BACKPACK.png
index 5481a4fcd4..4b7e877c75 100644
Binary files a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/equipped-BACKPACK.png and b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/icon-on.png b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/icon-on.png
index 8f7ae047c4..a208328cde 100644
Binary files a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/icon-on.png and b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/icon-on.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/icon.png b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/icon.png
index fe5a89a6f0..520fea9ede 100644
Binary files a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/icon.png and b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/inhand-left.png b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/inhand-left.png
index cfa34df1c2..b5cb0af78b 100644
Binary files a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/inhand-left.png and b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/inhand-right.png b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/inhand-right.png
index ede83bd77d..447706bb91 100644
Binary files a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/inhand-right.png and b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/inhand-right.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 8011c87a0e..2fcae77e7b 100644
--- a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/Jetpacks/void.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/1592a112e3d33eec4a0704b518a138d5a976f455",
+  "copyright": "Drawn by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/on-equipped-BACKPACK.png b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/on-equipped-BACKPACK.png
index 5481a4fcd4..c1cbd4967b 100644
Binary files a/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/on-equipped-BACKPACK.png and b/Resources/Textures/Objects/Tanks/Jetpacks/void.rsi/on-equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png b/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png
index 14d2f9ef84..f548ef7ace 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png and b/Resources/Textures/Objects/Tiles/tile.rsi/astrograss.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png b/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png
index e17ee0500b..e3c0948112 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png and b/Resources/Textures/Objects/Tiles/tile.rsi/astroice.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/brass-filled.png b/Resources/Textures/Objects/Tiles/tile.rsi/brass-filled.png
new file mode 100644
index 0000000000..a6f2df28cf
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/brass-filled.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/brass.png b/Resources/Textures/Objects/Tiles/tile.rsi/brass.png
new file mode 100644
index 0000000000..36ad463525
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/brass.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/carpet-cyan-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-cyan-inhand-left.png
new file mode 100644
index 0000000000..c4a019ba69
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-cyan-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/carpet-cyan-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-cyan-inhand-right.png
new file mode 100644
index 0000000000..c35dfc4ac8
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-cyan-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/carpet-cyan.png b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-cyan.png
new file mode 100644
index 0000000000..45fab28992
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-cyan.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/carpet-white-inhand-left.png b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-white-inhand-left.png
new file mode 100644
index 0000000000..c570665904
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-white-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/carpet-white-inhand-right.png b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-white-inhand-right.png
new file mode 100644
index 0000000000..46924dc2ae
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-white-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/carpet-white.png b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-white.png
new file mode 100644
index 0000000000..fd28316d97
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/carpet-white.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
index 05aeba33fd..11992954f8 100644
--- a/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
+++ b/Resources/Textures/Objects/Tiles/tile.rsi/meta.json
@@ -37,6 +37,15 @@
     {
       "name": "blue"
     },
+	{
+	  "name": "brass"
+	},
+	{
+	  "name": "brass-filled"
+	},
+	{
+	  "name": "reebe"
+	},
     {
       "name": "lime"
     },
@@ -132,6 +141,12 @@
     {
       "name": "carpet-pink"
     },
+    {
+      "name": "carpet-cyan"
+    },
+    {
+      "name": "carpet-white"
+    },
     {
       "name": "hydro"
     },
@@ -195,6 +210,12 @@
     {
       "name": "shuttlered"
     },
+    {
+      "name": "shuttlegrey"
+    },
+    {
+      "name": "shuttleblack"
+    },
     {
       "name": "carpetclown"
     },
@@ -297,6 +318,22 @@
       "name": "carpet-pink-inhand-right",
       "directions": 4
     },
+    {
+      "name": "carpet-cyan-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "carpet-cyan-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "carpet-white-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "carpet-white-inhand-right",
+      "directions": 4
+    },
     {
       "name": "grass-inhand-left",
       "directions": 4
@@ -408,6 +445,9 @@
     {
       "name": "hydro-inhand-left",
       "directions": 4
+    },
+    {
+      "name": "wood-large"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/reebe.png b/Resources/Textures/Objects/Tiles/tile.rsi/reebe.png
new file mode 100644
index 0000000000..bc906c2a1d
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/reebe.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblack.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblack.png
new file mode 100644
index 0000000000..008eeb40e7
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblack.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblue.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblue.png
index 8fc34f3912..4fc4076aee 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblue.png and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleblue.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlegrey.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlegrey.png
new file mode 100644
index 0000000000..4fd7069afe
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlegrey.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleorange.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleorange.png
index 517da85336..3433d217e2 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/shuttleorange.png and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttleorange.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlepurple.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlepurple.png
index c9459da1e8..297822ee7f 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlepurple.png and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlepurple.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlered.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlered.png
index e4f073d6dc..024fef68f1 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlered.png and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlered.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlewhite.png b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlewhite.png
index fcc482b34b..ba8440cd33 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/shuttlewhite.png and b/Resources/Textures/Objects/Tiles/tile.rsi/shuttlewhite.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/snow.png b/Resources/Textures/Objects/Tiles/tile.rsi/snow.png
index 8742892b23..385e2d59ac 100644
Binary files a/Resources/Textures/Objects/Tiles/tile.rsi/snow.png and b/Resources/Textures/Objects/Tiles/tile.rsi/snow.png differ
diff --git a/Resources/Textures/Objects/Tiles/tile.rsi/wood-large.png b/Resources/Textures/Objects/Tiles/tile.rsi/wood-large.png
new file mode 100644
index 0000000000..429d0e1e8d
Binary files /dev/null and b/Resources/Textures/Objects/Tiles/tile.rsi/wood-large.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/aballoon.png b/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/aballoon.png
new file mode 100644
index 0000000000..dcb06d09ca
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/aballoon.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/folded.png b/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/folded.png
new file mode 100644
index 0000000000..44580a1226
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/folded.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/meta.json b/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/meta.json
new file mode 100644
index 0000000000..81b7d5f2c3
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Decoys/agent_decoy.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from existing sprites.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+        "name": "folded"
+        },
+        {
+        "name": "aballoon",
+        "directions": 4
+        }
+]
+}
diff --git a/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/cballoon.png b/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/cballoon.png
new file mode 100644
index 0000000000..da63d127c4
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/cballoon.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/folded.png b/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/folded.png
new file mode 100644
index 0000000000..f16130ef38
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/folded.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/meta.json b/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/meta.json
new file mode 100644
index 0000000000..4eceaa987a
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Decoys/commander_decoy.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from existing sprites.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+        "name": "folded"
+        },
+        {
+        "name": "cballoon",
+        "directions": 4
+        }
+]
+}
diff --git a/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/eballoon.png b/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/eballoon.png
new file mode 100644
index 0000000000..1f5b6d4c25
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/eballoon.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/folded.png b/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/folded.png
new file mode 100644
index 0000000000..c335a79daa
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/folded.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/meta.json b/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/meta.json
new file mode 100644
index 0000000000..7a7d60a805
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Decoys/elite_decoy.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from existing sprites.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+        "name": "folded"
+        },
+        {
+        "name": "eballoon",
+        "directions": 4
+        }
+]
+}
diff --git a/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/folded.png b/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/folded.png
new file mode 100644
index 0000000000..7b3b7b9846
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/folded.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/jballoon.png b/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/jballoon.png
new file mode 100644
index 0000000000..7edcc12a1f
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/jballoon.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/meta.json b/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/meta.json
new file mode 100644
index 0000000000..f43b25335b
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Decoys/juggernaut_decoy.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from existing sprites.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+        "name": "folded"
+        },
+        {
+        "name": "jballoon",
+        "directions": 4
+        }
+]
+}
diff --git a/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/folded.png b/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/folded.png
new file mode 100644
index 0000000000..ba4af386a3
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/folded.png differ
diff --git a/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/meta.json b/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/meta.json
new file mode 100644
index 0000000000..7956c00980
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from existing sprites.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+        "name": "folded"
+        },
+        {
+        "name": "oballoon",
+        "directions": 4
+        }
+]
+}
diff --git a/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/oballoon.png b/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/oballoon.png
new file mode 100644
index 0000000000..ecdde4162a
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Decoys/operative_decoy.rsi/oballoon.png differ
diff --git a/Resources/Textures/Objects/Tools/greenlight.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tools/greenlight.rsi/equipped-BELT.png
new file mode 100644
index 0000000000..ca7c75907d
Binary files /dev/null and b/Resources/Textures/Objects/Tools/greenlight.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Tools/greenlight.rsi/flashlight-on.png b/Resources/Textures/Objects/Tools/greenlight.rsi/flashlight-on.png
new file mode 100644
index 0000000000..c8bd0f9b46
Binary files /dev/null and b/Resources/Textures/Objects/Tools/greenlight.rsi/flashlight-on.png differ
diff --git a/Resources/Textures/Objects/Tools/greenlight.rsi/flashlight-overlay.png b/Resources/Textures/Objects/Tools/greenlight.rsi/flashlight-overlay.png
new file mode 100644
index 0000000000..afd8f80fe2
Binary files /dev/null and b/Resources/Textures/Objects/Tools/greenlight.rsi/flashlight-overlay.png differ
diff --git a/Resources/Textures/Objects/Tools/greenlight.rsi/flashlight.png b/Resources/Textures/Objects/Tools/greenlight.rsi/flashlight.png
new file mode 100644
index 0000000000..b2a0eaa270
Binary files /dev/null and b/Resources/Textures/Objects/Tools/greenlight.rsi/flashlight.png differ
diff --git a/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-left-light.png b/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-left-light.png
new file mode 100644
index 0000000000..cb42c3eb65
Binary files /dev/null and b/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-left-light.png differ
diff --git a/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-left.png
new file mode 100644
index 0000000000..e4e6b42252
Binary files /dev/null and b/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-right-light.png b/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-right-light.png
new file mode 100644
index 0000000000..eea2533dfa
Binary files /dev/null and b/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-right-light.png differ
diff --git a/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-right.png
new file mode 100644
index 0000000000..42c9ca0060
Binary files /dev/null and b/Resources/Textures/Objects/Tools/greenlight.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Tools/greenlight.rsi/meta.json b/Resources/Textures/Objects/Tools/greenlight.rsi/meta.json
new file mode 100644
index 0000000000..41d6756d63
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/greenlight.rsi/meta.json
@@ -0,0 +1,40 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from vgstation and modified by Swept at https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/obj/lighting.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "flashlight"
+    },
+    {
+      "name": "flashlight-on"
+    },
+    {
+      "name": "flashlight-overlay"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left-light",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right-light",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/icon.png b/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/icon.png
new file mode 100644
index 0000000000..2aea25dd68
Binary files /dev/null and b/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/meta.json b/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/meta.json
new file mode 100644
index 0000000000..edae9c38c4
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Frontier Station, created by Tem Armoff https://github.com/new-frontiers-14/frontier-station-14/pull/484/files",
+    "states": [
+        {
+            "name": "scanner",
+            "directions": 1,
+            "delays": [
+                [
+                    0.4,
+                    0.4
+                ]
+            ]
+        },
+        {
+            "name": "icon",
+            "directions": 1
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/scanner.png b/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/scanner.png
new file mode 100644
index 0000000000..46d1c847fe
Binary files /dev/null and b/Resources/Textures/Objects/Tools/handheld_mass_scanner.rsi/scanner.png differ
diff --git a/Resources/Textures/Objects/Tools/t-ray.rsi/meta.json b/Resources/Textures/Objects/Tools/t-ray.rsi/meta.json
index c1929a1efe..e79ca36298 100644
--- a/Resources/Textures/Objects/Tools/t-ray.rsi/meta.json
+++ b/Resources/Textures/Objects/Tools/t-ray.rsi/meta.json
@@ -1,7 +1,7 @@
 {
 	"version": 1,
 	"license": "CC-BY-SA-3.0",
-	"copyright": "/tg/station, 'icons/obj/device.dmi', commit 2b8b045d",
+	"copyright": "/tg/station, 'icons/obj/device.dmi' commit 2b8b045d, redrawn by Ubaser.",
 	"size": { "x": 32, "y": 32 },
 	"states": [
 		{ "name": "tray-on" , "delays": [[0.1, 1.0]]},
diff --git a/Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png b/Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png
index d4a6da02cd..9ca7ff2ca4 100644
Binary files a/Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png and b/Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png differ
diff --git a/Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png b/Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png
index 5f9c84afd8..5c4ba77cfe 100644
Binary files a/Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png and b/Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json
index 023731bcb3..eb50004240 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json
@@ -10,6 +10,9 @@
         {
             "name": "base"
         },
+        {
+            "name": "tip"
+        },
         {
             "name": "base-spent"
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/tip.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/tip.png
new file mode 100644
index 0000000000..78ff6a8dc1
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/tip.png differ
diff --git a/Resources/Textures/Parallaxes/Asteroids.png b/Resources/Textures/Parallaxes/Asteroids.png
new file mode 100644
index 0000000000..fd5f4b6e15
Binary files /dev/null and b/Resources/Textures/Parallaxes/Asteroids.png differ
diff --git a/Resources/Textures/Parallaxes/attributions.yml b/Resources/Textures/Parallaxes/attributions.yml
index 71f0c919d2..fac31a8c0b 100644
--- a/Resources/Textures/Parallaxes/attributions.yml
+++ b/Resources/Textures/Parallaxes/attributions.yml
@@ -6,4 +6,19 @@
 - files: ["KettleParallaxNeb.png", "KettleParallaxBG.png", "AspidParallaxBG.png", "AspidParallaxBG.png"]
   license: "CC0-1.0"
   copyright: "adapted from Screaming Brain Studios"
-  source: "https://opengameart.org/content/seamless-space-backgrounds"
\ No newline at end of file
+  source: "https://opengameart.org/content/seamless-space-backgrounds"
+
+- files: ["gas_giant.png"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "made by brainfood1183 (github) for ss14"
+  source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Textures/Parallaxes/gas_giant.png"
+
+- files: ["Asteroids.png"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "taken from tgstation on https://github.com/tgstation/tgstation/commit/3df5d3b42bfb6b3b5adba1067ab41f83816255bb from parallax.dmi"
+  source: "https://github.com/tgstation/tgstation"
+
+- files: ["core_planet.png"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Drawn by Ubaser"
+  source: "https://github.com/space-wizards/space-station-14/blob/master/Resources/Textures/Parallaxes/core_planet.png"
diff --git a/Resources/Textures/Parallaxes/space_map2.png b/Resources/Textures/Parallaxes/space_map2.png
new file mode 100644
index 0000000000..d4e69b6a5b
Binary files /dev/null and b/Resources/Textures/Parallaxes/space_map2.png differ
diff --git a/Resources/Textures/Parallaxes/weh.txt b/Resources/Textures/Parallaxes/weh.txt
new file mode 100644
index 0000000000..0d2bc485cd
--- /dev/null
+++ b/Resources/Textures/Parallaxes/weh.txt
@@ -0,0 +1 @@
+spacescape
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Decoration/Curtains/black.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/black.rsi/closed.png
new file mode 100644
index 0000000000..d81aa6a6fb
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/black.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/black.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/black.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/black.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/black.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/black.rsi/open.png
new file mode 100644
index 0000000000..91981c6d40
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/black.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/blue.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/blue.rsi/closed.png
new file mode 100644
index 0000000000..06fa747422
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/blue.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/blue.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/blue.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/blue.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/blue.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/blue.rsi/open.png
new file mode 100644
index 0000000000..9095893cd2
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/blue.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/cyan.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/cyan.rsi/closed.png
new file mode 100644
index 0000000000..fefa173eea
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/cyan.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/cyan.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/cyan.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/cyan.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/cyan.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/cyan.rsi/open.png
new file mode 100644
index 0000000000..aef1f723d5
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/cyan.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/green.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/green.rsi/closed.png
new file mode 100644
index 0000000000..48c8387d25
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/green.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/green.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/green.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/green.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/green.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/green.rsi/open.png
new file mode 100644
index 0000000000..a1dc439f1e
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/green.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/hospital.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/hospital.rsi/closed.png
new file mode 100644
index 0000000000..8a9d2737a2
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/hospital.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/hospital.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/hospital.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/hospital.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/hospital.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/hospital.rsi/open.png
new file mode 100644
index 0000000000..127c2f88ec
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/hospital.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/orange.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/orange.rsi/closed.png
new file mode 100644
index 0000000000..047b573bf5
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/orange.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/orange.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/orange.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/orange.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/orange.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/orange.rsi/open.png
new file mode 100644
index 0000000000..fb647ddb61
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/orange.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/pink.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/pink.rsi/closed.png
new file mode 100644
index 0000000000..83a8b61af3
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/pink.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/pink.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/pink.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/pink.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/pink.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/pink.rsi/open.png
new file mode 100644
index 0000000000..071b3cbbfa
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/pink.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/purple.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/purple.rsi/closed.png
new file mode 100644
index 0000000000..0f03f5e973
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/purple.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/purple.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/purple.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/purple.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/purple.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/purple.rsi/open.png
new file mode 100644
index 0000000000..8f9359fd38
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/purple.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/red.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/red.rsi/closed.png
new file mode 100644
index 0000000000..aae143f5db
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/red.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/red.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/red.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/red.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/red.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/red.rsi/open.png
new file mode 100644
index 0000000000..70dc194c15
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/red.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/white.rsi/closed.png b/Resources/Textures/Structures/Decoration/Curtains/white.rsi/closed.png
new file mode 100644
index 0000000000..fbfbe84cfc
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/white.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Decoration/Curtains/white.rsi/meta.json b/Resources/Textures/Structures/Decoration/Curtains/white.rsi/meta.json
new file mode 100644
index 0000000000..77c92df8f8
--- /dev/null
+++ b/Resources/Textures/Structures/Decoration/Curtains/white.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for Space Station14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "open",
+      "directions": 1
+    },
+    {
+      "name": "closed",
+      "directions": 1
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Decoration/Curtains/white.rsi/open.png b/Resources/Textures/Structures/Decoration/Curtains/white.rsi/open.png
new file mode 100644
index 0000000000..f636da8155
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/Curtains/white.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Decoration/curtains.rsi/closed.png b/Resources/Textures/Structures/Decoration/curtains.rsi/closed.png
deleted file mode 100644
index 33f24e93d6..0000000000
Binary files a/Resources/Textures/Structures/Decoration/curtains.rsi/closed.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Decoration/curtains.rsi/meta.json b/Resources/Textures/Structures/Decoration/curtains.rsi/meta.json
deleted file mode 100644
index 68afb3696a..0000000000
--- a/Resources/Textures/Structures/Decoration/curtains.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/951c7976bf6cda431aed8a1b22a8624ff7dfd8e2",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "open",
-      "directions": 1
-    },
-    {
-      "name": "closed",
-      "directions": 1
-    }
-  ]
-}
diff --git a/Resources/Textures/Structures/Decoration/curtains.rsi/open.png b/Resources/Textures/Structures/Decoration/curtains.rsi/open.png
deleted file mode 100644
index 4b4e6aa360..0000000000
Binary files a/Resources/Textures/Structures/Decoration/curtains.rsi/open.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/assembly.png
new file mode 100644
index 0000000000..fe56e9f4da
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/assembly.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/bolted_unlit.png
new file mode 100644
index 0000000000..8937692851
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/bolted_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed.png
new file mode 100644
index 0000000000..4e0bdad1a1
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed_unlit.png
new file mode 100644
index 0000000000..c78d01c42d
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closed_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing.png
new file mode 100644
index 0000000000..b02200b2ce
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing_unlit.png
new file mode 100644
index 0000000000..f7b9eff2ca
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/closing_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/deny_unlit.png
new file mode 100644
index 0000000000..d5e7367a07
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/deny_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/emergency_unlit.png
new file mode 100644
index 0000000000..0303ac66ad
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/emergency_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/meta.json
new file mode 100644
index 0000000000..f686706dd3
--- /dev/null
+++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/meta.json
@@ -0,0 +1,167 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/a406e8388f763e496caac32c3cf11e455b20d28d/icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi and https://github.com/tgstation/tgstation/blob/a406e8388f763e496caac32c3cf11e455b20d28d/icons/obj/doors/airlocks/clockwork/overlays.dmi modified for SS14 by MACMAN2003",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+	  "name": "assembly"
+	},
+	{
+	  "name": "bolted_unlit"
+	},
+    {
+      "name": "closed"
+    },
+	{
+	  "name": "closed_unlit"
+	},
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+	{
+	  "name": "open",
+	  "delays": [
+	    [ 
+		  1 
+		]
+	  ]
+	},
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+	{
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_open",
+      "delays": [
+        [
+          0.4,
+          0.04,
+          0.07,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.07,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "panel_opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "sparks",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/open.png
new file mode 100644
index 0000000000..0c68b4b6c9
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening.png
new file mode 100644
index 0000000000..b4801197c2
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening_unlit.png
new file mode 100644
index 0000000000..20421c994c
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/opening_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_closing.png
new file mode 100644
index 0000000000..cc06c93bd0
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_open.png
new file mode 100644
index 0000000000..a8d3a3dc0f
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_opening.png
new file mode 100644
index 0000000000..325548cb8a
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/panel_opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/sparks.png
new file mode 100644
index 0000000000..453cbff2ce
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/sparks.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/welded.png
new file mode 100644
index 0000000000..87166f1f3c
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/assembly.png
new file mode 100644
index 0000000000..18cb58c81b
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/assembly.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/bolted_unlit.png
new file mode 100644
index 0000000000..8937692851
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/bolted_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closed.png
new file mode 100644
index 0000000000..b070cf3155
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closed_unlit.png
new file mode 100644
index 0000000000..c78d01c42d
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closed_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closing.png
new file mode 100644
index 0000000000..fc8b201873
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closing_unlit.png
new file mode 100644
index 0000000000..f7b9eff2ca
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/closing_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/deny_unlit.png
new file mode 100644
index 0000000000..d5e7367a07
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/deny_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/emergency_unlit.png
new file mode 100644
index 0000000000..0303ac66ad
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/emergency_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/meta.json
new file mode 100644
index 0000000000..f686706dd3
--- /dev/null
+++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/meta.json
@@ -0,0 +1,167 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/a406e8388f763e496caac32c3cf11e455b20d28d/icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi and https://github.com/tgstation/tgstation/blob/a406e8388f763e496caac32c3cf11e455b20d28d/icons/obj/doors/airlocks/clockwork/overlays.dmi modified for SS14 by MACMAN2003",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+	  "name": "assembly"
+	},
+	{
+	  "name": "bolted_unlit"
+	},
+    {
+      "name": "closed"
+    },
+	{
+	  "name": "closed_unlit"
+	},
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+	{
+	  "name": "open",
+	  "delays": [
+	    [ 
+		  1 
+		]
+	  ]
+	},
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+	{
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_open",
+      "delays": [
+        [
+          0.4,
+          0.04,
+          0.07,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.07,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "panel_opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "sparks",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/open.png
new file mode 100644
index 0000000000..0c68b4b6c9
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/opening.png
new file mode 100644
index 0000000000..c629103818
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/opening_unlit.png
new file mode 100644
index 0000000000..20421c994c
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/opening_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_closing.png
new file mode 100644
index 0000000000..cc06c93bd0
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_open.png
new file mode 100644
index 0000000000..a8d3a3dc0f
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_opening.png
new file mode 100644
index 0000000000..325548cb8a
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/panel_opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/sparks.png
new file mode 100644
index 0000000000..453cbff2ce
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/sparks.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/welded.png
new file mode 100644
index 0000000000..87166f1f3c
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/bolted_unlit.png
new file mode 100644
index 0000000000..68f1e08c5b
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/bolted_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/clockworkdeny.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/clockworkdeny.png
new file mode 100644
index 0000000000..702774e22d
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/clockworkdeny.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/clockworkspark.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/clockworkspark.png
new file mode 100644
index 0000000000..ef405aaa35
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/clockworkspark.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closed.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closed.png
new file mode 100644
index 0000000000..d9168af370
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closed_unlit.png
new file mode 100644
index 0000000000..50550c70d5
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closed_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closing.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closing.png
new file mode 100644
index 0000000000..2b9fd5bc7b
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closing_unlit.png
new file mode 100644
index 0000000000..92c270afef
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/closing_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/deny_unlit.png
new file mode 100644
index 0000000000..adc7115cb7
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/deny_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/emergency_unlit.png
new file mode 100644
index 0000000000..50550c70d5
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/emergency_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/meta.json b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/meta.json
new file mode 100644
index 0000000000..30fb6258df
--- /dev/null
+++ b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/meta.json
@@ -0,0 +1,305 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/59b26e9715e9690903c4174cc52c49c0362f6181/icons/obj/doors/windoor.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "closed",
+      "directions": 4
+    },
+    {
+      "name": "opening",
+      "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
+        ]
+      ]
+    },
+    {
+      "name": "opening_unlit",
+      "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
+        ]
+      ]
+    },
+	{
+	  "name": "closed_unlit",
+	  "directions": 4
+	},
+	{
+	  "name": "deny_unlit",
+	  "directions": 4,
+	  "delays":[
+	    [
+		  0.1, 0.2, 0.1
+		],
+		[
+		  0.1, 0.2, 0.1
+		],
+		[
+		  0.1, 0.2, 0.1
+		],
+		[
+		  0.1, 0.2, 0.1
+		]
+	  ]
+	},
+	{
+	  "name": "welded",
+	  "directions": 4
+	},
+	{
+	  "name": "bolted_unlit",
+	  "directions": 4
+	},
+	{
+	  "name": "emergency_unlit",
+	  "directions": 4
+	},
+    {
+      "name": "open",
+      "directions": 4
+    },
+    {
+      "name": "open_unlit",
+      "directions": 4
+    },
+	{
+      "name": "panel_open",
+      "directions": 4
+    },
+    {
+      "name": "closing",
+      "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
+        ]
+      ]
+    },
+    {
+      "name": "closing_unlit",
+      "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
+        ]
+      ]
+    },
+    {
+      "name": "clockworkdeny",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.2,
+          0.1
+        ],
+        [
+          0.1,
+          0.2,
+          0.1
+        ],
+        [
+          0.1,
+          0.2,
+          0.1
+        ],
+        [
+          0.1,
+          0.2,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "clockworkspark",
+      "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
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/open.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/open.png
new file mode 100644
index 0000000000..eef1c1ea84
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/open_unlit.png
new file mode 100644
index 0000000000..070fb919c3
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/open_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/opening.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/opening.png
new file mode 100644
index 0000000000..adb6efa18d
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/opening_unlit.png
new file mode 100644
index 0000000000..92c270afef
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/opening_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/panel_open.png
new file mode 100644
index 0000000000..21bbb4dedf
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/panel_open.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/welded.png b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/welded.png
new file mode 100644
index 0000000000..f154b0f50b
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/clockwork_windoor.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/assembly.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/assembly.png
new file mode 100644
index 0000000000..3556cb6704
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/assembly.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/bolted_unlit.png
new file mode 100644
index 0000000000..2ca98a410d
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/bolted_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closed.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closed.png
new file mode 100644
index 0000000000..24b76c669b
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closed_unlit.png
new file mode 100644
index 0000000000..435a5cb044
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closed_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closing.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closing.png
new file mode 100644
index 0000000000..fd245abf71
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closing_unlit.png
new file mode 100644
index 0000000000..a7265ce6ec
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/closing_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/deny_unlit.png
new file mode 100644
index 0000000000..aface6a2f6
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/deny_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/emergency_unlit.png
new file mode 100644
index 0000000000..ccd783a239
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/emergency_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/meta.json b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/meta.json
new file mode 100644
index 0000000000..f8ce184aec
--- /dev/null
+++ b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/meta.json
@@ -0,0 +1,172 @@
+{
+    "version":1,
+    "license":"CC-BY-SA-3.0",
+    "copyright":"Taken from tgstation at https://github.com/tgstation/tgstation/blob/3681006d7102045e334e8eddb23a8685fcdb258a/icons/obj/doors/windoor.dmi, edited by SphiraI(github)",
+    "size": {
+        "x":32,
+        "y":32
+    },
+    "states":[
+        {
+            "name":"assembly",
+            "directions":4,
+            "delays":[
+                [
+                    0.3,0.3
+                ],
+                [
+                    0.3,0.3
+                ],
+                [
+                    0.3,0.3
+                ],
+                [
+                    0.3,0.3
+                ]
+            ]
+        },
+        {
+            "name":"closed",
+            "directions":4
+        },
+        {
+            "name":"closed_unlit",
+            "directions":4
+        },
+        {
+            "name":"closing",
+            "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
+                ]
+            ]
+        },
+        {
+            "name":"closing_unlit",
+            "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]
+            ]
+        },
+        {
+            "name":"open",
+            "directions":4
+        },
+        {
+            "name":"open_unlit",
+            "directions":4
+        },
+        {
+            "name":"opening",
+            "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
+                ]
+            ]
+        },
+        {
+            "name":"opening_unlit",
+            "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
+                ]
+            ]
+        },
+        {
+            "name":"deny_unlit",
+            "directions":4,
+            "delays":[
+                [
+                    0.1,0.2,0.1
+                ],
+                [
+                    0.1,0.2,0.1
+                ],
+                [
+                    0.1,0.2,0.1
+                ],
+                [
+                    0.1,0.2,0.1
+                ]
+            ]
+        },
+        {
+            "name":"sparks",
+            "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
+                ]
+            ]
+        },
+        {
+            "name":"panel_open",
+            "directions":4
+        },
+        {
+            "name":"bolted_unlit",
+            "directions":4
+        },
+        {
+            "name":"welded",
+            "directions":4
+        },
+        {
+            "name":"secure_underlay",
+            "directions":4
+        },
+        {
+            "name": "emergency_unlit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/open.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/open.png
new file mode 100644
index 0000000000..ceb3e709ba
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/open_unlit.png
new file mode 100644
index 0000000000..ddcc55de0a
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/open_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/opening.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/opening.png
new file mode 100644
index 0000000000..a5761fe258
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/opening_unlit.png
new file mode 100644
index 0000000000..9a3072db8a
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/opening_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/panel_open.png
new file mode 100644
index 0000000000..21bbb4dedf
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/panel_open.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/secure_underlay.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/secure_underlay.png
new file mode 100644
index 0000000000..e574e9a12c
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/secure_underlay.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/sparks.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/sparks.png
new file mode 100644
index 0000000000..a139b5d3c3
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/sparks.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/welded.png b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/welded.png
new file mode 100644
index 0000000000..2975c479be
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/plasma.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/assembly.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/assembly.png
new file mode 100644
index 0000000000..e9a7113662
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/assembly.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/bolted_unlit.png
new file mode 100644
index 0000000000..2ca98a410d
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/bolted_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closed.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closed.png
new file mode 100644
index 0000000000..d8ee0cc068
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closed_unlit.png
new file mode 100644
index 0000000000..435a5cb044
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closed_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closing.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closing.png
new file mode 100644
index 0000000000..bc90e8fb23
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closing_unlit.png
new file mode 100644
index 0000000000..a7265ce6ec
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/closing_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/deny_unlit.png
new file mode 100644
index 0000000000..aface6a2f6
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/deny_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/emergency_unlit.png
new file mode 100644
index 0000000000..ccd783a239
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/emergency_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/meta.json b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/meta.json
new file mode 100644
index 0000000000..f8ce184aec
--- /dev/null
+++ b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/meta.json
@@ -0,0 +1,172 @@
+{
+    "version":1,
+    "license":"CC-BY-SA-3.0",
+    "copyright":"Taken from tgstation at https://github.com/tgstation/tgstation/blob/3681006d7102045e334e8eddb23a8685fcdb258a/icons/obj/doors/windoor.dmi, edited by SphiraI(github)",
+    "size": {
+        "x":32,
+        "y":32
+    },
+    "states":[
+        {
+            "name":"assembly",
+            "directions":4,
+            "delays":[
+                [
+                    0.3,0.3
+                ],
+                [
+                    0.3,0.3
+                ],
+                [
+                    0.3,0.3
+                ],
+                [
+                    0.3,0.3
+                ]
+            ]
+        },
+        {
+            "name":"closed",
+            "directions":4
+        },
+        {
+            "name":"closed_unlit",
+            "directions":4
+        },
+        {
+            "name":"closing",
+            "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
+                ]
+            ]
+        },
+        {
+            "name":"closing_unlit",
+            "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]
+            ]
+        },
+        {
+            "name":"open",
+            "directions":4
+        },
+        {
+            "name":"open_unlit",
+            "directions":4
+        },
+        {
+            "name":"opening",
+            "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
+                ]
+            ]
+        },
+        {
+            "name":"opening_unlit",
+            "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
+                ]
+            ]
+        },
+        {
+            "name":"deny_unlit",
+            "directions":4,
+            "delays":[
+                [
+                    0.1,0.2,0.1
+                ],
+                [
+                    0.1,0.2,0.1
+                ],
+                [
+                    0.1,0.2,0.1
+                ],
+                [
+                    0.1,0.2,0.1
+                ]
+            ]
+        },
+        {
+            "name":"sparks",
+            "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
+                ]
+            ]
+        },
+        {
+            "name":"panel_open",
+            "directions":4
+        },
+        {
+            "name":"bolted_unlit",
+            "directions":4
+        },
+        {
+            "name":"welded",
+            "directions":4
+        },
+        {
+            "name":"secure_underlay",
+            "directions":4
+        },
+        {
+            "name": "emergency_unlit",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/open.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/open.png
new file mode 100644
index 0000000000..7d3efaaa73
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/open_unlit.png
new file mode 100644
index 0000000000..ddcc55de0a
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/open_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/opening.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/opening.png
new file mode 100644
index 0000000000..b06847f1c2
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/opening_unlit.png
new file mode 100644
index 0000000000..9a3072db8a
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/opening_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/panel_open.png
new file mode 100644
index 0000000000..21bbb4dedf
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/panel_open.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/secure_underlay.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/secure_underlay.png
new file mode 100644
index 0000000000..e574e9a12c
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/secure_underlay.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/sparks.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/sparks.png
new file mode 100644
index 0000000000..a139b5d3c3
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/sparks.png differ
diff --git a/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/welded.png b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/welded.png
new file mode 100644
index 0000000000..2975c479be
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Windoors/uranium.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_0.png
new file mode 100644
index 0000000000..055adff7d2
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_0.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_1.png
new file mode 100644
index 0000000000..355184817c
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_1.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_2.png
new file mode 100644
index 0000000000..055adff7d2
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_2.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_3.png
new file mode 100644
index 0000000000..355184817c
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_3.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_4.png
new file mode 100644
index 0000000000..5e57970de6
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_4.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_5.png
new file mode 100644
index 0000000000..645fc314eb
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_6.png
new file mode 100644
index 0000000000..5e57970de6
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_6.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_7.png
new file mode 100644
index 0000000000..120333ea99
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/carpet_7.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/full.png
new file mode 100644
index 0000000000..a6d99c732c
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/meta.json
new file mode 100644
index 0000000000..bc5c77c790
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/Carpets/cyan_carpet.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Hqlle (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/Carpets/white_carpet.rsi/carpet_0.png b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_0.png
new file mode 100644
index 0000000000..a7f317edb2
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_0.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_1.png b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_1.png
new file mode 100644
index 0000000000..9c98702c8c
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_1.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_2.png b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_2.png
new file mode 100644
index 0000000000..a7f317edb2
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_2.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_3.png b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_3.png
new file mode 100644
index 0000000000..9c98702c8c
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_3.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_4.png b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_4.png
new file mode 100644
index 0000000000..263d1cdb3e
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_4.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_5.png b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_5.png
new file mode 100644
index 0000000000..bb0a72771d
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_6.png b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_6.png
new file mode 100644
index 0000000000..9103ea823b
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_6.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_7.png b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_7.png
new file mode 100644
index 0000000000..c8ef41627a
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/carpet_7.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/full.png b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/full.png
new file mode 100644
index 0000000000..48a8295336
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/meta.json b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/meta.json
new file mode 100644
index 0000000000..6d8edffd9f
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/Carpets/white_carpet.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Hqlle (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/Fancy/black.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/full.png
new file mode 100644
index 0000000000..962f141fd8
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/meta.json
new file mode 100644
index 0000000000..b566b964ad
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/meta.json
@@ -0,0 +1,163 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi",
+  "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/Fancy/black.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_0.png
new file mode 100644
index 0000000000..56abee0f9f
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_0.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_1.png
new file mode 100644
index 0000000000..3b62e9fa90
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_1.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_2.png
new file mode 100644
index 0000000000..56abee0f9f
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_2.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_3.png
new file mode 100644
index 0000000000..1ebdf5187a
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_3.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_4.png
new file mode 100644
index 0000000000..71d706c349
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_4.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_5.png
new file mode 100644
index 0000000000..6fe4d19d37
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_6.png
new file mode 100644
index 0000000000..61dd2f2107
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_6.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_7.png
new file mode 100644
index 0000000000..c840c44487
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/black.rsi/state_7.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/full.png
new file mode 100644
index 0000000000..74e4724849
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/meta.json
new file mode 100644
index 0000000000..b566b964ad
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/meta.json
@@ -0,0 +1,163 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi",
+  "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/Fancy/blue.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_0.png
new file mode 100644
index 0000000000..2463ead2ca
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_0.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_1.png
new file mode 100644
index 0000000000..cfa3aad6ea
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_1.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_2.png
new file mode 100644
index 0000000000..2463ead2ca
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_2.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_3.png
new file mode 100644
index 0000000000..1a56027c99
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_3.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_4.png
new file mode 100644
index 0000000000..63d5b3171a
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_4.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_5.png
new file mode 100644
index 0000000000..6d400f6c7a
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_6.png
new file mode 100644
index 0000000000..296dbf968c
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_6.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_7.png
new file mode 100644
index 0000000000..c11131fcf9
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/blue.rsi/state_7.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/full.png
new file mode 100644
index 0000000000..683eed7e83
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/meta.json
new file mode 100644
index 0000000000..b566b964ad
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/meta.json
@@ -0,0 +1,163 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi",
+  "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/Fancy/cyan.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_0.png
new file mode 100644
index 0000000000..14e394d6b8
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_0.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_1.png
new file mode 100644
index 0000000000..19f7d7fdf9
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_1.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_2.png
new file mode 100644
index 0000000000..14e394d6b8
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_2.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_3.png
new file mode 100644
index 0000000000..72d52ee1b1
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_3.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_4.png
new file mode 100644
index 0000000000..71f265825b
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_4.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_5.png
new file mode 100644
index 0000000000..d62bff28a0
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_6.png
new file mode 100644
index 0000000000..6bbe874988
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_6.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_7.png
new file mode 100644
index 0000000000..ae7c86d08c
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/cyan.rsi/state_7.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/full.png
new file mode 100644
index 0000000000..633afcee44
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/meta.json
new file mode 100644
index 0000000000..b566b964ad
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/meta.json
@@ -0,0 +1,163 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi",
+  "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/Fancy/green.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_0.png
new file mode 100644
index 0000000000..cd1118ddee
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_0.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_1.png
new file mode 100644
index 0000000000..959a89d656
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_1.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_2.png
new file mode 100644
index 0000000000..cd1118ddee
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_2.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_3.png
new file mode 100644
index 0000000000..d855fc21a0
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_3.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_4.png
new file mode 100644
index 0000000000..d76f5575e2
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_4.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_5.png
new file mode 100644
index 0000000000..aba7677a49
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_6.png
new file mode 100644
index 0000000000..c048e1f09c
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_6.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_7.png
new file mode 100644
index 0000000000..798a0f6f90
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/green.rsi/state_7.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/full.png
new file mode 100644
index 0000000000..90fd5808ff
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/meta.json
new file mode 100644
index 0000000000..b566b964ad
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/meta.json
@@ -0,0 +1,163 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi",
+  "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/Fancy/orange.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_0.png
new file mode 100644
index 0000000000..791333eb11
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_0.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_1.png
new file mode 100644
index 0000000000..c3e3e310ba
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_1.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_2.png
new file mode 100644
index 0000000000..791333eb11
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_2.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_3.png
new file mode 100644
index 0000000000..4dac655de7
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_3.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_4.png
new file mode 100644
index 0000000000..69557ca373
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_4.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_5.png
new file mode 100644
index 0000000000..acb0253887
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_6.png
new file mode 100644
index 0000000000..94861fc166
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_6.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_7.png
new file mode 100644
index 0000000000..1ee2ee1e83
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/orange.rsi/state_7.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/full.png
new file mode 100644
index 0000000000..447f822acd
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/meta.json
new file mode 100644
index 0000000000..b566b964ad
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/meta.json
@@ -0,0 +1,163 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi",
+  "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/Fancy/pink.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_0.png
new file mode 100644
index 0000000000..25c3d57d13
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_0.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_1.png
new file mode 100644
index 0000000000..f9e61669a2
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_1.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_2.png
new file mode 100644
index 0000000000..25c3d57d13
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_2.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_3.png
new file mode 100644
index 0000000000..64ac2ce45b
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_3.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_4.png
new file mode 100644
index 0000000000..03f5b75aed
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_4.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_5.png
new file mode 100644
index 0000000000..0d23fbccbf
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_6.png
new file mode 100644
index 0000000000..14c3119ce5
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_6.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_7.png
new file mode 100644
index 0000000000..5f0d70d52c
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/pink.rsi/state_7.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/full.png
new file mode 100644
index 0000000000..c79264a951
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/meta.json
new file mode 100644
index 0000000000..b566b964ad
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/meta.json
@@ -0,0 +1,163 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi",
+  "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/Fancy/purple.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_0.png
new file mode 100644
index 0000000000..dbeb971574
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_0.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_1.png
new file mode 100644
index 0000000000..dcc0a20590
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_1.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_2.png
new file mode 100644
index 0000000000..dbeb971574
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_2.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_3.png
new file mode 100644
index 0000000000..3949a234f5
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_3.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_4.png
new file mode 100644
index 0000000000..644a3b2960
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_4.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_5.png
new file mode 100644
index 0000000000..2a7770a80c
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_6.png
new file mode 100644
index 0000000000..df9e48cb18
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_6.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_7.png
new file mode 100644
index 0000000000..16a52aabba
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/purple.rsi/state_7.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/full.png
new file mode 100644
index 0000000000..73c4166f58
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/meta.json
new file mode 100644
index 0000000000..b566b964ad
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/meta.json
@@ -0,0 +1,163 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi",
+  "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/Fancy/red.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_0.png
new file mode 100644
index 0000000000..1e5c9cfb04
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_0.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_1.png
new file mode 100644
index 0000000000..3c2c1a1efb
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_1.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_2.png
new file mode 100644
index 0000000000..1e5c9cfb04
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_2.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_3.png
new file mode 100644
index 0000000000..16fe922635
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_3.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_4.png
new file mode 100644
index 0000000000..0773e28e93
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_4.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_5.png
new file mode 100644
index 0000000000..d346ccfa74
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_6.png
new file mode 100644
index 0000000000..8ef92fce00
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_6.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_7.png
new file mode 100644
index 0000000000..7e414b9387
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/red.rsi/state_7.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/full.png
new file mode 100644
index 0000000000..98af1c85e8
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/meta.json
new file mode 100644
index 0000000000..b566b964ad
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/meta.json
@@ -0,0 +1,163 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/tgstation/tgstation/blob/HEAD/icons/obj/structures.dmi",
+  "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/Fancy/white.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_0.png
new file mode 100644
index 0000000000..0b5db352b3
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_0.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_1.png
new file mode 100644
index 0000000000..087458ce7e
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_1.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_2.png
new file mode 100644
index 0000000000..0b5db352b3
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_2.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_3.png
new file mode 100644
index 0000000000..2e7fe74a93
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_3.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_4.png
new file mode 100644
index 0000000000..3cf33262b7
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_4.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_5.png
new file mode 100644
index 0000000000..44b68a3192
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_6.png
new file mode 100644
index 0000000000..07a53a5615
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_6.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_7.png
new file mode 100644
index 0000000000..b0dd66491b
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/Fancy/white.rsi/state_7.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/full.png b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/full.png
new file mode 100644
index 0000000000..7af0d50326
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/meta.json
new file mode 100644
index 0000000000..4ef0681ba6
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/meta.json
@@ -0,0 +1,163 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/3793e6187a25aa3edd925f2c8984fd3bc5fa3581/icons/obj/smooth_structures/brass_table.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "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
+		]
+	  ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_0.png b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_0.png
new file mode 100644
index 0000000000..e966d940eb
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_0.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_1.png b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_1.png
new file mode 100644
index 0000000000..be9b83a55c
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_1.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_2.png b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_2.png
new file mode 100644
index 0000000000..e966d940eb
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_2.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_3.png b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_3.png
new file mode 100644
index 0000000000..be9b83a55c
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_3.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_4.png b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_4.png
new file mode 100644
index 0000000000..f486ae7650
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_4.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_5.png b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_5.png
new file mode 100644
index 0000000000..e6a083c28e
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_5.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_6.png b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_6.png
new file mode 100644
index 0000000000..f486ae7650
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_6.png differ
diff --git a/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_7.png b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_7.png
new file mode 100644
index 0000000000..ee16f00ccc
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Tables/brass.rsi/state_7.png differ
diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/brass_chair.png b/Resources/Textures/Structures/Furniture/chairs.rsi/brass_chair.png
new file mode 100644
index 0000000000..7d2d0a7e77
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/chairs.rsi/brass_chair.png differ
diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
index f73db12625..c94ef97909 100644
--- a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
+++ b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC, brass chair.png taken from tgstation at https://github.com/tgstation/tgstation/blob/b7e7779c19b76449c290aaf2150fb93545b1a79a/icons/obj/chairs.dmi",
   "size": {
     "x": 32,
     "y": 32
@@ -90,6 +90,10 @@
     {
       "name": "steel-bench",
       "directions": 4
-    }
+    },
+	{
+		"name": "brass_chair",
+		"directions": 4
+	}
   ]
 }
diff --git a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/base.png b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/base.png
new file mode 100644
index 0000000000..61c59350e0
Binary files /dev/null and b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/broken.png b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/broken.png
index 8acd1a859c..0819f73d9a 100644
Binary files a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/broken.png and b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/burned.png b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/burned.png
new file mode 100644
index 0000000000..a981c6a16d
Binary files /dev/null and b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/burned.png differ
diff --git a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/burnt.png b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/burnt.png
deleted file mode 100644
index ef59d2235a..0000000000
Binary files a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/burnt.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/empty.png b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/empty.png
index e28c20cc0b..2be4bba511 100644
Binary files a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/empty.png and b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/empty.png differ
diff --git a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/glow.png b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/glow.png
new file mode 100644
index 0000000000..5e3024793a
Binary files /dev/null and b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/glow.png differ
diff --git a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/meta.json b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/meta.json
index 25064edf45..dfb451a88d 100644
--- a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/meta.json
+++ b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/meta.json
@@ -5,22 +5,22 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "By Peptide90 for SS14. empy, broken and burnt versions by Nekomancer.",
+  "copyright": "by ko4erga (discord)",
   "states": [
     {
-      "name": "off"
+      "name": "broken"
     },
     {
-      "name": "on"
+      "name": "burned"
     },
     {
-      "name": "empty"
+      "name": "base"
     },
-	{
-	  "name": "broken"
-	},
+	  {
+	    "name": "empty"
+	  },
     {
-       "name": "burnt"
+       "name": "glow"
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/off.png b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/off.png
deleted file mode 100644
index a1f276f06a..0000000000
Binary files a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/off.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/on.png b/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/on.png
deleted file mode 100644
index f0d6dec612..0000000000
Binary files a/Resources/Textures/Structures/Lighting/LightPosts/small_light_post.rsi/on.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Machines/arcade.rsi/arcade.png b/Resources/Textures/Structures/Machines/arcade.rsi/arcade.png
index 4f8b700c89..cfe8998acb 100644
Binary files a/Resources/Textures/Structures/Machines/arcade.rsi/arcade.png and b/Resources/Textures/Structures/Machines/arcade.rsi/arcade.png differ
diff --git a/Resources/Textures/Structures/Machines/computers.rsi/solar_screen.png b/Resources/Textures/Structures/Machines/computers.rsi/solar_screen.png
index 90eb9eb5c6..47c9c9340f 100644
Binary files a/Resources/Textures/Structures/Machines/computers.rsi/solar_screen.png and b/Resources/Textures/Structures/Machines/computers.rsi/solar_screen.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_sheater.rsi/meta.json b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_sheater.rsi/meta.json
new file mode 100644
index 0000000000..3b684cec11
--- /dev/null
+++ b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_sheater.rsi/meta.json
@@ -0,0 +1,50 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/ead7e05f990de05b7f5f93d39f9671498cb0aa01",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "sheaterOff"
+    },
+    {
+      "name": "sheaterCool",
+      "delays": [
+        [
+          0.2,
+		  0.2,
+		  0.2,
+		  0.2,
+		  0.2,
+		  0.2,
+		  0.2,
+		  0.2
+        ]
+      ]
+    },
+	{
+      "name": "sheaterHeat",
+      "delays": [
+        [
+          0.2,
+		  0.2,
+		  0.2,
+		  0.2,
+		  0.2,
+		  0.2,
+		  0.2,
+		  0.2
+        ]
+      ]
+    },
+    {
+      "name": "sheaterPanelOpen"
+    },
+    {
+      "name": "sheaterStandby"
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_sheater.rsi/sheaterCool.png b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_sheater.rsi/sheaterCool.png
new file mode 100644
index 0000000000..94682caed3
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_sheater.rsi/sheaterCool.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_sheater.rsi/sheaterHeat.png b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_sheater.rsi/sheaterHeat.png
new file mode 100644
index 0000000000..e33011d664
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_sheater.rsi/sheaterHeat.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_sheater.rsi/sheaterOff.png b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_sheater.rsi/sheaterOff.png
new file mode 100644
index 0000000000..39569086c5
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_sheater.rsi/sheaterOff.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_sheater.rsi/sheaterPanelOpen.png b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_sheater.rsi/sheaterPanelOpen.png
new file mode 100644
index 0000000000..2ce6410e55
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_sheater.rsi/sheaterPanelOpen.png differ
diff --git a/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_sheater.rsi/sheaterStandby.png b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_sheater.rsi/sheaterStandby.png
new file mode 100644
index 0000000000..e436eb1350
Binary files /dev/null and b/Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_sheater.rsi/sheaterStandby.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/lock.png b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/lock.png
rename to Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/locked.png
diff --git a/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/meta.json
index 0456b99ffa..5b5b51257a 100644
--- a/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/meta.json
@@ -34,7 +34,7 @@
       ]
     },
     {
-      "name": "lock",
+      "name": "locked",
       "directions": 4
     },
     {
diff --git a/Resources/Textures/Structures/Specific/Anomalies/Cores/shadow_core.rsi/core.png b/Resources/Textures/Structures/Specific/Anomalies/Cores/shadow_core.rsi/core.png
new file mode 100644
index 0000000000..d37b98aa15
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/Cores/shadow_core.rsi/core.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/Cores/shadow_core.rsi/meta.json b/Resources/Textures/Structures/Specific/Anomalies/Cores/shadow_core.rsi/meta.json
new file mode 100644
index 0000000000..94ffa2be6e
--- /dev/null
+++ b/Resources/Textures/Structures/Specific/Anomalies/Cores/shadow_core.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Created by TheShuEd (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "core"
+    },
+    {
+      "name": "pulse",
+      "delays": [
+        [
+          0.15625,
+          0.15625,
+          0.15625,
+          0.15625
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Specific/Anomalies/Cores/shadow_core.rsi/pulse.png b/Resources/Textures/Structures/Specific/Anomalies/Cores/shadow_core.rsi/pulse.png
new file mode 100644
index 0000000000..c9e239e515
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/Cores/shadow_core.rsi/pulse.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/anom.png b/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/anom.png
new file mode 100644
index 0000000000..d8a74d7f9c
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/anom.png differ
diff --git a/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/meta.json b/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/meta.json
new file mode 100644
index 0000000000..4f02c929a9
--- /dev/null
+++ b/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/meta.json
@@ -0,0 +1,34 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Created by TheShuEd (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 48
+  },
+  "states": [
+    {
+      "name": "anom",
+      "delays": [
+        [
+          0.25625,
+          0.25625,
+          0.25625
+        ]
+      ]
+    },
+    {
+      "name": "pulse",
+      "delays": [
+        [
+          0.15625,
+          0.15625,
+          0.15625,
+          0.15625,
+          0.15625,
+          0.15625
+        ]
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/pulse.png b/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/pulse.png
new file mode 100644
index 0000000000..81a8c92378
Binary files /dev/null and b/Resources/Textures/Structures/Specific/Anomalies/shadow_anom.rsi/pulse.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-locked.png b/Resources/Textures/Structures/Storage/canister.rsi/locked.png
similarity index 100%
rename from Resources/Textures/Structures/Storage/canister.rsi/can-locked.png
rename to Resources/Textures/Structures/Storage/canister.rsi/locked.png
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/meta.json b/Resources/Textures/Structures/Storage/canister.rsi/meta.json
index 7f9dfe2340..95d67cc8ae 100644
--- a/Resources/Textures/Structures/Storage/canister.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/canister.rsi/meta.json
@@ -23,10 +23,10 @@
       "name": "can-connector"
     },
     {
-      "name": "can-locked"
+      "name": "locked"
     },
     {
-      "name": "can-unlocked"
+      "name": "unlocked"
     },
     {
       "name": "can-o0",
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-unlocked.png b/Resources/Textures/Structures/Storage/canister.rsi/unlocked.png
similarity index 100%
rename from Resources/Textures/Structures/Storage/canister.rsi/can-unlocked.png
rename to Resources/Textures/Structures/Storage/canister.rsi/unlocked.png
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/DamageOverlay_12.png b/Resources/Textures/Structures/Storage/glassbox.rsi/DamageOverlay_12.png
new file mode 100644
index 0000000000..cce6fe0ba3
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/DamageOverlay_12.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/DamageOverlay_4.png b/Resources/Textures/Structures/Storage/glassbox.rsi/DamageOverlay_4.png
new file mode 100644
index 0000000000..08b6f66449
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/DamageOverlay_4.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/DamageOverlay_8.png b/Resources/Textures/Structures/Storage/glassbox.rsi/DamageOverlay_8.png
new file mode 100644
index 0000000000..6d980d1c67
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/DamageOverlay_8.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/caplaser.png b/Resources/Textures/Structures/Storage/glassbox.rsi/caplaser.png
new file mode 100644
index 0000000000..4af9023cd0
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/caplaser.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/glass-4.png b/Resources/Textures/Structures/Storage/glassbox.rsi/glass-4.png
new file mode 100644
index 0000000000..d321eb7fb1
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/glass-4.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/glass-up.png b/Resources/Textures/Structures/Storage/glassbox.rsi/glass-up.png
new file mode 100644
index 0000000000..39a32dfef5
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/glass-up.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/glass.png b/Resources/Textures/Structures/Storage/glassbox.rsi/glass.png
new file mode 100644
index 0000000000..1737ee03bd
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/glass.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox-empty-open.png b/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox-empty-open.png
new file mode 100644
index 0000000000..3a3bf591ca
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox-empty-open.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox-filled-closed.png b/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox-filled-closed.png
new file mode 100644
index 0000000000..b558cf5212
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox-filled-closed.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox-filled-open.png b/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox-filled-open.png
new file mode 100644
index 0000000000..48db8e88e5
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox-filled-open.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox.png b/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox.png
new file mode 100644
index 0000000000..3a3bf591ca
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/glassbox.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/locked.png b/Resources/Textures/Structures/Storage/glassbox.rsi/locked.png
new file mode 100644
index 0000000000..f5739c8058
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/meta.json b/Resources/Textures/Structures/Storage/glassbox.rsi/meta.json
new file mode 100644
index 0000000000..5ce653f37b
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/glassbox.rsi/meta.json
@@ -0,0 +1,50 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/0129a094635aac51e00fdc7aa3b4248affc1f49d Sprite modified and updated by Nimfar11 (Github), Shatter resprite by KREKS",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "glass"
+    },
+    {
+      "name": "DamageOverlay_4"
+    },
+    {
+      "name": "DamageOverlay_8"
+    },
+    {
+      "name": "DamageOverlay_12"
+    },
+    {
+      "name": "glass-4"
+    },
+    {
+      "name": "glass-up"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "caplaser"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "glassbox"
+    },
+    {
+      "name": "glassbox-empty-open"
+    },
+    {
+      "name": "glassbox-filled-closed"
+    },
+    {
+      "name": "glassbox-filled-open"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/glassbox.rsi/unlocked.png b/Resources/Textures/Structures/Storage/glassbox.rsi/unlocked.png
new file mode 100644
index 0000000000..1c92900339
Binary files /dev/null and b/Resources/Textures/Structures/Storage/glassbox.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/locked_switch.rsi/base.png b/Resources/Textures/Structures/Wallmounts/locked_switch.rsi/base.png
new file mode 100644
index 0000000000..cdee551f6f
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/locked_switch.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/locked_switch.rsi/locked.png b/Resources/Textures/Structures/Wallmounts/locked_switch.rsi/locked.png
new file mode 100644
index 0000000000..ae53cbd197
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/locked_switch.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/locked_switch.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/locked_switch.rsi/meta.json
new file mode 100644
index 0000000000..2279c5b9e4
--- /dev/null
+++ b/Resources/Textures/Structures/Wallmounts/locked_switch.rsi/meta.json
@@ -0,0 +1,65 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from CEV-Eris at commit 15748b71a1e6d2c547588c653d7c42f18011f7c5, modified by ThunderBear2006 (github) for Space Station 14, modified further by rosieposieeee (github)",
+  "states": [
+    {
+      "name": "base",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "locked",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "unlocked",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Wallmounts/locked_switch.rsi/unlocked.png b/Resources/Textures/Structures/Wallmounts/locked_switch.rsi/unlocked.png
new file mode 100644
index 0000000000..a20016cd4a
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/locked_switch.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
index 94c1af9c77..751413ad0c 100644
--- a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
@@ -1 +1,436 @@
-{"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. poster29_legit modified by TJohnson.", "size": {"x": 32, "y": 32}, "states": [{"name": "rolled_contraband"}, {"name": "rolled_legit"}, {"name": "poster_being_set", "delays": [[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]]}, {"name": "pinningposter"}, {"name": "poster_broken"}, {"name": "poster1_contraband"}, {"name": "poster2_contraband"}, {"name": "poster3_contraband"}, {"name": "poster4_contraband"}, {"name": "poster5_contraband"}, {"name": "poster6_contraband"}, {"name": "poster7_contraband"}, {"name": "poster8_contraband"}, {"name": "poster9_contraband"}, {"name": "poster10_contraband"}, {"name": "poster11_contraband"}, {"name": "poster12_contraband"}, {"name": "poster13_contraband"}, {"name": "poster14_contraband"}, {"name": "poster15_contraband"}, {"name": "poster16_contraband"}, {"name": "poster17_contraband"}, {"name": "poster18_contraband"}, {"name": "poster19_contraband"}, {"name": "poster20_contraband"}, {"name": "poster21_contraband"}, {"name": "poster22_contraband"}, {"name": "poster23_contraband"}, {"name": "poster24_contraband"}, {"name": "poster25_contraband"}, {"name": "poster26_contraband"}, {"name": "poster27_contraband"}, {"name": "poster28_contraband"}, {"name": "poster29_contraband"}, {"name": "poster30_contraband"}, {"name": "poster31_contraband"}, {"name": "poster32_contraband"}, {"name": "poster33_contraband"}, {"name": "poster35_contraband"}, {"name": "poster36_contraband"}, {"name": "poster37_contraband"}, {"name": "poster38_contraband"}, {"name": "poster39_contraband"}, {"name": "poster40_contraband"}, {"name": "poster41_contraband"}, {"name": "poster42_contraband"}, {"name": "poster43_contraband"}, {"name": "poster44_contraband"}, {"name": "poster45_contraband"}, {"name": "poster46_contraband"}, {"name": "poster47_contraband"}, {"name": "poster48_contraband"}, {"name": "poster50_contraband"}, {"name": "poster55_contraband"}, {"name": "poster56_contraband"}, {"name": "poster57_contraband"}, {"name": "poster58_contraband"}, {"name": "poster59_contraband"}, {"name": "poster60_contraband"}, {"name": "poster61_contraband"}, {"name": "poster62_contraband"}, {"name": "poster51_contraband"}, {"name": "poster1_legit"}, {"name": "poster2_legit"}, {"name": "poster3_legit"}, {"name": "poster4_legit"}, {"name": "poster5_legit"}, {"name": "poster6_legit"}, {"name": "poster7_legit"}, {"name": "poster8_legit"}, {"name": "poster9_legit"}, {"name": "poster10_legit"}, {"name": "poster11_legit"}, {"name": "poster12_legit"}, {"name": "poster13_legit"}, {"name": "poster14_legit"}, {"name": "poster15_legit"}, {"name": "poster16_legit"}, {"name": "poster17_legit"}, {"name": "poster18_legit"}, {"name": "poster19_legit"}, {"name": "poster20_legit"}, {"name": "poster21_legit"}, {"name": "poster22_legit"}, {"name": "poster23_legit"}, {"name": "poster24_legit"}, {"name": "poster25_legit"}, {"name": "poster26_legit"}, {"name": "poster27_legit"}, {"name": "poster28_legit"}, {"name": "poster29_legit"}, {"name": "poster30_legit"}, {"name": "poster31_legit"}, {"name": "poster32_legit"}, {"name": "poster33_legit"}, {"name": "poster34_legit"}, {"name": "poster35_legit"}, {"name": "poster36_legit"}, {"name": "poster37_legit"}, {"name": "poster38_legit"}, {"name": "poster39_legit"}, {"name": "poster40_legit"}, {"name": "poster41_legit"}, {"name": "poster42_legit"}, {"name": "poster43_legit"}, {"name": "poster44_legit"}, {"name": "poster45_legit"}, {"name": "poster46_legit"}, {"name": "poster47_legit"}, {"name": "poster48_legit"}, {"name": "poster49_legit"}, {"name": "poster50_legit"}, {"name": "poster51_legit"}, {"name": "random_legit"}, {"name": "random_contraband"}, {"name": "random_anything"}, {"name": "poster52_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "poster53_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "poster54_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "bagelmap", "directions": 1, "delays": [[1.0]]}, {"name": "deltamap", "directions": 1, "delays": [[1.0]]}, {"name": "marathonmap", "directions": 1, "delays": [[1.0]]}, {"name": "originmap", "delays": [[1.0]]}, {"name": "moosemap", "directions": 1, "delays": [[1.0]]}, {"name": "packedmap", "directions": 1, "delays": [[1.0]]}, {"name": "pillarmap", "directions": 1, "delays": [[1.0]]}, {"name": "salternmap", "directions": 1, "delays": [[1.0]]}, {"name": "splitmap", "directions": 1, "delays": [[1.0]]}, {"name": "lighthousemap", "directions": 1, "delays": [[1.0]]}, {"name": "waystationmap", "directions": 1, "delays": [[1.0]]}]}
+{
+  "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_  poster29_legit modified by TJohnson.",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "rolled_contraband"
+    },
+    {
+      "name": "rolled_legit"
+    },
+    {
+      "name": "poster_being_set",
+      "delays": [
+        [
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1
+        ]
+      ]
+    },
+    {
+      "name": "pinningposter"
+    },
+    {
+      "name": "poster_broken"
+    },
+    {
+      "name": "poster1_contraband"
+    },
+    {
+      "name": "poster2_contraband"
+    },
+    {
+      "name": "poster3_contraband"
+    },
+    {
+      "name": "poster4_contraband"
+    },
+    {
+      "name": "poster5_contraband"
+    },
+    {
+      "name": "poster6_contraband"
+    },
+    {
+      "name": "poster7_contraband"
+    },
+    {
+      "name": "poster8_contraband"
+    },
+    {
+      "name": "poster9_contraband"
+    },
+    {
+      "name": "poster10_contraband"
+    },
+    {
+      "name": "poster11_contraband"
+    },
+    {
+      "name": "poster12_contraband"
+    },
+    {
+      "name": "poster13_contraband"
+    },
+    {
+      "name": "poster14_contraband"
+    },
+    {
+      "name": "poster15_contraband"
+    },
+    {
+      "name": "poster16_contraband"
+    },
+    {
+      "name": "poster17_contraband"
+    },
+    {
+      "name": "poster18_contraband"
+    },
+    {
+      "name": "poster19_contraband"
+    },
+    {
+      "name": "poster20_contraband"
+    },
+    {
+      "name": "poster21_contraband"
+    },
+    {
+      "name": "poster22_contraband"
+    },
+    {
+      "name": "poster23_contraband"
+    },
+    {
+      "name": "poster24_contraband"
+    },
+    {
+      "name": "poster25_contraband"
+    },
+    {
+      "name": "poster26_contraband"
+    },
+    {
+      "name": "poster27_contraband"
+    },
+    {
+      "name": "poster28_contraband"
+    },
+    {
+      "name": "poster29_contraband"
+    },
+    {
+      "name": "poster30_contraband"
+    },
+    {
+      "name": "poster31_contraband"
+    },
+    {
+      "name": "poster32_contraband"
+    },
+    {
+      "name": "poster33_contraband"
+    },
+    {
+      "name": "poster35_contraband"
+    },
+    {
+      "name": "poster36_contraband"
+    },
+    {
+      "name": "poster37_contraband"
+    },
+    {
+      "name": "poster38_contraband"
+    },
+    {
+      "name": "poster39_contraband"
+    },
+    {
+      "name": "poster40_contraband"
+    },
+    {
+      "name": "poster41_contraband"
+    },
+    {
+      "name": "poster42_contraband"
+    },
+    {
+      "name": "poster43_contraband"
+    },
+    {
+      "name": "poster44_contraband"
+    },
+    {
+      "name": "poster45_contraband"
+    },
+    {
+      "name": "poster46_contraband"
+    },
+    {
+      "name": "poster47_contraband"
+    },
+    {
+      "name": "poster48_contraband"
+    },
+    {
+      "name": "poster50_contraband"
+    },
+    {
+      "name": "poster55_contraband"
+    },
+    {
+      "name": "poster56_contraband"
+    },
+    {
+      "name": "poster57_contraband"
+    },
+    {
+      "name": "poster58_contraband"
+    },
+    {
+      "name": "poster59_contraband"
+    },
+    {
+      "name": "poster60_contraband"
+    },
+    {
+      "name": "poster61_contraband"
+    },
+    {
+      "name": "poster62_contraband"
+    },
+    {
+      "name": "poster63_contraband"
+    },
+    {
+      "name": "poster51_contraband"
+    },
+    {
+      "name": "poster1_legit"
+    },
+    {
+      "name": "poster2_legit"
+    },
+    {
+      "name": "poster3_legit"
+    },
+    {
+      "name": "poster4_legit"
+    },
+    {
+      "name": "poster5_legit"
+    },
+    {
+      "name": "poster6_legit"
+    },
+    {
+      "name": "poster7_legit"
+    },
+    {
+      "name": "poster8_legit"
+    },
+    {
+      "name": "poster9_legit"
+    },
+    {
+      "name": "poster10_legit"
+    },
+    {
+      "name": "poster11_legit"
+    },
+    {
+      "name": "poster12_legit"
+    },
+    {
+      "name": "poster13_legit"
+    },
+    {
+      "name": "poster14_legit"
+    },
+    {
+      "name": "poster15_legit"
+    },
+    {
+      "name": "poster16_legit"
+    },
+    {
+      "name": "poster17_legit"
+    },
+    {
+      "name": "poster18_legit"
+    },
+    {
+      "name": "poster19_legit"
+    },
+    {
+      "name": "poster20_legit"
+    },
+    {
+      "name": "poster21_legit"
+    },
+    {
+      "name": "poster22_legit"
+    },
+    {
+      "name": "poster23_legit"
+    },
+    {
+      "name": "poster24_legit"
+    },
+    {
+      "name": "poster25_legit"
+    },
+    {
+      "name": "poster26_legit"
+    },
+    {
+      "name": "poster27_legit"
+    },
+    {
+      "name": "poster28_legit"
+    },
+    {
+      "name": "poster29_legit"
+    },
+    {
+      "name": "poster30_legit"
+    },
+    {
+      "name": "poster31_legit"
+    },
+    {
+      "name": "poster32_legit"
+    },
+    {
+      "name": "poster33_legit"
+    },
+    {
+      "name": "poster34_legit"
+    },
+    {
+      "name": "poster35_legit"
+    },
+    {
+      "name": "poster36_legit"
+    },
+    {
+      "name": "poster37_legit"
+    },
+    {
+      "name": "poster38_legit"
+    },
+    {
+      "name": "poster39_legit"
+    },
+    {
+      "name": "poster40_legit"
+    },
+    {
+      "name": "poster41_legit"
+    },
+    {
+      "name": "poster42_legit"
+    },
+    {
+      "name": "poster43_legit"
+    },
+    {
+      "name": "poster44_legit"
+    },
+    {
+      "name": "poster45_legit"
+    },
+    {
+      "name": "poster46_legit"
+    },
+    {
+      "name": "poster47_legit"
+    },
+    {
+      "name": "poster48_legit"
+    },
+    {
+      "name": "poster49_legit"
+    },
+    {
+      "name": "poster50_legit"
+    },
+    {
+      "name": "poster51_legit"
+    },
+    {
+      "name": "random_legit"
+    },
+    {
+      "name": "random_contraband"
+    },
+    {
+      "name": "random_anything"
+    },
+    {
+      "name": "poster52_contraband"
+    },
+    {
+      "name": "poster53_contraband"
+    },
+    {
+      "name": "poster54_contraband"
+    },
+    {
+      "name": "bagelmap"
+    },
+    {
+      "name": "deltamap"
+    },
+    {
+      "name": "marathonmap"
+    },
+    {
+      "name": "originmap"
+    },
+    {
+      "name": "moosemap"
+    },
+    {
+      "name": "packedmap"
+    },
+    {
+      "name": "pillarmap"
+    },
+    {
+      "name": "salternmap"
+    },
+    {
+      "name": "splitmap"
+    },
+    {
+      "name": "lighthousemap"
+    },
+    {
+      "name": "waystationmap"
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster63_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster63_contraband.png
new file mode 100644
index 0000000000..3ecb203059
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster63_contraband.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png
new file mode 100644
index 0000000000..9f36d43776
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/barbershop.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/barbershop.png
similarity index 100%
rename from Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/barbershop.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/barbershop.png
diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_exam.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_exam.png
similarity index 100%
rename from Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_exam.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/direction_exam.png
diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_icu.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_icu.png
similarity index 100%
rename from Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_icu.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/direction_icu.png
diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/laundromat.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/laundromat.png
similarity index 100%
rename from Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/laundromat.png
rename to Resources/Textures/Structures/Wallmounts/signs.rsi/laundromat.png
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
index 9a5f64759b..97be2aaa0d 100644
--- a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, except numerical signs which were created by discord: brainfood#7460, states: 'survival' and 'ntmining' from https://github.com/tgstation/tgstation/commit/f743754ec3ef446c8172388431effa73aeddb7ff#diff-b429dd7fccbca60d740d4887c1077a178abf1efffe57e7ae2a0b607c8a9e2202, 'janitor' edited by forgotmyotheraccount on github",
+  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, except numerical signs which were created by discord: brainfood#7460, states: 'survival' and 'ntmining' from https://github.com/tgstation/tgstation/commit/f743754ec3ef446c8172388431effa73aeddb7ff#diff-b429dd7fccbca60d740d4887c1077a178abf1efffe57e7ae2a0b607c8a9e2202, 'janitor' edited by forgotmyotheraccount on github, 'arcade', 'barbershop', 'direction_exam', 'direction_icu', 'laundromat', 'news', 'reception', and 'salvage' made by rosieposieeee (github)",
     "states": [
         {
             "name": "ai",
@@ -26,6 +26,14 @@
         {
             "name": "anomaly2"
         },
+        {
+            "name": "arcade",
+            "delays": [
+                [
+                    1
+                ]
+            ]
+        },
         {
             "name": "armory",
             "delays": [
@@ -34,6 +42,14 @@
                 ]
             ]
         },
+        {
+            "name": "barbershop",
+            "delays": [
+                [
+                    1
+                ]
+            ]
+        },
         {
             "name": "ass",
             "delays": [
@@ -300,6 +316,42 @@
                 ]
             ]
         },
+        {
+            "name": "direction_exam",
+            "directions": 4,
+            "delays": [
+                [
+                    1
+                ],
+                [
+                    1
+                ],
+                [
+                    1
+                ],
+                [
+                    1
+                ]
+            ]
+        },
+        {
+            "name": "direction_icu",
+            "directions": 4,
+            "delays": [
+                [
+                    1
+                ],
+                [
+                    1
+                ],
+                [
+                    1
+                ],
+                [
+                    1
+                ]
+            ]
+        },
         {
             "name": "direction_janitor",
             "directions": 4,
@@ -830,6 +882,14 @@
                 ]
             ]
         },
+        {
+            "name": "laundromat",
+            "delays": [
+                [
+                    1
+                ]
+            ]
+        },
         {
             "name": "law",
             "delays": [
@@ -894,6 +954,14 @@
                 ]
             ]
         },
+        {
+            "name": "news",
+            "delays": [
+                [
+                    1
+                ]
+            ]
+        },
         {
             "name": "nosmoking",
             "delays": [
@@ -966,6 +1034,14 @@
                 ]
             ]
         },
+        {
+            "name": "reception",
+            "delays": [
+                [
+                    1
+                ]
+            ]
+        },
         {
             "name": "rnd",
             "delays": [
@@ -982,6 +1058,14 @@
                 ]
             ]
         },
+        {
+            "name": "salvage",
+            "delays": [
+                [
+                    1
+                ]
+            ]
+        },
         {
             "name": "sci",
             "delays": [
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/news.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/news.png
new file mode 100644
index 0000000000..575d943c76
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/news.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/reception.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/reception.png
new file mode 100644
index 0000000000..b16670d5b5
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/reception.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/salvage.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/salvage.png
new file mode 100644
index 0000000000..8c51238f89
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/salvage.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/caution.png b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/caution.png
new file mode 100644
index 0000000000..56793d71fa
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/caution.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/caution_security.png b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/caution_security.png
new file mode 100644
index 0000000000..cfcb8b4f55
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/caution_security.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/exit.png b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/exit.png
new file mode 100644
index 0000000000..faec1fc09b
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/exit.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/grey.png b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/grey.png
new file mode 100644
index 0000000000..e35e9db9b6
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/grey.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/janitor.png b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/janitor.png
new file mode 100644
index 0000000000..f24cf205d4
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/janitor.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/meta.json
new file mode 100644
index 0000000000..55198fa3b6
--- /dev/null
+++ b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/meta.json
@@ -0,0 +1,100 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by rosieposieeee (github)",
+  "states": [
+    {
+      "name": "grey",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },{
+        "name": "exit",
+        "directions": 4,
+        "delays": [
+          [
+            1
+          ],
+          [
+            1
+          ],
+          [
+            1
+          ],
+          [
+            1
+          ]
+        ]
+      },
+    {
+      "name": "caution",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "caution_security",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "janitor",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Walls/clock.rsi/clock0.png b/Resources/Textures/Structures/Walls/clock.rsi/clock0.png
index fb72d3a1f4..b33b2aec31 100644
Binary files a/Resources/Textures/Structures/Walls/clock.rsi/clock0.png and b/Resources/Textures/Structures/Walls/clock.rsi/clock0.png differ
diff --git a/Resources/Textures/Structures/Walls/clock.rsi/clock1.png b/Resources/Textures/Structures/Walls/clock.rsi/clock1.png
index 626b446736..254366d60c 100644
Binary files a/Resources/Textures/Structures/Walls/clock.rsi/clock1.png and b/Resources/Textures/Structures/Walls/clock.rsi/clock1.png differ
diff --git a/Resources/Textures/Structures/Walls/clock.rsi/clock2.png b/Resources/Textures/Structures/Walls/clock.rsi/clock2.png
index fb72d3a1f4..b33b2aec31 100644
Binary files a/Resources/Textures/Structures/Walls/clock.rsi/clock2.png and b/Resources/Textures/Structures/Walls/clock.rsi/clock2.png differ
diff --git a/Resources/Textures/Structures/Walls/clock.rsi/clock3.png b/Resources/Textures/Structures/Walls/clock.rsi/clock3.png
index 626b446736..254366d60c 100644
Binary files a/Resources/Textures/Structures/Walls/clock.rsi/clock3.png and b/Resources/Textures/Structures/Walls/clock.rsi/clock3.png differ
diff --git a/Resources/Textures/Structures/Walls/clock.rsi/clock4.png b/Resources/Textures/Structures/Walls/clock.rsi/clock4.png
index 16598b39f1..13d68063f6 100644
Binary files a/Resources/Textures/Structures/Walls/clock.rsi/clock4.png and b/Resources/Textures/Structures/Walls/clock.rsi/clock4.png differ
diff --git a/Resources/Textures/Structures/Walls/clock.rsi/clock5.png b/Resources/Textures/Structures/Walls/clock.rsi/clock5.png
index de9c4642df..bab09c5415 100644
Binary files a/Resources/Textures/Structures/Walls/clock.rsi/clock5.png and b/Resources/Textures/Structures/Walls/clock.rsi/clock5.png differ
diff --git a/Resources/Textures/Structures/Walls/clock.rsi/clock6.png b/Resources/Textures/Structures/Walls/clock.rsi/clock6.png
index 16598b39f1..13d68063f6 100644
Binary files a/Resources/Textures/Structures/Walls/clock.rsi/clock6.png and b/Resources/Textures/Structures/Walls/clock.rsi/clock6.png differ
diff --git a/Resources/Textures/Structures/Walls/clock.rsi/clock7.png b/Resources/Textures/Structures/Walls/clock.rsi/clock7.png
index de9c4642df..bab09c5415 100644
Binary files a/Resources/Textures/Structures/Walls/clock.rsi/clock7.png and b/Resources/Textures/Structures/Walls/clock.rsi/clock7.png differ
diff --git a/Resources/Textures/Structures/Walls/clock.rsi/full.png b/Resources/Textures/Structures/Walls/clock.rsi/full.png
index 6768f805bb..4dd1fe8899 100644
Binary files a/Resources/Textures/Structures/Walls/clock.rsi/full.png and b/Resources/Textures/Structures/Walls/clock.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Walls/clock.rsi/meta.json b/Resources/Textures/Structures/Walls/clock.rsi/meta.json
index 2fe048c6b8..35463148c8 100644
--- a/Resources/Textures/Structures/Walls/clock.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/clock.rsi/meta.json
@@ -1 +1,49 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "clock0", "directions": 4}, {"name": "clock1", "directions": 4}, {"name": "clock2", "directions": 4}, {"name": "clock3", "directions": 4}, {"name": "clock4", "directions": 4}, {"name": "clock5", "directions": 4}, {"name": "clock6", "directions": 4}, {"name": "clock7", "directions": 4}, {"name": "full"}]}
\ No newline at end of file
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/b8fc9b367ebb26def792a68bcb25294e518698d8/icons/turf/walls/clockwork_wall.dmi and https://github.com/tgstation/tgstation/blob/f64e687250f028359d811b2c7e9d4974b2e7ffeb/icons/effects/clockwork.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+	  "name": "wall_gear"
+	},
+    {
+      "name": "clock0",
+	  "directions": 4
+    },
+    {
+      "name": "clock1",
+	  "directions": 4
+    },
+    {
+      "name": "clock2",
+	  "directions": 4
+    },
+    {
+      "name": "clock3",
+	  "directions": 4
+    },
+    {
+      "name": "clock4",
+	  "directions": 4
+    },
+    {
+      "name": "clock5",
+	  "directions": 4
+    },
+    {
+      "name": "clock6",
+	  "directions": 4
+    },
+    {
+      "name": "clock7",
+	  "directions": 4
+    },
+	{
+	  "name": "full"
+	}
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Walls/clock.rsi/wall_gear.png b/Resources/Textures/Structures/Walls/clock.rsi/wall_gear.png
new file mode 100644
index 0000000000..aef69dd4df
Binary files /dev/null and b/Resources/Textures/Structures/Walls/clock.rsi/wall_gear.png differ
diff --git a/Resources/Textures/Structures/Walls/clockwork_grille.rsi/brokenratvargrille.png b/Resources/Textures/Structures/Walls/clockwork_grille.rsi/brokenratvargrille.png
new file mode 100644
index 0000000000..e7552af0ca
Binary files /dev/null and b/Resources/Textures/Structures/Walls/clockwork_grille.rsi/brokenratvargrille.png differ
diff --git a/Resources/Textures/Structures/Walls/clockwork_grille.rsi/meta.json b/Resources/Textures/Structures/Walls/clockwork_grille.rsi/meta.json
new file mode 100644
index 0000000000..ff20b1dbf6
--- /dev/null
+++ b/Resources/Textures/Structures/Walls/clockwork_grille.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/f64e687250f028359d811b2c7e9d4974b2e7ffeb/icons/effects/clockwork.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "ratvargrille"
+    },
+    {
+      "name": "brokenratvargrille"
+    },
+	{
+	  "name": "ratvargrille_diagonal"
+	}
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Walls/clockwork_grille.rsi/ratvargrille.png b/Resources/Textures/Structures/Walls/clockwork_grille.rsi/ratvargrille.png
new file mode 100644
index 0000000000..919cb0271a
Binary files /dev/null and b/Resources/Textures/Structures/Walls/clockwork_grille.rsi/ratvargrille.png differ
diff --git a/Resources/Textures/Structures/Walls/clockwork_grille.rsi/ratvargrille_diagonal.png b/Resources/Textures/Structures/Walls/clockwork_grille.rsi/ratvargrille_diagonal.png
new file mode 100644
index 0000000000..61a7600462
Binary files /dev/null and b/Resources/Textures/Structures/Walls/clockwork_grille.rsi/ratvargrille_diagonal.png differ
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/meta.json b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
index 0cdbae8978..aa46326a4b 100644
--- a/Resources/Textures/Structures/Walls/rock.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
@@ -151,6 +151,9 @@
         {
             "name": "rock_bananium"
         },
+        {
+            "name": "rock_salt"
+        },
         {
             "name": "rock_sand"
         },
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_salt.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_salt.png
new file mode 100644
index 0000000000..4b8a163537
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_salt.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/meta.json
new file mode 100644
index 0000000000..06b6f4a550
--- /dev/null
+++ b/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/b8fc9b367ebb26def792a68bcb25294e518698d8/icons/obj/smooth_structures/clockwork_window.dmi diagonalized by MACMAN2003",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+	  "name": "state0",
+	  "directions": 4
+	},
+    {
+      "name": "state1",
+	  "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state0.png
new file mode 100644
index 0000000000..084563bfa2
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state1.png
new file mode 100644
index 0000000000..0e48f9c922
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow0.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow0.png
new file mode 100644
index 0000000000..48ba09f657
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow1.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow1.png
new file mode 100644
index 0000000000..025376834d
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow2.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow2.png
new file mode 100644
index 0000000000..48ba09f657
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow3.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow3.png
new file mode 100644
index 0000000000..025376834d
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow4.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow4.png
new file mode 100644
index 0000000000..aa4ed12cbc
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow5.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow5.png
new file mode 100644
index 0000000000..6bf733f81a
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow6.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow6.png
new file mode 100644
index 0000000000..aa4ed12cbc
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow7.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow7.png
new file mode 100644
index 0000000000..6d2c0e0650
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/cwindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/full.png b/Resources/Textures/Structures/Windows/clockwork_window.rsi/full.png
new file mode 100644
index 0000000000..d50a9f18d8
Binary files /dev/null and b/Resources/Textures/Structures/Windows/clockwork_window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/clockwork_window.rsi/meta.json b/Resources/Textures/Structures/Windows/clockwork_window.rsi/meta.json
new file mode 100644
index 0000000000..be03eb5f1a
--- /dev/null
+++ b/Resources/Textures/Structures/Windows/clockwork_window.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/b8fc9b367ebb26def792a68bcb25294e518698d8/icons/obj/smooth_structures/clockwork_window.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+	  "name": "full"
+	},
+    {
+      "name": "cwindow0",
+	  "directions": 4
+    },
+    {
+      "name": "cwindow1",
+	  "directions": 4
+    },
+    {
+      "name": "cwindow2",
+	  "directions": 4
+    },
+    {
+      "name": "cwindow3",
+	  "directions": 4
+    },
+    {
+      "name": "cwindow4",
+	  "directions": 4
+    },
+    {
+      "name": "cwindow5",
+	  "directions": 4
+    },
+    {
+      "name": "cwindow6",
+	  "directions": 4
+    },
+    {
+      "name": "cwindow7",
+	  "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Windows/directional.rsi/clock_window.png b/Resources/Textures/Structures/Windows/directional.rsi/clock_window.png
new file mode 100644
index 0000000000..8572dd81f5
Binary files /dev/null and b/Resources/Textures/Structures/Windows/directional.rsi/clock_window.png differ
diff --git a/Resources/Textures/Structures/Windows/directional.rsi/meta.json b/Resources/Textures/Structures/Windows/directional.rsi/meta.json
index 26742cfe6c..5a01452c00 100644
--- a/Resources/Textures/Structures/Windows/directional.rsi/meta.json
+++ b/Resources/Textures/Structures/Windows/directional.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "tgstation at ff1c30ac123dd28c6b5fee11e7f03654f5daa731, plasma windows from paradise at 44c12c6d9d0e42a9d3a582dff7e9a8d72b6ea68a",
+  "copyright": "tgstation at ff1c30ac123dd28c6b5fee11e7f03654f5daa731, plasma windows from paradise at 44c12c6d9d0e42a9d3a582dff7e9a8d72b6ea68a, uranium windows made via edit by SphiraI(github), clockwork windows from https://github.com/tgstation/tgstation/blob/21b42d49ecf2b87f665b5f122368f6a247676721/icons/obj/smooth_structures/structure_variations.dmi",
   "size": {
     "x": 32,
     "y": 32
@@ -24,12 +24,24 @@
       "directions": 4
     },
 	{
-	  "name": "plasma_window",
+	  "name": "clock_window",
 	  "directions": 4
 	},
 	{
-	  "name": "plasma_reinforced_window",
+	  "name": "plasma_window",
 	  "directions": 4
-	}
+	},
+    {
+        "name": "plasma_reinforced_window",
+        "directions": 4
+    },
+    {
+        "name": "uranium_window",
+        "directions": 4
+    },
+    {
+        "name": "uranium_reinforced_window",
+        "directions": 4
+    }
   ]
 }
diff --git a/Resources/Textures/Structures/Windows/directional.rsi/uranium_reinforced_window.png b/Resources/Textures/Structures/Windows/directional.rsi/uranium_reinforced_window.png
new file mode 100644
index 0000000000..2e5990bd0c
Binary files /dev/null and b/Resources/Textures/Structures/Windows/directional.rsi/uranium_reinforced_window.png differ
diff --git a/Resources/Textures/Structures/Windows/directional.rsi/uranium_window.png b/Resources/Textures/Structures/Windows/directional.rsi/uranium_window.png
new file mode 100644
index 0000000000..8a4661a5f2
Binary files /dev/null and b/Resources/Textures/Structures/Windows/directional.rsi/uranium_window.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/full.png b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/full.png
new file mode 100644
index 0000000000..6292748890
Binary files /dev/null and b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/meta.json b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/meta.json
new file mode 100644
index 0000000000..4b89f3cdb0
--- /dev/null
+++ b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0b906c6916ce3803473fa6caa65f5b8661118c46",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "full"
+        },
+        {
+            "name": "ptwindow0",
+            "directions": 4
+        },
+        {
+            "name": "ptwindow1",
+            "directions": 4
+        },
+        {
+            "name": "ptwindow2",
+            "directions": 4
+        },
+        {
+            "name": "ptwindow3",
+            "directions": 4
+        },
+        {
+            "name": "ptwindow4",
+            "directions": 4
+        },
+        {
+            "name": "ptwindow5",
+            "directions": 4
+        },
+        {
+            "name": "ptwindow6",
+            "directions": 4
+        },
+        {
+            "name": "ptwindow7",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow0.png b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow0.png
new file mode 100644
index 0000000000..1704c25c21
Binary files /dev/null and b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow0.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow1.png b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow1.png
new file mode 100644
index 0000000000..3c2aad6b26
Binary files /dev/null and b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow1.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow2.png b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow2.png
new file mode 100644
index 0000000000..1704c25c21
Binary files /dev/null and b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow2.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow3.png b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow3.png
new file mode 100644
index 0000000000..3c2aad6b26
Binary files /dev/null and b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow3.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow4.png b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow4.png
new file mode 100644
index 0000000000..dda14b7014
Binary files /dev/null and b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow4.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow5.png b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow5.png
new file mode 100644
index 0000000000..a4a28e41bf
Binary files /dev/null and b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow5.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow6.png b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow6.png
new file mode 100644
index 0000000000..dda14b7014
Binary files /dev/null and b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow6.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow7.png b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow7.png
new file mode 100644
index 0000000000..cc1f21f692
Binary files /dev/null and b/Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow7.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/meta.json b/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/meta.json
new file mode 100644
index 0000000000..769ebe5b39
--- /dev/null
+++ b/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from plastitanium_window.rsi by Flareguy for Space Station 14",
+    "states": [
+        {
+            "name": "state0"
+        },
+        {
+            "name": "state1"
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state0.png
new file mode 100644
index 0000000000..7737feb503
Binary files /dev/null and b/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state0.png differ
diff --git a/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state1.png
new file mode 100644
index 0000000000..834b6261fd
Binary files /dev/null and b/Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state1.png differ
diff --git a/Resources/Textures/Structures/stairs.rsi/meta.json b/Resources/Textures/Structures/stairs.rsi/meta.json
index 6a0f0ee2e0..d9f5a22fbe 100644
--- a/Resources/Textures/Structures/stairs.rsi/meta.json
+++ b/Resources/Textures/Structures/stairs.rsi/meta.json
@@ -8,11 +8,25 @@
     },
     "states": [
 		{
-			"name": "stairs",
-			"directions": 4
+			"name": "stairs_white",
+            "directions": 4
 		},
         {
-            "name": "stairs_stage"
+            "name": "stairs_stage_white"
+        },
+        {
+            "name": "stairs_steel",
+            "directions": 4
+        },
+        {
+            "name": "stairs_stage_steel"
+        },
+        {
+            "name": "stairs_dark",
+            "directions": 4
+        },
+        {
+            "name": "stairs_stage_dark"
         }
     ]
 }
diff --git a/Resources/Textures/Structures/stairs.rsi/stairs.png b/Resources/Textures/Structures/stairs.rsi/stairs.png
deleted file mode 100644
index d294ec6077..0000000000
Binary files a/Resources/Textures/Structures/stairs.rsi/stairs.png and /dev/null differ
diff --git a/Resources/Textures/Structures/stairs.rsi/stairs_dark.png b/Resources/Textures/Structures/stairs.rsi/stairs_dark.png
new file mode 100644
index 0000000000..49af8663ef
Binary files /dev/null and b/Resources/Textures/Structures/stairs.rsi/stairs_dark.png differ
diff --git a/Resources/Textures/Structures/stairs.rsi/stairs_stage.png b/Resources/Textures/Structures/stairs.rsi/stairs_stage.png
deleted file mode 100644
index 90d2c76de0..0000000000
Binary files a/Resources/Textures/Structures/stairs.rsi/stairs_stage.png and /dev/null differ
diff --git a/Resources/Textures/Structures/stairs.rsi/stairs_stage_dark.png b/Resources/Textures/Structures/stairs.rsi/stairs_stage_dark.png
new file mode 100644
index 0000000000..ae641ba749
Binary files /dev/null and b/Resources/Textures/Structures/stairs.rsi/stairs_stage_dark.png differ
diff --git a/Resources/Textures/Structures/stairs.rsi/stairs_stage_steel.png b/Resources/Textures/Structures/stairs.rsi/stairs_stage_steel.png
new file mode 100644
index 0000000000..cc83be0d4e
Binary files /dev/null and b/Resources/Textures/Structures/stairs.rsi/stairs_stage_steel.png differ
diff --git a/Resources/Textures/Structures/stairs.rsi/stairs_stage_white.png b/Resources/Textures/Structures/stairs.rsi/stairs_stage_white.png
new file mode 100644
index 0000000000..a7052275e8
Binary files /dev/null and b/Resources/Textures/Structures/stairs.rsi/stairs_stage_white.png differ
diff --git a/Resources/Textures/Structures/stairs.rsi/stairs_steel.png b/Resources/Textures/Structures/stairs.rsi/stairs_steel.png
new file mode 100644
index 0000000000..03680b78b9
Binary files /dev/null and b/Resources/Textures/Structures/stairs.rsi/stairs_steel.png differ
diff --git a/Resources/Textures/Structures/stairs.rsi/stairs_white.png b/Resources/Textures/Structures/stairs.rsi/stairs_white.png
new file mode 100644
index 0000000000..fd7fe45b97
Binary files /dev/null and b/Resources/Textures/Structures/stairs.rsi/stairs_white.png differ
diff --git a/Resources/Textures/Tiles/Misc/clockwork/clockwork_floor.png b/Resources/Textures/Tiles/Misc/clockwork/clockwork_floor.png
new file mode 100644
index 0000000000..3d15a8b6a2
Binary files /dev/null and b/Resources/Textures/Tiles/Misc/clockwork/clockwork_floor.png differ
diff --git a/Resources/Textures/Tiles/Misc/clockwork/clockwork_floor_filled.png b/Resources/Textures/Tiles/Misc/clockwork/clockwork_floor_filled.png
new file mode 100644
index 0000000000..387b8c9f88
Binary files /dev/null and b/Resources/Textures/Tiles/Misc/clockwork/clockwork_floor_filled.png differ
diff --git a/Resources/Textures/Tiles/Misc/clockwork/clockwork_lattice.rsi/clock_lattice.png b/Resources/Textures/Tiles/Misc/clockwork/clockwork_lattice.rsi/clock_lattice.png
new file mode 100644
index 0000000000..2682d44e05
Binary files /dev/null and b/Resources/Textures/Tiles/Misc/clockwork/clockwork_lattice.rsi/clock_lattice.png differ
diff --git a/Resources/Textures/Tiles/Misc/clockwork/clockwork_lattice.rsi/meta.json b/Resources/Textures/Tiles/Misc/clockwork/clockwork_lattice.rsi/meta.json
new file mode 100644
index 0000000000..b6e458da16
--- /dev/null
+++ b/Resources/Textures/Tiles/Misc/clockwork/clockwork_lattice.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/99e6a1b09e800f1dd5ac6003053e0a8b05939511/icons/obj/smooth_structures/lattice_clockwork.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "clock_lattice"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Tiles/Misc/clockwork/meta.json b/Resources/Textures/Tiles/Misc/clockwork/meta.json
new file mode 100644
index 0000000000..fc49c23ed1
--- /dev/null
+++ b/Resources/Textures/Tiles/Misc/clockwork/meta.json
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/cf00ca220063bedbb8838277bec32ef8ce90ede7/icons/turf/floors.dmi, item icons taken from tgstation at https://github.com/tgstation/tgstation/blob/c0f9d2e7e84856063bf2dbb93b35dc5c62cfdd5c/icons/obj/tiles.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "clockwork_floor"
+    },
+    {
+      "name": "reebe"
+    },
+    {
+      "name": "reebemap"
+    },
+    {
+      "name": "reebespawn"
+    },
+    {
+      "name": "reebelattice"
+    },
+    {
+      "name": "reebegame"
+    },
+    {
+      "name": "clockwork_floor_filled"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Tiles/Misc/clockwork/reebe.png b/Resources/Textures/Tiles/Misc/clockwork/reebe.png
new file mode 100644
index 0000000000..6718f9a513
Binary files /dev/null and b/Resources/Textures/Tiles/Misc/clockwork/reebe.png differ
diff --git a/Resources/Textures/Tiles/Misc/clockwork/reebegame.png b/Resources/Textures/Tiles/Misc/clockwork/reebegame.png
new file mode 100644
index 0000000000..ccd850007e
Binary files /dev/null and b/Resources/Textures/Tiles/Misc/clockwork/reebegame.png differ
diff --git a/Resources/Textures/Tiles/Misc/clockwork/reebelattice.png b/Resources/Textures/Tiles/Misc/clockwork/reebelattice.png
new file mode 100644
index 0000000000..50b8f1e386
Binary files /dev/null and b/Resources/Textures/Tiles/Misc/clockwork/reebelattice.png differ
diff --git a/Resources/Textures/Tiles/Misc/clockwork/reebemap.png b/Resources/Textures/Tiles/Misc/clockwork/reebemap.png
new file mode 100644
index 0000000000..7171205bb0
Binary files /dev/null and b/Resources/Textures/Tiles/Misc/clockwork/reebemap.png differ
diff --git a/Resources/Textures/Tiles/Misc/clockwork/reebespawn.png b/Resources/Textures/Tiles/Misc/clockwork/reebespawn.png
new file mode 100644
index 0000000000..20f9b3baff
Binary files /dev/null and b/Resources/Textures/Tiles/Misc/clockwork/reebespawn.png differ
diff --git a/Resources/Textures/Tiles/attributions.yml b/Resources/Textures/Tiles/attributions.yml
index 3616d5a7ec..7cfe5535a0 100644
--- a/Resources/Textures/Tiles/attributions.yml
+++ b/Resources/Textures/Tiles/attributions.yml
@@ -66,9 +66,9 @@
   copyright: "Taken from /tg/station at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae"
   source: "https://github.com/tgstation/tgstation/"
 
-- files: ["shuttleblue.png", "shuttleorange.png", "shuttlepurple.png", "shuttlered.png", "shuttlewhite.png"]
+- files: ["shuttleblue.png", "shuttleorange.png", "shuttlepurple.png", "shuttlered.png", "shuttlewhite.png", "shuttlegrey.png", "shuttleblack.png"]
   license: "CC-BY-SA-3.0"
-  copyright: "paradisestation commit 69c831afcd9aef25a2889b507e4f36a3a5fc6def, originally from /VG/ eris"
+  copyright: "Modified by Flareguy for Space Station 14. Unmodified sprite from paradisestation commit 69c831afcd9aef25a2889b507e4f36a3a5fc6def, originally from /VG/ eris"
   source: "https://github.com/ParadiseSS13/Paradise"
 
 - files: ["deprecated.png"]
@@ -115,3 +115,13 @@
   license: "CC-BY-SA-3.0"
   copyright: "taken at https://github.com/ParadiseSS13/Paradise/commit/43889a89d5a9378fd120d627f74613edb1841a66"
   source: "https://github.com/ParadiseSS13/Paradise"
+
+- files: ["latticeTrain.png"]
+  license: "CC0-1.0"
+  copyright: "Created by TheShuEd (github) for space-station-14."
+  source: "https://github.com/space-wizards/space-station-14/pull/24927"
+
+- files: ["wood_large.png"]
+  license: "CC0-1.0"
+  copyright: "Created by ps3moira (github) for space-station-14."
+  source: "https://github.com/space-wizards/space-station-14/"
diff --git a/Resources/Textures/Tiles/latticeTrain.png b/Resources/Textures/Tiles/latticeTrain.png
new file mode 100644
index 0000000000..72905e4a41
Binary files /dev/null and b/Resources/Textures/Tiles/latticeTrain.png differ
diff --git a/Resources/Textures/Tiles/shuttleblack.png b/Resources/Textures/Tiles/shuttleblack.png
new file mode 100644
index 0000000000..e5dc3ff666
Binary files /dev/null and b/Resources/Textures/Tiles/shuttleblack.png differ
diff --git a/Resources/Textures/Tiles/shuttleblue.png b/Resources/Textures/Tiles/shuttleblue.png
index da848dec98..8a57cf8b0a 100644
Binary files a/Resources/Textures/Tiles/shuttleblue.png and b/Resources/Textures/Tiles/shuttleblue.png differ
diff --git a/Resources/Textures/Tiles/shuttlegrey.png b/Resources/Textures/Tiles/shuttlegrey.png
new file mode 100644
index 0000000000..337fef7d30
Binary files /dev/null and b/Resources/Textures/Tiles/shuttlegrey.png differ
diff --git a/Resources/Textures/Tiles/shuttleorange.png b/Resources/Textures/Tiles/shuttleorange.png
index 46f562b506..0e42ad3467 100644
Binary files a/Resources/Textures/Tiles/shuttleorange.png and b/Resources/Textures/Tiles/shuttleorange.png differ
diff --git a/Resources/Textures/Tiles/shuttlepurple.png b/Resources/Textures/Tiles/shuttlepurple.png
index 3e05a9676d..2236948d38 100644
Binary files a/Resources/Textures/Tiles/shuttlepurple.png and b/Resources/Textures/Tiles/shuttlepurple.png differ
diff --git a/Resources/Textures/Tiles/shuttlered.png b/Resources/Textures/Tiles/shuttlered.png
index 49b6665dd2..732cf385d6 100644
Binary files a/Resources/Textures/Tiles/shuttlered.png and b/Resources/Textures/Tiles/shuttlered.png differ
diff --git a/Resources/Textures/Tiles/shuttlewhite.png b/Resources/Textures/Tiles/shuttlewhite.png
index 1e2dd5d0d5..1308a78d9e 100644
Binary files a/Resources/Textures/Tiles/shuttlewhite.png and b/Resources/Textures/Tiles/shuttlewhite.png differ
diff --git a/Resources/Textures/Tiles/wood_large.png b/Resources/Textures/Tiles/wood_large.png
new file mode 100644
index 0000000000..722c462a08
Binary files /dev/null and b/Resources/Textures/Tiles/wood_large.png differ
diff --git a/Resources/clientCommandPerms.yml b/Resources/clientCommandPerms.yml
index f18dd0f81b..99e0fea0c5 100644
--- a/Resources/clientCommandPerms.yml
+++ b/Resources/clientCommandPerms.yml
@@ -39,6 +39,7 @@
     - replay_set_time
     - replay_stop
     - replay_load
+    - saveconfig
 
 - Flags: DEBUG
   Commands:
@@ -52,7 +53,7 @@
     - hidemechanisms
     - showmechanisms
     - menuvis
-    - togglehealthoverlay
+    - showhealthbars
     - toggledecals
     - nodevis
     - nodevisfilter
diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index 897506623c..b8cfc40c1c 100644
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -372,18 +372,24 @@ binds:
   type: State
   key: Return
   canRepeat: true
-  mod1: Shift
 - function: TextNewline
   type: State
   key: NumpadEnter
   canRepeat: true
-  mod1: Shift
 - function: TextSubmit
   type: State
   key: Return
 - function: TextSubmit
   type: State
   key: NumpadEnter
+- function: MultilineTextSubmit
+  type: State
+  key: Return
+  mod1: Control
+- function: MultilineTextSubmit
+  type: State
+  key: NumpadEnter
+  mod1: Control
 - function: TextSelectAll
   type: State
   key: A
diff --git a/Resources/manifest.yml b/Resources/manifest.yml
index ed6de87682..f9b4a2705a 100644
--- a/Resources/manifest.yml
+++ b/Resources/manifest.yml
@@ -1,5 +1,3 @@
-defaultWindowTitle: Simple Station 14
+defaultWindowTitle: Parkstation
 windowIconSet: /Textures/Logo/icon
 splashLogo: /Textures/Logo/logo.png
-
-# PJB PLEASE
diff --git a/RobustToolbox b/RobustToolbox
index 9e0fc7017c..d8b7bb528d 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 9e0fc7017c4740b6bc8302cb724dc7c3b60b3299
+Subproject commit d8b7bb528d3b0a8b85cd46c01cb509fed8252ec4
diff --git a/SpaceStation14.sln b/SpaceStation14.sln
index 5a05a09e35..e0cb455a6d 100644
--- a/SpaceStation14.sln
+++ b/SpaceStation14.sln
@@ -129,6 +129,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content.PatreonParser", "Co
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Analyzers.Tests", "RobustToolbox\Robust.Analyzers.Tests\Robust.Analyzers.Tests.csproj", "{83F510FE-9B50-4D96-AFAB-CC13998D6AFE}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Roslyn", "Roslyn", "{7844DA69-B0F0-49FB-A05E-ECA37372277A}"
+	ProjectSection(SolutionItems) = preProject
+		RobustToolbox\Robust.Roslyn.Shared\Robust.Roslyn.Shared.props = RobustToolbox\Robust.Roslyn.Shared\Robust.Roslyn.Shared.props
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -457,20 +462,21 @@ Global
 		{41B450C0-A361-4CD7-8121-7072B8995CFC} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
 		{7B9472D3-79D4-48D1-9B22-BCDE518FE842} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
 		{1FAE651D-29D8-437A-9864-47CE0D180016} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
 		{8922428F-17C3-47A7-BFE9-570DEB2464DA} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
 		{16F7DE32-0186-44B9-9345-0C20D1BF2422} = {AFF53804-115F-4E67-B81F-26265EA27880}
 		{AFF53804-115F-4E67-B81F-26265EA27880} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
 		{23F09C45-950E-4DB7-A465-E937450FF008} = {AFF53804-115F-4E67-B81F-26265EA27880}
 		{440426C1-8DCA-43F6-967F-94439B8DAF47} = {AFF53804-115F-4E67-B81F-26265EA27880}
-		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
 		{A3C5B00A-D232-4A01-B82E-B0E58BFD5C12} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
 		{8A21C7CA-2EB8-40E5-8043-33582C06D139} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
 		{952AAF2A-DF63-4A7D-8094-3453893EBA80} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
 		{A965CB3B-FD31-44AF-8872-85ABA436098D} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{07CA34A1-1D37-4771-A2E3-495A1044AE0B} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
-		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
+		{7844DA69-B0F0-49FB-A05E-ECA37372277A} = {83B4CBBA-547A-42F0-A7CD-8A67D93196CE}
+		{3CFEB7DB-12C6-46F3-89FC-1450F3016FFA} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
+		{6FBF108E-5CB5-47DE-8D7E-B496ABA9E3E2} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
+		{07CA34A1-1D37-4771-A2E3-495A1044AE0B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
+		{88B0FC0F-7209-40E2-AF16-EB90AF727C5B} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
+		{83F510FE-9B50-4D96-AFAB-CC13998D6AFE} = {7844DA69-B0F0-49FB-A05E-ECA37372277A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {AA37ED9F-F8D6-468E-A101-658AD605B09A}
diff --git a/TODO.md b/TODO.md
deleted file mode 100644
index c6e2a6cc0c..0000000000
--- a/TODO.md
+++ /dev/null
@@ -1,21 +0,0 @@
-- [X] ~~https://github.com/space-wizards/space-station-14/commit/1c604a41a54f286604fa48e1b14f66d3c2d975dd - Replace our mothroaches with these (includes 672969b710d3da073564ef2b3757cb2aba411835)~~
-
-- [ ] https://github.com/space-wizards/space-station-14/commit/670f7459d0fd722d756db8adaded6838963679fa - Investigate if this is our problem or not
-
-- [X] ~~https://github.com/space-wizards/space-station-14/commit/d07ea20f74bedc584cef22f1bad1a9f50b80baf1 - Probably not required~~
-
-- [ ] Proper announcement attributions
-
-- [ ] Move Shiva localization into /DeltaV/
-
-- [ ] https://github.com/space-wizards/space-station-14/commit/eb0c86f803648c0ad8387f7255e15c402dc41653 - Does this have to do with storage refactor is it actually generic?
-
-- [ ] a698a85f3489b32df81ce5f6c62a2ad86465fea4 - Funny shuttle shit
-
-- [ ] beb8c262ae0633767647ad5dbbafc1b1fa1a5dec - To discuss :blunt:
-
-- [ ] 736300d505d72d1302392df2f474624c4087e440 - Make this work for the normal inventory system
-
-- [ ] b37b988ce36cd73cc15f321ecd36c89d84476841 - Fuck xaml
-
-- [ ] 0349c53d0cf723eec8bd72deb82e370cc9aa6519 - Sigh
\ No newline at end of file
diff --git a/Tools/dump_github_contributors.ps1 b/Tools/dump_github_contributors.ps1
index 68b1d7f426..193eec4692 100755
--- a/Tools/dump_github_contributors.ps1
+++ b/Tools/dump_github_contributors.ps1
@@ -27,7 +27,7 @@ function load_contribs([string] $repo)
 }
 
 $engineJson = load_contribs("space-wizards/RobustToolbox")
-$contentJson = load_contribs("DeltaV-Station/Delta-v-rebase")
+$contentJson = load_contribs("Simple-Station/Einstein-Engines")
 
 ($engineJson).login + ($contentJson).login `
     | select -unique `
diff --git a/flake.lock b/flake.lock
index 6cfa2ba415..6ab38fa41b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1706213598,
-        "narHash": "sha256-Toz3HEHeq6Esr5uDOMel8BiGSa94gj+og3Yz4YEgjYI=",
+        "lastModified": 1708210246,
+        "narHash": "sha256-Q8L9XwrBK53fbuuIFMbjKvoV7ixfLFKLw4yV+SD28Y8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cda0e75a0bd7cf05bd3e40658c163e4f8f376b7b",
+        "rev": "69405156cffbdf2be50153f13cbdf9a0bea38e49",
         "type": "github"
       },
       "original": {
diff --git a/shell.nix b/shell.nix
index d3ece6cdb1..da363feda9 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,8 +1,9 @@
-{ pkgs ? import (builtins.fetchTarball {
+{ pkgs ? (let lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+in import (builtins.fetchTarball {
   url =
-    "https://github.com/NixOS/nixpkgs/archive/cda0e75a0bd7cf05bd3e40658c163e4f8f376b7b.tar.gz";
-  sha256 = "sha256-Toz3HEHeq6Esr5uDOMel8BiGSa94gj+og3Yz4YEgjYI=";
-}) { } }:
+    "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.nixpkgs.locked.rev}.tar.gz";
+  sha256 = lock.nodes.nixpkgs.locked.narHash;
+}) { }) }:
 
 let
   dependencies = with pkgs; [
@@ -41,6 +42,7 @@ let
     dbus
     at-spi2-core
     cups
+    python3
   ];
 in pkgs.mkShell {
   name = "space-station-14-devshell";